From 935ba166f91898c0800d845d2d23e7b6bb074394 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Tue, 12 Oct 2021 23:48:00 -0700
Subject: [PATCH 001/117] [Fleet] Show security requirements page when ES
 security is not enabled (#114583)

* Show security requirements page when ES security is not enabled

* Add comments
---
 .../common/types/rest_spec/fleet_setup.ts     |   1 +
 .../fleet/public/applications/fleet/app.tsx   | 101 +++++++++---------
 .../es_requirements_page.tsx                  |   2 +-
 .../plugins/fleet/server/routes/app/index.ts  |  18 +++-
 .../translations/translations/ja-JP.json      |  21 ++--
 .../translations/translations/zh-CN.json      |  21 ++--
 6 files changed, 86 insertions(+), 78 deletions(-)

diff --git a/x-pack/plugins/fleet/common/types/rest_spec/fleet_setup.ts b/x-pack/plugins/fleet/common/types/rest_spec/fleet_setup.ts
index a637f19423a6b..198aa111c6fb0 100644
--- a/x-pack/plugins/fleet/common/types/rest_spec/fleet_setup.ts
+++ b/x-pack/plugins/fleet/common/types/rest_spec/fleet_setup.ts
@@ -13,6 +13,7 @@ export interface PostFleetSetupResponse {
 export interface GetFleetStatusResponse {
   isReady: boolean;
   missing_requirements: Array<
+    | 'security_required'
     | 'tls_required'
     | 'api_keys'
     | 'fleet_admin_user'
diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
index 11be87f146851..682c889d80b97 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
@@ -45,6 +45,7 @@ import { DefaultLayout, DefaultPageTitle, WithoutHeaderLayout, WithHeaderLayout
 import { AgentPolicyApp } from './sections/agent_policy';
 import { DataStreamApp } from './sections/data_stream';
 import { AgentsApp } from './sections/agents';
+import { MissingESRequirementsPage } from './sections/agents/agent_requirements_page';
 import { CreatePackagePolicyPage } from './sections/agent_policy/create_package_policy_page';
 import { EnrollmentTokenListPage } from './sections/agents/enrollment_token_list_page';
 
@@ -71,6 +72,53 @@ const Panel = styled(EuiPanel)`
   margin-left: auto;
 `;
 
+const PermissionsError: React.FunctionComponent<{ error: string }> = memo(({ error }) => {
+  if (error === 'MISSING_SECURITY') {
+    return <MissingESRequirementsPage missingRequirements={['security_required', 'api_keys']} />;
+  }
+
+  if (error === 'MISSING_SUPERUSER_ROLE') {
+    return (
+      <Panel>
+        <EuiEmptyPrompt
+          iconType="securityApp"
+          title={
+            <h2>
+              <FormattedMessage
+                id="xpack.fleet.permissionDeniedErrorTitle"
+                defaultMessage="Permission denied"
+              />
+            </h2>
+          }
+          body={
+            <p>
+              <FormattedMessage
+                id="xpack.fleet.permissionDeniedErrorMessage"
+                defaultMessage="You are not authorized to access Fleet. Fleet requires {roleName} privileges."
+                values={{ roleName: <EuiCode>superuser</EuiCode> }}
+              />
+            </p>
+          }
+        />
+      </Panel>
+    );
+  }
+
+  return (
+    <Error
+      title={
+        <FormattedMessage
+          id="xpack.fleet.permissionsRequestErrorMessageTitle"
+          defaultMessage="Unable to check permissions"
+        />
+      }
+      error={i18n.translate('xpack.fleet.permissionsRequestErrorMessageDescription', {
+        defaultMessage: 'There was a problem checking Fleet permissions',
+      })}
+    />
+  );
+});
+
 export const WithPermissionsAndSetup: React.FC = memo(({ children }) => {
   useBreadcrumbs('base');
   const { notifications } = useStartServices();
@@ -121,58 +169,7 @@ export const WithPermissionsAndSetup: React.FC = memo(({ children }) => {
   if (isPermissionsLoading || permissionsError) {
     return (
       <ErrorLayout isAddIntegrationsPath={isAddIntegrationsPath}>
-        {isPermissionsLoading ? (
-          <Loading />
-        ) : permissionsError === 'REQUEST_ERROR' ? (
-          <Error
-            title={
-              <FormattedMessage
-                id="xpack.fleet.permissionsRequestErrorMessageTitle"
-                defaultMessage="Unable to check permissions"
-              />
-            }
-            error={i18n.translate('xpack.fleet.permissionsRequestErrorMessageDescription', {
-              defaultMessage: 'There was a problem checking Fleet permissions',
-            })}
-          />
-        ) : (
-          <Panel>
-            <EuiEmptyPrompt
-              iconType="securityApp"
-              title={
-                <h2>
-                  {permissionsError === 'MISSING_SUPERUSER_ROLE' ? (
-                    <FormattedMessage
-                      id="xpack.fleet.permissionDeniedErrorTitle"
-                      defaultMessage="Permission denied"
-                    />
-                  ) : (
-                    <FormattedMessage
-                      id="xpack.fleet.securityRequiredErrorTitle"
-                      defaultMessage="Security is not enabled"
-                    />
-                  )}
-                </h2>
-              }
-              body={
-                <p>
-                  {permissionsError === 'MISSING_SUPERUSER_ROLE' ? (
-                    <FormattedMessage
-                      id="xpack.fleet.permissionDeniedErrorMessage"
-                      defaultMessage="You are not authorized to access Fleet. Fleet requires {roleName} privileges."
-                      values={{ roleName: <EuiCode>superuser</EuiCode> }}
-                    />
-                  ) : (
-                    <FormattedMessage
-                      id="xpack.fleet.securityRequiredErrorMessage"
-                      defaultMessage="You must enable security in Kibana and Elasticsearch to use Fleet."
-                    />
-                  )}
-                </p>
-              }
-            />
-          </Panel>
-        )}
+        {isPermissionsLoading ? <Loading /> : <PermissionsError error={permissionsError!} />}
       </ErrorLayout>
     );
   }
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/es_requirements_page.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/es_requirements_page.tsx
index 9c5ec12645c1d..5aff449a923b3 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/es_requirements_page.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/es_requirements_page.tsx
@@ -76,7 +76,7 @@ export const MissingESRequirementsPage: React.FunctionComponent<{
             values={{ esConfigFile: <EuiCode>elasticsearch.yml</EuiCode> }}
           />
           <EuiSpacer size="l" />
-          <RequirementItem isMissing={false}>
+          <RequirementItem isMissing={missingRequirements.includes('security_required')}>
             <FormattedMessage
               id="xpack.fleet.setupPage.elasticsearchSecurityFlagText"
               defaultMessage="{esSecurityLink}. Set {securityFlag} to {true} ."
diff --git a/x-pack/plugins/fleet/server/routes/app/index.ts b/x-pack/plugins/fleet/server/routes/app/index.ts
index f2fc6302c8ce5..025da6d79702c 100644
--- a/x-pack/plugins/fleet/server/routes/app/index.ts
+++ b/x-pack/plugins/fleet/server/routes/app/index.ts
@@ -13,11 +13,23 @@ import type { CheckPermissionsResponse, GenerateServiceTokenResponse } from '../
 import { defaultIngestErrorHandler, GenerateServiceTokenError } from '../../errors';
 
 export const getCheckPermissionsHandler: RequestHandler = async (context, request, response) => {
+  const missingSecurityBody: CheckPermissionsResponse = {
+    success: false,
+    error: 'MISSING_SECURITY',
+  };
   const body: CheckPermissionsResponse = { success: true };
   try {
     const security = await appContextService.getSecurity();
     const user = security.authc.getCurrentUser(request);
 
+    // when ES security is disabled, but Kibana security plugin is not explicitly disabled,
+    // `authc.getCurrentUser()` does not error, instead it comes back as `null`
+    if (!user) {
+      return response.ok({
+        body: missingSecurityBody,
+      });
+    }
+
     if (!user?.roles.includes('superuser')) {
       body.success = false;
       body.error = 'MISSING_SUPERUSER_ROLE';
@@ -28,10 +40,10 @@ export const getCheckPermissionsHandler: RequestHandler = async (context, reques
 
     return response.ok({ body: { success: true } });
   } catch (e) {
-    body.success = false;
-    body.error = 'MISSING_SECURITY';
+    // when Kibana security plugin is explicitly disabled,
+    // `appContextService.getSecurity()` returns an error, so we catch it here
     return response.ok({
-      body,
+      body: missingSecurityBody,
     });
   }
 };
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 06f5e133f33b6..84d87cb020fe9 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -4908,6 +4908,16 @@
     "visTypeMetric.colorModes.backgroundOptionLabel": "背景",
     "visTypeMetric.colorModes.labelsOptionLabel": "ラベル",
     "visTypeMetric.colorModes.noneOptionLabel": "なし",
+    "visTypeMetric.metricDescription": "計算結果を単独の数字として表示します。",
+    "visTypeMetric.metricTitle": "メトリック",
+    "visTypeMetric.params.color.useForLabel": "使用する色",
+    "visTypeMetric.params.rangesTitle": "範囲",
+    "visTypeMetric.params.settingsTitle": "設定",
+    "visTypeMetric.params.showTitleLabel": "タイトルを表示",
+    "visTypeMetric.params.style.fontSizeLabel": "ポイント単位のメトリックフォントサイズ",
+    "visTypeMetric.params.style.styleTitle": "スタイル",
+    "visTypeMetric.schemas.metricTitle": "メトリック",
+    "visTypeMetric.schemas.splitGroupTitle": "グループを分割",
     "expressionMetricVis.function.dimension.splitGroup": "グループを分割",
     "expressionMetricVis.function.bgFill.help": "html 16 進数コード（#123456）、html 色（red、blue）、または rgba 値（rgba（255,255,255,1））。",
     "expressionMetricVis.function.bucket.help": "バケットディメンションの構成です。",
@@ -4923,16 +4933,6 @@
     "expressionMetricVis.function.showLabels.help": "メトリック値の下にラベルを表示します。",
     "expressionMetricVis.function.subText.help": "メトリックの下に表示するカスタムテキスト",
     "expressionMetricVis.function.useRanges.help": "有効な色範囲です。",
-    "visTypeMetric.metricDescription": "計算結果を単独の数字として表示します。",
-    "visTypeMetric.metricTitle": "メトリック",
-    "visTypeMetric.params.color.useForLabel": "使用する色",
-    "visTypeMetric.params.rangesTitle": "範囲",
-    "visTypeMetric.params.settingsTitle": "設定",
-    "visTypeMetric.params.showTitleLabel": "タイトルを表示",
-    "visTypeMetric.params.style.fontSizeLabel": "ポイント単位のメトリックフォントサイズ",
-    "visTypeMetric.params.style.styleTitle": "スタイル",
-    "visTypeMetric.schemas.metricTitle": "メトリック",
-    "visTypeMetric.schemas.splitGroupTitle": "グループを分割",
     "visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.deprecation": "Visualizeの円グラフのレガシーグラフライブラリは廃止予定であり、8.0以降ではサポートされません。",
     "visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.description": "Visualizeで円グラフのレガシーグラフライブラリを有効にします。",
     "visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.name": "円グラフのレガシーグラフライブラリ",
@@ -10947,7 +10947,6 @@
     "xpack.fleet.preconfiguration.missingIDError": "{agentPolicyName}には「id」フィールドがありません。ポリシーのis_defaultまたはis_default_fleet_serverに設定されている場合をのぞき、「id」は必須です。",
     "xpack.fleet.preconfiguration.packageMissingError": "{agentPolicyName}を追加できませんでした。{pkgName}がインストールされていません。{pkgName}を`{packagesConfigValue}`に追加するか、{packagePolicyName}から削除してください。",
     "xpack.fleet.preconfiguration.policyDeleted": "構成済みのポリシー{id}が削除されました。作成をスキップしています",
-    "xpack.fleet.securityRequiredErrorMessage": "Fleet を使用するには、Kibana と Elasticsearch でセキュリティを有効にする必要があります。",
     "xpack.fleet.securityRequiredErrorTitle": "セキュリティが有効ではありません",
     "xpack.fleet.serverError.agentPolicyDoesNotExist": "エージェントポリシー{agentPolicyId}が存在しません",
     "xpack.fleet.serverError.enrollmentKeyDuplicate": "エージェントポリシーの{agentPolicyId}登録キー{providedKeyName}はすでに存在します",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index d8c35485f2dbc..fa78b2eae1432 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -4953,6 +4953,16 @@
     "visTypeMetric.colorModes.backgroundOptionLabel": "背景",
     "visTypeMetric.colorModes.labelsOptionLabel": "标签",
     "visTypeMetric.colorModes.noneOptionLabel": "无",
+    "visTypeMetric.metricDescription": "将计算结果显示为单个数字。",
+    "visTypeMetric.metricTitle": "指标",
+    "visTypeMetric.params.color.useForLabel": "将颜色用于",
+    "visTypeMetric.params.rangesTitle": "范围",
+    "visTypeMetric.params.settingsTitle": "设置",
+    "visTypeMetric.params.showTitleLabel": "显示标题",
+    "visTypeMetric.params.style.fontSizeLabel": "指标字体大小（磅）",
+    "visTypeMetric.params.style.styleTitle": "样式",
+    "visTypeMetric.schemas.metricTitle": "指标",
+    "visTypeMetric.schemas.splitGroupTitle": "拆分组",
     "expressionMetricVis.function.dimension.splitGroup": "拆分组",
     "expressionMetricVis.function.bgFill.help": "将颜色表示为 html 十六进制代码 (#123456)、html 颜色（red、blue）或 rgba 值 (rgba(255,255,255,1))。",
     "expressionMetricVis.function.bucket.help": "存储桶维度配置",
@@ -4968,16 +4978,6 @@
     "expressionMetricVis.function.showLabels.help": "在指标值下显示标签。",
     "expressionMetricVis.function.subText.help": "要在指标下显示的定制文本",
     "expressionMetricVis.function.useRanges.help": "已启用颜色范围。",
-    "visTypeMetric.metricDescription": "将计算结果显示为单个数字。",
-    "visTypeMetric.metricTitle": "指标",
-    "visTypeMetric.params.color.useForLabel": "将颜色用于",
-    "visTypeMetric.params.rangesTitle": "范围",
-    "visTypeMetric.params.settingsTitle": "设置",
-    "visTypeMetric.params.showTitleLabel": "显示标题",
-    "visTypeMetric.params.style.fontSizeLabel": "指标字体大小（磅）",
-    "visTypeMetric.params.style.styleTitle": "样式",
-    "visTypeMetric.schemas.metricTitle": "指标",
-    "visTypeMetric.schemas.splitGroupTitle": "拆分组",
     "visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.deprecation": "Visualize 中饼图的旧版图表库已弃用，自 8.0 后将不受支持。",
     "visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.description": "在 Visualize 中启用饼图的旧版图表库。",
     "visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.name": "饼图旧版图表库",
@@ -11061,7 +11061,6 @@
     "xpack.fleet.preconfiguration.missingIDError": "{agentPolicyName} 缺失 `id` 字段。`id` 是必需的，但标记为 is_default 或 is_default_fleet_server 的策略除外。",
     "xpack.fleet.preconfiguration.packageMissingError": "{agentPolicyName} 无法添加。{pkgName} 未安装，请将 {pkgName} 添加到 `{packagesConfigValue}` 或将其从 {packagePolicyName} 中移除。",
     "xpack.fleet.preconfiguration.policyDeleted": "预配置的策略 {id} 已删除；将跳过创建",
-    "xpack.fleet.securityRequiredErrorMessage": "必须在 Kibana 和 Elasticsearch 启用安全性，才能使用 Fleet。",
     "xpack.fleet.securityRequiredErrorTitle": "安全性未启用",
     "xpack.fleet.serverError.agentPolicyDoesNotExist": "代理策略 {agentPolicyId} 不存在",
     "xpack.fleet.serverError.enrollmentKeyDuplicate": "称作 {providedKeyName} 的注册密钥对于代理策略 {agentPolicyId} 已存在",

From 3d75154368a6dbf7694607378c90f78c67e664ce Mon Sep 17 00:00:00 2001
From: Oliver Gupte <ogupte@users.noreply.github.com>
Date: Wed, 13 Oct 2021 03:16:21 -0400
Subject: [PATCH 002/117] [APM] Removes the apm_oss plugin and deprecates
 related configs (#113364)

* [APM] Removes the apm_oss plugin and deprecates related configs (#108160)

* removes commented lines

* fixes typescript errors

* performs start up migration on the saved objects mapping for apm-indices

* removes all references to the deprecated apm_oss.* config paths in APM

* fixes missing bundle error

* fixes type error

* fixes eslint error with disabled rules

* fixes saved object mappings for es_archvices for tests

* fixes eslint error

* Updates default index values to include the more general apm-*. Fixes broken tests.

* removing unused configs from the config path migration: apm_oss.indexPattern and apm_oss.fleetMode

* - replaces full index configuration paths with references in the `xpack.apm.indices` namespace
- removes mergeConfig function and test

* fixes proxy mock object in unit test

* fixes linting issues

* PR feedback and failed test

* changes the configs at `xpack.apm.indices.*` from plural to singular to match `processor.event` values
---
 docs/developer/plugin-list.asciidoc           |  4 -
 packages/kbn-optimizer/limits.yml             |  1 -
 .../resources/base/bin/kibana-docker          |  6 ++
 src/plugins/apm_oss/README.asciidoc           |  5 -
 src/plugins/apm_oss/kibana.json               | 13 ---
 src/plugins/apm_oss/public/index.ts           | 16 ---
 src/plugins/apm_oss/public/plugin.ts          | 22 -----
 src/plugins/apm_oss/public/types.ts           | 16 ---
 src/plugins/apm_oss/server/index.ts           | 40 --------
 src/plugins/apm_oss/server/plugin.ts          | 30 ------
 src/plugins/apm_oss/tsconfig.json             | 17 ----
 .../integration/power_user/no_data_screen.ts  | 25 +++--
 x-pack/plugins/apm/kibana.json                |  1 -
 .../app/Settings/ApmIndices/index.tsx         | 19 ++--
 .../plugins/apm/public/utils/testHelpers.tsx  | 28 +++---
 .../apm/scripts/shared/read-kibana-config.ts  | 14 ++-
 .../scripts/upload-telemetry-data/index.ts    |  7 +-
 x-pack/plugins/apm/server/index.test.ts       | 40 --------
 x-pack/plugins/apm/server/index.ts            | 97 ++++++-------------
 .../alerts/register_error_count_alert_type.ts |  2 +-
 ...egister_transaction_duration_alert_type.ts |  6 +-
 ...ister_transaction_error_rate_alert_type.ts |  6 +-
 .../apm/server/lib/alerts/test_utils/index.ts |  8 +-
 .../create_anomaly_detection_jobs.ts          |  2 +-
 .../collect_data_telemetry/tasks.test.ts      | 10 +-
 .../collect_data_telemetry/tasks.ts           | 78 +++++++--------
 .../errors/distribution/get_buckets.test.ts   | 14 ++-
 .../get_is_using_transaction_events.test.ts   |  9 +-
 .../get_is_using_transaction_events.ts        |  3 +-
 .../helpers/aggregated_transactions/index.ts  |  3 +-
 .../unpack_processor_events.test.ts           | 13 ++-
 .../unpack_processor_events.ts                | 19 ++--
 .../server/lib/helpers/setup_request.test.ts  | 23 ++---
 .../create_static_index_pattern.test.ts       | 25 ++---
 .../create_static_index_pattern.ts            |  2 +-
 .../get_apm_index_pattern_title.test.ts       | 18 ++--
 .../get_apm_index_pattern_title.ts            |  8 +-
 .../java/gc/fetch_and_transform_gc_metrics.ts |  2 +-
 .../metrics/fetch_and_transform_metrics.ts    |  2 +-
 .../apm/server/lib/rum_client/has_rum_data.ts |  4 +-
 ...ransactions_correlations_search_service.ts |  2 +-
 .../latency_correlations_search_service.ts    |  2 +-
 .../search_strategy_provider.test.ts          |  5 +-
 .../server/lib/service_map/get_service_map.ts |  5 +-
 .../get_service_map_service_node_info.test.ts |  4 +-
 .../lib/service_map/get_trace_sample_ids.ts   | 13 +--
 .../get_service_transaction_groups.ts         |  2 +-
 .../settings/apm_indices/get_apm_indices.ts   | 37 +++----
 .../traces/__snapshots__/queries.test.ts.snap |  2 +-
 .../apm/server/lib/traces/get_trace_items.ts  |  8 +-
 .../lib/transactions/breakdown/index.test.ts  | 19 ++--
 .../lib/transactions/breakdown/index.ts       |  2 +-
 x-pack/plugins/apm/server/plugin.ts           | 26 ++---
 x-pack/plugins/apm/server/routes/fleet.ts     |  6 +-
 .../plugins/apm/server/routes/service_map.ts  |  6 +-
 .../apm/server/routes/settings/apm_indices.ts | 21 ++--
 .../apm/server/saved_objects/apm_indices.ts   | 42 ++++----
 .../migrations/update_apm_oss_index_paths.ts  | 36 +++++++
 .../apm/server/tutorial/envs/on_prem.ts       | 16 +--
 x-pack/plugins/apm/server/tutorial/index.ts   |  2 +-
 x-pack/plugins/apm/server/types.ts            |  6 --
 .../plugins/apm/server/utils/test_helpers.tsx | 44 ++++-----
 x-pack/plugins/apm/tsconfig.json              |  1 -
 .../plugins/observability/common/typings.ts   | 14 ++-
 .../hooks/use_app_index_pattern.tsx           |  2 +-
 .../public/context/has_data_context.test.tsx  |  5 +-
 .../observability/public/data_handler.test.ts |  5 +-
 .../pages/overview/overview.stories.tsx       |  5 +-
 .../encrypted_saved_objects/mappings.json     | 38 ++++----
 .../mappings.json                             | 38 ++++----
 .../es_archiver/key_rotation/mappings.json    | 38 ++++----
 .../action_task_params/mappings.json          | 38 ++++----
 .../es_archives/actions/mappings.json         | 38 ++++----
 .../es_archives/alerts_legacy/mappings.json   | 38 ++++----
 .../es_archives/canvas/reports/mappings.json  | 38 ++++----
 .../cases/migrations/7.10.0/mappings.json     | 38 ++++----
 .../cases/migrations/7.11.1/mappings.json     | 40 ++++----
 .../cases/migrations/7.13.2/mappings.json     | 40 ++++----
 .../7.13_user_actions/mappings.json           | 40 ++++----
 .../migrations/7.16.0_space/mappings.json     | 38 ++++----
 .../data/search_sessions/mappings.json        | 38 ++++----
 .../telemetry/agent_only/mappings.json        | 38 ++++----
 .../mappings.json                             | 38 ++++----
 .../cloned_endpoint_installed/mappings.json   | 38 ++++----
 .../cloned_endpoint_uninstalled/mappings.json | 38 ++++----
 .../endpoint_malware_disabled/mappings.json   | 38 ++++----
 .../endpoint_malware_enabled/mappings.json    | 38 ++++----
 .../endpoint_uninstalled/mappings.json        | 38 ++++----
 .../es_archives/fleet/agents/mappings.json    | 38 ++++----
 .../mappings.json                             | 38 ++++----
 .../es_archives/lists/mappings.json           | 38 ++++----
 .../canvas_disallowed_url/mappings.json       | 38 ++++----
 .../ecommerce_kibana_spaces/mappings.json     | 38 ++++----
 .../reporting/hugedata/mappings.json          | 38 ++++----
 .../multi_index_kibana/mappings.json          | 40 ++++----
 .../migrations/mappings.json                  | 38 ++++----
 .../timelines/7.15.0/mappings.json            | 38 ++++----
 .../timelines/7.15.0_space/mappings.json      | 40 ++++----
 .../visualize/default/mappings.json           | 38 ++++----
 99 files changed, 885 insertions(+), 1299 deletions(-)
 delete mode 100644 src/plugins/apm_oss/README.asciidoc
 delete mode 100644 src/plugins/apm_oss/kibana.json
 delete mode 100644 src/plugins/apm_oss/public/index.ts
 delete mode 100644 src/plugins/apm_oss/public/plugin.ts
 delete mode 100644 src/plugins/apm_oss/public/types.ts
 delete mode 100644 src/plugins/apm_oss/server/index.ts
 delete mode 100644 src/plugins/apm_oss/server/plugin.ts
 delete mode 100644 src/plugins/apm_oss/tsconfig.json
 delete mode 100644 x-pack/plugins/apm/server/index.test.ts
 create mode 100644 x-pack/plugins/apm/server/saved_objects/migrations/update_apm_oss_index_paths.ts

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index 17cc974ed4466..9581848be9e53 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -28,10 +28,6 @@ allowing users to configure their advanced settings, also known
 as uiSettings within the code.
 
 
-|{kib-repo}blob/{branch}/src/plugins/apm_oss/README.asciidoc[apmOss]
-|undefined
-
-
 |{kib-repo}blob/{branch}/src/plugins/bfetch/README.md[bfetch]
 |bfetch allows to batch HTTP requests and streams responses back.
 
diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index acef661d93bb0..068408bce40fd 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -2,7 +2,6 @@ pageLoadAssetSize:
   advancedSettings: 27596
   alerting: 106936
   apm: 64385
-  apmOss: 18996
   bfetch: 51874
   canvas: 1066647
   charts: 95000
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 2f3c610d905e7..9e7766ce16c9b 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
@@ -211,6 +211,12 @@ kibana_vars=(
     xpack.alerts.invalidateApiKeysTask.interval
     xpack.alerts.invalidateApiKeysTask.removalDelay
     xpack.apm.enabled
+    xpack.apm.indices.errors
+    xpack.apm.indices.metrics
+    xpack.apm.indices.onboarding
+    xpack.apm.indices.sourcemaps
+    xpack.apm.indices.spans
+    xpack.apm.indices.transactions
     xpack.apm.maxServiceEnvironments
     xpack.apm.searchAggregatedTransactions
     xpack.apm.serviceMapEnabled
diff --git a/src/plugins/apm_oss/README.asciidoc b/src/plugins/apm_oss/README.asciidoc
deleted file mode 100644
index c3c060a99ee27..0000000000000
--- a/src/plugins/apm_oss/README.asciidoc
+++ /dev/null
@@ -1,5 +0,0 @@
-# APM OSS plugin
-
-OSS plugin for APM. Includes index configuration and tutorial resources.
-
-See <<../../x-pack/plugins/apm/readme.md,the X-Pack APM plugin README>> for information about the main APM plugin.
diff --git a/src/plugins/apm_oss/kibana.json b/src/plugins/apm_oss/kibana.json
deleted file mode 100644
index f18b275add9e3..0000000000000
--- a/src/plugins/apm_oss/kibana.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "apmOss",
-  "owner": {
-    "name": "APM UI",
-    "githubTeam": "apm-ui"
-  },
-  "version": "8.0.0",
-  "server": true,
-  "kibanaVersion": "kibana",
-  "configPath": ["apm_oss"],
-  "ui": true,
-  "requiredPlugins": ["home"]
-}
diff --git a/src/plugins/apm_oss/public/index.ts b/src/plugins/apm_oss/public/index.ts
deleted file mode 100644
index fea8ac4a8a1e4..0000000000000
--- a/src/plugins/apm_oss/public/index.ts
+++ /dev/null
@@ -1,16 +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 { ApmOssPlugin } from './plugin';
-
-// This exports static code and TypeScript types,
-// as well as, Kibana Platform `plugin()` initializer.
-export function plugin() {
-  return new ApmOssPlugin();
-}
-export { ApmOssPluginSetup, ApmOssPluginStart } from './types';
diff --git a/src/plugins/apm_oss/public/plugin.ts b/src/plugins/apm_oss/public/plugin.ts
deleted file mode 100644
index e6981954b301a..0000000000000
--- a/src/plugins/apm_oss/public/plugin.ts
+++ /dev/null
@@ -1,22 +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 { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { ApmOssPluginSetup, ApmOssPluginStart } from './types';
-
-export class ApmOssPlugin implements Plugin<ApmOssPluginSetup, ApmOssPluginStart> {
-  public setup(core: CoreSetup): ApmOssPluginSetup {
-    return {};
-  }
-
-  public start(core: CoreStart): ApmOssPluginStart {
-    return {};
-  }
-
-  public stop() {}
-}
diff --git a/src/plugins/apm_oss/public/types.ts b/src/plugins/apm_oss/public/types.ts
deleted file mode 100644
index 16a1fe8be8004..0000000000000
--- a/src/plugins/apm_oss/public/types.ts
+++ /dev/null
@@ -1,16 +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-next-line @typescript-eslint/no-empty-interface
-export interface ApmOssPluginSetup {}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface ApmOssPluginStart {}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface AppPluginStartDependencies {}
diff --git a/src/plugins/apm_oss/server/index.ts b/src/plugins/apm_oss/server/index.ts
deleted file mode 100644
index f2f6777672e33..0000000000000
--- a/src/plugins/apm_oss/server/index.ts
+++ /dev/null
@@ -1,40 +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 { schema, TypeOf } from '@kbn/config-schema';
-import { ConfigDeprecationProvider, PluginInitializerContext } from '../../../core/server';
-import { APMOSSPlugin } from './plugin';
-
-const deprecations: ConfigDeprecationProvider = ({ deprecate, unused }) => [
-  deprecate('enabled', '8.0.0'),
-  unused('fleetMode'),
-  unused('indexPattern'),
-];
-
-export const config = {
-  schema: schema.object({
-    enabled: schema.boolean({ defaultValue: true }),
-    transactionIndices: schema.string({ defaultValue: 'apm-*' }),
-    spanIndices: schema.string({ defaultValue: 'apm-*' }),
-    errorIndices: schema.string({ defaultValue: 'apm-*' }),
-    metricsIndices: schema.string({ defaultValue: 'apm-*' }),
-    sourcemapIndices: schema.string({ defaultValue: 'apm-*' }),
-    onboardingIndices: schema.string({ defaultValue: 'apm-*' }),
-    indexPattern: schema.string({ defaultValue: 'apm-*' }),
-    fleetMode: schema.boolean({ defaultValue: true }),
-  }),
-  deprecations,
-};
-
-export function plugin(initializerContext: PluginInitializerContext) {
-  return new APMOSSPlugin(initializerContext);
-}
-
-export type APMOSSConfig = TypeOf<typeof config.schema>;
-
-export { APMOSSPluginSetup } from './plugin';
diff --git a/src/plugins/apm_oss/server/plugin.ts b/src/plugins/apm_oss/server/plugin.ts
deleted file mode 100644
index 02a8ac38be2a3..0000000000000
--- a/src/plugins/apm_oss/server/plugin.ts
+++ /dev/null
@@ -1,30 +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 { Observable } from 'rxjs';
-import { Plugin, PluginInitializerContext } from 'src/core/server';
-import { APMOSSConfig } from './';
-
-export class APMOSSPlugin implements Plugin<APMOSSPluginSetup> {
-  constructor(private readonly initContext: PluginInitializerContext) {
-    this.initContext = initContext;
-  }
-  public setup() {
-    const config$ = this.initContext.config.create<APMOSSConfig>();
-    const config = this.initContext.config.get<APMOSSConfig>();
-    return { config, config$ };
-  }
-
-  start() {}
-  stop() {}
-}
-
-export interface APMOSSPluginSetup {
-  config: APMOSSConfig;
-  config$: Observable<APMOSSConfig>;
-}
diff --git a/src/plugins/apm_oss/tsconfig.json b/src/plugins/apm_oss/tsconfig.json
deleted file mode 100644
index 08ed86d5da0a8..0000000000000
--- a/src/plugins/apm_oss/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./target/types",
-    "emitDeclarationOnly": true,
-    "declaration": true,
-    "declarationMap": true
-  },
-  "include": [
-    "common/**/*",
-    "public/**/*",
-    "server/**/*",
-    // have to declare *.json explicitly due to https://github.com/microsoft/TypeScript/issues/25636
-    "server/tutorial/index_pattern.json"
-  ],
-  "references": [{ "path": "../../core/tsconfig.json" }, { "path": "../home/tsconfig.json" }]
-}
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts
index 1e954d9982295..47eba11e6f6fb 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts
@@ -4,7 +4,6 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-/* eslint-disable @typescript-eslint/naming-convention */
 
 const apmIndicesSaveURL = '/internal/apm/settings/apm-indices/save';
 
@@ -20,12 +19,12 @@ describe('No data screen', () => {
         url: apmIndicesSaveURL,
         method: 'POST',
         body: {
-          'apm_oss.sourcemapIndices': 'foo-*',
-          'apm_oss.errorIndices': 'foo-*',
-          'apm_oss.onboardingIndices': 'foo-*',
-          'apm_oss.spanIndices': 'foo-*',
-          'apm_oss.transactionIndices': 'foo-*',
-          'apm_oss.metricsIndices': 'foo-*',
+          sourcemaps: 'foo-*',
+          errors: 'foo-*',
+          onboarding: 'foo-*',
+          spans: 'foo-*',
+          transactions: 'foo-*',
+          metrics: 'foo-*',
         },
         headers: {
           'kbn-xsrf': true,
@@ -50,12 +49,12 @@ describe('No data screen', () => {
         url: apmIndicesSaveURL,
         method: 'POST',
         body: {
-          'apm_oss.sourcemapIndices': '',
-          'apm_oss.errorIndices': '',
-          'apm_oss.onboardingIndices': '',
-          'apm_oss.spanIndices': '',
-          'apm_oss.transactionIndices': '',
-          'apm_oss.metricsIndices': '',
+          sourcemaps: '',
+          errors: '',
+          onboarding: '',
+          spans: '',
+          transactions: '',
+          metrics: '',
         },
         headers: { 'kbn-xsrf': true },
         auth: { user: 'apm_power_user', pass: 'changeme' },
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
index 4e82d82d655b4..865358959ea72 100644
--- a/x-pack/plugins/apm/kibana.json
+++ b/x-pack/plugins/apm/kibana.json
@@ -8,7 +8,6 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "requiredPlugins": [
-    "apmOss",
     "data",
     "embeddable",
     "features",
diff --git a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
index 6685dddd87d7f..2e526eff04346 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
@@ -30,40 +30,40 @@ import {
 
 const APM_INDEX_LABELS = [
   {
-    configurationName: 'apm_oss.sourcemapIndices',
+    configurationName: 'sourcemap',
     label: i18n.translate(
       'xpack.apm.settings.apmIndices.sourcemapIndicesLabel',
       { defaultMessage: 'Sourcemap Indices' }
     ),
   },
   {
-    configurationName: 'apm_oss.errorIndices',
+    configurationName: 'error',
     label: i18n.translate('xpack.apm.settings.apmIndices.errorIndicesLabel', {
       defaultMessage: 'Error Indices',
     }),
   },
   {
-    configurationName: 'apm_oss.onboardingIndices',
+    configurationName: 'onboarding',
     label: i18n.translate(
       'xpack.apm.settings.apmIndices.onboardingIndicesLabel',
       { defaultMessage: 'Onboarding Indices' }
     ),
   },
   {
-    configurationName: 'apm_oss.spanIndices',
+    configurationName: 'span',
     label: i18n.translate('xpack.apm.settings.apmIndices.spanIndicesLabel', {
       defaultMessage: 'Span Indices',
     }),
   },
   {
-    configurationName: 'apm_oss.transactionIndices',
+    configurationName: 'transaction',
     label: i18n.translate(
       'xpack.apm.settings.apmIndices.transactionIndicesLabel',
       { defaultMessage: 'Transaction Indices' }
     ),
   },
   {
-    configurationName: 'apm_oss.metricsIndices',
+    configurationName: 'metric',
     label: i18n.translate('xpack.apm.settings.apmIndices.metricsIndicesLabel', {
       defaultMessage: 'Metrics Indices',
     }),
@@ -145,7 +145,7 @@ export function ApmIndices() {
           }
         ),
       });
-    } catch (error) {
+    } catch (error: any) {
       notifications.toasts.addDanger({
         title: i18n.translate(
           'xpack.apm.settings.apmIndices.applyChanges.failed.title',
@@ -215,7 +215,10 @@ export function ApmIndices() {
                     {
                       defaultMessage:
                         'Overrides {configurationName}: {defaultValue}',
-                      values: { configurationName, defaultValue },
+                      values: {
+                        configurationName: `xpack.apm.indices.${configurationName}`,
+                        defaultValue,
+                      },
                     }
                   )}
                   fullWidth
diff --git a/x-pack/plugins/apm/public/utils/testHelpers.tsx b/x-pack/plugins/apm/public/utils/testHelpers.tsx
index 8764ac48c5440..2203bc63f68cd 100644
--- a/x-pack/plugins/apm/public/utils/testHelpers.tsx
+++ b/x-pack/plugins/apm/public/utils/testHelpers.tsx
@@ -119,14 +119,12 @@ interface MockSetup {
   config: APMConfig;
   uiFilters: UxUIFilters;
   indices: {
-    /* eslint-disable @typescript-eslint/naming-convention */
-    'apm_oss.sourcemapIndices': string;
-    'apm_oss.errorIndices': string;
-    'apm_oss.onboardingIndices': string;
-    'apm_oss.spanIndices': string;
-    'apm_oss.transactionIndices': string;
-    'apm_oss.metricsIndices': string;
-    /* eslint-enable @typescript-eslint/naming-convention */
+    sourcemaps: string;
+    errors: string;
+    onboarding: string;
+    spans: string;
+    transactions: string;
+    metrics: string;
     apmAgentConfigurationIndex: string;
     apmCustomLinkIndex: string;
   };
@@ -178,14 +176,12 @@ export async function inspectSearchParams(
     ) as APMConfig,
     uiFilters: {},
     indices: {
-      /* eslint-disable @typescript-eslint/naming-convention */
-      'apm_oss.sourcemapIndices': 'myIndex',
-      'apm_oss.errorIndices': 'myIndex',
-      'apm_oss.onboardingIndices': 'myIndex',
-      'apm_oss.spanIndices': 'myIndex',
-      'apm_oss.transactionIndices': 'myIndex',
-      'apm_oss.metricsIndices': 'myIndex',
-      /* eslint-enable @typescript-eslint/naming-convention */
+      sourcemaps: 'myIndex',
+      errors: 'myIndex',
+      onboarding: 'myIndex',
+      spans: 'myIndex',
+      transactions: 'myIndex',
+      metrics: 'myIndex',
       apmAgentConfigurationIndex: 'myIndex',
       apmCustomLinkIndex: 'myIndex',
     },
diff --git a/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts b/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts
index a85bd007bc4f3..f3e2b48390468 100644
--- a/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts
+++ b/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts
@@ -38,14 +38,12 @@ export const readKibanaConfig = () => {
   };
 
   return {
-    /* eslint-disable @typescript-eslint/naming-convention */
-    'apm_oss.transactionIndices': 'apm-*',
-    'apm_oss.metricsIndices': 'apm-*',
-    'apm_oss.errorIndices': 'apm-*',
-    'apm_oss.spanIndices': 'apm-*',
-    'apm_oss.onboardingIndices': 'apm-*',
-    'apm_oss.sourcemapIndices': 'apm-*',
-    /* eslint-enable @typescript-eslint/naming-convention */
+    'xpack.apm.indices.transaction': 'traces-apm*,apm-*',
+    'xpack.apm.indices.metric': 'metrics-apm*,apm-*',
+    'xpack.apm.indices.error': 'logs-apm*,apm-*',
+    'xpack.apm.indices.span': 'traces-apm*,apm-*',
+    'xpack.apm.indices.onboarding': 'apm-*',
+    'xpack.apm.indices.sourcemap': 'apm-*',
     'elasticsearch.hosts': 'http://localhost:9200',
     ...loadedKibanaConfig,
     ...cliEsCredentials,
diff --git a/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts b/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts
index 0dab75cfba9c7..c900123c6cee9 100644
--- a/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts
+++ b/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts
@@ -78,7 +78,12 @@ async function uploadData() {
     collectTelemetryParams: {
       logger: console as unknown as Logger,
       indices: {
-        ...config,
+        transaction: config['xpack.apm.indices.transaction'],
+        metric: config['xpack.apm.indices.metric'],
+        error: config['xpack.apm.indices.error'],
+        span: config['xpack.apm.indices.span'],
+        onboarding: config['xpack.apm.indices.onboarding'],
+        sourcemap: config['xpack.apm.indices.sourcemap'],
         apmCustomLinkIndex: '.apm-custom-links',
         apmAgentConfigurationIndex: '.apm-agent-configuration',
       },
diff --git a/x-pack/plugins/apm/server/index.test.ts b/x-pack/plugins/apm/server/index.test.ts
deleted file mode 100644
index be93557fea6fc..0000000000000
--- a/x-pack/plugins/apm/server/index.test.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-/* eslint-disable @typescript-eslint/naming-convention */
-
-import { APMOSSConfig } from 'src/plugins/apm_oss/server';
-import { APMXPackConfig } from '.';
-import { mergeConfigs } from './index';
-
-describe('mergeConfigs', () => {
-  it('merges the configs', () => {
-    const apmOssConfig = {
-      transactionIndices: 'apm-*-transaction-*',
-      spanIndices: 'apm-*-span-*',
-      errorIndices: 'apm-*-error-*',
-      metricsIndices: 'apm-*-metric-*',
-    } as APMOSSConfig;
-
-    const apmConfig = {
-      ui: { enabled: false },
-      enabled: true,
-      metricsInterval: 2000,
-      agent: { migrations: { enabled: true } },
-    } as APMXPackConfig;
-
-    expect(mergeConfigs(apmOssConfig, apmConfig)).toEqual({
-      'apm_oss.errorIndices': 'logs-apm*,apm-*-error-*',
-      'apm_oss.metricsIndices': 'metrics-apm*,apm-*-metric-*',
-      'apm_oss.spanIndices': 'traces-apm*,apm-*-span-*',
-      'apm_oss.transactionIndices': 'traces-apm*,apm-*-transaction-*',
-      'xpack.apm.metricsInterval': 2000,
-      'xpack.apm.ui.enabled': false,
-      'xpack.apm.agent.migrations.enabled': true,
-    });
-  });
-});
diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
index 22787b0301ce0..c0dffc50e4e4f 100644
--- a/x-pack/plugins/apm/server/index.ts
+++ b/x-pack/plugins/apm/server/index.ts
@@ -10,11 +10,12 @@ import {
   PluginConfigDescriptor,
   PluginInitializerContext,
 } from 'src/core/server';
-import { APMOSSConfig } from 'src/plugins/apm_oss/server';
 import { maxSuggestions } from '../../observability/common';
 import { SearchAggregatedTransactionSetting } from '../common/aggregated_transactions';
 import { APMPlugin } from './plugin';
 
+// All options should be documented in the APM configuration settings: https://github.com/elastic/kibana/blob/master/docs/settings/apm-settings.asciidoc
+// and be included on cloud allow list unless there are specific reasons not to
 const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
   serviceMapEnabled: schema.boolean({ defaultValue: true }),
@@ -47,12 +48,37 @@ const configSchema = schema.object({
       enabled: schema.boolean({ defaultValue: false }),
     }),
   }),
+  indices: schema.object({
+    transaction: schema.string({ defaultValue: 'traces-apm*,apm-*' }),
+    span: schema.string({ defaultValue: 'traces-apm*,apm-*' }),
+    error: schema.string({ defaultValue: 'logs-apm*,apm-*' }),
+    metric: schema.string({ defaultValue: 'metrics-apm*,apm-*' }),
+    sourcemap: schema.string({ defaultValue: 'apm-*' }),
+    onboarding: schema.string({ defaultValue: 'apm-*' }),
+  }),
 });
 
 // plugin config
-export const config: PluginConfigDescriptor<APMXPackConfig> = {
-  deprecations: ({ deprecate, renameFromRoot }) => [
+export const config: PluginConfigDescriptor<APMConfig> = {
+  deprecations: ({
+    deprecate,
+    renameFromRoot,
+    deprecateFromRoot,
+    unusedFromRoot,
+  }) => [
     deprecate('enabled', '8.0.0'),
+    renameFromRoot(
+      'apm_oss.transactionIndices',
+      'xpack.apm.indices.transaction'
+    ),
+    renameFromRoot('apm_oss.spanIndices', 'xpack.apm.indices.span'),
+    renameFromRoot('apm_oss.errorIndices', 'xpack.apm.indices.error'),
+    renameFromRoot('apm_oss.metricsIndices', 'xpack.apm.indices.metric'),
+    renameFromRoot('apm_oss.sourcemapIndices', 'xpack.apm.indices.sourcemap'),
+    renameFromRoot('apm_oss.onboardingIndices', 'xpack.apm.indices.onboarding'),
+    deprecateFromRoot('apm_oss.enabled', '8.0.0'),
+    unusedFromRoot('apm_oss.fleetMode'),
+    unusedFromRoot('apm_oss.indexPattern'),
     renameFromRoot(
       'xpack.apm.maxServiceEnvironments',
       `uiSettings.overrides[${maxSuggestions}]`
@@ -70,69 +96,8 @@ export const config: PluginConfigDescriptor<APMXPackConfig> = {
   schema: configSchema,
 };
 
-export type APMXPackConfig = TypeOf<typeof configSchema>;
-export type APMConfig = ReturnType<typeof mergeConfigs>;
-
-// plugin config and ui indices settings
-// All options should be documented in the APM configuration settings: https://github.com/elastic/kibana/blob/master/docs/settings/apm-settings.asciidoc
-// and be included on cloud allow list unless there are specific reasons not to
-export function mergeConfigs(
-  apmOssConfig: APMOSSConfig,
-  apmConfig: APMXPackConfig
-) {
-  const mergedConfig = {
-    /* eslint-disable @typescript-eslint/naming-convention */
-    // TODO: Remove all apm_oss options by 8.0
-    'apm_oss.transactionIndices': apmOssConfig.transactionIndices,
-    'apm_oss.spanIndices': apmOssConfig.spanIndices,
-    'apm_oss.errorIndices': apmOssConfig.errorIndices,
-    'apm_oss.metricsIndices': apmOssConfig.metricsIndices,
-    'apm_oss.sourcemapIndices': apmOssConfig.sourcemapIndices,
-    'apm_oss.onboardingIndices': apmOssConfig.onboardingIndices,
-    /* eslint-enable @typescript-eslint/naming-convention */
-    'xpack.apm.serviceMapEnabled': apmConfig.serviceMapEnabled,
-    'xpack.apm.serviceMapFingerprintBucketSize':
-      apmConfig.serviceMapFingerprintBucketSize,
-    'xpack.apm.serviceMapTraceIdBucketSize':
-      apmConfig.serviceMapTraceIdBucketSize,
-    'xpack.apm.serviceMapFingerprintGlobalBucketSize':
-      apmConfig.serviceMapFingerprintGlobalBucketSize,
-    'xpack.apm.serviceMapTraceIdGlobalBucketSize':
-      apmConfig.serviceMapTraceIdGlobalBucketSize,
-    'xpack.apm.serviceMapMaxTracesPerRequest':
-      apmConfig.serviceMapMaxTracesPerRequest,
-    'xpack.apm.ui.enabled': apmConfig.ui.enabled,
-    'xpack.apm.ui.maxTraceItems': apmConfig.ui.maxTraceItems,
-    'xpack.apm.ui.transactionGroupBucketSize':
-      apmConfig.ui.transactionGroupBucketSize,
-    'xpack.apm.autocreateApmIndexPattern': apmConfig.autocreateApmIndexPattern,
-    'xpack.apm.telemetryCollectionEnabled':
-      apmConfig.telemetryCollectionEnabled,
-    'xpack.apm.searchAggregatedTransactions':
-      apmConfig.searchAggregatedTransactions,
-    'xpack.apm.metricsInterval': apmConfig.metricsInterval,
-    'xpack.apm.agent.migrations.enabled': apmConfig.agent.migrations.enabled,
-  };
-
-  // Add data stream indices to list of configured values
-  mergedConfig[
-    'apm_oss.transactionIndices'
-  ] = `traces-apm*,${mergedConfig['apm_oss.transactionIndices']}`;
-
-  mergedConfig[
-    'apm_oss.spanIndices'
-  ] = `traces-apm*,${mergedConfig['apm_oss.spanIndices']}`;
-
-  mergedConfig[
-    'apm_oss.errorIndices'
-  ] = `logs-apm*,${mergedConfig['apm_oss.errorIndices']}`;
-
-  mergedConfig[
-    'apm_oss.metricsIndices'
-  ] = `metrics-apm*,${mergedConfig['apm_oss.metricsIndices']}`;
-
-  return mergedConfig;
-}
+export type APMConfig = TypeOf<typeof configSchema>;
+export type ApmIndicesConfigName = keyof APMConfig['indices'];
 
 export const plugin = (initContext: PluginInitializerContext) =>
   new APMPlugin(initContext);
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts
index d1026b0b6ca8b..7fe2adcfe24d7 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts
@@ -99,7 +99,7 @@ export function registerErrorCountAlertType({
         });
 
         const searchParams = {
-          index: indices['apm_oss.errorIndices'],
+          index: indices.error,
           size: 0,
           body: {
             query: {
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
index b383b4777eca4..df4de254346c9 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
@@ -115,12 +115,12 @@ export function registerTransactionDurationAlertType({
       // to prevent (likely) unnecessary blocking request
       // in rule execution
       const searchAggregatedTransactions =
-        config['xpack.apm.searchAggregatedTransactions'] !==
+        config.searchAggregatedTransactions !==
         SearchAggregatedTransactionSetting.never;
 
       const index = searchAggregatedTransactions
-        ? indices['apm_oss.metricsIndices']
-        : indices['apm_oss.transactionIndices'];
+        ? indices.metric
+        : indices.transaction;
 
       const field = getTransactionDurationFieldForAggregatedTransactions(
         searchAggregatedTransactions
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts
index 6c59bcc4107b0..598487d02625a 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts
@@ -110,12 +110,12 @@ export function registerTransactionErrorRateAlertType({
         // to prevent (likely) unnecessary blocking request
         // in rule execution
         const searchAggregatedTransactions =
-          config['xpack.apm.searchAggregatedTransactions'] !==
+          config.searchAggregatedTransactions !==
           SearchAggregatedTransactionSetting.never;
 
         const index = searchAggregatedTransactions
-          ? indices['apm_oss.metricsIndices']
-          : indices['apm_oss.transactionIndices'];
+          ? indices.metric
+          : indices.transaction;
 
         const searchParams = {
           index,
diff --git a/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts b/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts
index 5d5865bdd2289..22649a7010461 100644
--- a/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts
@@ -17,10 +17,10 @@ export const createRuleTypeMocks = () => {
   let alertExecutor: (...args: any[]) => Promise<any>;
 
   const mockedConfig$ = of({
-    /* eslint-disable @typescript-eslint/naming-convention */
-    'apm_oss.errorIndices': 'apm-*',
-    'apm_oss.transactionIndices': 'apm-*',
-    /* eslint-enable @typescript-eslint/naming-convention */
+    indices: {
+      error: 'apm-*',
+      transaction: 'apm-*',
+    },
   } as APMConfig);
 
   const loggerMock = {
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
index 324202b207237..10758b6d90cdc 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
@@ -50,7 +50,7 @@ export async function createAnomalyDetectionJobs(
       `Creating ML anomaly detection jobs for environments: [${uniqueMlJobEnvs}].`
     );
 
-    const indexPatternName = indices['apm_oss.metricsIndices'];
+    const indexPatternName = indices.metric;
     const responses = await Promise.all(
       uniqueMlJobEnvs.map((environment) =>
         createAnomalyDetectionJob({ ml, environment, indexPatternName })
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts
index 4bfac442b4a3c..1e697ebdcae06 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts
@@ -14,12 +14,10 @@ import {
 
 describe('data telemetry collection tasks', () => {
   const indices = {
-    /* eslint-disable @typescript-eslint/naming-convention */
-    'apm_oss.errorIndices': 'apm-8.0.0-error',
-    'apm_oss.metricsIndices': 'apm-8.0.0-metric',
-    'apm_oss.spanIndices': 'apm-8.0.0-span',
-    'apm_oss.transactionIndices': 'apm-8.0.0-transaction',
-    /* eslint-enable @typescript-eslint/naming-convention */
+    error: 'apm-8.0.0-error',
+    metric: 'apm-8.0.0-metric',
+    span: 'apm-8.0.0-span',
+    transaction: 'apm-8.0.0-transaction',
   } as ApmIndicesConfig;
 
   describe('environments', () => {
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
index d624c8527df86..8764223ad1ebb 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
@@ -78,7 +78,7 @@ export const tasks: TelemetryTask[] = [
         };
 
         const params = {
-          index: [indices['apm_oss.transactionIndices']],
+          index: [indices.transaction],
           body: {
             size: 0,
             timeout,
@@ -138,7 +138,7 @@ export const tasks: TelemetryTask[] = [
       // fixed date range for reliable results
       const lastTransaction = (
         await search({
-          index: indices['apm_oss.transactionIndices'],
+          index: indices.transaction,
           body: {
             query: {
               bool: {
@@ -253,10 +253,10 @@ export const tasks: TelemetryTask[] = [
 
       const response = await search({
         index: [
-          indices['apm_oss.errorIndices'],
-          indices['apm_oss.metricsIndices'],
-          indices['apm_oss.spanIndices'],
-          indices['apm_oss.transactionIndices'],
+          indices.error,
+          indices.metric,
+          indices.span,
+          indices.transaction,
         ],
         body: {
           size: 0,
@@ -310,10 +310,10 @@ export const tasks: TelemetryTask[] = [
 
       const response = await search({
         index: [
-          indices['apm_oss.errorIndices'],
-          indices['apm_oss.metricsIndices'],
-          indices['apm_oss.spanIndices'],
-          indices['apm_oss.transactionIndices'],
+          indices.error,
+          indices.metric,
+          indices.span,
+          indices.transaction,
         ],
         body: {
           size: 0,
@@ -345,7 +345,7 @@ export const tasks: TelemetryTask[] = [
     name: 'environments',
     executor: async ({ indices, search }) => {
       const response = await search({
-        index: [indices['apm_oss.transactionIndices']],
+        index: [indices.transaction],
         body: {
           query: {
             bool: {
@@ -426,12 +426,12 @@ export const tasks: TelemetryTask[] = [
     name: 'processor_events',
     executor: async ({ indices, search }) => {
       const indicesByProcessorEvent = {
-        error: indices['apm_oss.errorIndices'],
-        metric: indices['apm_oss.metricsIndices'],
-        span: indices['apm_oss.spanIndices'],
-        transaction: indices['apm_oss.transactionIndices'],
-        onboarding: indices['apm_oss.onboardingIndices'],
-        sourcemap: indices['apm_oss.sourcemapIndices'],
+        error: indices.error,
+        metric: indices.metric,
+        span: indices.span,
+        transaction: indices.transaction,
+        onboarding: indices.onboarding,
+        sourcemap: indices.sourcemap,
       };
 
       type ProcessorEvent = keyof typeof indicesByProcessorEvent;
@@ -549,10 +549,10 @@ export const tasks: TelemetryTask[] = [
           return prevJob.then(async (data) => {
             const response = await search({
               index: [
-                indices['apm_oss.errorIndices'],
-                indices['apm_oss.spanIndices'],
-                indices['apm_oss.metricsIndices'],
-                indices['apm_oss.transactionIndices'],
+                indices.error,
+                indices.span,
+                indices.metric,
+                indices.transaction,
               ],
               body: {
                 size: 0,
@@ -598,11 +598,7 @@ export const tasks: TelemetryTask[] = [
     name: 'versions',
     executor: async ({ search, indices }) => {
       const response = await search({
-        index: [
-          indices['apm_oss.transactionIndices'],
-          indices['apm_oss.spanIndices'],
-          indices['apm_oss.errorIndices'],
-        ],
+        index: [indices.transaction, indices.span, indices.error],
         terminateAfter: 1,
         body: {
           query: {
@@ -647,7 +643,7 @@ export const tasks: TelemetryTask[] = [
     executor: async ({ search, indices }) => {
       const errorGroupsCount = (
         await search({
-          index: indices['apm_oss.errorIndices'],
+          index: indices.error,
           body: {
             size: 0,
             timeout,
@@ -683,7 +679,7 @@ export const tasks: TelemetryTask[] = [
 
       const transactionGroupsCount = (
         await search({
-          index: indices['apm_oss.transactionIndices'],
+          index: indices.transaction,
           body: {
             size: 0,
             timeout,
@@ -719,7 +715,7 @@ export const tasks: TelemetryTask[] = [
 
       const tracesPerDayCount = (
         await search({
-          index: indices['apm_oss.transactionIndices'],
+          index: indices.transaction,
           body: {
             query: {
               bool: {
@@ -741,11 +737,7 @@ export const tasks: TelemetryTask[] = [
 
       const servicesCount = (
         await search({
-          index: [
-            indices['apm_oss.transactionIndices'],
-            indices['apm_oss.errorIndices'],
-            indices['apm_oss.metricsIndices'],
-          ],
+          index: [indices.transaction, indices.error, indices.metric],
           body: {
             size: 0,
             timeout,
@@ -811,11 +803,7 @@ export const tasks: TelemetryTask[] = [
         const data = await prevJob;
 
         const response = await search({
-          index: [
-            indices['apm_oss.errorIndices'],
-            indices['apm_oss.metricsIndices'],
-            indices['apm_oss.transactionIndices'],
-          ],
+          index: [indices.error, indices.metric, indices.transaction],
           body: {
             size: 0,
             timeout,
@@ -1006,12 +994,12 @@ export const tasks: TelemetryTask[] = [
       const response = await indicesStats({
         index: [
           indices.apmAgentConfigurationIndex,
-          indices['apm_oss.errorIndices'],
-          indices['apm_oss.metricsIndices'],
-          indices['apm_oss.onboardingIndices'],
-          indices['apm_oss.sourcemapIndices'],
-          indices['apm_oss.spanIndices'],
-          indices['apm_oss.transactionIndices'],
+          indices.error,
+          indices.metric,
+          indices.onboarding,
+          indices.sourcemap,
+          indices.span,
+          indices.transaction,
         ],
       });
 
diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.test.ts b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.test.ts
index 809869e13de7f..871df10d9bafa 100644
--- a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.test.ts
+++ b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.test.ts
@@ -43,14 +43,12 @@ describe('get buckets', () => {
           }
         ) as APMConfig,
         indices: {
-          /* eslint-disable @typescript-eslint/naming-convention */
-          'apm_oss.sourcemapIndices': 'apm-*',
-          'apm_oss.errorIndices': 'apm-*',
-          'apm_oss.onboardingIndices': 'apm-*',
-          'apm_oss.spanIndices': 'apm-*',
-          'apm_oss.transactionIndices': 'apm-*',
-          'apm_oss.metricsIndices': 'apm-*',
-          /* eslint-enable @typescript-eslint/naming-convention */
+          sourcemap: 'apm-*',
+          error: 'apm-*',
+          onboarding: 'apm-*',
+          span: 'apm-*',
+          transaction: 'apm-*',
+          metric: 'apm-*',
           apmAgentConfigurationIndex: '.apm-agent-configuration',
           apmCustomLinkIndex: '.apm-custom-link',
         },
diff --git a/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/get_is_using_transaction_events.test.ts b/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/get_is_using_transaction_events.test.ts
index f17224384842d..1fac873ced7be 100644
--- a/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/get_is_using_transaction_events.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/get_is_using_transaction_events.test.ts
@@ -58,8 +58,7 @@ describe('getIsUsingTransactionEvents', () => {
 
   describe('with config xpack.apm.searchAggregatedTransactions: never', () => {
     const config = {
-      'xpack.apm.searchAggregatedTransactions':
-        SearchAggregatedTransactionSetting.never,
+      searchAggregatedTransactions: SearchAggregatedTransactionSetting.never,
     };
 
     it('should be false', async () => {
@@ -81,8 +80,7 @@ describe('getIsUsingTransactionEvents', () => {
 
   describe('with config xpack.apm.searchAggregatedTransactions: always', () => {
     const config = {
-      'xpack.apm.searchAggregatedTransactions':
-        SearchAggregatedTransactionSetting.always,
+      searchAggregatedTransactions: SearchAggregatedTransactionSetting.always,
     };
     it('should be false when kuery is empty', async () => {
       mock = await inspectSearchParams(
@@ -164,8 +162,7 @@ describe('getIsUsingTransactionEvents', () => {
 
   describe('with config xpack.apm.searchAggregatedTransactions: auto', () => {
     const config = {
-      'xpack.apm.searchAggregatedTransactions':
-        SearchAggregatedTransactionSetting.auto,
+      searchAggregatedTransactions: SearchAggregatedTransactionSetting.auto,
     };
 
     it('should query for data once if metrics data found', async () => {
diff --git a/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/get_is_using_transaction_events.ts b/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/get_is_using_transaction_events.ts
index 70df0959a63b6..66e9697ab7c91 100644
--- a/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/get_is_using_transaction_events.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/get_is_using_transaction_events.ts
@@ -23,8 +23,7 @@ export async function getIsUsingTransactionEvents({
   start?: number;
   end?: number;
 }): Promise<boolean> {
-  const searchAggregatedTransactions =
-    config['xpack.apm.searchAggregatedTransactions'];
+  const searchAggregatedTransactions = config.searchAggregatedTransactions;
 
   if (
     searchAggregatedTransactions === SearchAggregatedTransactionSetting.never
diff --git a/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/index.ts b/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/index.ts
index 478f3218ef38c..a58a95dd43fcc 100644
--- a/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/index.ts
@@ -63,8 +63,7 @@ export async function getSearchAggregatedTransactions({
   apmEventClient: APMEventClient;
   kuery: string;
 }): Promise<boolean> {
-  const searchAggregatedTransactions =
-    config['xpack.apm.searchAggregatedTransactions'];
+  const searchAggregatedTransactions = config.searchAggregatedTransactions;
 
   if (
     kuery ||
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.test.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.test.ts
index 4983d6d515944..5ef3786e9bde4 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.test.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 import { APMEventESSearchRequest } from '.';
 import { ApmIndicesConfig } from '../../../settings/apm_indices/get_apm_indices';
 import { unpackProcessorEvents } from './unpack_processor_events';
@@ -19,12 +18,12 @@ describe('unpackProcessorEvents', () => {
     } as APMEventESSearchRequest;
 
     const indices = {
-      'apm_oss.transactionIndices': 'my-apm-*-transaction-*',
-      'apm_oss.metricsIndices': 'my-apm-*-metric-*',
-      'apm_oss.errorIndices': 'my-apm-*-error-*',
-      'apm_oss.spanIndices': 'my-apm-*-span-*',
-      'apm_oss.onboardingIndices': 'my-apm-*-onboarding-',
-      'apm_oss.sourcemapIndices': 'my-apm-*-sourcemap-*',
+      transaction: 'my-apm-*-transaction-*',
+      metric: 'my-apm-*-metric-*',
+      error: 'my-apm-*-error-*',
+      span: 'my-apm-*-span-*',
+      onboarding: 'my-apm-*-onboarding-*',
+      sourcemap: 'my-apm-*-sourcemap-*',
     } as ApmIndicesConfig;
 
     res = unpackProcessorEvents(request, indices);
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts
index 47a2b3fe7e5c8..582fe0374c5ca 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts
@@ -13,19 +13,16 @@ import {
   ESFilter,
 } from '../../../../../../../../src/core/types/elasticsearch';
 import { APMEventESSearchRequest, APMEventESTermsEnumRequest } from '.';
-import {
-  ApmIndicesConfig,
-  ApmIndicesName,
-} from '../../../settings/apm_indices/get_apm_indices';
+import { ApmIndicesConfig } from '../../../settings/apm_indices/get_apm_indices';
 
-const processorEventIndexMap: Record<ProcessorEvent, ApmIndicesName> = {
-  [ProcessorEvent.transaction]: 'apm_oss.transactionIndices',
-  [ProcessorEvent.span]: 'apm_oss.spanIndices',
-  [ProcessorEvent.metric]: 'apm_oss.metricsIndices',
-  [ProcessorEvent.error]: 'apm_oss.errorIndices',
+const processorEventIndexMap = {
+  [ProcessorEvent.transaction]: 'transaction',
+  [ProcessorEvent.span]: 'span',
+  [ProcessorEvent.metric]: 'metric',
+  [ProcessorEvent.error]: 'error',
   // TODO: should have its own config setting
-  [ProcessorEvent.profile]: 'apm_oss.transactionIndices',
-};
+  [ProcessorEvent.profile]: 'transaction',
+} as const;
 
 export function unpackProcessorEvents(
   request: APMEventESSearchRequest | APMEventESTermsEnumRequest,
diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
index 94e88a09ea35c..d5ff97c050d9d 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
@@ -10,19 +10,20 @@ import { APMConfig } from '../..';
 import { APMRouteHandlerResources } from '../../routes/typings';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { PROCESSOR_EVENT } from '../../../common/elasticsearch_fieldnames';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
+import { PromiseReturnType } from '../../../../observability/typings/common';
 
 jest.mock('../settings/apm_indices/get_apm_indices', () => ({
-  getApmIndices: async () => ({
-    /* eslint-disable @typescript-eslint/naming-convention */
-    'apm_oss.sourcemapIndices': 'apm-*',
-    'apm_oss.errorIndices': 'apm-*',
-    'apm_oss.onboardingIndices': 'apm-*',
-    'apm_oss.spanIndices': 'apm-*',
-    'apm_oss.transactionIndices': 'apm-*',
-    'apm_oss.metricsIndices': 'apm-*',
-    /* eslint-enable @typescript-eslint/naming-convention */
-    apmAgentConfigurationIndex: 'apm-*',
-  }),
+  getApmIndices: async () =>
+    ({
+      sourcemap: 'apm-*',
+      error: 'apm-*',
+      onboarding: 'apm-*',
+      span: 'apm-*',
+      transaction: 'apm-*',
+      metric: 'apm-*',
+      apmAgentConfigurationIndex: 'apm-*',
+    } as PromiseReturnType<typeof getApmIndices>),
 }));
 
 jest.mock('../index_pattern/get_dynamic_index_pattern', () => ({
diff --git a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.test.ts b/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.test.ts
index aae707c6e4689..83adab6ae6cbc 100644
--- a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.test.ts
+++ b/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.test.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 import { createStaticIndexPattern } from './create_static_index_pattern';
 import { Setup } from '../helpers/setup_request';
 import * as HistoricalAgentData from '../../routes/historical_data/has_historical_agent_data';
@@ -25,11 +24,11 @@ function getMockSavedObjectsClient(existingIndexPatternTitle: string) {
 
 const setup = {
   indices: {
-    'apm_oss.transactionIndices': 'apm-*-transaction-*',
-    'apm_oss.spanIndices': 'apm-*-span-*',
-    'apm_oss.errorIndices': 'apm-*-error-*',
-    'apm_oss.metricsIndices': 'apm-*-metrics-*',
-  },
+    transaction: 'apm-*-transaction-*',
+    span: 'apm-*-span-*',
+    error: 'apm-*-error-*',
+    metric: 'apm-*-metrics-*',
+  } as APMConfig['indices'],
 } as unknown as Setup;
 
 describe('createStaticIndexPattern', () => {
@@ -37,7 +36,7 @@ describe('createStaticIndexPattern', () => {
     const savedObjectsClient = getMockSavedObjectsClient('apm-*');
     await createStaticIndexPattern({
       setup,
-      config: { 'xpack.apm.autocreateApmIndexPattern': false } as APMConfig,
+      config: { autocreateApmIndexPattern: false } as APMConfig,
       savedObjectsClient,
       spaceId: 'default',
     });
@@ -54,7 +53,7 @@ describe('createStaticIndexPattern', () => {
 
     await createStaticIndexPattern({
       setup,
-      config: { 'xpack.apm.autocreateApmIndexPattern': true } as APMConfig,
+      config: { autocreateApmIndexPattern: true } as APMConfig,
       savedObjectsClient,
       spaceId: 'default',
     });
@@ -71,7 +70,7 @@ describe('createStaticIndexPattern', () => {
 
     await createStaticIndexPattern({
       setup,
-      config: { 'xpack.apm.autocreateApmIndexPattern': true } as APMConfig,
+      config: { autocreateApmIndexPattern: true } as APMConfig,
       savedObjectsClient,
       spaceId: 'default',
     });
@@ -91,9 +90,7 @@ describe('createStaticIndexPattern', () => {
 
     await createStaticIndexPattern({
       setup,
-      config: {
-        'xpack.apm.autocreateApmIndexPattern': true,
-      } as APMConfig,
+      config: { autocreateApmIndexPattern: true } as APMConfig,
       savedObjectsClient,
       spaceId: 'default',
     });
@@ -120,9 +117,7 @@ describe('createStaticIndexPattern', () => {
 
     await createStaticIndexPattern({
       setup,
-      config: {
-        'xpack.apm.autocreateApmIndexPattern': true,
-      } as APMConfig,
+      config: { autocreateApmIndexPattern: true } as APMConfig,
       savedObjectsClient,
       spaceId: 'default',
     });
diff --git a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts b/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts
index 4f35e7e639151..26ae2ac337e88 100644
--- a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts
+++ b/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts
@@ -34,7 +34,7 @@ export async function createStaticIndexPattern({
 }): Promise<boolean> {
   return withApmSpan('create_static_index_pattern', async () => {
     // don't autocreate APM index pattern if it's been disabled via the config
-    if (!config['xpack.apm.autocreateApmIndexPattern']) {
+    if (!config.autocreateApmIndexPattern) {
       return false;
     }
 
diff --git a/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.test.ts b/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.test.ts
index 8103630157584..8b7444ffdf6fa 100644
--- a/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.test.ts
+++ b/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.test.ts
@@ -5,18 +5,16 @@
  * 2.0.
  */
 
-/* eslint-disable @typescript-eslint/naming-convention */
-
 import { ApmIndicesConfig } from '../settings/apm_indices/get_apm_indices';
 import { getApmIndexPatternTitle } from './get_apm_index_pattern_title';
 
 describe('getApmIndexPatternTitle', () => {
   it('returns an index pattern title by combining existing indicies', () => {
     const title = getApmIndexPatternTitle({
-      'apm_oss.transactionIndices': 'apm-*-transaction-*',
-      'apm_oss.spanIndices': 'apm-*-span-*',
-      'apm_oss.errorIndices': 'apm-*-error-*',
-      'apm_oss.metricsIndices': 'apm-*-metrics-*',
+      transaction: 'apm-*-transaction-*',
+      span: 'apm-*-span-*',
+      error: 'apm-*-error-*',
+      metric: 'apm-*-metrics-*',
     } as ApmIndicesConfig);
     expect(title).toBe(
       'apm-*-transaction-*,apm-*-span-*,apm-*-error-*,apm-*-metrics-*'
@@ -25,10 +23,10 @@ describe('getApmIndexPatternTitle', () => {
 
   it('removes duplicates', () => {
     const title = getApmIndexPatternTitle({
-      'apm_oss.transactionIndices': 'apm-*',
-      'apm_oss.spanIndices': 'apm-*',
-      'apm_oss.errorIndices': 'apm-*',
-      'apm_oss.metricsIndices': 'apm-*',
+      transaction: 'apm-*',
+      span: 'apm-*',
+      error: 'apm-*',
+      metric: 'apm-*',
     } as ApmIndicesConfig);
     expect(title).toBe('apm-*');
   });
diff --git a/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.ts b/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.ts
index e65f200130e9a..5e055ff1c2fdc 100644
--- a/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.ts
+++ b/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.ts
@@ -10,9 +10,9 @@ import { ApmIndicesConfig } from '../settings/apm_indices/get_apm_indices';
 
 export function getApmIndexPatternTitle(apmIndicesConfig: ApmIndicesConfig) {
   return uniq([
-    apmIndicesConfig['apm_oss.transactionIndices'],
-    apmIndicesConfig['apm_oss.spanIndices'],
-    apmIndicesConfig['apm_oss.errorIndices'],
-    apmIndicesConfig['apm_oss.metricsIndices'],
+    apmIndicesConfig.transaction,
+    apmIndicesConfig.span,
+    apmIndicesConfig.error,
+    apmIndicesConfig.metric,
   ]).join(',');
 }
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
index ba35836452122..06138931c004e 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
@@ -85,7 +85,7 @@ export async function fetchAndTransformGcMetrics({
               date_histogram: getMetricsDateHistogramParams({
                 start,
                 end,
-                metricsInterval: config['xpack.apm.metricsInterval'],
+                metricsInterval: config.metricsInterval,
               }),
               aggs: {
                 // get the max value
diff --git a/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts b/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
index a3fce0368f4a5..581a0782e4d72 100644
--- a/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
@@ -99,7 +99,7 @@ export async function fetchAndTransformMetrics<T extends MetricAggs>({
           date_histogram: getMetricsDateHistogramParams({
             start,
             end,
-            metricsInterval: config['xpack.apm.metricsInterval'],
+            metricsInterval: config.metricsInterval,
           }),
           aggs,
         },
diff --git a/x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts b/x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts
index 9409e94fa9ba9..ba35ac5c5c89c 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts
@@ -56,7 +56,7 @@ export async function hasRumData({
 
     const response = await apmEventClient.search('has_rum_data', params);
     return {
-      indices: setup.indices['apm_oss.transactionIndices']!,
+      indices: setup.indices.transaction,
       hasData: response.hits.total.value > 0,
       serviceName:
         response.aggregations?.services?.mostTraffic?.buckets?.[0]?.key,
@@ -65,7 +65,7 @@ export async function hasRumData({
     return {
       hasData: false,
       serviceName: undefined,
-      indices: setup.indices['apm_oss.transactionIndices']!,
+      indices: setup.indices.transaction,
     };
   }
 }
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/failed_transactions_correlations/failed_transactions_correlations_search_service.ts b/x-pack/plugins/apm/server/lib/search_strategies/failed_transactions_correlations/failed_transactions_correlations_search_service.ts
index 02ba0a8514b62..239cf39f15ffe 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/failed_transactions_correlations/failed_transactions_correlations_search_service.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/failed_transactions_correlations/failed_transactions_correlations_search_service.ts
@@ -65,7 +65,7 @@ export const failedTransactionsCorrelationsSearchServiceProvider: FailedTransact
         const params: FailedTransactionsCorrelationsRequestParams &
           SearchStrategyServerParams = {
           ...searchServiceParams,
-          index: indices['apm_oss.transactionIndices'],
+          index: indices.transaction,
           includeFrozen,
         };
 
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/latency_correlations/latency_correlations_search_service.ts b/x-pack/plugins/apm/server/lib/search_strategies/latency_correlations/latency_correlations_search_service.ts
index 7e420c821a746..91f4a0d3349a4 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/latency_correlations/latency_correlations_search_service.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/latency_correlations/latency_correlations_search_service.ts
@@ -67,7 +67,7 @@ export const latencyCorrelationsSearchServiceProvider: LatencyCorrelationsSearch
         const indices = await getApmIndices();
         params = {
           ...searchServiceParams,
-          index: indices['apm_oss.transactionIndices'],
+          index: indices.transaction,
           includeFrozen,
         };
 
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/search_strategy_provider.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/search_strategy_provider.test.ts
index 6e03c879f9b97..8a9d04df32036 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/search_strategy_provider.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/search_strategy_provider.test.ts
@@ -90,10 +90,7 @@ const clientSearchMock = (
 };
 
 const getApmIndicesMock = async () =>
-  ({
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    'apm_oss.transactionIndices': 'apm-*',
-  } as ApmIndicesConfig);
+  ({ transaction: 'apm-*' } as ApmIndicesConfig);
 
 describe('APM Correlations search strategy', () => {
   describe('strategy interface', () => {
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
index 2497a85c0c774..ae511d0fed8f8 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
@@ -53,10 +53,7 @@ async function getConnectionData({
       end,
     });
 
-    const chunks = chunk(
-      traceIds,
-      setup.config['xpack.apm.serviceMapMaxTracesPerRequest']
-    );
+    const chunks = chunk(traceIds, setup.config.serviceMapMaxTracesPerRequest);
 
     const init = {
       connections: [],
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts
index 2129606e69fc3..afb88189a5fd2 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts
@@ -70,9 +70,7 @@ describe('getServiceMapServiceNodeInfo', () => {
         indices: {},
         start: 1593460053026000,
         end: 1593497863217000,
-        config: {
-          'xpack.apm.metricsInterval': 30,
-        },
+        config: { metricsInterval: 30 },
         uiFilters: { environment: 'test environment' },
       } as unknown as Setup;
       const serviceName = 'test service name';
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts b/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
index c1c11f7bf639a..7e16e69498e7c 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
@@ -60,13 +60,11 @@ export async function getTraceSampleIds({
   query.bool.filter.push(...environmentQuery(environment));
 
   const fingerprintBucketSize = serviceName
-    ? config['xpack.apm.serviceMapFingerprintBucketSize']
-    : config['xpack.apm.serviceMapFingerprintGlobalBucketSize'];
-
+    ? config.serviceMapFingerprintBucketSize
+    : config.serviceMapFingerprintGlobalBucketSize;
   const traceIdBucketSize = serviceName
-    ? config['xpack.apm.serviceMapTraceIdBucketSize']
-    : config['xpack.apm.serviceMapTraceIdGlobalBucketSize'];
-
+    ? config.serviceMapTraceIdBucketSize
+    : config.serviceMapTraceIdGlobalBucketSize;
   const samplerShardSize = traceIdBucketSize * 10;
 
   const params = {
@@ -137,8 +135,7 @@ export async function getTraceSampleIds({
       'get_trace_sample_ids',
       params
     );
-    // make sure at least one trace per composite/connection bucket
-    // is queried
+    // make sure at least one trace per composite/connection bucket is queried
     const traceIdsWithPriority =
       tracesSampleResponse.aggregations?.connections.buckets.flatMap((bucket) =>
         bucket.sample.trace_ids.buckets.map((sampleDocBucket, index) => ({
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_transaction_groups.ts b/x-pack/plugins/apm/server/lib/services/get_service_transaction_groups.ts
index d5a2006060395..fbc1e2880495b 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_transaction_groups.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_transaction_groups.ts
@@ -57,7 +57,7 @@ export async function getServiceTransactionGroups({
   end: number;
 }) {
   const { apmEventClient, config } = setup;
-  const bucketSize = config['xpack.apm.ui.transactionGroupBucketSize'];
+  const bucketSize = config.ui.transactionGroupBucketSize;
 
   const field = getTransactionDurationFieldForAggregatedTransactions(
     searchAggregatedTransactions
diff --git a/x-pack/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts b/x-pack/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts
index 0ade96682b362..107493af1a0c0 100644
--- a/x-pack/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts
+++ b/x-pack/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-import { merge } from 'lodash';
-
 import { SavedObjectsClient } from 'src/core/server';
 import { PromiseReturnType } from '../../../../../observability/typings/common';
 import {
@@ -22,8 +20,6 @@ export { ApmIndicesConfig };
 
 type ISavedObjectsClient = Pick<SavedObjectsClient, 'get'>;
 
-export type ApmIndicesName = keyof ApmIndicesConfig;
-
 async function getApmIndicesSavedObject(
   savedObjectsClient: ISavedObjectsClient
 ) {
@@ -38,14 +34,12 @@ async function getApmIndicesSavedObject(
 
 export function getApmIndicesConfig(config: APMConfig): ApmIndicesConfig {
   return {
-    /* eslint-disable @typescript-eslint/naming-convention */
-    'apm_oss.sourcemapIndices': config['apm_oss.sourcemapIndices'],
-    'apm_oss.errorIndices': config['apm_oss.errorIndices'],
-    'apm_oss.onboardingIndices': config['apm_oss.onboardingIndices'],
-    'apm_oss.spanIndices': config['apm_oss.spanIndices'],
-    'apm_oss.transactionIndices': config['apm_oss.transactionIndices'],
-    'apm_oss.metricsIndices': config['apm_oss.metricsIndices'],
-    /* eslint-enable @typescript-eslint/naming-convention */
+    sourcemap: config.indices.sourcemap,
+    error: config.indices.error,
+    onboarding: config.indices.onboarding,
+    span: config.indices.span,
+    transaction: config.indices.transaction,
+    metric: config.indices.metric,
     // system indices, not configurable
     apmAgentConfigurationIndex: '.apm-agent-configuration',
     apmCustomLinkIndex: '.apm-custom-link',
@@ -64,21 +58,12 @@ export async function getApmIndices({
       savedObjectsClient
     );
     const apmIndicesConfig = getApmIndicesConfig(config);
-    return merge({}, apmIndicesConfig, apmIndicesSavedObject);
+    return { ...apmIndicesConfig, ...apmIndicesSavedObject };
   } catch (error) {
     return getApmIndicesConfig(config);
   }
 }
 
-const APM_UI_INDICES: ApmIndicesName[] = [
-  'apm_oss.sourcemapIndices',
-  'apm_oss.errorIndices',
-  'apm_oss.onboardingIndices',
-  'apm_oss.spanIndices',
-  'apm_oss.transactionIndices',
-  'apm_oss.metricsIndices',
-];
-
 export async function getApmIndexSettings({
   context,
   config,
@@ -88,7 +73,7 @@ export async function getApmIndexSettings({
     apmIndicesSavedObject = await getApmIndicesSavedObject(
       context.core.savedObjects.client
     );
-  } catch (error) {
+  } catch (error: any) {
     if (error.output && error.output.statusCode === 404) {
       apmIndicesSavedObject = {};
     } else {
@@ -97,7 +82,11 @@ export async function getApmIndexSettings({
   }
   const apmIndicesConfig = getApmIndicesConfig(config);
 
-  return APM_UI_INDICES.map((configurationName) => ({
+  const apmIndices = Object.keys(config.indices) as Array<
+    keyof typeof config.indices
+  >;
+
+  return apmIndices.map((configurationName) => ({
     configurationName,
     defaultValue: apmIndicesConfig[configurationName], // value defined in kibana[.dev].yml
     savedValue: apmIndicesSavedObject[configurationName], // value saved via Saved Objects service
diff --git a/x-pack/plugins/apm/server/lib/traces/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/traces/__snapshots__/queries.test.ts.snap
index 53318fe5fe594..ea8f39f9d9b6d 100644
--- a/x-pack/plugins/apm/server/lib/traces/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/traces/__snapshots__/queries.test.ts.snap
@@ -37,7 +37,7 @@ Object {
         },
       },
     },
-    "size": "myIndex",
+    "size": 1000,
   },
 }
 `;
diff --git a/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts b/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
index e940100edcf52..60a28fd9abdbd 100644
--- a/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
+++ b/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
@@ -24,7 +24,7 @@ export async function getTraceItems(
   end: number
 ) {
   const { apmEventClient, config } = setup;
-  const maxTraceItems = config['xpack.apm.ui.maxTraceItems'];
+  const maxTraceItems = config.ui.maxTraceItems;
   const excludedLogLevels = ['debug', 'info', 'warning'];
 
   const errorResponsePromise = apmEventClient.search('get_errors_docs', {
@@ -80,9 +80,5 @@ export async function getTraceItems(
   const traceDocs = traceResponse.hits.hits.map((hit) => hit._source);
   const errorDocs = errorResponse.hits.hits.map((hit) => hit._source);
 
-  return {
-    exceedsMax,
-    traceDocs,
-    errorDocs,
-  };
+  return { exceedsMax, traceDocs, errorDocs };
 }
diff --git a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts
index 6e9d0aad96b71..76cabd3e3af93 100644
--- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts
@@ -11,16 +11,15 @@ import noDataResponse from './mock_responses/no_data.json';
 import dataResponse from './mock_responses/data.json';
 import { APMConfig } from '../../..';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
-
-const mockIndices = {
-  /* eslint-disable @typescript-eslint/naming-convention */
-  'apm_oss.sourcemapIndices': 'myIndex',
-  'apm_oss.errorIndices': 'myIndex',
-  'apm_oss.onboardingIndices': 'myIndex',
-  'apm_oss.spanIndices': 'myIndex',
-  'apm_oss.transactionIndices': 'myIndex',
-  'apm_oss.metricsIndices': 'myIndex',
-  /* eslint-enable @typescript-eslint/naming-convention */
+import { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices';
+
+const mockIndices: ApmIndicesConfig = {
+  sourcemap: 'myIndex',
+  error: 'myIndex',
+  onboarding: 'myIndex',
+  span: 'myIndex',
+  transaction: 'myIndex',
+  metric: 'myIndex',
   apmAgentConfigurationIndex: 'myIndex',
   apmCustomLinkIndex: 'myIndex',
 };
diff --git a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
index 62277dba8ac29..a5c11776c70b0 100644
--- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
@@ -124,7 +124,7 @@ export async function getTransactionBreakdown({
           date_histogram: getMetricsDateHistogramParams({
             start,
             end,
-            metricsInterval: config['xpack.apm.metricsInterval'],
+            metricsInterval: config.metricsInterval,
           }),
           aggs: subAggs,
         },
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index 2296227de2a33..d2d8dbf602364 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import { combineLatest } from 'rxjs';
-import { map, take } from 'rxjs/operators';
+import { take } from 'rxjs/operators';
 import {
   CoreSetup,
   CoreStart,
@@ -19,8 +18,7 @@ import { isEmpty, mapValues } from 'lodash';
 import { SavedObjectsClient } from '../../../../src/core/server';
 import { mappingFromFieldMap } from '../../rule_registry/common/mapping_from_field_map';
 import { Dataset } from '../../rule_registry/server';
-import { APMConfig, APMXPackConfig, APM_SERVER_FEATURE_ID } from '.';
-import { mergeConfigs } from './index';
+import { APMConfig, APM_SERVER_FEATURE_ID } from '.';
 import { UI_SETTINGS } from '../../../../src/plugins/data/common';
 import { APM_FEATURE, registerFeaturesUsage } from './feature';
 import { registerApmAlerts } from './lib/alerts/register_apm_alerts';
@@ -73,29 +71,23 @@ export class APMPlugin
     plugins: Omit<APMPluginSetupDependencies, 'core'>
   ) {
     this.logger = this.initContext.logger.get();
-    const config$ = this.initContext.config.create<APMXPackConfig>();
-    const mergedConfig$ = combineLatest(plugins.apmOss.config$, config$).pipe(
-      map(([apmOssConfig, apmConfig]) => mergeConfigs(apmOssConfig, apmConfig))
-    );
+    const config$ = this.initContext.config.create<APMConfig>();
 
     core.savedObjects.registerType(apmIndices);
     core.savedObjects.registerType(apmTelemetry);
     core.savedObjects.registerType(apmServerSettings);
 
-    const currentConfig = mergeConfigs(
-      plugins.apmOss.config,
-      this.initContext.config.get<APMXPackConfig>()
-    );
+    const currentConfig = this.initContext.config.get<APMConfig>();
     this.currentConfig = currentConfig;
 
     if (
       plugins.taskManager &&
       plugins.usageCollection &&
-      currentConfig['xpack.apm.telemetryCollectionEnabled']
+      currentConfig.telemetryCollectionEnabled
     ) {
       createApmTelemetry({
         core,
-        config$: mergedConfig$,
+        config$,
         usageCollector: plugins.usageCollection,
         taskManager: plugins.taskManager,
         logger: this.logger,
@@ -156,7 +148,7 @@ export class APMPlugin
     const boundGetApmIndices = async () =>
       getApmIndices({
         savedObjectsClient: await getInternalSavedObjectsClient(core),
-        config: await mergedConfig$.pipe(take(1)).toPromise(),
+        config: await config$.pipe(take(1)).toPromise(),
       });
 
     boundGetApmIndices().then((indices) => {
@@ -193,7 +185,7 @@ export class APMPlugin
         ruleDataClient,
         alerting: plugins.alerting,
         ml: plugins.ml,
-        config$: mergedConfig$,
+        config$,
         logger: this.logger!.get('rule'),
       });
     }
@@ -231,7 +223,7 @@ export class APMPlugin
     });
 
     return {
-      config$: mergedConfig$,
+      config$,
       getApmIndices: boundGetApmIndices,
       createApmEventClient: async ({
         request,
diff --git a/x-pack/plugins/apm/server/routes/fleet.ts b/x-pack/plugins/apm/server/routes/fleet.ts
index d8097228df0dc..2884c08ceb9a1 100644
--- a/x-pack/plugins/apm/server/routes/fleet.ts
+++ b/x-pack/plugins/apm/server/routes/fleet.ts
@@ -129,8 +129,7 @@ const getMigrationCheckRoute = createApmServerRoute({
   options: { tags: ['access:apm'] },
   handler: async (resources) => {
     const { plugins, context, config, request } = resources;
-    const cloudApmMigrationEnabled =
-      config['xpack.apm.agent.migrations.enabled'];
+    const cloudApmMigrationEnabled = config.agent.migrations.enabled;
     if (!plugins.fleet || !plugins.security) {
       throw Boom.internal(FLEET_SECURITY_REQUIRED_MESSAGE);
     }
@@ -158,8 +157,7 @@ const createCloudApmPackagePolicyRoute = createApmServerRoute({
   options: { tags: ['access:apm', 'access:apm_write'] },
   handler: async (resources) => {
     const { plugins, context, config, request, logger } = resources;
-    const cloudApmMigrationEnabled =
-      config['xpack.apm.agent.migrations.enabled'];
+    const cloudApmMigrationEnabled = config.agent.migrations.enabled;
     if (!plugins.fleet || !plugins.security) {
       throw Boom.internal(FLEET_SECURITY_REQUIRED_MESSAGE);
     }
diff --git a/x-pack/plugins/apm/server/routes/service_map.ts b/x-pack/plugins/apm/server/routes/service_map.ts
index f9062ac13e049..17fb9d7c98c5f 100644
--- a/x-pack/plugins/apm/server/routes/service_map.ts
+++ b/x-pack/plugins/apm/server/routes/service_map.ts
@@ -33,7 +33,7 @@ const serviceMapRoute = createApmServerRoute({
   options: { tags: ['access:apm'] },
   handler: async (resources) => {
     const { config, context, params, logger } = resources;
-    if (!config['xpack.apm.serviceMapEnabled']) {
+    if (!config.serviceMapEnabled) {
       throw Boom.notFound();
     }
     if (!isActivePlatinumLicense(context.licensing.license)) {
@@ -81,7 +81,7 @@ const serviceMapServiceNodeRoute = createApmServerRoute({
   handler: async (resources) => {
     const { config, context, params } = resources;
 
-    if (!config['xpack.apm.serviceMapEnabled']) {
+    if (!config.serviceMapEnabled) {
       throw Boom.notFound();
     }
     if (!isActivePlatinumLicense(context.licensing.license)) {
@@ -125,7 +125,7 @@ const serviceMapBackendNodeRoute = createApmServerRoute({
   handler: async (resources) => {
     const { config, context, params } = resources;
 
-    if (!config['xpack.apm.serviceMapEnabled']) {
+    if (!config.serviceMapEnabled) {
       throw Boom.notFound();
     }
     if (!isActivePlatinumLicense(context.licensing.license)) {
diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices.ts b/x-pack/plugins/apm/server/routes/settings/apm_indices.ts
index 1cba5f972c27e..156f4d1af0bb2 100644
--- a/x-pack/plugins/apm/server/routes/settings/apm_indices.ts
+++ b/x-pack/plugins/apm/server/routes/settings/apm_indices.ts
@@ -13,6 +13,7 @@ import {
   getApmIndexSettings,
 } from '../../lib/settings/apm_indices/get_apm_indices';
 import { saveApmIndices } from '../../lib/settings/apm_indices/save_apm_indices';
+import { APMConfig } from '../..';
 
 // get list of apm indices and values
 const apmIndexSettingsRoute = createApmServerRoute({
@@ -37,6 +38,10 @@ const apmIndicesRoute = createApmServerRoute({
   },
 });
 
+type SaveApmIndicesBodySchema = {
+  [Property in keyof APMConfig['indices']]: t.StringC;
+};
+
 // save ui indices
 const saveApmIndicesRoute = createApmServerRoute({
   endpoint: 'POST /internal/apm/settings/apm-indices/save',
@@ -45,15 +50,13 @@ const saveApmIndicesRoute = createApmServerRoute({
   },
   params: t.type({
     body: t.partial({
-      /* eslint-disable @typescript-eslint/naming-convention */
-      'apm_oss.sourcemapIndices': t.string,
-      'apm_oss.errorIndices': t.string,
-      'apm_oss.onboardingIndices': t.string,
-      'apm_oss.spanIndices': t.string,
-      'apm_oss.transactionIndices': t.string,
-      'apm_oss.metricsIndices': t.string,
-      /* eslint-enable @typescript-eslint/naming-convention */
-    }),
+      sourcemap: t.string,
+      error: t.string,
+      onboarding: t.string,
+      span: t.string,
+      transaction: t.string,
+      metric: t.string,
+    } as SaveApmIndicesBodySchema),
   }),
   handler: async (resources) => {
     const { params, context } = resources;
diff --git a/x-pack/plugins/apm/server/saved_objects/apm_indices.ts b/x-pack/plugins/apm/server/saved_objects/apm_indices.ts
index df5267023ae89..4aa6c4953056a 100644
--- a/x-pack/plugins/apm/server/saved_objects/apm_indices.ts
+++ b/x-pack/plugins/apm/server/saved_objects/apm_indices.ts
@@ -7,34 +7,24 @@
 
 import { SavedObjectsType } from 'src/core/server';
 import { i18n } from '@kbn/i18n';
+import { updateApmOssIndexPaths } from './migrations/update_apm_oss_index_paths';
+import { ApmIndicesConfigName } from '..';
+
+const properties: { [Property in ApmIndicesConfigName]: { type: 'keyword' } } =
+  {
+    sourcemap: { type: 'keyword' },
+    error: { type: 'keyword' },
+    onboarding: { type: 'keyword' },
+    span: { type: 'keyword' },
+    transaction: { type: 'keyword' },
+    metric: { type: 'keyword' },
+  };
 
 export const apmIndices: SavedObjectsType = {
   name: 'apm-indices',
   hidden: false,
   namespaceType: 'agnostic',
-  mappings: {
-    properties: {
-      /* eslint-disable @typescript-eslint/naming-convention */
-      'apm_oss.sourcemapIndices': {
-        type: 'keyword',
-      },
-      'apm_oss.errorIndices': {
-        type: 'keyword',
-      },
-      'apm_oss.onboardingIndices': {
-        type: 'keyword',
-      },
-      'apm_oss.spanIndices': {
-        type: 'keyword',
-      },
-      'apm_oss.transactionIndices': {
-        type: 'keyword',
-      },
-      'apm_oss.metricsIndices': {
-        type: 'keyword',
-      },
-    },
-  },
+  mappings: { properties },
   management: {
     importableAndExportable: true,
     icon: 'apmApp',
@@ -43,4 +33,10 @@ export const apmIndices: SavedObjectsType = {
         defaultMessage: 'APM Settings - Index',
       }),
   },
+  migrations: {
+    '7.16.0': (doc) => {
+      const attributes = updateApmOssIndexPaths(doc.attributes);
+      return { ...doc, attributes };
+    },
+  },
 };
diff --git a/x-pack/plugins/apm/server/saved_objects/migrations/update_apm_oss_index_paths.ts b/x-pack/plugins/apm/server/saved_objects/migrations/update_apm_oss_index_paths.ts
new file mode 100644
index 0000000000000..72ba40db0ce05
--- /dev/null
+++ b/x-pack/plugins/apm/server/saved_objects/migrations/update_apm_oss_index_paths.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.
+ */
+
+const apmIndexConfigs = [
+  ['sourcemap', 'apm_oss.sourcemapIndices'],
+  ['error', 'apm_oss.errorIndices'],
+  ['onboarding', 'apm_oss.onboardingIndices'],
+  ['span', 'apm_oss.spanIndices'],
+  ['transaction', 'apm_oss.transactionIndices'],
+  ['metric', 'apm_oss.metricsIndices'],
+] as const;
+
+type ApmIndexConfigs = typeof apmIndexConfigs[number][0];
+type ApmIndicesSavedObjectAttributes = Partial<{
+  [Property in ApmIndexConfigs]: string;
+}>;
+type DeprecatedApmIndexConfigPaths = typeof apmIndexConfigs[number][1];
+type DeprecatedApmIndicesSavedObjectAttributes = Partial<{
+  [Property in DeprecatedApmIndexConfigPaths]: string;
+}>;
+
+export function updateApmOssIndexPaths(
+  attributes: DeprecatedApmIndicesSavedObjectAttributes
+) {
+  return apmIndexConfigs.reduce((attrs, [configPath, deprecatedConfigPath]) => {
+    const indexConfig: string | undefined = attributes[deprecatedConfigPath];
+    if (indexConfig) {
+      attrs[configPath] = indexConfig;
+    }
+    return attrs;
+  }, {} as ApmIndicesSavedObjectAttributes);
+}
diff --git a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
index acc0ce69e0e4e..ba99b0624c441 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
@@ -37,13 +37,7 @@ export function onPremInstructions({
   apmConfig,
   isFleetPluginEnabled,
 }: {
-  apmConfig: Pick<
-    APMConfig,
-    | 'apm_oss.errorIndices'
-    | 'apm_oss.transactionIndices'
-    | 'apm_oss.metricsIndices'
-    | 'apm_oss.onboardingIndices'
-  >;
+  apmConfig: APMConfig;
   isFleetPluginEnabled: boolean;
 }): InstructionsSchema {
   const EDIT_CONFIG = createEditConfig();
@@ -149,7 +143,7 @@ export function onPremInstructions({
             }
           ),
           esHitsCheck: {
-            index: apmConfig['apm_oss.onboardingIndices'],
+            index: apmConfig.indices.onboarding,
             query: {
               bool: {
                 filter: [
@@ -242,9 +236,9 @@ export function onPremInstructions({
           ),
           esHitsCheck: {
             index: [
-              apmConfig['apm_oss.errorIndices'],
-              apmConfig['apm_oss.transactionIndices'],
-              apmConfig['apm_oss.metricsIndices'],
+              apmConfig.indices.error,
+              apmConfig.indices.transaction,
+              apmConfig.indices.metric,
             ],
             query: {
               bool: {
diff --git a/x-pack/plugins/apm/server/tutorial/index.ts b/x-pack/plugins/apm/server/tutorial/index.ts
index 66e6ffaed95a8..5caf2b4372483 100644
--- a/x-pack/plugins/apm/server/tutorial/index.ts
+++ b/x-pack/plugins/apm/server/tutorial/index.ts
@@ -67,7 +67,7 @@ export const tutorialProvider =
       ],
     };
 
-    if (apmConfig['xpack.apm.ui.enabled']) {
+    if (apmConfig.ui.enabled) {
       // @ts-expect-error artifacts.application is readonly
       artifacts.application = {
         path: '/app/apm',
diff --git a/x-pack/plugins/apm/server/types.ts b/x-pack/plugins/apm/server/types.ts
index 325891d8c1d33..c686c42beb6ef 100644
--- a/x-pack/plugins/apm/server/types.ts
+++ b/x-pack/plugins/apm/server/types.ts
@@ -16,7 +16,6 @@ import {
   PluginStart as DataPluginStart,
 } from '../../../../src/plugins/data/server';
 import { SpacesPluginSetup, SpacesPluginStart } from '../../spaces/server';
-import { APMOSSPluginSetup } from '../../../../src/plugins/apm_oss/server';
 import {
   HomeServerPluginSetup,
   HomeServerPluginStart,
@@ -71,10 +70,6 @@ interface DependencyMap {
     setup: SpacesPluginSetup;
     start: SpacesPluginStart;
   };
-  apmOss: {
-    setup: APMOSSPluginSetup;
-    start: undefined;
-  };
   home: {
     setup: HomeServerPluginSetup;
     start: HomeServerPluginStart;
@@ -135,7 +130,6 @@ interface DependencyMap {
 
 const requiredDependencies = [
   'features',
-  'apmOss',
   'data',
   'licensing',
   'triggersActionsUi',
diff --git a/x-pack/plugins/apm/server/utils/test_helpers.tsx b/x-pack/plugins/apm/server/utils/test_helpers.tsx
index 7b6b549e07c8d..5cf5016aec2e9 100644
--- a/x-pack/plugins/apm/server/utils/test_helpers.tsx
+++ b/x-pack/plugins/apm/server/utils/test_helpers.tsx
@@ -12,6 +12,7 @@ import {
   ESSearchResponse,
 } from '../../../../../src/core/types/elasticsearch';
 import { UxUIFilters } from '../../typings/ui_filters';
+import { ApmIndicesConfig } from '../lib/settings/apm_indices/get_apm_indices';
 
 interface Options {
   mockResponse?: (
@@ -26,18 +27,7 @@ interface MockSetup {
   internalClient: any;
   config: APMConfig;
   uiFilters: UxUIFilters;
-  indices: {
-    /* eslint-disable @typescript-eslint/naming-convention */
-    'apm_oss.sourcemapIndices': string;
-    'apm_oss.errorIndices': string;
-    'apm_oss.onboardingIndices': string;
-    'apm_oss.spanIndices': string;
-    'apm_oss.transactionIndices': string;
-    'apm_oss.metricsIndices': string;
-    /* eslint-enable @typescript-eslint/naming-convention */
-    apmAgentConfigurationIndex: string;
-    apmCustomLinkIndex: string;
-  };
+  indices: ApmIndicesConfig;
 }
 
 export async function inspectSearchParams(
@@ -61,6 +51,16 @@ export async function inspectSearchParams(
   let response;
   let error;
 
+  const mockApmIndices: {
+    [Property in keyof APMConfig['indices']]: string;
+  } = {
+    sourcemap: 'myIndex',
+    error: 'myIndex',
+    onboarding: 'myIndex',
+    span: 'myIndex',
+    transaction: 'myIndex',
+    metric: 'myIndex',
+  };
   const mockSetup = {
     apmEventClient: { search: spy } as any,
     internalClient: { search: spy } as any,
@@ -76,8 +76,15 @@ export async function inspectSearchParams(
           switch (key) {
             default:
               return 'myIndex';
-
-            case 'xpack.apm.metricsInterval':
+            case 'indices':
+              return mockApmIndices;
+            case 'ui':
+              return {
+                enabled: true,
+                transactionGroupBucketSize: 1000,
+                maxTraceItems: 1000,
+              };
+            case 'metricsInterval':
               return 30;
           }
         },
@@ -85,14 +92,7 @@ export async function inspectSearchParams(
     ) as APMConfig,
     uiFilters: options?.uiFilters ?? {},
     indices: {
-      /* eslint-disable @typescript-eslint/naming-convention */
-      'apm_oss.sourcemapIndices': 'myIndex',
-      'apm_oss.errorIndices': 'myIndex',
-      'apm_oss.onboardingIndices': 'myIndex',
-      'apm_oss.spanIndices': 'myIndex',
-      'apm_oss.transactionIndices': 'myIndex',
-      'apm_oss.metricsIndices': 'myIndex',
-      /* eslint-enable @typescript-eslint/naming-convention */
+      ...mockApmIndices,
       apmAgentConfigurationIndex: 'myIndex',
       apmCustomLinkIndex: 'myIndex',
     },
diff --git a/x-pack/plugins/apm/tsconfig.json b/x-pack/plugins/apm/tsconfig.json
index c1030d2a4be1d..5db20725dd785 100644
--- a/x-pack/plugins/apm/tsconfig.json
+++ b/x-pack/plugins/apm/tsconfig.json
@@ -19,7 +19,6 @@
   ],
   "references": [
     { "path": "../../../src/core/tsconfig.json" },
-    { "path": "../../../src/plugins/apm_oss/tsconfig.json" },
     { "path": "../../../src/plugins/data/tsconfig.json" },
     { "path": "../../../src/plugins/embeddable/tsconfig.json" },
     { "path": "../../../src/plugins/home/tsconfig.json" },
diff --git a/x-pack/plugins/observability/common/typings.ts b/x-pack/plugins/observability/common/typings.ts
index 71337075e1617..bccb0f4491009 100644
--- a/x-pack/plugins/observability/common/typings.ts
+++ b/x-pack/plugins/observability/common/typings.ts
@@ -16,14 +16,12 @@ export const alertWorkflowStatusRt = t.keyof({
 export type AlertWorkflowStatus = t.TypeOf<typeof alertWorkflowStatusRt>;
 
 export interface ApmIndicesConfig {
-  /* eslint-disable @typescript-eslint/naming-convention */
-  'apm_oss.sourcemapIndices': string;
-  'apm_oss.errorIndices': string;
-  'apm_oss.onboardingIndices': string;
-  'apm_oss.spanIndices': string;
-  'apm_oss.transactionIndices': string;
-  'apm_oss.metricsIndices': string;
-  /* eslint-enable @typescript-eslint/naming-convention */
+  sourcemap: string;
+  error: string;
+  onboarding: string;
+  span: string;
+  transaction: string;
+  metric: string;
   apmAgentConfigurationIndex: string;
   apmCustomLinkIndex: string;
 }
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx
index 83a7ac1ae17dc..8a766075ef8d2 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx
@@ -65,7 +65,7 @@ export function IndexPatternContextProvider({ children }: ProviderProps) {
             case 'mobile':
               const resultApm = await getDataHandler('apm')?.hasData();
               hasDataT = Boolean(resultApm?.hasData);
-              indices = resultApm?.indices['apm_oss.transactionIndices'];
+              indices = resultApm?.indices.transaction;
               break;
           }
           setHasAppData((prevState) => ({ ...prevState, [dataType]: hasDataT }));
diff --git a/x-pack/plugins/observability/public/context/has_data_context.test.tsx b/x-pack/plugins/observability/public/context/has_data_context.test.tsx
index 36f7bfb990222..a586a8bf0bcce 100644
--- a/x-pack/plugins/observability/public/context/has_data_context.test.tsx
+++ b/x-pack/plugins/observability/public/context/has_data_context.test.tsx
@@ -24,10 +24,7 @@ import { act } from '@testing-library/react';
 const relativeStart = '2020-10-08T06:00:00.000Z';
 const relativeEnd = '2020-10-08T07:00:00.000Z';
 
-const sampleAPMIndices = {
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  'apm_oss.transactionIndices': 'apm-*',
-} as ApmIndicesConfig;
+const sampleAPMIndices = { transaction: 'apm-*' } as ApmIndicesConfig;
 
 function wrapper({ children }: { children: React.ReactElement }) {
   const history = createMemoryHistory();
diff --git a/x-pack/plugins/observability/public/data_handler.test.ts b/x-pack/plugins/observability/public/data_handler.test.ts
index e0b8494d4dbed..2beae5d111f7d 100644
--- a/x-pack/plugins/observability/public/data_handler.test.ts
+++ b/x-pack/plugins/observability/public/data_handler.test.ts
@@ -9,10 +9,7 @@ import { registerDataHandler, getDataHandler } from './data_handler';
 import moment from 'moment';
 import { ApmIndicesConfig } from '../common/typings';
 
-const sampleAPMIndices = {
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  'apm_oss.transactionIndices': 'apm-*',
-} as ApmIndicesConfig;
+const sampleAPMIndices = { transaction: 'apm-*' } as ApmIndicesConfig;
 
 const params = {
   absoluteTime: {
diff --git a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx
index 3c389a0ee20b2..506b919b16416 100644
--- a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx
@@ -36,10 +36,7 @@ function unregisterAll() {
   unregisterDataHandler({ appName: 'synthetics' });
 }
 
-const sampleAPMIndices = {
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  'apm_oss.transactionIndices': 'apm-*',
-} as ApmIndicesConfig;
+const sampleAPMIndices = { transaction: 'apm-*' } as ApmIndicesConfig;
 
 const withCore = makeDecorator({
   name: 'withCore',
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json
index a083c8f7e3bcf..daa99c4d71967 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json
+++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json
@@ -189,27 +189,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json
index 22b79eb9bbd8e..4e41d8cb72fb5 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json
+++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json
@@ -216,27 +216,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json
index 74083cbfa949a..9164430730216 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json
+++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json
@@ -214,27 +214,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/action_task_params/mappings.json b/x-pack/test/functional/es_archives/action_task_params/mappings.json
index 2bb6be179d890..874886647e6d6 100644
--- a/x-pack/test/functional/es_archives/action_task_params/mappings.json
+++ b/x-pack/test/functional/es_archives/action_task_params/mappings.json
@@ -206,27 +206,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/actions/mappings.json b/x-pack/test/functional/es_archives/actions/mappings.json
index eeb9d09d3b0a2..786005d1ab6a6 100644
--- a/x-pack/test/functional/es_archives/actions/mappings.json
+++ b/x-pack/test/functional/es_archives/actions/mappings.json
@@ -202,27 +202,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/alerts_legacy/mappings.json b/x-pack/test/functional/es_archives/alerts_legacy/mappings.json
index 69edf30c1ffd0..9c856a829a343 100644
--- a/x-pack/test/functional/es_archives/alerts_legacy/mappings.json
+++ b/x-pack/test/functional/es_archives/alerts_legacy/mappings.json
@@ -198,27 +198,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/canvas/reports/mappings.json b/x-pack/test/functional/es_archives/canvas/reports/mappings.json
index 047a52aaa1f98..51c48857d2481 100644
--- a/x-pack/test/functional/es_archives/canvas/reports/mappings.json
+++ b/x-pack/test/functional/es_archives/canvas/reports/mappings.json
@@ -229,27 +229,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/cases/migrations/7.10.0/mappings.json b/x-pack/test/functional/es_archives/cases/migrations/7.10.0/mappings.json
index c7e1a180e6c54..bd0b2c4e9ad27 100644
--- a/x-pack/test/functional/es_archives/cases/migrations/7.10.0/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.10.0/mappings.json
@@ -199,27 +199,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/cases/migrations/7.11.1/mappings.json b/x-pack/test/functional/es_archives/cases/migrations/7.11.1/mappings.json
index bc719ab40aebd..2da75330be93a 100644
--- a/x-pack/test/functional/es_archives/cases/migrations/7.11.1/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.11.1/mappings.json
@@ -254,27 +254,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
@@ -2720,4 +2716,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/functional/es_archives/cases/migrations/7.13.2/mappings.json b/x-pack/test/functional/es_archives/cases/migrations/7.13.2/mappings.json
index 88f3e5d78cb16..62fec329aa40f 100644
--- a/x-pack/test/functional/es_archives/cases/migrations/7.13.2/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.13.2/mappings.json
@@ -260,27 +260,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
@@ -2864,4 +2860,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/functional/es_archives/cases/migrations/7.13_user_actions/mappings.json b/x-pack/test/functional/es_archives/cases/migrations/7.13_user_actions/mappings.json
index c6b71a2613859..8a9c1a626e652 100644
--- a/x-pack/test/functional/es_archives/cases/migrations/7.13_user_actions/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.13_user_actions/mappings.json
@@ -261,27 +261,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
@@ -2951,4 +2947,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/functional/es_archives/cases/migrations/7.16.0_space/mappings.json b/x-pack/test/functional/es_archives/cases/migrations/7.16.0_space/mappings.json
index 51fe50218b1f5..4b8f2c7103b20 100644
--- a/x-pack/test/functional/es_archives/cases/migrations/7.16.0_space/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.16.0_space/mappings.json
@@ -275,27 +275,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/data/search_sessions/mappings.json b/x-pack/test/functional/es_archives/data/search_sessions/mappings.json
index a3eab7787c3eb..1203e1d892d56 100644
--- a/x-pack/test/functional/es_archives/data/search_sessions/mappings.json
+++ b/x-pack/test/functional/es_archives/data/search_sessions/mappings.json
@@ -169,27 +169,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/mappings.json
index 4dcb8f905b197..daab89b69483e 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/mappings.json
@@ -198,27 +198,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json
index d6d91281151aa..c133c3fec76e2 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json
@@ -199,27 +199,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json
index d6d91281151aa..c133c3fec76e2 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json
@@ -199,27 +199,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json
index d6d91281151aa..c133c3fec76e2 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json
@@ -199,27 +199,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json
index 4dcb8f905b197..daab89b69483e 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json
@@ -198,27 +198,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json
index 4dcb8f905b197..daab89b69483e 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json
@@ -198,27 +198,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json
index 4dcb8f905b197..daab89b69483e 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json
@@ -198,27 +198,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/fleet/agents/mappings.json b/x-pack/test/functional/es_archives/fleet/agents/mappings.json
index 8e4c7a912b75a..b2f5392ebd23a 100644
--- a/x-pack/test/functional/es_archives/fleet/agents/mappings.json
+++ b/x-pack/test/functional/es_archives/fleet/agents/mappings.json
@@ -189,27 +189,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json b/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json
index 7479c525f6a07..7853368bc37d5 100644
--- a/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json
+++ b/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json
@@ -181,27 +181,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/lists/mappings.json b/x-pack/test/functional/es_archives/lists/mappings.json
index 134ed28bac2e7..e23c5ad224506 100644
--- a/x-pack/test/functional/es_archives/lists/mappings.json
+++ b/x-pack/test/functional/es_archives/lists/mappings.json
@@ -196,27 +196,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
index 5bffb9540e983..a35e4c8e07e97 100644
--- a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
@@ -193,27 +193,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json
index 254184cbef584..9d11349819d68 100644
--- a/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json
@@ -214,27 +214,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json b/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json
index 1fdde9d9d208b..02a212d65cc1a 100644
--- a/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json
@@ -170,27 +170,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json b/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json
index f950877aea332..f6b5df41938fb 100644
--- a/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json
@@ -172,27 +172,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
@@ -2028,4 +2024,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/functional/es_archives/security_solution/migrations/mappings.json b/x-pack/test/functional/es_archives/security_solution/migrations/mappings.json
index 5a602322b3017..fa49916066a1a 100644
--- a/x-pack/test/functional/es_archives/security_solution/migrations/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/migrations/mappings.json
@@ -272,27 +272,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/mappings.json b/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/mappings.json
index 7561dbb8dc6d2..2e6a9bcee3d8c 100644
--- a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/mappings.json
@@ -276,27 +276,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json b/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json
index 0fa5a458f6995..682b241c126f4 100644
--- a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json
@@ -273,27 +273,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },
@@ -3089,4 +3085,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/functional/es_archives/visualize/default/mappings.json b/x-pack/test/functional/es_archives/visualize/default/mappings.json
index 00dddbcafdd1c..2d761064d0a46 100644
--- a/x-pack/test/functional/es_archives/visualize/default/mappings.json
+++ b/x-pack/test/functional/es_archives/visualize/default/mappings.json
@@ -254,27 +254,23 @@
         },
         "apm-indices": {
           "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
+            "errors": {
+              "type": "keyword"
+            },
+            "metrics": {
+              "type": "keyword"
+            },
+            "onboarding": {
+              "type": "keyword"
+            },
+            "sourcemaps": {
+              "type": "keyword"
+            },
+            "spans": {
+              "type": "keyword"
+            },
+            "transactions": {
+              "type": "keyword"
             }
           }
         },

From 1d71d42a7b14e1560bd4fb2ebcaa7d913c0054b7 Mon Sep 17 00:00:00 2001
From: Ashokaditya <am.struktr@gmail.com>
Date: Wed, 13 Oct 2021 09:25:20 +0200
Subject: [PATCH 003/117] [Security Solution][Endpoint] Host Isolation API
 changes (#113621)

* Use the new data stream (if exists) to write action request to
and then the fleet index. Else do as usual.

fixes elastic/security-team/issues/1704

* fix legacy tests

* add relevant additional tests

* remove duplicate test

* update tests

* cleanup

review changes
refs elastic/security-team/issues/1704

* fix lint

* Use correct mapping keys when writing to index

* write record on new index when action request fails to write to `.fleet-actions`

review comments

* better error message

review comment

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../common/endpoint/constants.ts              |   8 +-
 .../endpoint_action_generator.ts              |  54 +----
 .../data_loaders/index_endpoint_actions.ts    |  20 +-
 .../common/endpoint/types/actions.ts          |  44 ++++
 .../endpoint/routes/actions/isolation.test.ts | 110 ++++++++--
 .../endpoint/routes/actions/isolation.ts      | 191 +++++++++++++++---
 6 files changed, 326 insertions(+), 101 deletions(-)

diff --git a/x-pack/plugins/security_solution/common/endpoint/constants.ts b/x-pack/plugins/security_solution/common/endpoint/constants.ts
index c7949299c68db..6e9123da2dd9b 100644
--- a/x-pack/plugins/security_solution/common/endpoint/constants.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/constants.ts
@@ -5,8 +5,12 @@
  * 2.0.
  */
 
-export const ENDPOINT_ACTIONS_INDEX = '.logs-endpoint.actions-default';
-export const ENDPOINT_ACTION_RESPONSES_INDEX = '.logs-endpoint.action.responses-default';
+/** endpoint data streams that are used for host isolation  */
+/** for index patterns `.logs-endpoint.actions-* and .logs-endpoint.action.responses-*`*/
+export const ENDPOINT_ACTIONS_DS = '.logs-endpoint.actions';
+export const ENDPOINT_ACTIONS_INDEX = `${ENDPOINT_ACTIONS_DS}-default`;
+export const ENDPOINT_ACTION_RESPONSES_DS = '.logs-endpoint.action.responses';
+export const ENDPOINT_ACTION_RESPONSES_INDEX = `${ENDPOINT_ACTIONS_DS}-default`;
 
 export const eventsIndexPattern = 'logs-endpoint.events.*';
 export const alertsIndexPattern = 'logs-endpoint.alerts-*';
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/endpoint_action_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/endpoint_action_generator.ts
index 0a39e4ea351f0..dd4eeeab15cce 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/endpoint_action_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/endpoint_action_generator.ts
@@ -8,51 +8,7 @@
 import { DeepPartial } from 'utility-types';
 import { merge } from 'lodash';
 import { BaseDataGenerator } from './base_data_generator';
-import { EndpointActionData, ISOLATION_ACTIONS } from '../types';
-
-interface EcsError {
-  code: string;
-  id: string;
-  message: string;
-  stack_trace: string;
-  type: string;
-}
-
-interface EndpointActionFields {
-  action_id: string;
-  data: EndpointActionData;
-}
-
-interface ActionRequestFields {
-  expiration: string;
-  type: 'INPUT_ACTION';
-  input_type: 'endpoint';
-}
-
-interface ActionResponseFields {
-  completed_at: string;
-  started_at: string;
-}
-export interface LogsEndpointAction {
-  '@timestamp': string;
-  agent: {
-    id: string | string[];
-  };
-  EndpointAction: EndpointActionFields & ActionRequestFields;
-  error?: EcsError;
-  user: {
-    id: string;
-  };
-}
-
-export interface LogsEndpointActionResponse {
-  '@timestamp': string;
-  agent: {
-    id: string | string[];
-  };
-  EndpointAction: EndpointActionFields & ActionResponseFields;
-  error?: EcsError;
-}
+import { ISOLATION_ACTIONS, LogsEndpointAction, LogsEndpointActionResponse } from '../types';
 
 const ISOLATION_COMMANDS: ISOLATION_ACTIONS[] = ['isolate', 'unisolate'];
 
@@ -66,7 +22,7 @@ export class EndpointActionGenerator extends BaseDataGenerator {
         agent: {
           id: [this.randomUUID()],
         },
-        EndpointAction: {
+        EndpointActions: {
           action_id: this.randomUUID(),
           expiration: this.randomFutureDate(timeStamp),
           type: 'INPUT_ACTION',
@@ -86,11 +42,11 @@ export class EndpointActionGenerator extends BaseDataGenerator {
   }
 
   generateIsolateAction(overrides: DeepPartial<LogsEndpointAction> = {}): LogsEndpointAction {
-    return merge(this.generate({ EndpointAction: { data: { command: 'isolate' } } }), overrides);
+    return merge(this.generate({ EndpointActions: { data: { command: 'isolate' } } }), overrides);
   }
 
   generateUnIsolateAction(overrides: DeepPartial<LogsEndpointAction> = {}): LogsEndpointAction {
-    return merge(this.generate({ EndpointAction: { data: { command: 'unisolate' } } }), overrides);
+    return merge(this.generate({ EndpointActions: { data: { command: 'unisolate' } } }), overrides);
   }
 
   /** Generates an endpoint action response */
@@ -105,7 +61,7 @@ export class EndpointActionGenerator extends BaseDataGenerator {
         agent: {
           id: this.randomUUID(),
         },
-        EndpointAction: {
+        EndpointActions: {
           action_id: this.randomUUID(),
           completed_at: timeStamp.toISOString(),
           data: {
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_actions.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_actions.ts
index bf46214b20f31..e4379271315dd 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_actions.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_actions.ts
@@ -7,12 +7,8 @@
 
 import { Client } from '@elastic/elasticsearch';
 import { DeleteByQueryResponse } from '@elastic/elasticsearch/api/types';
-import { HostMetadata } from '../types';
-import {
-  EndpointActionGenerator,
-  LogsEndpointAction,
-  LogsEndpointActionResponse,
-} from '../data_generators/endpoint_action_generator';
+import { HostMetadata, LogsEndpointAction, LogsEndpointActionResponse } from '../types';
+import { EndpointActionGenerator } from '../data_generators/endpoint_action_generator';
 import { wrapErrorAndRejectPromise } from './utils';
 import { ENDPOINT_ACTIONS_INDEX, ENDPOINT_ACTION_RESPONSES_INDEX } from '../constants';
 
@@ -49,7 +45,7 @@ export const indexEndpointActionsForHost = async (
   for (let i = 0; i < total; i++) {
     // create an action
     const action = endpointActionGenerator.generate({
-      EndpointAction: {
+      EndpointActions: {
         data: { comment: 'data generator: this host is same as bad' },
       },
     });
@@ -66,9 +62,9 @@ export const indexEndpointActionsForHost = async (
     // Create an action response for the above
     const actionResponse = endpointActionGenerator.generateResponse({
       agent: { id: agentId },
-      EndpointAction: {
-        action_id: action.EndpointAction.action_id,
-        data: action.EndpointAction.data,
+      EndpointActions: {
+        action_id: action.EndpointActions.action_id,
+        data: action.EndpointActions.data,
       },
     });
 
@@ -174,7 +170,7 @@ export const deleteIndexedEndpointActions = async (
                   {
                     terms: {
                       action_id: indexedData.endpointActions.map(
-                        (action) => action.EndpointAction.action_id
+                        (action) => action.EndpointActions.action_id
                       ),
                     },
                   },
@@ -200,7 +196,7 @@ export const deleteIndexedEndpointActions = async (
                   {
                     terms: {
                       action_id: indexedData.endpointActionResponses.map(
-                        (action) => action.EndpointAction.action_id
+                        (action) => action.EndpointActions.action_id
                       ),
                     },
                   },
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
index c6d30825c21c9..bc46ca2f5b451 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
@@ -10,6 +10,50 @@ import { ActionStatusRequestSchema, HostIsolationRequestSchema } from '../schema
 
 export type ISOLATION_ACTIONS = 'isolate' | 'unisolate';
 
+interface EcsError {
+  code?: string;
+  id?: string;
+  message: string;
+  stack_trace?: string;
+  type?: string;
+}
+
+interface EndpointActionFields {
+  action_id: string;
+  data: EndpointActionData;
+}
+
+interface ActionRequestFields {
+  expiration: string;
+  type: 'INPUT_ACTION';
+  input_type: 'endpoint';
+}
+
+interface ActionResponseFields {
+  completed_at: string;
+  started_at: string;
+}
+export interface LogsEndpointAction {
+  '@timestamp': string;
+  agent: {
+    id: string | string[];
+  };
+  EndpointActions: EndpointActionFields & ActionRequestFields;
+  error?: EcsError;
+  user: {
+    id: string;
+  };
+}
+
+export interface LogsEndpointActionResponse {
+  '@timestamp': string;
+  agent: {
+    id: string | string[];
+  };
+  EndpointActions: EndpointActionFields & ActionResponseFields;
+  error?: EcsError;
+}
+
 export interface EndpointActionData {
   command: ISOLATION_ACTIONS;
   comment?: string;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts
index 71df9902223da..ee3bc5e1f21e3 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts
@@ -34,16 +34,18 @@ import {
   ISOLATE_HOST_ROUTE,
   UNISOLATE_HOST_ROUTE,
   metadataTransformPrefix,
+  ENDPOINT_ACTIONS_INDEX,
 } from '../../../../common/endpoint/constants';
 import {
   EndpointAction,
   HostIsolationRequestBody,
   HostIsolationResponse,
   HostMetadata,
+  LogsEndpointAction,
 } from '../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { legacyMetadataSearchResponse } from '../metadata/support/test_support';
-import { ElasticsearchAssetType } from '../../../../../fleet/common';
+import { AGENT_ACTIONS_INDEX, ElasticsearchAssetType } from '../../../../../fleet/common';
 import { CasesClientMock } from '../../../../../cases/server/client/mocks';
 
 interface CallRouteInterface {
@@ -109,7 +111,8 @@ describe('Host Isolation', () => {
 
     let callRoute: (
       routePrefix: string,
-      opts: CallRouteInterface
+      opts: CallRouteInterface,
+      indexExists?: { endpointDsExists: boolean }
     ) => Promise<jest.Mocked<SecuritySolutionRequestHandlerContext>>;
     const superUser = {
       username: 'superuser',
@@ -175,22 +178,42 @@ describe('Host Isolation', () => {
       // it returns the requestContext mock used in the call, to assert internal calls (e.g. the indexed document)
       callRoute = async (
         routePrefix: string,
-        { body, idxResponse, searchResponse, mockUser, license }: CallRouteInterface
+        { body, idxResponse, searchResponse, mockUser, license }: CallRouteInterface,
+        indexExists?: { endpointDsExists: boolean }
       ): Promise<jest.Mocked<SecuritySolutionRequestHandlerContext>> => {
         const asUser = mockUser ? mockUser : superUser;
         (startContract.security.authc.getCurrentUser as jest.Mock).mockImplementationOnce(
           () => asUser
         );
+
         const ctx = createRouteHandlerContext(mockScopedClient, mockSavedObjectClient);
-        const withIdxResp = idxResponse ? idxResponse : { statusCode: 201 };
-        ctx.core.elasticsearch.client.asCurrentUser.index = jest
+        // mock _index_template
+        ctx.core.elasticsearch.client.asInternalUser.indices.existsIndexTemplate = jest
           .fn()
-          .mockImplementationOnce(() => Promise.resolve(withIdxResp));
-        ctx.core.elasticsearch.client.asCurrentUser.search = jest
+          .mockImplementationOnce(() => {
+            if (indexExists) {
+              return Promise.resolve({
+                body: true,
+                statusCode: 200,
+              });
+            }
+            return Promise.resolve({
+              body: false,
+              statusCode: 404,
+            });
+          });
+        const withIdxResp = idxResponse ? idxResponse : { statusCode: 201 };
+        const mockIndexResponse = jest.fn().mockImplementation(() => Promise.resolve(withIdxResp));
+        const mockSearchResponse = jest
           .fn()
           .mockImplementation(() =>
             Promise.resolve({ body: legacyMetadataSearchResponse(searchResponse) })
           );
+        if (indexExists) {
+          ctx.core.elasticsearch.client.asInternalUser.index = mockIndexResponse;
+        }
+        ctx.core.elasticsearch.client.asCurrentUser.index = mockIndexResponse;
+        ctx.core.elasticsearch.client.asCurrentUser.search = mockSearchResponse;
         const withLicense = license ? license : Platinum;
         licenseEmitter.next(withLicense);
         const mockRequest = httpServerMock.createKibanaRequest({ body });
@@ -288,11 +311,6 @@ describe('Host Isolation', () => {
       ).mock.calls[0][0].body;
       expect(actionDoc.timeout).toEqual(300);
     });
-
-    it('succeeds when just an endpoint ID is provided', async () => {
-      await callRoute(ISOLATE_HOST_ROUTE, { body: { endpoint_ids: ['XYZ'] } });
-      expect(mockResponse.ok).toBeCalled();
-    });
     it('sends the action to the correct agent when endpoint ID is given', async () => {
       const doc = docGen.generateHostMetadata();
       const AgentID = doc.elastic.agent.id;
@@ -326,6 +344,74 @@ describe('Host Isolation', () => {
       expect(actionDoc.data.command).toEqual('unisolate');
     });
 
+    describe('With endpoint data streams', () => {
+      it('handles unisolation', async () => {
+        const ctx = await callRoute(
+          UNISOLATE_HOST_ROUTE,
+          {
+            body: { endpoint_ids: ['XYZ'] },
+          },
+          { endpointDsExists: true }
+        );
+        const actionDocs: [
+          { index: string; body: LogsEndpointAction },
+          { index: string; body: EndpointAction }
+        ] = [
+          (ctx.core.elasticsearch.client.asCurrentUser.index as jest.Mock).mock.calls[0][0],
+          (ctx.core.elasticsearch.client.asInternalUser.index as jest.Mock).mock.calls[1][0],
+        ];
+
+        expect(actionDocs[0].index).toEqual(ENDPOINT_ACTIONS_INDEX);
+        expect(actionDocs[1].index).toEqual(AGENT_ACTIONS_INDEX);
+        expect(actionDocs[0].body.EndpointActions.data.command).toEqual('unisolate');
+        expect(actionDocs[1].body.data.command).toEqual('unisolate');
+      });
+
+      it('handles isolation', async () => {
+        const ctx = await callRoute(
+          ISOLATE_HOST_ROUTE,
+          {
+            body: { endpoint_ids: ['XYZ'] },
+          },
+          { endpointDsExists: true }
+        );
+        const actionDocs: [
+          { index: string; body: LogsEndpointAction },
+          { index: string; body: EndpointAction }
+        ] = [
+          (ctx.core.elasticsearch.client.asCurrentUser.index as jest.Mock).mock.calls[0][0],
+          (ctx.core.elasticsearch.client.asInternalUser.index as jest.Mock).mock.calls[1][0],
+        ];
+
+        expect(actionDocs[0].index).toEqual(ENDPOINT_ACTIONS_INDEX);
+        expect(actionDocs[1].index).toEqual(AGENT_ACTIONS_INDEX);
+        expect(actionDocs[0].body.EndpointActions.data.command).toEqual('isolate');
+        expect(actionDocs[1].body.data.command).toEqual('isolate');
+      });
+
+      it('handles errors', async () => {
+        const ErrMessage = 'Uh oh!';
+        await callRoute(
+          UNISOLATE_HOST_ROUTE,
+          {
+            body: { endpoint_ids: ['XYZ'] },
+            idxResponse: {
+              statusCode: 500,
+              body: {
+                result: ErrMessage,
+              },
+            },
+          },
+          { endpointDsExists: true }
+        );
+
+        expect(mockResponse.ok).not.toBeCalled();
+        const response = mockResponse.customError.mock.calls[0][0];
+        expect(response.statusCode).toEqual(500);
+        expect((response.body as Error).message).toEqual(ErrMessage);
+      });
+    });
+
     describe('License Level', () => {
       it('allows platinum license levels to isolate hosts', async () => {
         await callRoute(ISOLATE_HOST_ROUTE, {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
index 45f0e851dfdd1..4652630649ffc 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
@@ -6,15 +6,25 @@
  */
 
 import moment from 'moment';
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler, Logger } from 'src/core/server';
 import uuid from 'uuid';
 import { TypeOf } from '@kbn/config-schema';
 import { CommentType } from '../../../../../cases/common';
 import { CasesByAlertId } from '../../../../../cases/common/api/cases/case';
 import { HostIsolationRequestSchema } from '../../../../common/endpoint/schema/actions';
-import { ISOLATE_HOST_ROUTE, UNISOLATE_HOST_ROUTE } from '../../../../common/endpoint/constants';
+import {
+  ENDPOINT_ACTIONS_DS,
+  ENDPOINT_ACTION_RESPONSES_DS,
+  ISOLATE_HOST_ROUTE,
+  UNISOLATE_HOST_ROUTE,
+} from '../../../../common/endpoint/constants';
 import { AGENT_ACTIONS_INDEX } from '../../../../../fleet/common';
-import { EndpointAction, HostMetadata } from '../../../../common/endpoint/types';
+import {
+  EndpointAction,
+  HostMetadata,
+  LogsEndpointAction,
+  LogsEndpointActionResponse,
+} from '../../../../common/endpoint/types';
 import {
   SecuritySolutionPluginRouter,
   SecuritySolutionRequestHandlerContext,
@@ -52,6 +62,57 @@ export function registerHostIsolationRoutes(
   );
 }
 
+const createFailedActionResponseEntry = async ({
+  context,
+  doc,
+  logger,
+}: {
+  context: SecuritySolutionRequestHandlerContext;
+  doc: LogsEndpointActionResponse;
+  logger: Logger;
+}): Promise<void> => {
+  const esClient = context.core.elasticsearch.client.asCurrentUser;
+  try {
+    await esClient.index<LogsEndpointActionResponse>({
+      index: `${ENDPOINT_ACTION_RESPONSES_DS}-default`,
+      body: {
+        ...doc,
+        error: {
+          code: '424',
+          message: 'Failed to deliver action request to fleet',
+        },
+      },
+    });
+  } catch (e) {
+    logger.error(e);
+  }
+};
+
+const doLogsEndpointActionDsExists = async ({
+  context,
+  logger,
+  dataStreamName,
+}: {
+  context: SecuritySolutionRequestHandlerContext;
+  logger: Logger;
+  dataStreamName: string;
+}): Promise<boolean> => {
+  try {
+    const esClient = context.core.elasticsearch.client.asInternalUser;
+    const doesIndexTemplateExist = await esClient.indices.existsIndexTemplate({
+      name: dataStreamName,
+    });
+    return doesIndexTemplateExist.statusCode === 404 ? false : true;
+  } catch (error) {
+    const errorType = error?.type ?? '';
+    if (errorType !== 'resource_not_found_exception') {
+      logger.error(error);
+      throw error;
+    }
+    return false;
+  }
+};
+
 export const isolationRequestHandler = function (
   endpointContext: EndpointAppContext,
   isolate: boolean
@@ -106,43 +167,121 @@ export const isolationRequestHandler = function (
     caseIDs = [...new Set(caseIDs)];
 
     // create an Action ID and dispatch it to ES & Fleet Server
-    const esClient = context.core.elasticsearch.client.asCurrentUser;
     const actionID = uuid.v4();
-    let result;
+
+    let fleetActionIndexResult;
+    let logsEndpointActionsResult;
+
+    const agents = endpointData.map((endpoint: HostMetadata) => endpoint.elastic.agent.id);
+    const doc = {
+      '@timestamp': moment().toISOString(),
+      agent: {
+        id: agents,
+      },
+      EndpointActions: {
+        action_id: actionID,
+        expiration: moment().add(2, 'weeks').toISOString(),
+        type: 'INPUT_ACTION',
+        input_type: 'endpoint',
+        data: {
+          command: isolate ? 'isolate' : 'unisolate',
+          comment: req.body.comment ?? undefined,
+        },
+      } as Omit<EndpointAction, 'agents' | 'user_id'>,
+      user: {
+        id: user!.username,
+      },
+    };
+
+    // if .logs-endpoint.actions data stream exists
+    // try to create action request record in .logs-endpoint.actions DS as the current user
+    // (from >= v7.16, use this check to ensure the current user has privileges to write to the new index)
+    // and allow only users with superuser privileges to write to fleet indices
+    const logger = endpointContext.logFactory.get('host-isolation');
+    const doesLogsEndpointActionsDsExist = await doLogsEndpointActionDsExists({
+      context,
+      logger,
+      dataStreamName: ENDPOINT_ACTIONS_DS,
+    });
+    // if the new endpoint indices/data streams exists
+    // write the action request to the new index as the current user
+    if (doesLogsEndpointActionsDsExist) {
+      try {
+        const esClient = context.core.elasticsearch.client.asCurrentUser;
+        logsEndpointActionsResult = await esClient.index<LogsEndpointAction>({
+          index: `${ENDPOINT_ACTIONS_DS}-default`,
+          body: {
+            ...doc,
+          },
+        });
+        if (logsEndpointActionsResult.statusCode !== 201) {
+          return res.customError({
+            statusCode: 500,
+            body: {
+              message: logsEndpointActionsResult.body.result,
+            },
+          });
+        }
+      } catch (e) {
+        return res.customError({
+          statusCode: 500,
+          body: { message: e },
+        });
+      }
+    }
+
     try {
-      result = await esClient.index<EndpointAction>({
+      let esClient = context.core.elasticsearch.client.asCurrentUser;
+      if (doesLogsEndpointActionsDsExist) {
+        // create action request record as system user with user in .fleet-actions
+        esClient = context.core.elasticsearch.client.asInternalUser;
+      }
+      // write as the current user if the new indices do not exist
+      // <v7.16 requires the current user to be super user
+      fleetActionIndexResult = await esClient.index<EndpointAction>({
         index: AGENT_ACTIONS_INDEX,
         body: {
-          action_id: actionID,
-          '@timestamp': moment().toISOString(),
-          expiration: moment().add(2, 'weeks').toISOString(),
-          type: 'INPUT_ACTION',
-          input_type: 'endpoint',
-          agents: endpointData.map((endpt: HostMetadata) => endpt.elastic.agent.id),
-          user_id: user!.username,
+          ...doc.EndpointActions,
+          '@timestamp': doc['@timestamp'],
+          agents,
           timeout: 300, // 5 minutes
-          data: {
-            command: isolate ? 'isolate' : 'unisolate',
-            comment: req.body.comment ?? undefined,
-          },
+          user_id: doc.user.id,
         },
       });
+
+      if (fleetActionIndexResult.statusCode !== 201) {
+        return res.customError({
+          statusCode: 500,
+          body: {
+            message: fleetActionIndexResult.body.result,
+          },
+        });
+      }
     } catch (e) {
+      // create entry in .logs-endpoint.action.responses-default data stream
+      // when writing to .fleet-actions fails
+      if (doesLogsEndpointActionsDsExist) {
+        await createFailedActionResponseEntry({
+          context,
+          doc: {
+            '@timestamp': moment().toISOString(),
+            agent: doc.agent,
+            EndpointActions: {
+              action_id: doc.EndpointActions.action_id,
+              completed_at: moment().toISOString(),
+              started_at: moment().toISOString(),
+              data: doc.EndpointActions.data,
+            },
+          },
+          logger,
+        });
+      }
       return res.customError({
         statusCode: 500,
         body: { message: e },
       });
     }
 
-    if (result.statusCode !== 201) {
-      return res.customError({
-        statusCode: 500,
-        body: {
-          message: result.body.result,
-        },
-      });
-    }
-
     // Update all cases with a comment
     if (caseIDs.length > 0) {
       const targets = endpointData.map((endpt: HostMetadata) => ({

From aad477185d689c9e04e25326b3b8181f26051c88 Mon Sep 17 00:00:00 2001
From: Marco Liberati <dej611@users.noreply.github.com>
Date: Wed, 13 Oct 2021 10:08:08 +0200
Subject: [PATCH 004/117] [Lens] Keep the custom label when transitioning
 to/from Formula (#114270)

* :bug: Keep the custom label when transitioning to/from Formula

* :bug: Fix transition bug with padding

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../dimension_panel/dimension_editor.tsx      |   6 +-
 .../operations/layer_helpers.test.ts          | 116 ++++++++++++++++++
 .../operations/layer_helpers.ts               |  33 +++--
 3 files changed, 145 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
index 2f1c00bc5cca0..8286ab492f14d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
@@ -731,9 +731,9 @@ export function DimensionEditor(props: DimensionEditorProps) {
       />
       {TabContent}
 
-      {!isFullscreen && !currentFieldIsInvalid && temporaryState === 'none' && (
+      {!isFullscreen && !currentFieldIsInvalid && (
         <div className="lnsIndexPatternDimensionEditor__section lnsIndexPatternDimensionEditor__section--padded">
-          {!incompleteInfo && selectedColumn && (
+          {!incompleteInfo && selectedColumn && temporaryState === 'none' && (
             <LabelInput
               value={selectedColumn.label}
               onChange={(value) => {
@@ -756,7 +756,7 @@ export function DimensionEditor(props: DimensionEditorProps) {
             />
           )}
 
-          {!isFullscreen && !incompleteInfo && !hideGrouping && (
+          {!isFullscreen && !incompleteInfo && !hideGrouping && temporaryState === 'none' && (
             <BucketNestingEditor
               layer={state.layers[props.layerId]}
               columnId={props.columnId}
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
index ef1de43ad06ed..77a2b334a9e20 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
@@ -1139,6 +1139,122 @@ describe('state_helpers', () => {
           }).columns.col1
         ).toEqual(expect.objectContaining({ label: 'Average of bytes' }));
       });
+
+      it('should carry over a custom label when transitioning to a managed reference', () => {
+        expect(
+          replaceColumn({
+            layer: {
+              indexPatternId: '1',
+              columnOrder: ['col1', 'col2'],
+              columns: {
+                col1: {
+                  label: 'MY CUSTOM LABEL',
+                  customLabel: true,
+                  dataType: 'string',
+                  isBucketed: true,
+                  operationType: 'terms',
+                  sourceField: 'source',
+                  params: {
+                    orderBy: { type: 'alphabetical' },
+                    orderDirection: 'asc',
+                    size: 5,
+                  },
+                },
+              },
+            },
+            indexPattern,
+            columnId: 'col1',
+            op: 'formula',
+            field: indexPattern.fields[2], // bytes field
+            visualizationGroups: [],
+            shouldResetLabel: undefined,
+          }).columns.col1
+        ).toEqual(expect.objectContaining({ label: 'MY CUSTOM LABEL' }));
+      });
+
+      it('should overwrite the current label when transitioning to a managed reference operation when not custom', () => {
+        expect(
+          replaceColumn({
+            layer: {
+              indexPatternId: '1',
+              columnOrder: ['col1', 'col2'],
+              columns: {
+                col1: {
+                  label: 'Average of bytes',
+                  dataType: 'number',
+                  isBucketed: false,
+                  operationType: 'average',
+                  sourceField: 'bytes',
+                },
+              },
+            },
+            indexPattern,
+            columnId: 'col1',
+            op: 'formula',
+            field: indexPattern.fields[2], // bytes field
+            visualizationGroups: [],
+            shouldResetLabel: undefined,
+          }).columns.col1
+        ).toEqual(expect.objectContaining({ label: 'average(bytes)' }));
+      });
+
+      it('should carry over a custom label when transitioning from a managed reference', () => {
+        expect(
+          replaceColumn({
+            layer: {
+              indexPatternId: '1',
+              columnOrder: ['col1', 'col2'],
+              columns: {
+                col1: {
+                  label: 'MY CUSTOM LABEL',
+                  customLabel: true,
+                  dataType: 'number',
+                  operationType: 'formula',
+                  isBucketed: false,
+                  scale: 'ratio',
+                  params: { isFormulaBroken: false, formula: 'average(bytes)' },
+                  references: [],
+                },
+              },
+            },
+            indexPattern,
+            columnId: 'col1',
+            op: 'average',
+            field: indexPattern.fields[2], // bytes field
+            visualizationGroups: [],
+            shouldResetLabel: undefined,
+          }).columns.col1
+        ).toEqual(expect.objectContaining({ label: 'MY CUSTOM LABEL' }));
+      });
+
+      it('should not carry over the managed reference default label to the new operation', () => {
+        expect(
+          replaceColumn({
+            layer: {
+              indexPatternId: '1',
+              columnOrder: ['col1', 'col2'],
+              columns: {
+                col1: {
+                  label: 'average(bytes)',
+                  customLabel: true,
+                  dataType: 'number',
+                  operationType: 'formula',
+                  isBucketed: false,
+                  scale: 'ratio',
+                  params: { isFormulaBroken: false, formula: 'average(bytes)' },
+                  references: [],
+                },
+              },
+            },
+            indexPattern,
+            columnId: 'col1',
+            op: 'average',
+            field: indexPattern.fields[2], // bytes field
+            visualizationGroups: [],
+            shouldResetLabel: undefined,
+          }).columns.col1
+        ).toEqual(expect.objectContaining({ label: 'Average of bytes' }));
+      });
     });
 
     it('should execute adjustments for other columns', () => {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
index baacc7bb64d16..b3b98e5054aa6 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
@@ -417,6 +417,17 @@ export function replaceColumn({
         field,
         visualizationGroups,
       });
+
+      // if the formula label is not the default one, propagate it to the new operation
+      if (
+        !shouldResetLabel &&
+        previousColumn.customLabel &&
+        previousColumn.label !==
+          previousDefinition.getDefaultLabel(previousColumn, indexPattern, tempLayer.columns)
+      ) {
+        hypotheticalLayer.columns[columnId].customLabel = true;
+        hypotheticalLayer.columns[columnId].label = previousColumn.label;
+      }
       if (hypotheticalLayer.incompleteColumns && hypotheticalLayer.incompleteColumns[columnId]) {
         return {
           ...layer,
@@ -500,13 +511,10 @@ export function replaceColumn({
     // TODO: Refactor all this to be more generic and know less about Formula
     // if managed it has to look at the full picture to have a seamless transition
     if (operationDefinition.input === 'managedReference') {
-      const newColumn = copyCustomLabel(
-        operationDefinition.buildColumn(
-          { ...baseOptions, layer: tempLayer },
-          previousColumn.params,
-          operationDefinitionMap
-        ),
-        previousColumn
+      const newColumn = operationDefinition.buildColumn(
+        { ...baseOptions, layer: tempLayer },
+        previousColumn.params,
+        operationDefinitionMap
       ) as FormulaIndexPatternColumn;
 
       // now remove the previous references
@@ -535,6 +543,17 @@ export function replaceColumn({
         newLayer = basicLayer;
       }
 
+      // when coming to Formula keep the custom label
+      const regeneratedColumn = newLayer.columns[columnId];
+      if (
+        !shouldResetLabel &&
+        regeneratedColumn.operationType !== previousColumn.operationType &&
+        previousColumn.customLabel
+      ) {
+        regeneratedColumn.customLabel = true;
+        regeneratedColumn.label = previousColumn.label;
+      }
+
       return updateDefaultLabels(
         {
           ...tempLayer,

From 62d39cc1fdbc8a4240e3ba9d8ac125923a673e52 Mon Sep 17 00:00:00 2001
From: Mark Hopkin <mark.hopkin@elastic.co>
Date: Wed, 13 Oct 2021 09:10:15 +0100
Subject: [PATCH 005/117] [Fleet] Add Integration Policy Page Improvements
 (#114556)

* Show add agent link instead of 0 agents

* Add popover

* open and close popover

* fill button

* add popover to agent cell

* PR feedback

* only add offset to props if it's provided

* make code clearer

* Update x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx

Co-authored-by: Dave Snider <dave.snider@gmail.com>

* remove unused import

* whitespace

Co-authored-by: Dave Snider <dave.snider@gmail.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../agent_policy/details_page/index.tsx       | 112 +++++++++++++-----
 .../package_policy_agents_cell.test.tsx       |  29 ++++-
 .../components/package_policy_agents_cell.tsx |  40 +++++--
 .../detail/policies/package_policies.tsx      |   7 +-
 .../components/add_agent_help_popover.tsx     |  88 ++++++++++++++
 .../plugins/fleet/public/components/index.ts  |   1 +
 6 files changed, 234 insertions(+), 43 deletions(-)
 create mode 100644 x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/index.tsx
index eec7d80b75c4b..76994feb18fea 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/index.tsx
@@ -10,17 +10,19 @@ import { Redirect, useRouteMatch, Switch, Route, useHistory, useLocation } from
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, FormattedDate } from '@kbn/i18n/react';
 import {
+  EuiButtonEmpty,
+  EuiDescriptionList,
+  EuiDescriptionListDescription,
+  EuiDescriptionListTitle,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiI18nNumber,
   EuiIconTip,
-  EuiTitle,
-  EuiText,
+  EuiLink,
+  EuiPortal,
   EuiSpacer,
-  EuiButtonEmpty,
-  EuiI18nNumber,
-  EuiDescriptionList,
-  EuiDescriptionListTitle,
-  EuiDescriptionListDescription,
+  EuiText,
+  EuiTitle,
 } from '@elastic/eui';
 import type { Props as EuiTabProps } from '@elastic/eui/src/components/tabs/tab';
 import styled from 'styled-components';
@@ -36,7 +38,7 @@ import {
   useFleetStatus,
   useIntraAppState,
 } from '../../../hooks';
-import { Loading, Error } from '../../../components';
+import { Loading, Error, AgentEnrollmentFlyout, AddAgentHelpPopover } from '../../../components';
 import { WithHeaderLayout } from '../../../layouts';
 import { LinkedAgentCount, AgentPolicyActionMenu } from '../components';
 
@@ -58,7 +60,16 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
   const agentPolicyRequest = useGetOneAgentPolicy(policyId);
   const agentPolicy = agentPolicyRequest.data ? agentPolicyRequest.data.item : null;
   const { isLoading, error, sendRequest: refreshAgentPolicy } = agentPolicyRequest;
+  const queryParams = new URLSearchParams(useLocation().search);
+  const openEnrollmentFlyoutOpenByDefault = queryParams.get('openEnrollmentFlyout') === 'true';
+  const openAddAgentHelpPopoverOpenByDefault = queryParams.get('showAddAgentHelp') === 'true';
   const [redirectToAgentPolicyList] = useState<boolean>(false);
+  const [isEnrollmentFlyoutOpen, setIsEnrollmentFlyoutOpen] = useState<boolean>(
+    openEnrollmentFlyoutOpenByDefault
+  );
+  const [isAddAgentHelpPopoverOpen, setIsAddAgentHelpPopoverOpen] = useState<boolean>(
+    openAddAgentHelpPopoverOpenByDefault
+  );
   const agentStatusRequest = useGetAgentStatus(policyId);
   const { refreshAgentStatus } = agentStatusRequest;
   const {
@@ -66,8 +77,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
   } = useStartServices();
   const routeState = useIntraAppState<AgentPolicyDetailsDeployAgentAction>();
   const agentStatus = agentStatusRequest.data?.results;
-  const queryParams = new URLSearchParams(useLocation().search);
-  const openEnrollmentFlyoutOpenByDefault = queryParams.get('openEnrollmentFlyout') === 'true';
+
   const { isReady: isFleetReady } = useFleetStatus();
 
   const headerLeftContent = useMemo(
@@ -138,6 +148,25 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
     [getHref, isLoading, agentPolicy, policyId]
   );
 
+  const onCancelEnrollment = useMemo(() => {
+    if (routeState && routeState.onDoneNavigateTo && isFleetReady) {
+      const [appId, options] = routeState.onDoneNavigateTo;
+      return () => navigateToApp(appId, options);
+    }
+
+    return undefined;
+  }, [isFleetReady, navigateToApp, routeState]);
+
+  const addAgentLink = (
+    <EuiLink
+      onClick={() => {
+        setIsAddAgentHelpPopoverOpen(false);
+        setIsEnrollmentFlyoutOpen(true);
+      }}
+    >
+      <FormattedMessage id="xpack.fleet.policyDetails.addAgentButton" defaultMessage="Add agent" />
+    </EuiLink>
+  );
   const headerRightContent = useMemo(
     () =>
       agentPolicy ? (
@@ -168,15 +197,25 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
             { isDivider: true },
             {
               label: i18n.translate('xpack.fleet.policyDetails.summary.usedBy', {
-                defaultMessage: 'Used by',
+                defaultMessage: 'Agents',
               }),
-              content: (
-                <LinkedAgentCount
-                  count={(agentStatus && agentStatus.total) || 0}
-                  agentPolicyId={(agentPolicy && agentPolicy.id) || ''}
-                  showAgentText
-                />
-              ),
+              content:
+                agentStatus && agentStatus!.total ? (
+                  <LinkedAgentCount
+                    count={agentStatus.total}
+                    agentPolicyId={(agentPolicy && agentPolicy.id) || ''}
+                    showAgentText
+                  />
+                ) : (
+                  <AddAgentHelpPopover
+                    button={addAgentLink}
+                    isOpen={isAddAgentHelpPopoverOpen}
+                    offset={15}
+                    closePopover={() => {
+                      setIsAddAgentHelpPopoverOpen(false);
+                    }}
+                  />
+                ),
             },
             { isDivider: true },
             {
@@ -203,16 +242,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
                   onCopySuccess={(newAgentPolicy: AgentPolicy) => {
                     history.push(getPath('policy_details', { policyId: newAgentPolicy.id }));
                   }}
-                  enrollmentFlyoutOpenByDefault={openEnrollmentFlyoutOpenByDefault}
-                  onCancelEnrollment={
-                    routeState && routeState.onDoneNavigateTo && isFleetReady
-                      ? () =>
-                          navigateToApp(
-                            routeState.onDoneNavigateTo![0],
-                            routeState.onDoneNavigateTo![1]
-                          )
-                      : undefined
-                  }
+                  onCancelEnrollment={onCancelEnrollment}
                 />
               ),
             },
@@ -237,7 +267,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
         </EuiFlexGroup>
       ) : undefined,
     /* eslint-disable-next-line react-hooks/exhaustive-deps */
-    [agentPolicy, policyId, agentStatus]
+    [agentPolicy, policyId, agentStatus, isAddAgentHelpPopoverOpen]
   );
 
   const headerTabs = useMemo(() => {
@@ -303,8 +333,28 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
       );
     }
 
-    return <AgentPolicyDetailsContent agentPolicy={agentPolicy} />;
-  }, [agentPolicy, policyId, error, isLoading, redirectToAgentPolicyList]);
+    return (
+      <>
+        {isEnrollmentFlyoutOpen && (
+          <EuiPortal>
+            <AgentEnrollmentFlyout
+              agentPolicy={agentPolicy}
+              onClose={onCancelEnrollment || (() => setIsEnrollmentFlyoutOpen(false))}
+            />
+          </EuiPortal>
+        )}
+        <AgentPolicyDetailsContent agentPolicy={agentPolicy} />;
+      </>
+    );
+  }, [
+    redirectToAgentPolicyList,
+    isLoading,
+    error,
+    agentPolicy,
+    isEnrollmentFlyoutOpen,
+    onCancelEnrollment,
+    policyId,
+  ]);
 
   return (
     <AgentPolicyRefreshContext.Provider value={{ refresh: refreshAgentPolicy }}>
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/components/package_policy_agents_cell.test.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/components/package_policy_agents_cell.test.tsx
index 8872c61299093..6cb9aab005e77 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/components/package_policy_agents_cell.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/components/package_policy_agents_cell.test.tsx
@@ -13,7 +13,12 @@ import { createIntegrationsTestRendererMock } from '../../../../../../../../mock
 
 import { PackagePolicyAgentsCell } from './package_policy_agents_cell';
 
-function renderCell({ agentCount = 0, agentPolicyId = '123', onAddAgent = () => {} }) {
+function renderCell({
+  agentCount = 0,
+  agentPolicyId = '123',
+  onAddAgent = () => {},
+  hasHelpPopover = false,
+}) {
   const renderer = createIntegrationsTestRendererMock();
 
   return renderer.render(
@@ -21,6 +26,7 @@ function renderCell({ agentCount = 0, agentPolicyId = '123', onAddAgent = () =>
       agentCount={agentCount}
       agentPolicyId={agentPolicyId}
       onAddAgent={onAddAgent}
+      hasHelpPopover={hasHelpPopover}
     />
   );
 }
@@ -40,4 +46,25 @@ describe('PackagePolicyAgentsCell', () => {
       expect(utils.queryByText('9999')).toBeInTheDocument();
     });
   });
+
+  test('it should display help popover if count is 0 and hasHelpPopover=true', async () => {
+    const utils = renderCell({ agentCount: 0, hasHelpPopover: true });
+    await act(async () => {
+      expect(utils.queryByText('9999')).not.toBeInTheDocument();
+      expect(utils.queryByText('Add agent')).toBeInTheDocument();
+      expect(
+        utils.container.querySelector('[data-test-subj="addAgentHelpPopover"]')
+      ).toBeInTheDocument();
+    });
+  });
+  test('it should not display help popover if count is > 0 and hasHelpPopover=true', async () => {
+    const utils = renderCell({ agentCount: 9999, hasHelpPopover: true });
+    await act(async () => {
+      expect(utils.queryByText('9999')).toBeInTheDocument();
+      expect(utils.queryByText('Add agent')).not.toBeInTheDocument();
+      expect(
+        utils.container.querySelector('[data-test-subj="addAgentHelpPopover"]')
+      ).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/components/package_policy_agents_cell.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/components/package_policy_agents_cell.tsx
index 37543e7e5ae1b..e70d10e735571 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/components/package_policy_agents_cell.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/components/package_policy_agents_cell.tsx
@@ -5,20 +5,43 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { useState } from 'react';
 
 import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { LinkedAgentCount } from '../../../../../../components';
+import { LinkedAgentCount, AddAgentHelpPopover } from '../../../../../../components';
+
+const AddAgentButton = ({ onAddAgent }: { onAddAgent: () => void }) => (
+  <EuiButton iconType="plusInCircle" data-test-subj="addAgentButton" onClick={onAddAgent}>
+    <FormattedMessage
+      id="xpack.fleet.epm.packageDetails.integrationList.addAgent"
+      defaultMessage="Add agent"
+    />
+  </EuiButton>
+);
+
+const AddAgentButtonWithPopover = ({ onAddAgent }: { onAddAgent: () => void }) => {
+  const button = <AddAgentButton onAddAgent={onAddAgent} />;
+  const [isHelpOpen, setIsHelpOpen] = useState<boolean>(true);
+  return (
+    <AddAgentHelpPopover
+      button={button}
+      isOpen={isHelpOpen}
+      closePopover={() => setIsHelpOpen(false)}
+    />
+  );
+};
 
 export const PackagePolicyAgentsCell = ({
   agentPolicyId,
   agentCount = 0,
   onAddAgent,
+  hasHelpPopover = false,
 }: {
   agentPolicyId: string;
   agentCount?: number;
+  hasHelpPopover?: boolean;
   onAddAgent: () => void;
 }) => {
   if (agentCount > 0) {
@@ -31,12 +54,9 @@ export const PackagePolicyAgentsCell = ({
     );
   }
 
-  return (
-    <EuiButton iconType="plusInCircle" data-test-subj="addAgentButton" onClick={onAddAgent}>
-      <FormattedMessage
-        id="xpack.fleet.epm.packageDetails.integrationList.addAgent"
-        defaultMessage="Add agent"
-      />
-    </EuiButton>
-  );
+  if (!hasHelpPopover) {
+    return <AddAgentButton onAddAgent={onAddAgent} />;
+  }
+
+  return <AddAgentButtonWithPopover onAddAgent={onAddAgent} />;
 };
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
index 304bdd621b1b2..2a7cab929211a 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
@@ -81,6 +81,10 @@ export const PackagePoliciesPage = ({ name, version }: PackagePoliciesPanelProps
     () => queryParams.get('addAgentToPolicyId'),
     [queryParams]
   );
+  const showAddAgentHelpForPolicyId = useMemo(
+    () => queryParams.get('showAddAgentHelpForPolicyId'),
+    [queryParams]
+  );
   const [flyoutOpenForPolicyId, setFlyoutOpenForPolicyId] = useState<string | null>(
     agentPolicyIdFromParams
   );
@@ -294,6 +298,7 @@ export const PackagePoliciesPage = ({ name, version }: PackagePoliciesPanelProps
               agentPolicyId={agentPolicy.id}
               agentCount={agentPolicy.agents}
               onAddAgent={() => setFlyoutOpenForPolicyId(agentPolicy.id)}
+              hasHelpPopover={showAddAgentHelpForPolicyId === agentPolicy.id}
             />
           );
         },
@@ -321,7 +326,7 @@ export const PackagePoliciesPage = ({ name, version }: PackagePoliciesPanelProps
         },
       },
     ],
-    [getHref, viewDataStep]
+    [getHref, showAddAgentHelpForPolicyId, viewDataStep]
   );
 
   const noItemsMessage = useMemo(() => {
diff --git a/x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx b/x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx
new file mode 100644
index 0000000000000..e47070fdc7b99
--- /dev/null
+++ b/x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import type { ReactElement } from 'react';
+import React from 'react';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import type { NoArgCallback } from '@elastic/eui';
+import { EuiTourStep, EuiLink, EuiText } from '@elastic/eui';
+
+import { useStartServices } from '../hooks';
+
+export const AddAgentHelpPopover = ({
+  button,
+  isOpen,
+  offset,
+  closePopover,
+}: {
+  button: ReactElement;
+  isOpen: boolean;
+  offset?: number;
+  closePopover: NoArgCallback<void>;
+}) => {
+  const { docLinks } = useStartServices();
+
+  const optionalProps: { offset?: number } = {};
+
+  if (offset !== undefined) {
+    optionalProps.offset = offset; // offset being present in props sets it to 0 so only add if specified
+  }
+
+  return (
+    <EuiTourStep
+      {...optionalProps}
+      content={
+        <EuiText size="m" style={{ width: 302 }}>
+          <FormattedMessage
+            id="xpack.fleet.addAgentHelpPopover.popoverBody"
+            defaultMessage="For integrations to work successfully, add {elasticAgent} to your host to collect data and send it to Elastic Stack. {learnMoreLink}"
+            values={{
+              elasticAgent: <strong>Elastic Agent</strong>,
+              learnMoreLink: (
+                <EuiLink target="_blank" external href={docLinks.links.fleet.elasticAgent}>
+                  <FormattedMessage
+                    id="xpack.fleet.addAgentHelpPopover.documentationLink"
+                    defaultMessage="Learn more about Elastic Agent."
+                  />
+                </EuiLink>
+              ),
+            }}
+          />
+        </EuiText>
+      }
+      isStepOpen={isOpen}
+      minWidth={300}
+      onFinish={() => {}}
+      step={1}
+      stepsTotal={1}
+      title={
+        <FormattedMessage
+          id="xpack.fleet.addAgentHelpPopover.title"
+          defaultMessage="Don't forget to add the agent to your host"
+        />
+      }
+      anchorPosition="downCenter"
+      subtitle={null}
+      data-test-subj="addAgentHelpPopover"
+      footerAction={
+        <EuiLink
+          onClick={() => {
+            closePopover();
+          }}
+        >
+          <FormattedMessage
+            id="xpack.fleet.addAgentHelpPopover.footActionButton"
+            defaultMessage="Got it"
+          />
+        </EuiLink>
+      }
+    >
+      {button}
+    </EuiTourStep>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/components/index.ts b/x-pack/plugins/fleet/public/components/index.ts
index dca0a92076180..3252315312d02 100644
--- a/x-pack/plugins/fleet/public/components/index.ts
+++ b/x-pack/plugins/fleet/public/components/index.ts
@@ -19,6 +19,7 @@ export { AgentPolicyPackageBadges } from './agent_policy_package_badges';
 export { DangerEuiContextMenuItem } from './danger_eui_context_menu_item';
 export { PackagePolicyDeleteProvider } from './package_policy_delete_provider';
 export { PackagePolicyActionsMenu } from './package_policy_actions_menu';
+export { AddAgentHelpPopover } from './add_agent_help_popover';
 export * from './link_and_revision';
 export * from './settings_flyout';
 export * from './agent_enrollment_flyout';

From d9ef453b268098a2f0cb8c6f2e93bfb1cfc1efe3 Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Wed, 13 Oct 2021 11:31:04 +0300
Subject: [PATCH 006/117] [Discover] Removing SavedObject usage for savedSearch
 (#112983)

* [Discover] Step 2 - remove SavedObjectLoader

* Fix PR comments

* fix test names

* fix ts error

* add handling of missed 'so'

* add Embeddable error

* fix jest

* add DiscoverError component

* fix Joe comments

* add search params

* add throwErrorOnUrlConflict util method

* add error handling into transform plugin

* do some updates

* add spaces into visualize, visualizations

* fix Tim's comment

* pass false into createGetterSetter for getSpaces

* Fix comments

* Fix lint

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Uladzislau Lasitsa <Uladzislau_Lasitsa@epam.com>
---
 src/plugins/discover/kibana.json              |   4 +-
 .../discover/public/__mocks__/saved_search.ts |  34 -----
 .../discover/public/__mocks__/services.ts     |   2 -
 .../apps/context/services/context.ts          |   6 +-
 .../components/layout/discover_documents.tsx  |   4 +-
 .../components/layout/discover_layout.tsx     |  25 ++-
 .../components/top_nav/on_save_search.tsx     |  33 ++--
 .../apps/main/discover_main_route.tsx         | 122 ++++++++++-----
 .../apps/main/services/discover_state.test.ts |   2 +-
 .../main/services/use_discover_state.test.ts  |  14 ++
 .../apps/main/services/use_discover_state.ts  |   9 +-
 .../apps/main/services/use_saved_search.ts    |   4 +-
 .../application/apps/main/utils/fetch_all.ts  |   6 +-
 .../apps/main/utils/fetch_chart.ts            |   6 +-
 .../apps/main/utils/fetch_documents.ts        |   4 +-
 .../apps/main/utils/fetch_total_hits.ts       |   4 +-
 .../main/utils/get_chart_agg_config.test.ts   |   4 +-
 .../apps/main/utils/get_chart_agg_configs.ts  |   4 +-
 .../apps/main/utils/get_dimensions.test.ts    |   4 +-
 .../apps/main/utils/get_fetch_observable.ts   |   4 +-
 .../apps/main/utils/get_sharing_data.ts       |   2 +-
 .../apps/main/utils/get_state_defaults.ts     |   9 +-
 .../apps/main/utils/persist_saved_search.ts   |   9 +-
 .../apps/main/utils/resolve_index_pattern.ts  |   4 +-
 .../main/utils/update_search_source.test.ts   |   2 +-
 .../apps/main/utils/update_search_source.ts   |   2 +-
 .../helpers/update_search_source.test.ts      |   2 +-
 .../embeddable/saved_search_embeddable.tsx    |   5 +-
 .../embeddable/search_embeddable_factory.ts   |  26 +++-
 .../public/application/embeddable/types.ts    |   2 +-
 .../embeddable/view_saved_search_action.ts    |   3 +-
 src/plugins/discover/public/build_services.ts |  14 +-
 src/plugins/discover/public/index.ts          |  13 +-
 src/plugins/discover/public/mocks.ts          |   4 +-
 src/plugins/discover/public/plugin.tsx        |  18 ++-
 .../public/saved_searches/constants.ts        |  10 ++
 .../saved_searches/get_saved_searches.test.ts | 144 ++++++++++++++++++
 .../saved_searches/get_saved_searches.ts      |  85 +++++++++++
 .../discover/public/saved_searches/index.ts   |  24 ++-
 .../{ => legacy}/_saved_search.ts             |  11 +-
 .../public/saved_searches/legacy/index.ts     |  10 ++
 .../{ => legacy}/saved_searches.ts            |   8 +-
 .../public/saved_searches/legacy/types.ts     |  34 +++++
 .../save_saved_searches.test.ts               | 117 ++++++++++++++
 .../saved_searches/save_saved_searches.ts     |  80 ++++++++++
 .../saved_search_alias_match_redirect.test.ts |  73 +++++++++
 .../saved_search_alias_match_redirect.ts      |  49 ++++++
 ...saved_search_url_conflict_callout.test.tsx |  61 ++++++++
 .../saved_search_url_conflict_callout.ts      |  46 ++++++
 .../saved_searches_utils.test.ts              | 140 +++++++++++++++++
 .../saved_searches/saved_searches_utils.ts    |  57 +++++++
 .../discover/public/saved_searches/types.ts   |  49 +++---
 src/plugins/discover/tsconfig.json            |   4 +-
 src/plugins/vis_default_editor/kibana.json    |   2 +-
 .../public/components/sidebar/sidebar.tsx     |   4 +-
 .../components/sidebar/sidebar_title.tsx      |   8 +-
 src/plugins/visualizations/public/plugin.ts   |  15 +-
 .../public/saved_visualizations/_saved_vis.ts |   4 +-
 src/plugins/visualizations/public/services.ts |  18 +--
 src/plugins/visualizations/public/vis.ts      |  22 ++-
 .../visualize/public/application/types.ts     |  19 +--
 .../utils/get_visualization_instance.test.ts  |  25 +--
 .../utils/get_visualization_instance.ts       |  21 ++-
 src/plugins/visualize/public/plugin.ts        |   4 +-
 .../get_csv_panel_action.test.ts              |   4 +-
 .../panel_actions/get_csv_panel_action.tsx    |   2 +-
 x-pack/plugins/transform/kibana.json          |   1 +
 .../public/__mocks__/shared_imports.ts        |   2 +-
 .../transform/public/app/app_dependencies.tsx |   2 +
 .../app/hooks/use_search_items/common.ts      |   7 -
 .../use_search_items/use_search_items.ts      |  18 ++-
 .../public/app/mount_management_section.ts    |   3 +-
 x-pack/plugins/transform/public/plugin.ts     |   2 +
 .../transform/public/shared_imports.ts        |   5 +-
 74 files changed, 1318 insertions(+), 282 deletions(-)
 create mode 100644 src/plugins/discover/public/saved_searches/constants.ts
 create mode 100644 src/plugins/discover/public/saved_searches/get_saved_searches.test.ts
 create mode 100644 src/plugins/discover/public/saved_searches/get_saved_searches.ts
 rename src/plugins/discover/public/saved_searches/{ => legacy}/_saved_search.ts (80%)
 create mode 100644 src/plugins/discover/public/saved_searches/legacy/index.ts
 rename src/plugins/discover/public/saved_searches/{ => legacy}/saved_searches.ts (78%)
 create mode 100644 src/plugins/discover/public/saved_searches/legacy/types.ts
 create mode 100644 src/plugins/discover/public/saved_searches/save_saved_searches.test.ts
 create mode 100644 src/plugins/discover/public/saved_searches/save_saved_searches.ts
 create mode 100644 src/plugins/discover/public/saved_searches/saved_search_alias_match_redirect.test.ts
 create mode 100644 src/plugins/discover/public/saved_searches/saved_search_alias_match_redirect.ts
 create mode 100644 src/plugins/discover/public/saved_searches/saved_search_url_conflict_callout.test.tsx
 create mode 100644 src/plugins/discover/public/saved_searches/saved_search_url_conflict_callout.ts
 create mode 100644 src/plugins/discover/public/saved_searches/saved_searches_utils.test.ts
 create mode 100644 src/plugins/discover/public/saved_searches/saved_searches_utils.ts

diff --git a/src/plugins/discover/kibana.json b/src/plugins/discover/kibana.json
index 46eeb5af1470d..3d5fdefd276d3 100644
--- a/src/plugins/discover/kibana.json
+++ b/src/plugins/discover/kibana.json
@@ -15,8 +15,8 @@
     "savedObjects",
     "indexPatternFieldEditor"
   ],
-  "optionalPlugins": ["home", "share", "usageCollection"],
-  "requiredBundles": ["kibanaUtils", "home", "kibanaReact", "fieldFormats"],
+  "optionalPlugins": ["home", "share", "usageCollection", "spaces"],
+  "requiredBundles": ["kibanaUtils", "home", "kibanaReact", "fieldFormats", "dataViews"],
   "extraPublicDirs": ["common"],
   "owner": {
     "name": "Data Discovery",
diff --git a/src/plugins/discover/public/__mocks__/saved_search.ts b/src/plugins/discover/public/__mocks__/saved_search.ts
index ebe65a5770356..a488fe7e04c50 100644
--- a/src/plugins/discover/public/__mocks__/saved_search.ts
+++ b/src/plugins/discover/public/__mocks__/saved_search.ts
@@ -13,44 +13,10 @@ import { indexPatternWithTimefieldMock } from './index_pattern_with_timefield';
 
 export const savedSearchMock = {
   id: 'the-saved-search-id',
-  type: 'search',
-  attributes: {
-    title: 'the-saved-search-title',
-    kibanaSavedObjectMeta: {
-      searchSourceJSON:
-        '{"highlightAll":true,"version":true,"query":{"query":"foo : \\"bar\\" ","language":"kuery"},"filter":[],"indexRefName":"kibanaSavedObjectMeta.searchSourceJSON.index"}',
-    },
-  },
-  references: [
-    {
-      name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
-      type: 'index-pattern',
-      id: 'the-index-pattern-id',
-    },
-  ],
-  migrationVersion: { search: '7.5.0' },
-  error: undefined,
   searchSource: createSearchSourceMock({ index: indexPatternMock }),
 } as unknown as SavedSearch;
 
 export const savedSearchMockWithTimeField = {
   id: 'the-saved-search-id-with-timefield',
-  type: 'search',
-  attributes: {
-    title: 'the-saved-search-title',
-    kibanaSavedObjectMeta: {
-      searchSourceJSON:
-        '{"highlightAll":true,"version":true,"query":{"query":"foo : \\"bar\\" ","language":"kuery"},"filter":[],"indexRefName":"kibanaSavedObjectMeta.searchSourceJSON.index"}',
-    },
-  },
-  references: [
-    {
-      name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
-      type: 'index-pattern',
-      id: 'the-index-pattern-id',
-    },
-  ],
-  migrationVersion: { search: '7.5.0' },
-  error: undefined,
   searchSource: createSearchSourceMock({ index: indexPatternWithTimefieldMock }),
 } as unknown as SavedSearch;
diff --git a/src/plugins/discover/public/__mocks__/services.ts b/src/plugins/discover/public/__mocks__/services.ts
index 30d66b113e528..8cc5ccf5aa121 100644
--- a/src/plugins/discover/public/__mocks__/services.ts
+++ b/src/plugins/discover/public/__mocks__/services.ts
@@ -16,7 +16,6 @@ import {
   SAMPLE_SIZE_SETTING,
   SORT_DEFAULT_ORDER_SETTING,
 } from '../../common';
-import { savedSearchMock } from './saved_search';
 import { UI_SETTINGS } from '../../../data/common';
 import { TopNavMenu } from '../../../navigation/public';
 import { FORMATS_UI_SETTINGS } from 'src/plugins/field_formats/common';
@@ -78,7 +77,6 @@ export const discoverServiceMock = {
       editIndexPattern: jest.fn(),
     },
   },
-  getSavedSearchById: (id?: string) => Promise.resolve(savedSearchMock),
   navigation: {
     ui: { TopNavMenu },
   },
diff --git a/src/plugins/discover/public/application/apps/context/services/context.ts b/src/plugins/discover/public/application/apps/context/services/context.ts
index b76b5ac648c22..257ae2dcce834 100644
--- a/src/plugins/discover/public/application/apps/context/services/context.ts
+++ b/src/plugins/discover/public/application/apps/context/services/context.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { Filter, IndexPattern, SearchSource } from 'src/plugins/data/public';
+import { Filter, IndexPattern, ISearchSource } from 'src/plugins/data/public';
 import { reverseSortDir, SortDirection } from './utils/sorting';
 import { convertIsoToMillis, extractNanos } from './utils/date_conversion';
 import { fetchHitsInInterval } from './utils/fetch_hits_in_interval';
@@ -53,7 +53,7 @@ export async function fetchSurroundingDocs(
   }
   const { data } = getServices();
   const timeField = indexPattern.timeFieldName!;
-  const searchSource = data.search.searchSource.createEmpty() as SearchSource;
+  const searchSource = data.search.searchSource.createEmpty();
   updateSearchSource(searchSource, indexPattern, filters, Boolean(useNewFieldsApi));
   const sortDirToApply = type === SurrDocType.SUCCESSORS ? sortDir : reverseSortDir(sortDir);
 
@@ -104,7 +104,7 @@ export async function fetchSurroundingDocs(
 }
 
 export function updateSearchSource(
-  searchSource: SearchSource,
+  searchSource: ISearchSource,
   indexPattern: IndexPattern,
   filters: Filter[],
   useNewFieldsApi: boolean
diff --git a/src/plugins/discover/public/application/apps/main/components/layout/discover_documents.tsx b/src/plugins/discover/public/application/apps/main/components/layout/discover_documents.tsx
index e0e0c9c6f8831..d6ede9aa7fe5f 100644
--- a/src/plugins/discover/public/application/apps/main/components/layout/discover_documents.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/layout/discover_documents.tsx
@@ -134,7 +134,7 @@ function DiscoverDocumentsComponent({
           sort={state.sort || []}
           isLoading={isLoading}
           searchDescription={savedSearch.description}
-          sharedItemTitle={savedSearch.lastSavedTitle}
+          sharedItemTitle={savedSearch.title}
           onAddColumn={onAddColumn}
           onFilter={onAddFilter as DocViewFilterFn}
           onMoveColumn={onMoveColumn}
@@ -156,7 +156,7 @@ function DiscoverDocumentsComponent({
             sort={(state.sort as SortPairArr[]) || []}
             sampleSize={sampleSize}
             searchDescription={savedSearch.description}
-            searchTitle={savedSearch.lastSavedTitle}
+            searchTitle={savedSearch.title}
             setExpandedDoc={setExpandedDoc}
             showTimeCol={showTimeCol}
             services={services}
diff --git a/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx b/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx
index 4bbef32dcbadd..6c6393daf30a3 100644
--- a/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx
@@ -39,6 +39,10 @@ import { useDataGridColumns } from '../../../../helpers/use_data_grid_columns';
 import { DiscoverDocuments } from './discover_documents';
 import { FetchStatus } from '../../../../types';
 import { useDataState } from '../../utils/use_data_state';
+import {
+  SavedSearchURLConflictCallout,
+  useSavedSearchAliasMatchRedirect,
+} from '../../../../../saved_searches';
 
 /**
  * Local storage key for sidebar persistence state
@@ -65,10 +69,18 @@ export function DiscoverLayout({
   state,
   stateContainer,
 }: DiscoverLayoutProps) {
-  const { trackUiMetric, capabilities, indexPatterns, data, uiSettings, filterManager, storage } =
-    services;
+  const {
+    trackUiMetric,
+    capabilities,
+    indexPatterns,
+    data,
+    uiSettings,
+    filterManager,
+    storage,
+    history,
+    spaces,
+  } = services;
   const { main$, charts$, totalHits$ } = savedSearchData$;
-
   const [expandedDoc, setExpandedDoc] = useState<ElasticSearchHit | undefined>(undefined);
   const [inspectorSession, setInspectorSession] = useState<InspectorSession | undefined>(undefined);
   const fetchCounter = useRef<number>(0);
@@ -80,6 +92,8 @@ export function DiscoverLayout({
     }
   }, [dataState.fetchStatus]);
 
+  useSavedSearchAliasMatchRedirect({ savedSearch, spaces, history });
+
   const timeField = useMemo(() => {
     return indexPattern.type !== 'rollup' ? indexPattern.timeFieldName : undefined;
   }, [indexPattern]);
@@ -174,6 +188,11 @@ export function DiscoverLayout({
         resetSavedSearch={resetSavedSearch}
       />
       <EuiPageBody className="dscPageBody" aria-describedby="savedSearchTitle">
+        <SavedSearchURLConflictCallout
+          savedSearch={savedSearch}
+          spaces={spaces}
+          history={history}
+        />
         <h1 id="savedSearchTitle" className="euiScreenReaderOnly">
           {savedSearch.title}
         </h1>
diff --git a/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx b/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx
index c68b1ab7b844c..18766b5df7f33 100644
--- a/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { SavedObjectSaveModal, showSaveModal } from '../../../../../../../saved_objects/public';
-import { SavedSearch } from '../../../../../saved_searches';
+import { SavedSearch, SaveSavedSearchOptions } from '../../../../../saved_searches';
 import { IndexPattern } from '../../../../../../../data/common';
 import { DiscoverServices } from '../../../../../build_services';
 import { GetStateReturn } from '../../services/discover_state';
@@ -27,11 +27,7 @@ async function saveDataSource({
   indexPattern: IndexPattern;
   navigateTo: (url: string) => void;
   savedSearch: SavedSearch;
-  saveOptions: {
-    confirmOverwrite: boolean;
-    isTitleDuplicateConfirmed: boolean;
-    onTitleDuplicate: () => void;
-  };
+  saveOptions: SaveSavedSearchOptions;
   services: DiscoverServices;
   state: GetStateReturn;
 }) {
@@ -47,14 +43,20 @@ async function saveDataSource({
         }),
         'data-test-subj': 'saveSearchSuccess',
       });
-
-      if (savedSearch.id !== prevSavedSearchId) {
-        navigateTo(`/view/${encodeURIComponent(savedSearch.id)}`);
+      if (id !== prevSavedSearchId) {
+        navigateTo(`/view/${encodeURIComponent(id)}`);
       } else {
         // Update defaults so that "reload saved query" functions correctly
         state.resetAppState();
-        services.chrome.docTitle.change(savedSearch.lastSavedTitle!);
-        setBreadcrumbsTitle(savedSearch, services.chrome);
+        services.chrome.docTitle.change(savedSearch.title!);
+
+        setBreadcrumbsTitle(
+          {
+            ...savedSearch,
+            id: prevSavedSearchId ?? id,
+          },
+          services.chrome
+        );
       }
     }
   }
@@ -106,11 +108,10 @@ export async function onSaveSearch({
   }) => {
     const currentTitle = savedSearch.title;
     savedSearch.title = newTitle;
-    savedSearch.copyOnSave = newCopyOnSave;
-    const saveOptions = {
-      confirmOverwrite: false,
-      isTitleDuplicateConfirmed,
+    const saveOptions: SaveSavedSearchOptions = {
       onTitleDuplicate,
+      copyOnSave: newCopyOnSave,
+      isTitleDuplicateConfirmed,
     };
     const response = await saveDataSource({
       indexPattern,
@@ -133,7 +134,7 @@ export async function onSaveSearch({
     <SavedObjectSaveModal
       onSave={onSave}
       onClose={() => {}}
-      title={savedSearch.title}
+      title={savedSearch.title ?? ''}
       showCopyOnSave={!!savedSearch.id}
       objectType={i18n.translate('discover.localMenu.saveSaveSearchObjectType', {
         defaultMessage: 'search',
diff --git a/src/plugins/discover/public/application/apps/main/discover_main_route.tsx b/src/plugins/discover/public/application/apps/main/discover_main_route.tsx
index a95668642558c..b674bfd6568ac 100644
--- a/src/plugins/discover/public/application/apps/main/discover_main_route.tsx
+++ b/src/plugins/discover/public/application/apps/main/discover_main_route.tsx
@@ -8,15 +8,18 @@
 import React, { useEffect, useState, memo } from 'react';
 import { History } from 'history';
 import { useParams } from 'react-router-dom';
-import type { SavedObject as SavedObjectDeprecated } from 'src/plugins/saved_objects/public';
-import { IndexPatternAttributes, SavedObject } from 'src/plugins/data/common';
+import { i18n } from '@kbn/i18n';
+import { EuiEmptyPrompt } from '@elastic/eui';
+
+import { IndexPatternAttributes, ISearchSource, SavedObject } from 'src/plugins/data/common';
 import { DiscoverServices } from '../../../build_services';
-import { SavedSearch } from '../../../saved_searches';
+import { SavedSearch, getSavedSearch, getSavedSearchFullPathUrl } from '../../../saved_searches';
 import { getState } from './services/discover_state';
 import { loadIndexPattern, resolveIndexPattern } from './utils/resolve_index_pattern';
 import { DiscoverMainApp } from './discover_main_app';
 import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../../helpers/breadcrumbs';
 import { redirectWhenMissing } from '../../../../../kibana_utils/public';
+import { DataViewSavedObjectConflictError } from '../../../../../data_views/common';
 import { getUrlTracker } from '../../../kibana_services';
 import { LoadingIndicator } from '../../components/common/loading_indicator';
 
@@ -37,6 +40,21 @@ interface DiscoverLandingParams {
   id: string;
 }
 
+const DiscoverError = ({ error }: { error: Error }) => (
+  <EuiEmptyPrompt
+    iconType="alert"
+    iconColor="danger"
+    title={
+      <h2>
+        {i18n.translate('discover.discoverError.title', {
+          defaultMessage: 'Error loading Discover',
+        })}
+      </h2>
+    }
+    body={<p>{error.message}</p>}
+  />
+);
+
 export function DiscoverMainRoute({ services, history }: DiscoverMainProps) {
   const {
     core,
@@ -46,7 +64,7 @@ export function DiscoverMainRoute({ services, history }: DiscoverMainProps) {
     toastNotifications,
     http: { basePath },
   } = services;
-
+  const [error, setError] = useState<Error>();
   const [savedSearch, setSavedSearch] = useState<SavedSearch>();
   const indexPattern = savedSearch?.searchSource?.getField('index');
   const [indexPatternList, setIndexPatternList] = useState<
@@ -58,58 +76,76 @@ export function DiscoverMainRoute({ services, history }: DiscoverMainProps) {
   useEffect(() => {
     const savedSearchId = id;
 
-    async function loadDefaultOrCurrentIndexPattern(usedSavedSearch: SavedSearch) {
-      await data.indexPatterns.ensureDefaultDataView();
-      const { appStateContainer } = getState({ history, uiSettings: config });
-      const { index } = appStateContainer.getState();
-      const ip = await loadIndexPattern(index || '', data.indexPatterns, config);
-      const ipList = ip.list as Array<SavedObject<IndexPatternAttributes>>;
-      const indexPatternData = await resolveIndexPattern(
-        ip,
-        usedSavedSearch.searchSource,
-        toastNotifications
-      );
-      setIndexPatternList(ipList);
-      return indexPatternData;
+    async function loadDefaultOrCurrentIndexPattern(searchSource: ISearchSource) {
+      try {
+        await data.indexPatterns.ensureDefaultDataView();
+        const { appStateContainer } = getState({ history, uiSettings: config });
+        const { index } = appStateContainer.getState();
+        const ip = await loadIndexPattern(index || '', data.indexPatterns, config);
+
+        const ipList = ip.list as Array<SavedObject<IndexPatternAttributes>>;
+        const indexPatternData = await resolveIndexPattern(ip, searchSource, toastNotifications);
+
+        setIndexPatternList(ipList);
+
+        return indexPatternData;
+      } catch (e) {
+        setError(e);
+      }
     }
 
     async function loadSavedSearch() {
       try {
-        const loadedSavedSearch = await services.getSavedSearchById(savedSearchId);
-        const loadedIndexPattern = await loadDefaultOrCurrentIndexPattern(loadedSavedSearch);
-        if (loadedSavedSearch && !loadedSavedSearch?.searchSource.getField('index')) {
-          loadedSavedSearch.searchSource.setField('index', loadedIndexPattern);
+        const currentSavedSearch = await getSavedSearch(savedSearchId, {
+          search: services.data.search,
+          savedObjectsClient: core.savedObjects.client,
+          spaces: services.spaces,
+        });
+
+        const loadedIndexPattern = await loadDefaultOrCurrentIndexPattern(
+          currentSavedSearch.searchSource
+        );
+
+        if (!currentSavedSearch.searchSource.getField('index')) {
+          currentSavedSearch.searchSource.setField('index', loadedIndexPattern);
         }
-        setSavedSearch(loadedSavedSearch);
-        if (savedSearchId) {
+
+        setSavedSearch(currentSavedSearch);
+
+        if (currentSavedSearch.id) {
           chrome.recentlyAccessed.add(
-            (loadedSavedSearch as unknown as SavedObjectDeprecated).getFullPath(),
-            loadedSavedSearch.title,
-            loadedSavedSearch.id
+            getSavedSearchFullPathUrl(currentSavedSearch.id),
+            currentSavedSearch.title ?? '',
+            currentSavedSearch.id
           );
         }
       } catch (e) {
-        redirectWhenMissing({
-          history,
-          navigateToApp: core.application.navigateToApp,
-          basePath,
-          mapping: {
-            search: '/',
-            'index-pattern': {
-              app: 'management',
-              path: `kibana/objects/savedSearches/${id}`,
+        if (e instanceof DataViewSavedObjectConflictError) {
+          setError(e);
+        } else {
+          redirectWhenMissing({
+            history,
+            navigateToApp: core.application.navigateToApp,
+            basePath,
+            mapping: {
+              search: '/',
+              'index-pattern': {
+                app: 'management',
+                path: `kibana/objects/savedSearches/${id}`,
+              },
             },
-          },
-          toastNotifications,
-          onBeforeRedirect() {
-            getUrlTracker().setTrackedUrl('/');
-          },
-        })(e);
+            toastNotifications,
+            onBeforeRedirect() {
+              getUrlTracker().setTrackedUrl('/');
+            },
+          })(e);
+        }
       }
     }
 
     loadSavedSearch();
   }, [
+    core.savedObjects.client,
     basePath,
     chrome.recentlyAccessed,
     config,
@@ -129,6 +165,10 @@ export function DiscoverMainRoute({ services, history }: DiscoverMainProps) {
     );
   }, [chrome, savedSearch]);
 
+  if (error) {
+    return <DiscoverError error={error} />;
+  }
+
   if (!indexPattern || !savedSearch) {
     return <LoadingIndicator />;
   }
diff --git a/src/plugins/discover/public/application/apps/main/services/discover_state.test.ts b/src/plugins/discover/public/application/apps/main/services/discover_state.test.ts
index 905d81a6fc716..9968ca6f1f63f 100644
--- a/src/plugins/discover/public/application/apps/main/services/discover_state.test.ts
+++ b/src/plugins/discover/public/application/apps/main/services/discover_state.test.ts
@@ -14,7 +14,7 @@ import {
 } from './discover_state';
 import { createBrowserHistory, History } from 'history';
 import { dataPluginMock } from '../../../../../../data/public/mocks';
-import { SavedSearch } from '../../../../saved_searches';
+import type { SavedSearch } from '../../../../saved_searches';
 import { SEARCH_FIELDS_FROM_SOURCE } from '../../../../../common';
 
 let history: History;
diff --git a/src/plugins/discover/public/application/apps/main/services/use_discover_state.test.ts b/src/plugins/discover/public/application/apps/main/services/use_discover_state.test.ts
index 28f5f96acc144..c719f83980aa0 100644
--- a/src/plugins/discover/public/application/apps/main/services/use_discover_state.test.ts
+++ b/src/plugins/discover/public/application/apps/main/services/use_discover_state.test.ts
@@ -15,6 +15,20 @@ import { indexPatternMock } from '../../../../__mocks__/index_pattern';
 import { SearchSource } from '../../../../../../data/common';
 
 describe('test useDiscoverState', () => {
+  const originalSavedObjectsClient = discoverServiceMock.core.savedObjects.client;
+
+  beforeAll(() => {
+    discoverServiceMock.core.savedObjects.client.resolve = jest.fn().mockReturnValue({
+      saved_object: {
+        attributes: {},
+      },
+    });
+  });
+
+  afterAll(() => {
+    discoverServiceMock.core.savedObjects.client = originalSavedObjectsClient;
+  });
+
   test('return is valid', async () => {
     const { history } = createSearchSessionMock();
 
diff --git a/src/plugins/discover/public/application/apps/main/services/use_discover_state.ts b/src/plugins/discover/public/application/apps/main/services/use_discover_state.ts
index 223d896b16cd1..ce30c0749b938 100644
--- a/src/plugins/discover/public/application/apps/main/services/use_discover_state.ts
+++ b/src/plugins/discover/public/application/apps/main/services/use_discover_state.ts
@@ -11,7 +11,7 @@ import { History } from 'history';
 import { getState } from './discover_state';
 import { getStateDefaults } from '../utils/get_state_defaults';
 import { DiscoverServices } from '../../../../build_services';
-import { SavedSearch } from '../../../../saved_searches';
+import { SavedSearch, getSavedSearch } from '../../../../saved_searches';
 import { loadIndexPattern } from '../utils/resolve_index_pattern';
 import { useSavedSearch as useSavedSearchData } from './use_saved_search';
 import {
@@ -148,7 +148,12 @@ export function useDiscoverState({
    */
   const resetSavedSearch = useCallback(
     async (id?: string) => {
-      const newSavedSearch = await services.getSavedSearchById(id);
+      const newSavedSearch = await getSavedSearch(id, {
+        search: services.data.search,
+        savedObjectsClient: services.core.savedObjects.client,
+        spaces: services.spaces,
+      });
+
       const newIndexPattern = newSavedSearch.searchSource.getField('index') || indexPattern;
       newSavedSearch.searchSource.setField('index', newIndexPattern);
       const newAppState = getStateDefaults({
diff --git a/src/plugins/discover/public/application/apps/main/services/use_saved_search.ts b/src/plugins/discover/public/application/apps/main/services/use_saved_search.ts
index d11c76283fedd..6cadfbb89acfb 100644
--- a/src/plugins/discover/public/application/apps/main/services/use_saved_search.ts
+++ b/src/plugins/discover/public/application/apps/main/services/use_saved_search.ts
@@ -9,7 +9,7 @@ import { useCallback, useEffect, useMemo, useRef } from 'react';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { DiscoverServices } from '../../../../build_services';
 import { DiscoverSearchSessionManager } from './discover_search_session';
-import { SearchSource } from '../../../../../../data/common';
+import { ISearchSource } from '../../../../../../data/common';
 import { GetStateReturn } from './discover_state';
 import { ElasticSearchHit } from '../../../doc_views/doc_views_types';
 import { RequestAdapter } from '../../../../../../inspector/public';
@@ -91,7 +91,7 @@ export const useSavedSearch = ({
 }: {
   initialFetchStatus: FetchStatus;
   searchSessionManager: DiscoverSearchSessionManager;
-  searchSource: SearchSource;
+  searchSource: ISearchSource;
   services: DiscoverServices;
   stateContainer: GetStateReturn;
   useNewFieldsApi: boolean;
diff --git a/src/plugins/discover/public/application/apps/main/utils/fetch_all.ts b/src/plugins/discover/public/application/apps/main/utils/fetch_all.ts
index 53d13ee547b0f..e9d9335abcda0 100644
--- a/src/plugins/discover/public/application/apps/main/utils/fetch_all.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/fetch_all.ts
@@ -14,11 +14,11 @@ import {
   sendResetMsg,
 } from '../services/use_saved_search_messages';
 import { updateSearchSource } from './update_search_source';
-import { SortOrder } from '../../../../saved_searches/types';
+import type { SortOrder } from '../../../../saved_searches';
 import { fetchDocuments } from './fetch_documents';
 import { fetchTotalHits } from './fetch_total_hits';
 import { fetchChart } from './fetch_chart';
-import { SearchSource } from '../../../../../../data/common';
+import { ISearchSource } from '../../../../../../data/common';
 import { Adapters } from '../../../../../../inspector';
 import { AppState } from '../services/discover_state';
 import { FetchStatus } from '../../../types';
@@ -29,7 +29,7 @@ import { ReduxLikeStateContainer } from '../../../../../../kibana_utils/common';
 
 export function fetchAll(
   dataSubjects: SavedSearchData,
-  searchSource: SearchSource,
+  searchSource: ISearchSource,
   reset = false,
   fetchDeps: {
     abortController: AbortController;
diff --git a/src/plugins/discover/public/application/apps/main/utils/fetch_chart.ts b/src/plugins/discover/public/application/apps/main/utils/fetch_chart.ts
index 67f34c7503c59..50f3a1b8bfea7 100644
--- a/src/plugins/discover/public/application/apps/main/utils/fetch_chart.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/fetch_chart.ts
@@ -11,7 +11,7 @@ import {
   DataPublicPluginStart,
   isCompleteResponse,
   search,
-  SearchSource,
+  ISearchSource,
 } from '../../../../../../data/public';
 import { Adapters } from '../../../../../../inspector';
 import { getChartAggConfigs, getDimensions } from './index';
@@ -25,7 +25,7 @@ import { sendErrorMsg, sendLoadingMsg } from '../services/use_saved_search_messa
 
 export function fetchChart(
   data$: SavedSearchData,
-  searchSource: SearchSource,
+  searchSource: ISearchSource,
   {
     abortController,
     appStateContainer,
@@ -114,7 +114,7 @@ export function fetchChart(
 }
 
 export function updateSearchSource(
-  searchSource: SearchSource,
+  searchSource: ISearchSource,
   interval: string,
   data: DataPublicPluginStart
 ) {
diff --git a/src/plugins/discover/public/application/apps/main/utils/fetch_documents.ts b/src/plugins/discover/public/application/apps/main/utils/fetch_documents.ts
index 2f06a9dbbb3db..6c5eff7cff702 100644
--- a/src/plugins/discover/public/application/apps/main/utils/fetch_documents.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/fetch_documents.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { filter } from 'rxjs/operators';
 import { Adapters } from '../../../../../../inspector/common';
-import { isCompleteResponse, SearchSource } from '../../../../../../data/common';
+import { isCompleteResponse, ISearchSource } from '../../../../../../data/common';
 import { FetchStatus } from '../../../types';
 import { SavedSearchData } from '../services/use_saved_search';
 import { sendErrorMsg, sendLoadingMsg } from '../services/use_saved_search_messages';
@@ -17,7 +17,7 @@ import { DiscoverServices } from '../../../../build_services';
 
 export const fetchDocuments = (
   data$: SavedSearchData,
-  searchSource: SearchSource,
+  searchSource: ISearchSource,
   {
     abortController,
     inspectorAdapters,
diff --git a/src/plugins/discover/public/application/apps/main/utils/fetch_total_hits.ts b/src/plugins/discover/public/application/apps/main/utils/fetch_total_hits.ts
index 9688f5ddd614d..cfab0d17fcd54 100644
--- a/src/plugins/discover/public/application/apps/main/utils/fetch_total_hits.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/fetch_total_hits.ts
@@ -11,7 +11,7 @@ import { filter } from 'rxjs/operators';
 import {
   DataPublicPluginStart,
   isCompleteResponse,
-  SearchSource,
+  ISearchSource,
 } from '../../../../../../data/public';
 import { Adapters } from '../../../../../../inspector/common';
 import { FetchStatus } from '../../../types';
@@ -20,7 +20,7 @@ import { sendErrorMsg, sendLoadingMsg } from '../services/use_saved_search_messa
 
 export function fetchTotalHits(
   data$: SavedSearchData,
-  searchSource: SearchSource,
+  searchSource: ISearchSource,
   {
     abortController,
     data,
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_config.test.ts b/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_config.test.ts
index 3eef49fe6ddcb..515565f0062c9 100644
--- a/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_config.test.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_config.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { indexPatternWithTimefieldMock } from '../../../../__mocks__/index_pattern_with_timefield';
-import { SearchSource } from '../../../../../../data/public';
+import { ISearchSource } from '../../../../../../data/public';
 import { dataPluginMock } from '../../../../../../data/public/mocks';
 import { getChartAggConfigs } from './get_chart_agg_configs';
 
@@ -22,7 +22,7 @@ describe('getChartAggConfigs', () => {
         }
       },
       removeField: jest.fn(),
-    } as unknown as SearchSource;
+    } as unknown as ISearchSource;
 
     const dataMock = dataPluginMock.createStartContract();
 
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_configs.ts b/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_configs.ts
index 2665254027fd9..65f98f72beec0 100644
--- a/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_configs.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_configs.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { SearchSource } from '../../../../../../data/common';
+import { ISearchSource } from '../../../../../../data/common';
 import { DataPublicPluginStart } from '../../../../../../data/public';
 
 /**
@@ -13,7 +13,7 @@ import { DataPublicPluginStart } from '../../../../../../data/public';
  * for Discover's histogram vis
  */
 export function getChartAggConfigs(
-  searchSource: SearchSource,
+  searchSource: ISearchSource,
   histogramInterval: string,
   data: DataPublicPluginStart
 ) {
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_dimensions.test.ts b/src/plugins/discover/public/application/apps/main/utils/get_dimensions.test.ts
index b98662f2db3b5..35a6e955fe5b2 100644
--- a/src/plugins/discover/public/application/apps/main/utils/get_dimensions.test.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_dimensions.test.ts
@@ -9,7 +9,7 @@ import { dataPluginMock } from '../../../../../../data/public/mocks';
 
 import { getDimensions } from './get_dimensions';
 import { indexPatternWithTimefieldMock } from '../../../../__mocks__/index_pattern_with_timefield';
-import { SearchSource, calculateBounds } from '../../../../../../data/common';
+import { ISearchSource, calculateBounds } from '../../../../../../data/common';
 import { getChartAggConfigs } from './get_chart_agg_configs';
 
 test('getDimensions', () => {
@@ -23,7 +23,7 @@ test('getDimensions', () => {
         return indexPattern;
       }
     },
-  } as unknown as SearchSource;
+  } as unknown as ISearchSource;
 
   const dataMock = dataPluginMock.createStartContract();
   dataMock.query.timefilter.timefilter.getTime = () => {
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_fetch_observable.ts b/src/plugins/discover/public/application/apps/main/utils/get_fetch_observable.ts
index 528f0e74d3ed6..de79a9425f17c 100644
--- a/src/plugins/discover/public/application/apps/main/utils/get_fetch_observable.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_fetch_observable.ts
@@ -12,7 +12,7 @@ import { FetchStatus } from '../../../types';
 import type {
   AutoRefreshDoneFn,
   DataPublicPluginStart,
-  SearchSource,
+  ISearchSource,
 } from '../../../../../../data/public';
 import { DataMain$, DataRefetch$ } from '../services/use_saved_search';
 import { DiscoverSearchSessionManager } from '../services/discover_search_session';
@@ -33,7 +33,7 @@ export function getFetch$({
   main$: DataMain$;
   refetch$: DataRefetch$;
   searchSessionManager: DiscoverSearchSessionManager;
-  searchSource: SearchSource;
+  searchSource: ISearchSource;
   initialFetchStatus: FetchStatus;
 }) {
   const { timefilter } = data.query.timefilter;
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_sharing_data.ts b/src/plugins/discover/public/application/apps/main/utils/get_sharing_data.ts
index 21292fabdd13f..437d4fda666fc 100644
--- a/src/plugins/discover/public/application/apps/main/utils/get_sharing_data.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_sharing_data.ts
@@ -11,7 +11,7 @@ import type { IUiSettingsClient } from 'src/core/public';
 import type { DataPublicPluginStart } from 'src/plugins/data/public';
 import type { ISearchSource, SearchSourceFields } from 'src/plugins/data/common';
 import { DOC_HIDE_TIME_COLUMN_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
-import type { SavedSearch, SortOrder } from '../../../../saved_searches/types';
+import type { SavedSearch, SortOrder } from '../../../../saved_searches';
 import { getSortForSearchSource } from '../components/doc_table';
 import { AppState } from '../services/discover_state';
 
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts b/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts
index cd23d52022374..11ebf0ecf9af4 100644
--- a/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts
@@ -31,10 +31,11 @@ export function getStateDefaults({
   data: DataPublicPluginStart;
   savedSearch: SavedSearch;
 }) {
-  const searchSource = savedSearch.searchSource;
-  const indexPattern = savedSearch.searchSource.getField('index');
+  const { searchSource } = savedSearch;
+  const indexPattern = searchSource.getField('index');
+
   const query = searchSource.getField('query') || data.query.queryString.getDefaultQuery();
-  const sort = getSortArray(savedSearch.sort, indexPattern!);
+  const sort = getSortArray(savedSearch.sort ?? [], indexPattern!);
   const columns = getDefaultColumns(savedSearch, config);
 
   const defaultState = {
@@ -43,7 +44,7 @@ export function getStateDefaults({
       ? getDefaultSort(indexPattern, config.get(SORT_DEFAULT_ORDER_SETTING, 'desc'))
       : sort,
     columns,
-    index: indexPattern!.id,
+    index: indexPattern?.id,
     interval: 'auto',
     filters: cloneDeep(searchSource.getOwnField('filter')),
     hideChart: undefined,
diff --git a/src/plugins/discover/public/application/apps/main/utils/persist_saved_search.ts b/src/plugins/discover/public/application/apps/main/utils/persist_saved_search.ts
index a5e1e2bb6c2ea..584fbe14cb59e 100644
--- a/src/plugins/discover/public/application/apps/main/utils/persist_saved_search.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/persist_saved_search.ts
@@ -10,9 +10,10 @@ import { updateSearchSource } from './update_search_source';
 import { IndexPattern } from '../../../../../../data/public';
 import { SavedSearch } from '../../../../saved_searches';
 import { AppState } from '../services/discover_state';
-import { SortOrder } from '../../../../saved_searches/types';
+import type { SortOrder } from '../../../../saved_searches';
 import { SavedObjectSaveOpts } from '../../../../../../saved_objects/public';
 import { DiscoverServices } from '../../../../build_services';
+import { saveSavedSearch } from '../../../../saved_searches';
 
 /**
  * Helper function to update and persist the given savedSearch
@@ -52,8 +53,10 @@ export async function persistSavedSearch(
   }
 
   try {
-    const id = await savedSearch.save(saveOptions);
-    onSuccess(id);
+    const id = await saveSavedSearch(savedSearch, saveOptions, services.core.savedObjects.client);
+    if (id) {
+      onSuccess(id);
+    }
     return { id };
   } catch (saveError) {
     onError(saveError, savedSearch);
diff --git a/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts b/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts
index d30b67db31186..613615446ee08 100644
--- a/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { IndexPattern, IndexPatternsContract, SearchSource } from 'src/plugins/data/common';
+import type { IndexPattern, IndexPatternsContract, ISearchSource } from 'src/plugins/data/common';
 import type { IUiSettingsClient, SavedObject, ToastsStart } from 'kibana/public';
 export type IndexPatternSavedObject = SavedObject & { title: string };
 
@@ -95,7 +95,7 @@ export async function loadIndexPattern(
  */
 export function resolveIndexPattern(
   ip: IndexPatternData,
-  searchSource: SearchSource,
+  searchSource: ISearchSource,
   toastNotifications: ToastsStart
 ) {
   const { loaded: loadedIndexPattern, stateVal, stateValFound } = ip;
diff --git a/src/plugins/discover/public/application/apps/main/utils/update_search_source.test.ts b/src/plugins/discover/public/application/apps/main/utils/update_search_source.test.ts
index 945140e0586ab..22f3b6ad86f6c 100644
--- a/src/plugins/discover/public/application/apps/main/utils/update_search_source.test.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/update_search_source.test.ts
@@ -9,7 +9,7 @@
 import { updateSearchSource } from './update_search_source';
 import { createSearchSourceMock } from '../../../../../../data/common/search/search_source/mocks';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
-import { SortOrder } from '../../../../saved_searches/types';
+import type { SortOrder } from '../../../../saved_searches';
 import { discoverServiceMock } from '../../../../__mocks__/services';
 
 describe('updateSearchSource', () => {
diff --git a/src/plugins/discover/public/application/apps/main/utils/update_search_source.ts b/src/plugins/discover/public/application/apps/main/utils/update_search_source.ts
index 4dfcbc7b79712..6d592e176afe5 100644
--- a/src/plugins/discover/public/application/apps/main/utils/update_search_source.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/update_search_source.ts
@@ -8,7 +8,7 @@
 
 import { SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
 import { IndexPattern, ISearchSource } from '../../../../../../data/common';
-import { SortOrder } from '../../../../saved_searches/types';
+import type { SortOrder } from '../../../../saved_searches';
 import { DiscoverServices } from '../../../../build_services';
 import { getSortForSearchSource } from '../components/doc_table';
 
diff --git a/src/plugins/discover/public/application/embeddable/helpers/update_search_source.test.ts b/src/plugins/discover/public/application/embeddable/helpers/update_search_source.test.ts
index f3edc523f4464..f09131cb5c926 100644
--- a/src/plugins/discover/public/application/embeddable/helpers/update_search_source.test.ts
+++ b/src/plugins/discover/public/application/embeddable/helpers/update_search_source.test.ts
@@ -8,7 +8,7 @@
 import { createSearchSourceMock } from '../../../../../data/common/search/search_source/mocks';
 import { updateSearchSource } from './update_search_source';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
-import { SortOrder } from '../../../saved_searches/types';
+import type { SortOrder } from '../../../saved_searches';
 
 describe('updateSearchSource', () => {
   const defaults = {
diff --git a/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx b/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx
index ef8670f976672..8849806cf5959 100644
--- a/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx
+++ b/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx
@@ -165,7 +165,7 @@ export class SavedSearchEmbeddable
     const executionContext = {
       type: this.type,
       name: 'discover',
-      id: this.savedSearch.id,
+      id: this.savedSearch.id!,
       description: this.output.title || this.output.defaultTitle || '',
       url: this.output.editUrl,
       parent: this.input.executionContext,
@@ -232,7 +232,7 @@ export class SavedSearchEmbeddable
       searchDescription: this.savedSearch.description,
       description: this.savedSearch.description,
       inspectorAdapters: this.inspectorAdapters,
-      searchTitle: this.savedSearch.lastSavedTitle,
+      searchTitle: this.savedSearch.title,
       services: this.services,
       onAddColumn: (columnName: string) => {
         if (!props.columns) {
@@ -404,7 +404,6 @@ export class SavedSearchEmbeddable
 
   public destroy() {
     super.destroy();
-    this.savedSearch.destroy();
     if (this.searchProps) {
       delete this.searchProps;
     }
diff --git a/src/plugins/discover/public/application/embeddable/search_embeddable_factory.ts b/src/plugins/discover/public/application/embeddable/search_embeddable_factory.ts
index 95f5b2d3ce284..a8b492d368768 100644
--- a/src/plugins/discover/public/application/embeddable/search_embeddable_factory.ts
+++ b/src/plugins/discover/public/application/embeddable/search_embeddable_factory.ts
@@ -20,6 +20,11 @@ import { TimeRange } from '../../../../data/public';
 import { SearchInput, SearchOutput } from './types';
 import { SEARCH_EMBEDDABLE_TYPE } from './constants';
 import { SavedSearchEmbeddable } from './saved_search_embeddable';
+import {
+  getSavedSearch,
+  getSavedSearchUrl,
+  throwErrorOnSavedSearchUrlConflict,
+} from '../../saved_searches';
 
 interface StartServices {
   executeTriggerActions: UiActionsStart['executeTriggerActions'];
@@ -59,20 +64,27 @@ export class SearchEmbeddableFactory
     input: Partial<SearchInput> & { id: string; timeRange: TimeRange },
     parent?: Container
   ): Promise<SavedSearchEmbeddable | ErrorEmbeddable> => {
-    const filterManager = getServices().filterManager;
-
-    const url = await getServices().getSavedSearchUrlById(savedObjectId);
-    const editUrl = getServices().addBasePath(`/app/discover${url}`);
+    const services = getServices();
+    const filterManager = services.filterManager;
+    const url = getSavedSearchUrl(savedObjectId);
+    const editUrl = services.addBasePath(`/app/discover${url}`);
     try {
-      const savedObject = await getServices().getSavedSearchById(savedObjectId);
-      const indexPattern = savedObject.searchSource.getField('index');
+      const savedSearch = await getSavedSearch(savedObjectId, {
+        search: services.data.search,
+        savedObjectsClient: services.core.savedObjects.client,
+        spaces: services.spaces,
+      });
+
+      await throwErrorOnSavedSearchUrlConflict(savedSearch);
+
+      const indexPattern = savedSearch.searchSource.getField('index');
       const { executeTriggerActions } = await this.getStartServices();
       const { SavedSearchEmbeddable: SavedSearchEmbeddableClass } = await import(
         './saved_search_embeddable'
       );
       return new SavedSearchEmbeddableClass(
         {
-          savedSearch: savedObject,
+          savedSearch,
           editUrl,
           editPath: url,
           filterManager,
diff --git a/src/plugins/discover/public/application/embeddable/types.ts b/src/plugins/discover/public/application/embeddable/types.ts
index 5a08534918d4f..de109e3fa7879 100644
--- a/src/plugins/discover/public/application/embeddable/types.ts
+++ b/src/plugins/discover/public/application/embeddable/types.ts
@@ -13,7 +13,7 @@ import {
   IEmbeddable,
 } from 'src/plugins/embeddable/public';
 import { Filter, IndexPattern, TimeRange, Query } from '../../../../data/public';
-import { SavedSearch } from '../..';
+import { SavedSearch } from '../../saved_searches';
 import { SortOrder } from '../apps/main/components/doc_table/components/table_header/helpers';
 
 export interface SearchInput extends EmbeddableInput {
diff --git a/src/plugins/discover/public/application/embeddable/view_saved_search_action.ts b/src/plugins/discover/public/application/embeddable/view_saved_search_action.ts
index 69c273f326c61..e4b97d011ff64 100644
--- a/src/plugins/discover/public/application/embeddable/view_saved_search_action.ts
+++ b/src/plugins/discover/public/application/embeddable/view_saved_search_action.ts
@@ -12,6 +12,7 @@ import { IEmbeddable, ViewMode } from '../../../../embeddable/public';
 import { Action } from '../../../../ui_actions/public';
 import { SavedSearchEmbeddable } from './saved_search_embeddable';
 import { SEARCH_EMBEDDABLE_TYPE } from '../../../common';
+import { getSavedSearchUrl } from '../../saved_searches';
 
 export const ACTION_VIEW_SAVED_SEARCH = 'ACTION_VIEW_SAVED_SEARCH';
 
@@ -28,7 +29,7 @@ export class ViewSavedSearchAction implements Action<ViewSearchContext> {
   async execute(context: ActionExecutionContext<ViewSearchContext>): Promise<void> {
     const { embeddable } = context;
     const savedSearchId = (embeddable as SavedSearchEmbeddable).getSavedSearch().id;
-    const path = `#/view/${encodeURIComponent(savedSearchId)}`;
+    const path = getSavedSearchUrl(savedSearchId);
     const app = embeddable ? embeddable.getOutput().editApp : undefined;
     await this.application.navigateToApp(app ? app : 'discover', { path });
   }
diff --git a/src/plugins/discover/public/build_services.ts b/src/plugins/discover/public/build_services.ts
index e88f00fadcbf1..ab2484abee892 100644
--- a/src/plugins/discover/public/build_services.ts
+++ b/src/plugins/discover/public/build_services.ts
@@ -31,13 +31,14 @@ import { UiCounterMetricType } from '@kbn/analytics';
 import { Storage } from '../../kibana_utils/public';
 
 import { DiscoverStartPlugins } from './plugin';
-import { createSavedSearchesLoader, SavedSearch } from './saved_searches';
 import { getHistory } from './kibana_services';
 import { KibanaLegacyStart } from '../../kibana_legacy/public';
 import { UrlForwardingStart } from '../../url_forwarding/public';
 import { NavigationPublicPluginStart } from '../../navigation/public';
 import { IndexPatternFieldEditorStart } from '../../index_pattern_field_editor/public';
 
+import type { SpacesApi } from '../../../../x-pack/plugins/spaces/public';
+
 export interface DiscoverServices {
   addBasePath: (path: string) => string;
   capabilities: Capabilities;
@@ -57,13 +58,12 @@ export interface DiscoverServices {
   urlForwarding: UrlForwardingStart;
   timefilter: TimefilterContract;
   toastNotifications: ToastsStart;
-  getSavedSearchById: (id?: string) => Promise<SavedSearch>;
-  getSavedSearchUrlById: (id: string) => Promise<string>;
   uiSettings: IUiSettingsClient;
   trackUiMetric?: (metricType: UiCounterMetricType, eventName: string | string[]) => void;
   indexPatternFieldEditor: IndexPatternFieldEditorStart;
   http: HttpStart;
   storage: Storage;
+  spaces?: SpacesApi;
 }
 
 export function buildServices(
@@ -71,11 +71,6 @@ export function buildServices(
   plugins: DiscoverStartPlugins,
   context: PluginInitializerContext
 ): DiscoverServices {
-  const services = {
-    savedObjectsClient: core.savedObjects.client,
-    savedObjects: plugins.savedObjects,
-  };
-  const savedObjectService = createSavedSearchesLoader(services);
   const { usageCollection } = plugins;
   const storage = new Storage(localStorage);
 
@@ -88,8 +83,6 @@ export function buildServices(
     docLinks: core.docLinks,
     theme: plugins.charts.theme,
     filterManager: plugins.data.query.filterManager,
-    getSavedSearchById: async (id?: string) => savedObjectService.get(id),
-    getSavedSearchUrlById: async (id: string) => savedObjectService.urlFor(id),
     history: getHistory,
     indexPatterns: plugins.data.indexPatterns,
     inspector: plugins.inspector,
@@ -107,5 +100,6 @@ export function buildServices(
     trackUiMetric: usageCollection?.reportUiCounter.bind(usageCollection, 'discover'),
     indexPatternFieldEditor: plugins.indexPatternFieldEditor,
     http: core.http,
+    spaces: plugins.spaces,
   };
 }
diff --git a/src/plugins/discover/public/index.ts b/src/plugins/discover/public/index.ts
index 3840df4353faf..f6cd687c962c3 100644
--- a/src/plugins/discover/public/index.ts
+++ b/src/plugins/discover/public/index.ts
@@ -9,12 +9,23 @@
 import { PluginInitializerContext } from 'kibana/public';
 import { DiscoverPlugin } from './plugin';
 
+export {
+  getSavedSearch,
+  getSavedSearchFullPathUrl,
+  getSavedSearchUrl,
+  getSavedSearchUrlConflictMessage,
+  throwErrorOnSavedSearchUrlConflict,
+  SavedSearch,
+  LegacySavedSearch,
+  SavedSearchLoader,
+  __LEGACY,
+} from './saved_searches';
+
 export { DiscoverSetup, DiscoverStart } from './plugin';
 export function plugin(initializerContext: PluginInitializerContext) {
   return new DiscoverPlugin(initializerContext);
 }
 
-export { SavedSearch, SavedSearchLoader, createSavedSearchesLoader } from './saved_searches';
 export { ISearchEmbeddable, SEARCH_EMBEDDABLE_TYPE, SearchInput } from './application/embeddable';
 export { loadSharingDataHelpers } from './shared';
 
diff --git a/src/plugins/discover/public/mocks.ts b/src/plugins/discover/public/mocks.ts
index 71de630132b0a..6a3c703ea0da8 100644
--- a/src/plugins/discover/public/mocks.ts
+++ b/src/plugins/discover/public/mocks.ts
@@ -24,7 +24,9 @@ const createSetupContract = (): Setup => {
 
 const createStartContract = (): Start => {
   const startContract: Start = {
-    savedSearchLoader: {} as DiscoverStart['savedSearchLoader'],
+    __LEGACY: {
+      savedSearchLoader: {} as DiscoverStart['__LEGACY']['savedSearchLoader'],
+    },
     urlGenerator: {
       createUrl: jest.fn(),
     } as unknown as DiscoverStart['urlGenerator'],
diff --git a/src/plugins/discover/public/plugin.tsx b/src/plugins/discover/public/plugin.tsx
index afb83d6cbd667..e34e7644caa25 100644
--- a/src/plugins/discover/public/plugin.tsx
+++ b/src/plugins/discover/public/plugin.tsx
@@ -45,7 +45,7 @@ import {
   getScopedHistory,
   syncHistoryLocations,
 } from './kibana_services';
-import { createSavedSearchesLoader } from './saved_searches';
+import { __LEGACY } from './saved_searches';
 import { registerFeature } from './register_feature';
 import { buildServices } from './build_services';
 import {
@@ -61,6 +61,7 @@ import { replaceUrlHashQuery } from '../../kibana_utils/public/';
 import { IndexPatternFieldEditorStart } from '../../../plugins/index_pattern_field_editor/public';
 import { DeferredSpinner } from './shared';
 import { ViewSavedSearchAction } from './application/embeddable/view_saved_search_action';
+import type { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
 
 declare module '../../share/public' {
   export interface UrlGeneratorStateMapping {
@@ -120,7 +121,9 @@ export interface DiscoverSetup {
 }
 
 export interface DiscoverStart {
-  savedSearchLoader: SavedObjectLoader;
+  __LEGACY: {
+    savedSearchLoader: SavedObjectLoader;
+  };
 
   /**
    * @deprecated Use URL locator instead. URL generator will be removed.
@@ -189,6 +192,7 @@ export interface DiscoverStartPlugins {
   savedObjects: SavedObjectsStart;
   usageCollection?: UsageCollectionSetup;
   indexPatternFieldEditor: IndexPatternFieldEditorStart;
+  spaces?: SpacesPluginStart;
 }
 
 /**
@@ -410,10 +414,12 @@ export class DiscoverPlugin
     return {
       urlGenerator: this.urlGenerator,
       locator: this.locator,
-      savedSearchLoader: createSavedSearchesLoader({
-        savedObjectsClient: core.savedObjects.client,
-        savedObjects: plugins.savedObjects,
-      }),
+      __LEGACY: {
+        savedSearchLoader: __LEGACY.createSavedSearchesLoader({
+          savedObjectsClient: core.savedObjects.client,
+          savedObjects: plugins.savedObjects,
+        }),
+      },
     };
   }
 
diff --git a/src/plugins/discover/public/saved_searches/constants.ts b/src/plugins/discover/public/saved_searches/constants.ts
new file mode 100644
index 0000000000000..f8e191c263bd7
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/constants.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 SAVED_SEARCH_TYPE = 'search';
diff --git a/src/plugins/discover/public/saved_searches/get_saved_searches.test.ts b/src/plugins/discover/public/saved_searches/get_saved_searches.test.ts
new file mode 100644
index 0000000000000..755831e7009ed
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/get_saved_searches.test.ts
@@ -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 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 { SavedObjectsStart } from '../../../../core/public';
+import type { DataPublicPluginStart } from '../../../data/public';
+
+import { savedObjectsServiceMock } from '../../../../core/public/mocks';
+import { dataPluginMock } from '../../../data/public/mocks';
+
+import { getSavedSearch } from './get_saved_searches';
+
+describe('getSavedSearch', () => {
+  let search: DataPublicPluginStart['search'];
+  let savedObjectsClient: SavedObjectsStart['client'];
+
+  beforeEach(() => {
+    savedObjectsClient = savedObjectsServiceMock.createStartContract().client;
+    search = dataPluginMock.createStartContract().search;
+  });
+
+  test('should return empty saved search in case of no id', async () => {
+    const savedSearch = await getSavedSearch(undefined, { savedObjectsClient, search });
+
+    expect(search.searchSource.createEmpty).toHaveBeenCalled();
+    expect(savedSearch).toHaveProperty('searchSource');
+  });
+
+  test('should throw an error if so not found', async () => {
+    let errorMessage = 'No error thrown.';
+    savedObjectsClient.resolve = jest.fn().mockReturnValue({
+      saved_object: {
+        attributes: {},
+        error: {
+          statusCode: 404,
+          error: 'Not Found',
+          message: 'Saved object [search/ccf1af80-2297-11ec-86e0-1155ffb9c7a7] not found',
+        },
+        id: 'ccf1af80-2297-11ec-86e0-1155ffb9c7a7',
+        type: 'search',
+        references: [],
+      },
+    });
+
+    try {
+      await getSavedSearch('ccf1af80-2297-11ec-86e0-1155ffb9c7a7', {
+        savedObjectsClient,
+        search,
+      });
+    } catch (error) {
+      errorMessage = error.message;
+    }
+
+    expect(errorMessage).toBe(
+      'Could not locate that search (id: ccf1af80-2297-11ec-86e0-1155ffb9c7a7)'
+    );
+  });
+
+  test('should find saved search', async () => {
+    savedObjectsClient.resolve = jest.fn().mockReturnValue({
+      saved_object: {
+        attributes: {
+          kibanaSavedObjectMeta: {
+            searchSourceJSON:
+              '{"query":{"query":"","language":"kuery"},"filter":[],"indexRefName":"kibanaSavedObjectMeta.searchSourceJSON.index"}',
+          },
+          title: 'test1',
+          sort: [['order_date', 'desc']],
+          columns: ['_source'],
+          description: 'description',
+          grid: {},
+          hideChart: false,
+        },
+        id: 'ccf1af80-2297-11ec-86e0-1155ffb9c7a7',
+        type: 'search',
+        references: [
+          {
+            name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
+            id: 'ff959d40-b880-11e8-a6d9-e546fe2bba5f',
+            type: 'index-pattern',
+          },
+        ],
+        namespaces: ['default'],
+      },
+      outcome: 'exactMatch',
+    });
+
+    const savedSearch = await getSavedSearch('ccf1af80-2297-11ec-86e0-1155ffb9c7a7', {
+      savedObjectsClient,
+      search,
+    });
+
+    expect(savedObjectsClient.resolve).toHaveBeenCalled();
+    expect(savedSearch).toMatchInlineSnapshot(`
+      Object {
+        "columns": Array [
+          "_source",
+        ],
+        "description": "description",
+        "grid": Object {},
+        "hideChart": false,
+        "id": "ccf1af80-2297-11ec-86e0-1155ffb9c7a7",
+        "searchSource": Object {
+          "create": [MockFunction],
+          "createChild": [MockFunction],
+          "createCopy": [MockFunction],
+          "destroy": [MockFunction],
+          "fetch": [MockFunction],
+          "fetch$": [MockFunction],
+          "getField": [MockFunction],
+          "getFields": [MockFunction],
+          "getId": [MockFunction],
+          "getOwnField": [MockFunction],
+          "getParent": [MockFunction],
+          "getSearchRequestBody": [MockFunction],
+          "getSerializedFields": [MockFunction],
+          "history": Array [],
+          "onRequestStart": [MockFunction],
+          "removeField": [MockFunction],
+          "serialize": [MockFunction],
+          "setField": [MockFunction],
+          "setFields": [MockFunction],
+          "setParent": [MockFunction],
+          "setPreferredSearchStrategyId": [MockFunction],
+        },
+        "sharingSavedObjectProps": Object {
+          "aliasTargetId": undefined,
+          "errorJSON": undefined,
+          "outcome": "exactMatch",
+        },
+        "sort": Array [
+          Array [
+            "order_date",
+            "desc",
+          ],
+        ],
+        "title": "test1",
+      }
+    `);
+  });
+});
diff --git a/src/plugins/discover/public/saved_searches/get_saved_searches.ts b/src/plugins/discover/public/saved_searches/get_saved_searches.ts
new file mode 100644
index 0000000000000..32c50f691fe42
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/get_saved_searches.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 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 { SavedObjectsStart } from '../../../../core/public';
+import type { DataPublicPluginStart } from '../../../data/public';
+import type { SavedSearchAttributes, SavedSearch } from './types';
+
+import { SAVED_SEARCH_TYPE } from './constants';
+import { fromSavedSearchAttributes } from './saved_searches_utils';
+import { injectSearchSourceReferences, parseSearchSourceJSON } from '../../../data/public';
+import { SavedObjectNotFound } from '../../../kibana_utils/public';
+
+import type { SpacesApi } from '../../../../../x-pack/plugins/spaces/public';
+
+interface GetSavedSearchDependencies {
+  search: DataPublicPluginStart['search'];
+  savedObjectsClient: SavedObjectsStart['client'];
+  spaces?: SpacesApi;
+}
+
+const getEmptySavedSearch = ({
+  search,
+}: {
+  search: DataPublicPluginStart['search'];
+}): SavedSearch => ({
+  searchSource: search.searchSource.createEmpty(),
+});
+
+const findSavedSearch = async (
+  savedSearchId: string,
+  { search, savedObjectsClient, spaces }: GetSavedSearchDependencies
+) => {
+  const so = await savedObjectsClient.resolve<SavedSearchAttributes>(
+    SAVED_SEARCH_TYPE,
+    savedSearchId
+  );
+
+  if (!so.saved_object || so.saved_object.error) {
+    throw new SavedObjectNotFound(SAVED_SEARCH_TYPE, savedSearchId);
+  }
+
+  const savedSearch = so.saved_object;
+
+  const parsedSearchSourceJSON = parseSearchSourceJSON(
+    savedSearch.attributes.kibanaSavedObjectMeta?.searchSourceJSON ?? '{}'
+  );
+
+  const searchSourceValues = injectSearchSourceReferences(
+    parsedSearchSourceJSON as Parameters<typeof injectSearchSourceReferences>[0],
+    savedSearch.references
+  );
+
+  return fromSavedSearchAttributes(
+    savedSearchId,
+    savedSearch.attributes,
+    await search.searchSource.create(searchSourceValues),
+    {
+      outcome: so.outcome,
+      aliasTargetId: so.alias_target_id,
+      errorJSON:
+        so.outcome === 'conflict' && spaces
+          ? JSON.stringify({
+              targetType: SAVED_SEARCH_TYPE,
+              sourceId: savedSearchId,
+              targetSpace: (await spaces.getActiveSpace()).id,
+            })
+          : undefined,
+    }
+  );
+};
+
+/** @public **/
+export const getSavedSearch = async (
+  savedSearchId: string | undefined,
+  dependencies: GetSavedSearchDependencies
+) => {
+  return savedSearchId
+    ? findSavedSearch(savedSearchId, dependencies)
+    : getEmptySavedSearch(dependencies);
+};
diff --git a/src/plugins/discover/public/saved_searches/index.ts b/src/plugins/discover/public/saved_searches/index.ts
index 86564cc5d6eca..6870fa5e6d617 100644
--- a/src/plugins/discover/public/saved_searches/index.ts
+++ b/src/plugins/discover/public/saved_searches/index.ts
@@ -6,5 +6,25 @@
  * Side Public License, v 1.
  */
 
-export { createSavedSearchesLoader } from './saved_searches';
-export { SavedSearch, SavedSearchLoader } from './types';
+import { createSavedSearchesLoader } from './legacy/saved_searches';
+
+export { getSavedSearch } from './get_saved_searches';
+export {
+  getSavedSearchUrl,
+  getSavedSearchFullPathUrl,
+  getSavedSearchUrlConflictMessage,
+  throwErrorOnSavedSearchUrlConflict,
+} from './saved_searches_utils';
+export { useSavedSearchAliasMatchRedirect } from './saved_search_alias_match_redirect';
+export { SavedSearchURLConflictCallout } from './saved_search_url_conflict_callout';
+export { saveSavedSearch, SaveSavedSearchOptions } from './save_saved_searches';
+
+export { SAVED_SEARCH_TYPE } from './constants';
+
+export type { SavedSearch } from './types';
+export type { LegacySavedSearch, SavedSearchLoader, SortOrder } from './legacy/types';
+
+/** @deprecated __LEGACY object will be removed in v8**/
+export const __LEGACY = {
+  createSavedSearchesLoader,
+};
diff --git a/src/plugins/discover/public/saved_searches/_saved_search.ts b/src/plugins/discover/public/saved_searches/legacy/_saved_search.ts
similarity index 80%
rename from src/plugins/discover/public/saved_searches/_saved_search.ts
rename to src/plugins/discover/public/saved_searches/legacy/_saved_search.ts
index 56533ed20b31e..154f91f5582b3 100644
--- a/src/plugins/discover/public/saved_searches/_saved_search.ts
+++ b/src/plugins/discover/public/saved_searches/legacy/_saved_search.ts
@@ -6,11 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject, SavedObjectsStart } from '../../../saved_objects/public';
+import type { SavedObject, SavedObjectsStart } from '../../../../saved_objects/public';
+import { SAVED_SEARCH_TYPE } from '../constants';
+import { getSavedSearchFullPathUrl } from '../saved_searches_utils';
 
+/** @deprecated **/
 export function createSavedSearchClass(savedObjects: SavedObjectsStart) {
   class SavedSearch extends savedObjects.SavedObjectClass {
-    public static type: string = 'search';
+    public static type: string = SAVED_SEARCH_TYPE;
     public static mapping = {
       title: 'text',
       description: 'text',
@@ -31,7 +34,7 @@ export function createSavedSearchClass(savedObjects: SavedObjectsStart) {
     constructor(id: string) {
       super({
         id,
-        type: 'search',
+        type: SAVED_SEARCH_TYPE,
         mapping: {
           title: 'text',
           description: 'text',
@@ -54,7 +57,7 @@ export function createSavedSearchClass(savedObjects: SavedObjectsStart) {
       });
       this.showInRecentlyAccessed = true;
       this.id = id;
-      this.getFullPath = () => `/app/discover#/view/${String(id)}`;
+      this.getFullPath = () => getSavedSearchFullPathUrl(String(id));
     }
   }
 
diff --git a/src/plugins/discover/public/saved_searches/legacy/index.ts b/src/plugins/discover/public/saved_searches/legacy/index.ts
new file mode 100644
index 0000000000000..0bfed6f57b9f5
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/legacy/index.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { createSavedSearchesLoader } from './saved_searches';
+export { LegacySavedSearch, SavedSearchLoader } from './types';
diff --git a/src/plugins/discover/public/saved_searches/saved_searches.ts b/src/plugins/discover/public/saved_searches/legacy/saved_searches.ts
similarity index 78%
rename from src/plugins/discover/public/saved_searches/saved_searches.ts
rename to src/plugins/discover/public/saved_searches/legacy/saved_searches.ts
index 0fe693dcd2ebe..58bed080d0249 100644
--- a/src/plugins/discover/public/saved_searches/saved_searches.ts
+++ b/src/plugins/discover/public/saved_searches/legacy/saved_searches.ts
@@ -6,15 +6,17 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'kibana/public';
-import { SavedObjectLoader, SavedObjectsStart } from '../../../saved_objects/public';
+import type { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectLoader, SavedObjectsStart } from '../../../../saved_objects/public';
 import { createSavedSearchClass } from './_saved_search';
+import { getSavedSearchUrl } from '../saved_searches_utils';
 
 interface Services {
   savedObjectsClient: SavedObjectsClientContract;
   savedObjects: SavedObjectsStart;
 }
 
+/** @deprecated **/
 export function createSavedSearchesLoader({ savedObjectsClient, savedObjects }: Services) {
   const SavedSearchClass = createSavedSearchClass(savedObjects);
   const savedSearchLoader = new SavedObjectLoader(SavedSearchClass, savedObjectsClient);
@@ -25,7 +27,7 @@ export function createSavedSearchesLoader({ savedObjectsClient, savedObjects }:
     nouns: 'saved searches',
   };
 
-  savedSearchLoader.urlFor = (id: string) => (id ? `#/view/${encodeURIComponent(id)}` : '#/');
+  savedSearchLoader.urlFor = getSavedSearchUrl;
 
   return savedSearchLoader;
 }
diff --git a/src/plugins/discover/public/saved_searches/legacy/types.ts b/src/plugins/discover/public/saved_searches/legacy/types.ts
new file mode 100644
index 0000000000000..e55422ff26a7b
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/legacy/types.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 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 { ISearchSource } from '../../../../data/public';
+import type { SavedObjectSaveOpts } from '../../../../saved_objects/public';
+import type { DiscoverGridSettings } from '../../application/components/discover_grid/types';
+
+export type SortOrder = [string, string];
+
+/** @deprecated **/
+export interface LegacySavedSearch {
+  readonly id: string;
+  title: string;
+  searchSource: ISearchSource;
+  description?: string;
+  columns: string[];
+  sort: SortOrder[];
+  grid: DiscoverGridSettings;
+  destroy: () => void;
+  save: (saveOptions: SavedObjectSaveOpts) => Promise<string>;
+  copyOnSave?: boolean;
+  hideChart?: boolean;
+}
+
+/** @deprecated **/
+export interface SavedSearchLoader {
+  get: (id: string) => Promise<LegacySavedSearch>;
+  urlFor: (id: string) => string;
+}
diff --git a/src/plugins/discover/public/saved_searches/save_saved_searches.test.ts b/src/plugins/discover/public/saved_searches/save_saved_searches.test.ts
new file mode 100644
index 0000000000000..eabbfe7f9419f
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/save_saved_searches.test.ts
@@ -0,0 +1,117 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { SavedObjectsStart } from '../../../../core/public';
+
+import { savedObjectsServiceMock } from '../../../../core/public/mocks';
+import { dataPluginMock } from '../../../data/public/mocks';
+
+import { saveSavedSearch } from './save_saved_searches';
+import type { SavedSearch } from './types';
+
+describe('saveSavedSearch', () => {
+  let savedObjectsClient: SavedObjectsStart['client'];
+  let savedSearch: SavedSearch;
+
+  beforeEach(() => {
+    savedObjectsClient = savedObjectsServiceMock.createStartContract().client;
+    const searchSource = dataPluginMock.createStartContract().search.searchSource.createEmpty();
+
+    savedSearch = {
+      id: 'id',
+      title: 'title',
+      searchSource: {
+        ...searchSource,
+        serialize: () => ({
+          searchSourceJSON: '{}',
+          references: [],
+        }),
+      },
+      sharingSavedObjectProps: {
+        outcome: 'aliasMatch',
+      },
+    } as SavedSearch;
+  });
+
+  describe('onTitleDuplicate', () => {
+    test('should check for title duplicating', async () => {
+      savedObjectsClient.find = jest.fn().mockReturnValue({
+        savedObjects: [{ get: () => 'title' }],
+      });
+      const onTitleDuplicate = jest.fn();
+
+      await saveSavedSearch(
+        savedSearch,
+        {
+          onTitleDuplicate,
+          copyOnSave: true,
+        },
+        savedObjectsClient
+      );
+
+      expect(onTitleDuplicate).toHaveBeenCalled();
+    });
+
+    test('should not check for title duplicating for saving existing search', async () => {
+      savedObjectsClient.find = jest.fn().mockReturnValue({
+        savedObjects: [{ get: () => 'title' }],
+      });
+      const onTitleDuplicate = jest.fn();
+
+      await saveSavedSearch(
+        savedSearch,
+        {
+          onTitleDuplicate,
+          copyOnSave: false,
+        },
+        savedObjectsClient
+      );
+
+      expect(onTitleDuplicate).not.toHaveBeenCalled();
+    });
+  });
+
+  test('should call savedObjectsClient.create for saving new search', async () => {
+    delete savedSearch.id;
+
+    await saveSavedSearch(savedSearch, {}, savedObjectsClient);
+
+    expect(savedObjectsClient.create).toHaveBeenCalledWith(
+      'search',
+      {
+        columns: [],
+        description: '',
+        grid: {},
+        hideChart: false,
+        kibanaSavedObjectMeta: { searchSourceJSON: '{}' },
+        sort: [],
+        title: 'title',
+      },
+      { references: [] }
+    );
+  });
+
+  test('should call savedObjectsClient.update for saving existing search', async () => {
+    await saveSavedSearch(savedSearch, {}, savedObjectsClient);
+
+    expect(savedObjectsClient.update).toHaveBeenCalledWith(
+      'search',
+      'id',
+      {
+        columns: [],
+        description: '',
+        grid: {},
+        hideChart: false,
+        kibanaSavedObjectMeta: { searchSourceJSON: '{}' },
+        sort: [],
+        title: 'title',
+      },
+      { references: [] }
+    );
+  });
+});
diff --git a/src/plugins/discover/public/saved_searches/save_saved_searches.ts b/src/plugins/discover/public/saved_searches/save_saved_searches.ts
new file mode 100644
index 0000000000000..c3440bdb7696a
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/save_saved_searches.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 type { SavedObjectsStart } from 'kibana/public';
+import type { SavedSearch, SavedSearchAttributes } from './types';
+
+import { SAVED_SEARCH_TYPE } from './constants';
+import { toSavedSearchAttributes } from './saved_searches_utils';
+
+export interface SaveSavedSearchOptions {
+  onTitleDuplicate?: () => void;
+  isTitleDuplicateConfirmed?: boolean;
+  copyOnSave?: boolean;
+}
+
+const hasDuplicatedTitle = async (
+  title: string,
+  savedObjectsClient: SavedObjectsStart['client']
+): Promise<boolean | void> => {
+  if (!title) {
+    return;
+  }
+
+  const response = await savedObjectsClient.find({
+    type: SAVED_SEARCH_TYPE,
+    perPage: 10,
+    search: `"${title}"`,
+    searchFields: ['title'],
+    fields: ['title'],
+  });
+
+  return response.savedObjects.some(
+    (obj) => obj.get('title').toLowerCase() === title.toLowerCase()
+  );
+};
+
+/** @internal **/
+export const saveSavedSearch = async (
+  savedSearch: SavedSearch,
+  options: SaveSavedSearchOptions,
+  savedObjectsClient: SavedObjectsStart['client']
+): Promise<string | undefined> => {
+  const isNew = options.copyOnSave || !savedSearch.id;
+
+  if (savedSearch.title) {
+    if (
+      isNew &&
+      !options.isTitleDuplicateConfirmed &&
+      options.onTitleDuplicate &&
+      (await hasDuplicatedTitle(savedSearch.title, savedObjectsClient))
+    ) {
+      options.onTitleDuplicate();
+      return;
+    }
+  }
+
+  const { searchSourceJSON, references } = savedSearch.searchSource.serialize();
+  const resp = isNew
+    ? await savedObjectsClient.create<SavedSearchAttributes>(
+        SAVED_SEARCH_TYPE,
+        toSavedSearchAttributes(savedSearch, searchSourceJSON),
+        {
+          references,
+        }
+      )
+    : await savedObjectsClient.update<SavedSearchAttributes>(
+        SAVED_SEARCH_TYPE,
+        savedSearch.id!,
+        toSavedSearchAttributes(savedSearch, searchSourceJSON),
+        {
+          references,
+        }
+      );
+
+  return resp?.id;
+};
diff --git a/src/plugins/discover/public/saved_searches/saved_search_alias_match_redirect.test.ts b/src/plugins/discover/public/saved_searches/saved_search_alias_match_redirect.test.ts
new file mode 100644
index 0000000000000..0a871061d2b19
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/saved_search_alias_match_redirect.test.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 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 { renderHook } from '@testing-library/react-hooks';
+import type { History } from 'history';
+
+import { useSavedSearchAliasMatchRedirect } from './saved_search_alias_match_redirect';
+import type { SavedSearch } from './types';
+
+import { spacesPluginMock } from '../../../../../x-pack/plugins/spaces/public/mocks';
+
+describe('useSavedSearchAliasMatchRedirect', () => {
+  let spaces: ReturnType<typeof spacesPluginMock.createStartContract>;
+  let history: () => History;
+
+  beforeEach(() => {
+    spaces = spacesPluginMock.createStartContract();
+    history = () =>
+      ({
+        location: {
+          search: '?_g=foo',
+        },
+      } as History);
+  });
+
+  test('should redirect in case of aliasMatch', () => {
+    const savedSearch = {
+      id: 'id',
+      sharingSavedObjectProps: {
+        outcome: 'aliasMatch',
+        aliasTargetId: 'aliasTargetId',
+      },
+    } as SavedSearch;
+
+    renderHook(() => useSavedSearchAliasMatchRedirect({ spaces, savedSearch, history }));
+
+    expect(spaces.ui.redirectLegacyUrl).toHaveBeenCalledWith(
+      '#/view/aliasTargetId?_g=foo',
+      ' search'
+    );
+  });
+
+  test('should not redirect if outcome !== aliasMatch', () => {
+    const savedSearch = {
+      id: 'id',
+      sharingSavedObjectProps: {
+        outcome: 'exactMatch',
+      },
+    } as SavedSearch;
+
+    renderHook(() => useSavedSearchAliasMatchRedirect({ spaces, savedSearch, history }));
+
+    expect(spaces.ui.redirectLegacyUrl).not.toHaveBeenCalled();
+  });
+
+  test('should not redirect if aliasTargetId is not defined', () => {
+    const savedSearch = {
+      id: 'id',
+      sharingSavedObjectProps: {
+        outcome: 'aliasMatch',
+      },
+    } as SavedSearch;
+
+    renderHook(() => useSavedSearchAliasMatchRedirect({ spaces, savedSearch, history }));
+
+    expect(spaces.ui.redirectLegacyUrl).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/plugins/discover/public/saved_searches/saved_search_alias_match_redirect.ts b/src/plugins/discover/public/saved_searches/saved_search_alias_match_redirect.ts
new file mode 100644
index 0000000000000..3a88c1a2b1989
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/saved_search_alias_match_redirect.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 type { History } from 'history';
+import { useEffect } from 'react';
+import { i18n } from '@kbn/i18n';
+import { getSavedSearchUrl } from './saved_searches_utils';
+
+import type { SavedSearch } from './types';
+import type { SpacesApi } from '../../../../../x-pack/plugins/spaces/public';
+
+interface SavedSearchAliasMatchRedirectProps {
+  savedSearch?: SavedSearch;
+  spaces?: SpacesApi;
+  history: () => History;
+}
+
+export const useSavedSearchAliasMatchRedirect = ({
+  savedSearch,
+  spaces,
+  history,
+}: SavedSearchAliasMatchRedirectProps) => {
+  useEffect(() => {
+    async function aliasMatchRedirect() {
+      if (savedSearch) {
+        const { aliasTargetId, outcome } = savedSearch.sharingSavedObjectProps ?? {};
+
+        if (spaces && aliasTargetId && outcome === 'aliasMatch') {
+          await spaces.ui.redirectLegacyUrl(
+            `${getSavedSearchUrl(aliasTargetId)}${history().location.search}`,
+            i18n.translate('discover.savedSearchAliasMatchRedirect.objectNoun', {
+              defaultMessage: '{savedSearch} search',
+              values: {
+                savedSearch: savedSearch.title,
+              },
+            })
+          );
+        }
+      }
+    }
+
+    aliasMatchRedirect();
+  }, [savedSearch, spaces, history]);
+};
diff --git a/src/plugins/discover/public/saved_searches/saved_search_url_conflict_callout.test.tsx b/src/plugins/discover/public/saved_searches/saved_search_url_conflict_callout.test.tsx
new file mode 100644
index 0000000000000..c92c15e771f64
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/saved_search_url_conflict_callout.test.tsx
@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 type { History } from 'history';
+
+import { mountWithIntl } from '@kbn/test/jest';
+import { SavedSearchURLConflictCallout } from './saved_search_url_conflict_callout';
+import type { SavedSearch } from './types';
+
+import { spacesPluginMock } from '../../../../../x-pack/plugins/spaces/public/mocks';
+
+describe('SavedSearchURLConflictCallout', () => {
+  let spaces: ReturnType<typeof spacesPluginMock.createStartContract>;
+  let history: () => History;
+
+  beforeEach(() => {
+    spaces = spacesPluginMock.createStartContract();
+    spaces.ui.components.getLegacyUrlConflict = jest.fn().mockReturnValue('callout');
+    history = () =>
+      ({
+        location: {
+          search: '?_g=foo',
+        },
+      } as History);
+  });
+
+  test("should render URLConflictCallout in case of id's conflicts", () => {
+    const savedSearch = {
+      id: 'id',
+      sharingSavedObjectProps: {
+        outcome: 'conflict',
+        aliasTargetId: 'aliasTargetId',
+      },
+    } as SavedSearch;
+
+    const component = mountWithIntl(
+      <SavedSearchURLConflictCallout spaces={spaces} savedSearch={savedSearch} history={history} />
+    );
+
+    expect(component.children()).toMatchInlineSnapshot(`"callout"`);
+  });
+
+  test('should not render URLConflictCallout in case of no conflicts', () => {
+    const savedSearch = {
+      id: 'id',
+      sharingSavedObjectProps: {},
+    } as SavedSearch;
+
+    const component = mountWithIntl(
+      <SavedSearchURLConflictCallout spaces={spaces} savedSearch={savedSearch} history={history} />
+    );
+
+    expect(component.children()).toMatchInlineSnapshot(`null`);
+  });
+});
diff --git a/src/plugins/discover/public/saved_searches/saved_search_url_conflict_callout.ts b/src/plugins/discover/public/saved_searches/saved_search_url_conflict_callout.ts
new file mode 100644
index 0000000000000..fd07126c496cf
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/saved_search_url_conflict_callout.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 { i18n } from '@kbn/i18n';
+import type { History } from 'history';
+import { getSavedSearchUrl } from './saved_searches_utils';
+
+import type { SavedSearch } from './types';
+import type { SpacesApi } from '../../../../../x-pack/plugins/spaces/public';
+
+interface SavedSearchURLConflictCalloutProps {
+  savedSearch?: SavedSearch;
+  spaces?: SpacesApi;
+  history: () => History;
+}
+
+export const SavedSearchURLConflictCallout = ({
+  savedSearch,
+  spaces,
+  history,
+}: SavedSearchURLConflictCalloutProps) => {
+  if (spaces && savedSearch?.id && savedSearch?.sharingSavedObjectProps?.outcome === 'conflict') {
+    const otherObjectId = savedSearch.sharingSavedObjectProps?.aliasTargetId;
+
+    if (otherObjectId) {
+      return spaces.ui.components.getLegacyUrlConflict({
+        objectNoun: i18n.translate('discover.savedSearchURLConflictCallout.objectNoun', {
+          defaultMessage: '{savedSearch} search',
+          values: {
+            savedSearch: savedSearch.title,
+          },
+        }),
+        currentObjectId: savedSearch.id,
+        otherObjectPath: `${getSavedSearchUrl(otherObjectId)}${history().location.search}`,
+        otherObjectId,
+      });
+    }
+  }
+
+  return null;
+};
diff --git a/src/plugins/discover/public/saved_searches/saved_searches_utils.test.ts b/src/plugins/discover/public/saved_searches/saved_searches_utils.test.ts
new file mode 100644
index 0000000000000..12c73e86b3dc4
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/saved_searches_utils.test.ts
@@ -0,0 +1,140 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import {
+  getSavedSearchUrl,
+  getSavedSearchFullPathUrl,
+  fromSavedSearchAttributes,
+  toSavedSearchAttributes,
+  throwErrorOnSavedSearchUrlConflict,
+} from './saved_searches_utils';
+
+import { createSearchSourceMock } from '../../../data/public/mocks';
+
+import type { SavedSearchAttributes, SavedSearch } from './types';
+
+describe('saved_searches_utils', () => {
+  describe('getSavedSearchUrl', () => {
+    test('should return valid saved search url', () => {
+      expect(getSavedSearchUrl()).toBe('#/');
+      expect(getSavedSearchUrl('id')).toBe('#/view/id');
+    });
+  });
+
+  describe('getSavedSearchFullPathUrl', () => {
+    test('should return valid full path url', () => {
+      expect(getSavedSearchFullPathUrl()).toBe('/app/discover#/');
+      expect(getSavedSearchFullPathUrl('id')).toBe('/app/discover#/view/id');
+    });
+  });
+
+  describe('fromSavedSearchAttributes', () => {
+    test('should convert attributes into SavedSearch', () => {
+      const attributes: SavedSearchAttributes = {
+        kibanaSavedObjectMeta: { searchSourceJSON: '{}' },
+        title: 'saved search',
+        sort: [],
+        columns: ['a', 'b'],
+        description: 'foo',
+        grid: {},
+        hideChart: true,
+      };
+
+      expect(fromSavedSearchAttributes('id', attributes, createSearchSourceMock(), {}))
+        .toMatchInlineSnapshot(`
+        Object {
+          "columns": Array [
+            "a",
+            "b",
+          ],
+          "description": "foo",
+          "grid": Object {},
+          "hideChart": true,
+          "id": "id",
+          "searchSource": SearchSource {
+            "dependencies": Object {
+              "getConfig": [MockFunction],
+              "onResponse": [MockFunction],
+              "search": [MockFunction],
+            },
+            "fields": Object {},
+            "getFieldName": [Function],
+            "history": Array [],
+            "id": "data_source1",
+            "inheritOptions": Object {},
+            "parent": undefined,
+            "requestStartHandlers": Array [],
+            "searchStrategyId": undefined,
+          },
+          "sharingSavedObjectProps": Object {},
+          "sort": Array [],
+          "title": "saved search",
+        }
+      `);
+    });
+  });
+
+  describe('throwErrorOnSavedSearchUrlConflict', () => {
+    test('should throw an error on url conflict', async () => {
+      let error = 'no error';
+
+      try {
+        await throwErrorOnSavedSearchUrlConflict({
+          id: 'id',
+          sharingSavedObjectProps: {
+            outcome: 'conflict',
+            errorJSON: '{}',
+          },
+        } as SavedSearch);
+      } catch (e) {
+        error = e.message;
+      }
+
+      expect(error).toBe(
+        'This search has the same URL as a legacy alias. Disable the alias to resolve this error : {}'
+      );
+    });
+  });
+
+  describe('toSavedSearchAttributes', () => {
+    test('should serialize SavedSearch attributes', () => {
+      const savedSearch: SavedSearch = {
+        id: 'id',
+        searchSource: createSearchSourceMock(),
+        title: 'title',
+        sort: [['a', 'asc']],
+        columns: ['c', 'd'],
+        description: 'description',
+        grid: {},
+        hideChart: true,
+      };
+
+      expect(toSavedSearchAttributes(savedSearch, '{}')).toMatchInlineSnapshot(`
+        Object {
+          "columns": Array [
+            "c",
+            "d",
+          ],
+          "description": "description",
+          "grid": Object {},
+          "hideChart": true,
+          "kibanaSavedObjectMeta": Object {
+            "searchSourceJSON": "{}",
+          },
+          "sort": Array [
+            Array [
+              "a",
+              "asc",
+            ],
+          ],
+          "title": "title",
+        }
+      `);
+    });
+  });
+});
diff --git a/src/plugins/discover/public/saved_searches/saved_searches_utils.ts b/src/plugins/discover/public/saved_searches/saved_searches_utils.ts
new file mode 100644
index 0000000000000..98ab2267a875e
--- /dev/null
+++ b/src/plugins/discover/public/saved_searches/saved_searches_utils.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 { i18n } from '@kbn/i18n';
+import type { SavedSearchAttributes, SavedSearch } from './types';
+
+export const getSavedSearchUrl = (id?: string) => (id ? `#/view/${encodeURIComponent(id)}` : '#/');
+
+export const getSavedSearchFullPathUrl = (id?: string) => `/app/discover${getSavedSearchUrl(id)}`;
+
+export const getSavedSearchUrlConflictMessage = async (savedSearch: SavedSearch) =>
+  i18n.translate('discover.savedSearchEmbeddable.legacyURLConflict.errorMessage', {
+    defaultMessage: `This search has the same URL as a legacy alias. Disable the alias to resolve this error : {json}`,
+    values: {
+      json: savedSearch.sharingSavedObjectProps?.errorJSON,
+    },
+  });
+
+export const throwErrorOnSavedSearchUrlConflict = async (savedSearch: SavedSearch) => {
+  if (savedSearch.sharingSavedObjectProps?.errorJSON) {
+    throw new Error(await getSavedSearchUrlConflictMessage(savedSearch));
+  }
+};
+
+export const fromSavedSearchAttributes = (
+  id: string,
+  attributes: SavedSearchAttributes,
+  searchSource: SavedSearch['searchSource'],
+  sharingSavedObjectProps: SavedSearch['sharingSavedObjectProps']
+): SavedSearch => ({
+  id,
+  searchSource,
+  sharingSavedObjectProps,
+  title: attributes.title,
+  sort: attributes.sort,
+  columns: attributes.columns,
+  description: attributes.description,
+  grid: attributes.grid,
+  hideChart: attributes.hideChart,
+});
+
+export const toSavedSearchAttributes = (
+  savedSearch: SavedSearch,
+  searchSourceJSON: string
+): SavedSearchAttributes => ({
+  kibanaSavedObjectMeta: { searchSourceJSON },
+  title: savedSearch.title ?? '',
+  sort: savedSearch.sort ?? [],
+  columns: savedSearch.columns ?? [],
+  description: savedSearch.description ?? '',
+  grid: savedSearch.grid ?? {},
+  hideChart: savedSearch.hideChart ?? false,
+});
diff --git a/src/plugins/discover/public/saved_searches/types.ts b/src/plugins/discover/public/saved_searches/types.ts
index b1c7b48d696b3..645ada901d5e5 100644
--- a/src/plugins/discover/public/saved_searches/types.ts
+++ b/src/plugins/discover/public/saved_searches/types.ts
@@ -6,26 +6,39 @@
  * Side Public License, v 1.
  */
 
-import { SearchSource } from '../../../data/public';
-import { SavedObjectSaveOpts } from '../../../saved_objects/public';
-import { DiscoverGridSettings } from '../application/components/discover_grid/types';
+import type { ISearchSource } from '../../../data/public';
+import { DiscoverGridSettingsColumn } from '../application/components/discover_grid/types';
 
-export type SortOrder = [string, string];
-export interface SavedSearch {
-  readonly id: string;
+/** @internal **/
+export interface SavedSearchAttributes {
   title: string;
-  searchSource: SearchSource;
-  description?: string;
+  sort: Array<[string, string]>;
   columns: string[];
-  sort: SortOrder[];
-  grid: DiscoverGridSettings;
-  destroy: () => void;
-  save: (saveOptions: SavedObjectSaveOpts) => Promise<string>;
-  lastSavedTitle?: string;
-  copyOnSave?: boolean;
-  hideChart?: boolean;
+  description: string;
+  grid: {
+    columns?: Record<string, DiscoverGridSettingsColumn>;
+  };
+  hideChart: boolean;
+  kibanaSavedObjectMeta: {
+    searchSourceJSON: string;
+  };
 }
-export interface SavedSearchLoader {
-  get: (id: string) => Promise<SavedSearch>;
-  urlFor: (id: string) => string;
+
+/** @public **/
+export interface SavedSearch {
+  searchSource: ISearchSource;
+  id?: string;
+  title?: string;
+  sort?: Array<[string, string]>;
+  columns?: string[];
+  description?: string;
+  grid?: {
+    columns?: Record<string, DiscoverGridSettingsColumn>;
+  };
+  hideChart?: boolean;
+  sharingSavedObjectProps?: {
+    outcome?: 'aliasMatch' | 'exactMatch' | 'conflict';
+    aliasTargetId?: string;
+    errorJSON?: string;
+  };
 }
diff --git a/src/plugins/discover/tsconfig.json b/src/plugins/discover/tsconfig.json
index b3f1ad5d0bc1e..eb739e673cacd 100644
--- a/src/plugins/discover/tsconfig.json
+++ b/src/plugins/discover/tsconfig.json
@@ -24,6 +24,8 @@
     { "path": "../kibana_react/tsconfig.json" },
     { "path": "../kibana_legacy/tsconfig.json" },
     { "path": "../index_pattern_field_editor/tsconfig.json"},
-    { "path": "../field_formats/tsconfig.json" }
+    { "path": "../field_formats/tsconfig.json" },
+    { "path": "../data_views/tsconfig.json" },
+    { "path": "../../../x-pack/plugins/spaces/tsconfig.json" }
   ]
 }
diff --git a/src/plugins/vis_default_editor/kibana.json b/src/plugins/vis_default_editor/kibana.json
index e85c5713eb82c..efed1eab1e494 100644
--- a/src/plugins/vis_default_editor/kibana.json
+++ b/src/plugins/vis_default_editor/kibana.json
@@ -3,7 +3,7 @@
   "version": "kibana",
   "ui": true,
   "optionalPlugins": ["visualize"],
-  "requiredBundles": ["kibanaUtils", "kibanaReact", "data", "fieldFormats"],
+  "requiredBundles": ["kibanaUtils", "kibanaReact", "data", "fieldFormats", "discover"],
   "owner": {
     "name": "Vis Editors",
     "githubTeam": "kibana-vis-editors"
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx b/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
index dab982e5a8070..f1eebbbdf2116 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
@@ -26,7 +26,7 @@ import {
 } from 'src/plugins/visualizations/public';
 import type { Schema } from 'src/plugins/visualizations/public';
 import { TimeRange } from 'src/plugins/data/public';
-import { SavedObject } from 'src/plugins/saved_objects/public';
+import { SavedSearch } from 'src/plugins/discover/public';
 import { DefaultEditorNavBar } from './navbar';
 import { DefaultEditorControls } from './controls';
 import { setStateParamValue, useEditorReducer, useEditorFormState, discardChanges } from './state';
@@ -42,7 +42,7 @@ interface DefaultEditorSideBarProps {
   vis: Vis;
   isLinkedSearch: boolean;
   eventEmitter: EventEmitter;
-  savedSearch?: SavedObject;
+  savedSearch?: SavedSearch;
   timeRange: TimeRange;
 }
 
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx b/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
index cab27d53b827d..2740f4ff50b4e 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
@@ -25,18 +25,18 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 
 import { Vis } from 'src/plugins/visualizations/public';
-import { SavedObject } from 'src/plugins/saved_objects/public';
+import { SavedSearch, getSavedSearchUrl } from '../../../../discover/public';
 import { ApplicationStart } from '../../../../../core/public';
 import { useKibana } from '../../../../kibana_react/public';
 
 interface LinkedSearchProps {
-  savedSearch: SavedObject;
+  savedSearch: SavedSearch;
   eventEmitter: EventEmitter;
 }
 
 interface SidebarTitleProps {
   isLinkedSearch: boolean;
-  savedSearch?: SavedObject;
+  savedSearch?: SavedSearch;
   vis: Vis;
   eventEmitter: EventEmitter;
 }
@@ -55,7 +55,7 @@ export function LinkedSearch({ savedSearch, eventEmitter }: LinkedSearchProps) {
   }, [eventEmitter]);
   const onClickViewInDiscover = useCallback(() => {
     application.navigateToApp('discover', {
-      path: `#/view/${savedSearch.id}`,
+      path: getSavedSearchUrl(savedSearch.id),
     });
   }, [application, savedSearch.id]);
 
diff --git a/src/plugins/visualizations/public/plugin.ts b/src/plugins/visualizations/public/plugin.ts
index 47f544ce2f5d3..87095f5c389ed 100644
--- a/src/plugins/visualizations/public/plugin.ts
+++ b/src/plugins/visualizations/public/plugin.ts
@@ -23,9 +23,9 @@ import {
   setAggs,
   setChrome,
   setOverlays,
-  setSavedSearchLoader,
   setEmbeddable,
   setDocLinks,
+  setSpaces,
 } from './services';
 import {
   VISUALIZE_EMBEDDABLE_TYPE,
@@ -51,8 +51,6 @@ import {
   findListItems,
 } from './utils/saved_visualize_utils';
 
-import { createSavedSearchesLoader } from '../../discover/public';
-
 import type {
   PluginInitializerContext,
   CoreSetup,
@@ -191,6 +189,11 @@ export class VisualizationsPlugin
     setAggs(data.search.aggs);
     setOverlays(core.overlays);
     setChrome(core.chrome);
+
+    if (spaces) {
+      setSpaces(spaces);
+    }
+
     const savedVisualizationsLoader = createSavedVisLoader({
       savedObjectsClient: core.savedObjects.client,
       indexPatterns: data.indexPatterns,
@@ -198,11 +201,7 @@ export class VisualizationsPlugin
       visualizationTypes: types,
     });
     setSavedVisualizationsLoader(savedVisualizationsLoader);
-    const savedSearchLoader = createSavedSearchesLoader({
-      savedObjectsClient: core.savedObjects.client,
-      savedObjects,
-    });
-    setSavedSearchLoader(savedSearchLoader);
+
     return {
       ...types,
       showNewVisModal,
diff --git a/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts b/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts
index fbd8e414c2738..aa8183eb8da39 100644
--- a/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts
+++ b/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts
@@ -16,8 +16,8 @@
 import type { SavedObjectsStart, SavedObject } from '../../../../plugins/saved_objects/public';
 // @ts-ignore
 import { updateOldState } from '../legacy/vis_update_state';
+import { __LEGACY } from '../../../discover/public';
 import { extractReferences, injectReferences } from '../utils/saved_visualization_references';
-import { createSavedSearchesLoader } from '../../../discover/public';
 import type { SavedObjectsClientContract } from '../../../../core/public';
 import type { IndexPatternsContract } from '../../../../plugins/data/public';
 import type { ISavedVis } from '../types';
@@ -30,7 +30,7 @@ export interface SavedVisServices {
 
 /** @deprecated **/
 export function createSavedVisClass(services: SavedVisServices) {
-  const savedSearch = createSavedSearchesLoader(services);
+  const savedSearch = __LEGACY.createSavedSearchesLoader(services);
 
   class SavedVis extends services.savedObjects.SavedObjectClass {
     public static type: string = 'visualization';
diff --git a/src/plugins/visualizations/public/services.ts b/src/plugins/visualizations/public/services.ts
index f1ab9077cd207..b5db56e61ebe4 100644
--- a/src/plugins/visualizations/public/services.ts
+++ b/src/plugins/visualizations/public/services.ts
@@ -18,13 +18,14 @@ import type {
 } from '../../../core/public';
 import type { TypesStart } from './vis_types';
 import { createGetterSetter } from '../../../plugins/kibana_utils/public';
-import { DataPublicPluginStart, TimefilterContract } from '../../../plugins/data/public';
-import { UsageCollectionSetup } from '../../../plugins/usage_collection/public';
-import { ExpressionsStart } from '../../../plugins/expressions/public';
-import { UiActionsStart } from '../../../plugins/ui_actions/public';
-import { SavedVisualizationsLoader } from './saved_visualizations';
-import { SavedObjectLoader } from '../../saved_objects/public';
-import { EmbeddableStart } from '../../embeddable/public';
+import type { DataPublicPluginStart, TimefilterContract } from '../../../plugins/data/public';
+import type { UsageCollectionSetup } from '../../../plugins/usage_collection/public';
+import type { ExpressionsStart } from '../../../plugins/expressions/public';
+import type { UiActionsStart } from '../../../plugins/ui_actions/public';
+import type { SavedVisualizationsLoader } from './saved_visualizations';
+import type { EmbeddableStart } from '../../embeddable/public';
+
+import type { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
 
 export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
 
@@ -64,5 +65,4 @@ export const [getOverlays, setOverlays] = createGetterSetter<OverlayStart>('Over
 
 export const [getChrome, setChrome] = createGetterSetter<ChromeStart>('Chrome');
 
-export const [getSavedSearchLoader, setSavedSearchLoader] =
-  createGetterSetter<SavedObjectLoader>('savedSearchLoader');
+export const [getSpaces, setSpaces] = createGetterSetter<SpacesPluginStart>('Spaces', false);
diff --git a/src/plugins/visualizations/public/vis.ts b/src/plugins/visualizations/public/vis.ts
index dfab4ecfc3cd8..2a1e7f2c8c673 100644
--- a/src/plugins/visualizations/public/vis.ts
+++ b/src/plugins/visualizations/public/vis.ts
@@ -21,17 +21,19 @@ import { Assign } from '@kbn/utility-types';
 import { i18n } from '@kbn/i18n';
 
 import { PersistedState } from './persisted_state';
-import { getTypes, getAggs, getSearch, getSavedSearchLoader } from './services';
+import { getTypes, getAggs, getSearch, getSavedObjects, getSpaces } from './services';
 import {
   IAggConfigs,
   IndexPattern,
   ISearchSource,
   AggConfigSerialized,
   SearchSourceFields,
-} from '../../../plugins/data/public';
+} from '../../data/public';
 import { BaseVisType } from './vis_types';
 import { VisParams } from '../common/types';
 
+import { getSavedSearch, throwErrorOnSavedSearchUrlConflict } from '../../discover/public';
+
 export interface SerializedVisData {
   expression?: string;
   aggs: AggConfigSerialized[];
@@ -58,14 +60,20 @@ export interface VisData {
 }
 
 const getSearchSource = async (inputSearchSource: ISearchSource, savedSearchId?: string) => {
-  const searchSource = inputSearchSource.createCopy();
   if (savedSearchId) {
-    const savedSearch = await getSavedSearchLoader().get(savedSearchId);
+    const savedSearch = await getSavedSearch(savedSearchId, {
+      search: getSearch(),
+      savedObjectsClient: getSavedObjects().client,
+      spaces: getSpaces(),
+    });
+
+    await throwErrorOnSavedSearchUrlConflict(savedSearch);
 
-    searchSource.setParent(savedSearch.searchSource);
+    if (savedSearch?.searchSource) {
+      inputSearchSource.setParent(savedSearch.searchSource);
+    }
   }
-  searchSource.setField('size', 0);
-  return searchSource;
+  return inputSearchSource;
 };
 
 type PartialVisState = Assign<SerializedVis, { data: Partial<SerializedVisData> }>;
diff --git a/src/plugins/visualize/public/application/types.ts b/src/plugins/visualize/public/application/types.ts
index 4debd9a4a7b7d..e77520c962d88 100644
--- a/src/plugins/visualize/public/application/types.ts
+++ b/src/plugins/visualize/public/application/types.ts
@@ -8,7 +8,6 @@
 
 import type { EventEmitter } from 'events';
 import type { History } from 'history';
-
 import type { SerializableRecord } from '@kbn/utility-types';
 
 import type {
@@ -38,7 +37,7 @@ import type {
 import type { NavigationPublicPluginStart as NavigationStart } from 'src/plugins/navigation/public';
 import type { Query, Filter, DataPublicPluginStart, TimeRange } from 'src/plugins/data/public';
 import type { SharePluginStart } from 'src/plugins/share/public';
-import type { SavedObjectsStart, SavedObject } from 'src/plugins/saved_objects/public';
+import type { SavedObjectsStart } from 'src/plugins/saved_objects/public';
 import type { EmbeddableStart, EmbeddableStateTransfer } from 'src/plugins/embeddable/public';
 import type { UrlForwardingStart } from 'src/plugins/url_forwarding/public';
 import type { PresentationUtilPluginStart } from 'src/plugins/presentation_util/public';
@@ -46,6 +45,7 @@ import type { SpacesPluginStart } from '../../../../../x-pack/plugins/spaces/pub
 import type { DashboardStart } from '../../../dashboard/public';
 import type { SavedObjectsTaggingApi } from '../../../saved_objects_tagging_oss/public';
 import type { UsageCollectionStart } from '../../../usage_collection/public';
+import type { SavedSearch } from '../../../discover/public';
 
 import { PureVisState } from '../../common/types';
 
@@ -108,20 +108,15 @@ export interface VisualizeServices extends CoreStart {
   spaces?: SpacesPluginStart;
 }
 
-export interface SavedVisInstance {
-  vis: Vis;
-  savedVis: VisSavedObject;
-  savedSearch?: SavedObject;
-  embeddableHandler: VisualizeEmbeddableContract;
-}
-
-export interface ByValueVisInstance {
+export interface VisInstance {
   vis: Vis;
   savedVis: VisSavedObject;
-  savedSearch?: SavedObject;
+  savedSearch?: SavedSearch;
   embeddableHandler: VisualizeEmbeddableContract;
 }
 
+export type SavedVisInstance = VisInstance;
+export type ByValueVisInstance = VisInstance;
 export type VisualizeEditorVisInstance = SavedVisInstance | ByValueVisInstance;
 
 export type VisEditorConstructor<TVisParams = VisParams> = new (
@@ -142,7 +137,7 @@ export interface EditorRenderProps {
   filters: Filter[];
   timeRange: TimeRange;
   query?: Query;
-  savedSearch?: SavedObject;
+  savedSearch?: SavedSearch;
   uiState: PersistedState;
   /**
    * Flag to determine if visualiztion is linked to the saved search
diff --git a/src/plugins/visualize/public/application/utils/get_visualization_instance.test.ts b/src/plugins/visualize/public/application/utils/get_visualization_instance.test.ts
index 209516793d69d..777ba244c06a1 100644
--- a/src/plugins/visualize/public/application/utils/get_visualization_instance.test.ts
+++ b/src/plugins/visualize/public/application/utils/get_visualization_instance.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createSavedSearchesLoader } from '../../../../discover/public';
+import { getSavedSearch } from '../../../../discover/public';
 import type {
   VisualizeInput,
   VisSavedObject,
@@ -21,13 +21,13 @@ import { createVisualizeServicesMock } from './mocks';
 import { VisualizeServices } from '../types';
 import { BehaviorSubject } from 'rxjs';
 
-const mockSavedSearchObj = {};
-const mockGetSavedSearch = jest.fn(() => mockSavedSearchObj);
-
 jest.mock('../../../../discover/public', () => ({
-  createSavedSearchesLoader: jest.fn(() => ({
-    get: mockGetSavedSearch,
-  })),
+  getSavedSearch: jest.fn().mockResolvedValue({
+    id: 'savedSearch',
+    title: 'savedSearchTitle',
+    searchSource: {},
+  }),
+  throwErrorOnSavedSearchUrlConflict: jest.fn(),
 }));
 
 let savedVisMock: VisSavedObject;
@@ -116,9 +116,14 @@ describe('getVisualizationInstance', () => {
     visMock.data.savedSearchId = 'saved_search_id';
     const { savedSearch } = await getVisualizationInstance(mockServices, 'saved_vis_id');
 
-    expect(createSavedSearchesLoader).toHaveBeenCalled();
-    expect(mockGetSavedSearch).toHaveBeenCalledWith(visMock.data.savedSearchId);
-    expect(savedSearch).toBe(mockSavedSearchObj);
+    expect(getSavedSearch).toHaveBeenCalled();
+    expect(savedSearch).toMatchInlineSnapshot(`
+      Object {
+        "id": "savedSearch",
+        "searchSource": Object {},
+        "title": "savedSearchTitle",
+      }
+    `);
   });
 
   test('should subscribe on embeddable handler updates and send toasts on errors', async () => {
diff --git a/src/plugins/visualize/public/application/utils/get_visualization_instance.ts b/src/plugins/visualize/public/application/utils/get_visualization_instance.ts
index faf25ff28cec0..876501d5f099b 100644
--- a/src/plugins/visualize/public/application/utils/get_visualization_instance.ts
+++ b/src/plugins/visualize/public/application/utils/get_visualization_instance.ts
@@ -14,10 +14,13 @@ import {
   VisualizeInput,
 } from 'src/plugins/visualizations/public';
 import { SearchSourceFields } from 'src/plugins/data/public';
-import { SavedObject } from 'src/plugins/saved_objects/public';
 import { cloneDeep } from 'lodash';
 import { ExpressionValueError } from 'src/plugins/expressions/public';
-import { createSavedSearchesLoader } from '../../../../discover/public';
+import {
+  getSavedSearch,
+  SavedSearch,
+  throwErrorOnSavedSearchUrlConflict,
+} from '../../../../discover/public';
 import { SavedFieldNotFound, SavedFieldTypeInvalidForAgg } from '../../../../kibana_utils/common';
 import { VisualizeServices } from '../types';
 
@@ -33,8 +36,7 @@ const createVisualizeEmbeddableAndLinkSavedSearch = async (
   vis: Vis,
   visualizeServices: VisualizeServices
 ) => {
-  const { data, createVisEmbeddableFromObject, savedObjects, savedObjectsPublic } =
-    visualizeServices;
+  const { data, createVisEmbeddableFromObject, savedObjects, spaces } = visualizeServices;
   const embeddableHandler = (await createVisEmbeddableFromObject(vis, {
     id: '',
     timeRange: data.query.timefilter.timefilter.getTime(),
@@ -50,13 +52,16 @@ const createVisualizeEmbeddableAndLinkSavedSearch = async (
     }
   });
 
-  let savedSearch: SavedObject | undefined;
+  let savedSearch: SavedSearch | undefined;
 
   if (vis.data.savedSearchId) {
-    savedSearch = await createSavedSearchesLoader({
+    savedSearch = await getSavedSearch(vis.data.savedSearchId, {
+      search: data.search,
       savedObjectsClient: savedObjects.client,
-      savedObjects: savedObjectsPublic,
-    }).get(vis.data.savedSearchId);
+      spaces,
+    });
+
+    await throwErrorOnSavedSearchUrlConflict(savedSearch);
   }
 
   return { savedSearch, embeddableHandler };
diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts
index c9df6a6ec57d8..7ff3434286b6b 100644
--- a/src/plugins/visualize/public/plugin.ts
+++ b/src/plugins/visualize/public/plugin.ts
@@ -28,7 +28,6 @@ import {
   createKbnUrlStateStorage,
   withNotifyOnErrors,
 } from '../../kibana_utils/public';
-import type { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
 
 import { VisualizeConstants } from './application/visualize_constants';
 import { DataPublicPluginStart, DataPublicPluginSetup, esFilters } from '../../data/public';
@@ -45,6 +44,7 @@ import type { EmbeddableStart } from '../../embeddable/public';
 import type { DashboardStart } from '../../dashboard/public';
 import type { SavedObjectTaggingOssPluginStart } from '../../saved_objects_tagging_oss/public';
 import type { UsageCollectionStart } from '../../usage_collection/public';
+import type { SpacesApi } from '../../../../x-pack/plugins/spaces/public';
 
 import { setVisEditorsRegistry, setUISettings, setUsageCollector } from './services';
 import { createVisEditorsRegistry, VisEditorsRegistry } from './vis_editors_registry';
@@ -62,7 +62,7 @@ export interface VisualizePluginStartDependencies {
   savedObjectsTaggingOss?: SavedObjectTaggingOssPluginStart;
   presentationUtil: PresentationUtilPluginStart;
   usageCollection?: UsageCollectionStart;
-  spaces: SpacesPluginStart;
+  spaces?: SpacesApi;
 }
 
 export interface VisualizePluginSetupDependencies {
diff --git a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts
index bedf310725ae2..a4fe1835ce5f7 100644
--- a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts
+++ b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts
@@ -107,7 +107,7 @@ describe('GetCsvReportPanelAction', () => {
       columns: [],
       objectType: 'downloadCsv',
       searchSource: {},
-      title: undefined,
+      title: '',
       version: '7.15.0',
     });
   });
@@ -144,7 +144,7 @@ describe('GetCsvReportPanelAction', () => {
       columns: ['column_a', 'column_b'],
       objectType: 'downloadCsv',
       searchSource: { testData: 'testDataValue' },
-      title: undefined,
+      title: '',
       version: '7.15.0',
     });
   });
diff --git a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
index 115d7599c6bc8..fbfaeab9bc4f2 100644
--- a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
+++ b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
@@ -122,7 +122,7 @@ export class ReportingCsvPanelAction implements ActionDefinition<ActionContext>
     const immediateJobParams = this.apiClient.getDecoratedJobParams({
       searchSource: getSearchSource(true),
       columns,
-      title: savedSearch.title,
+      title: savedSearch.title || '',
       objectType: 'downloadCsv', // FIXME: added for typescript, but immediate download job does not need objectType
     });
 
diff --git a/x-pack/plugins/transform/kibana.json b/x-pack/plugins/transform/kibana.json
index 5e1c1fb938a86..f47b018dd1d26 100644
--- a/x-pack/plugins/transform/kibana.json
+++ b/x-pack/plugins/transform/kibana.json
@@ -17,6 +17,7 @@
   "optionalPlugins": [
     "security",
     "usageCollection",
+    "spaces",
     "alerting"
   ],
   "configPath": ["xpack", "transform"],
diff --git a/x-pack/plugins/transform/public/__mocks__/shared_imports.ts b/x-pack/plugins/transform/public/__mocks__/shared_imports.ts
index ae072e6666e4a..e0788d7747e65 100644
--- a/x-pack/plugins/transform/public/__mocks__/shared_imports.ts
+++ b/x-pack/plugins/transform/public/__mocks__/shared_imports.ts
@@ -13,7 +13,7 @@ export const useRequest = jest.fn(() => ({
   error: null,
   data: undefined,
 }));
-export const createSavedSearchesLoader = jest.fn();
+export const getSavedSearch = jest.fn();
 
 // just passing through the reimports
 export { getMlSharedImports, ES_CLIENT_TOTAL_HITS_RELATION } from '../../../ml/public';
diff --git a/x-pack/plugins/transform/public/app/app_dependencies.tsx b/x-pack/plugins/transform/public/app/app_dependencies.tsx
index c39aa5a49e5e9..d3f356f3e83b3 100644
--- a/x-pack/plugins/transform/public/app/app_dependencies.tsx
+++ b/x-pack/plugins/transform/public/app/app_dependencies.tsx
@@ -10,6 +10,7 @@ import type { DataPublicPluginStart } from 'src/plugins/data/public';
 import type { SavedObjectsStart } from 'src/plugins/saved_objects/public';
 import type { ScopedHistory } from 'kibana/public';
 import type { SharePluginStart } from 'src/plugins/share/public';
+import type { SpacesPluginStart } from '../../../spaces/public';
 
 import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import type { Storage } from '../../../../../src/plugins/kibana_utils/public';
@@ -32,6 +33,7 @@ export interface AppDependencies {
   savedObjectsPlugin: SavedObjectsStart;
   share: SharePluginStart;
   ml: GetMlSharedImportsReturnType;
+  spaces?: SpacesPluginStart;
 }
 
 export const useAppDependencies = () => {
diff --git a/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts b/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts
index 3e85f5d4d49a4..db5fd82808a91 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts
@@ -20,12 +20,10 @@ import { isIndexPattern } from '../../../../common/types/index_pattern';
 export type SavedSearchQuery = object;
 
 type IndexPatternId = string;
-type SavedSearchId = string;
 
 let indexPatternCache: Array<SimpleSavedObject<Record<string, any>>> = [];
 let fullIndexPatterns;
 let currentIndexPattern = null;
-let currentSavedSearch = null;
 
 export let refreshIndexPatterns: () => Promise<unknown>;
 
@@ -76,11 +74,6 @@ export function loadCurrentIndexPattern(
   return currentIndexPattern;
 }
 
-export function loadCurrentSavedSearch(savedSearches: any, savedSearchId: SavedSearchId) {
-  currentSavedSearch = savedSearches.get(savedSearchId);
-  return currentSavedSearch;
-}
-
 export interface SearchItems {
   indexPattern: IndexPattern;
   savedSearch: any;
diff --git a/x-pack/plugins/transform/public/app/hooks/use_search_items/use_search_items.ts b/x-pack/plugins/transform/public/app/hooks/use_search_items/use_search_items.ts
index 44e3cc347824d..bd225ae9d0a32 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_search_items/use_search_items.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_search_items/use_search_items.ts
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 
 import { isIndexPattern } from '../../../../common/types/index_pattern';
 
-import { createSavedSearchesLoader } from '../../../shared_imports';
+import { getSavedSearch, getSavedSearchUrlConflictMessage } from '../../../shared_imports';
 
 import { useAppDependencies } from '../../app_dependencies';
 
@@ -20,7 +20,6 @@ import {
   getIndexPatternIdByTitle,
   loadCurrentIndexPattern,
   loadIndexPatterns,
-  loadCurrentSavedSearch,
   SearchItems,
 } from './common';
 
@@ -32,10 +31,6 @@ export const useSearchItems = (defaultSavedObjectId: string | undefined) => {
   const indexPatterns = appDeps.data.indexPatterns;
   const uiSettings = appDeps.uiSettings;
   const savedObjectsClient = appDeps.savedObjects.client;
-  const savedSearches = createSavedSearchesLoader({
-    savedObjectsClient,
-    savedObjects: appDeps.savedObjectsPlugin,
-  });
 
   const [searchItems, setSearchItems] = useState<SearchItems | undefined>(undefined);
 
@@ -52,7 +47,16 @@ export const useSearchItems = (defaultSavedObjectId: string | undefined) => {
     }
 
     try {
-      fetchedSavedSearch = await loadCurrentSavedSearch(savedSearches, id);
+      fetchedSavedSearch = await getSavedSearch(id, {
+        search: appDeps.data.search,
+        savedObjectsClient: appDeps.savedObjects.client,
+        spaces: appDeps.spaces,
+      });
+
+      if (fetchedSavedSearch?.sharingSavedObjectProps?.errorJSON) {
+        setError(await getSavedSearchUrlConflictMessage(fetchedSavedSearch));
+        return;
+      }
     } catch (e) {
       // Just let fetchedSavedSearch stay undefined in case it doesn't exist.
     }
diff --git a/x-pack/plugins/transform/public/app/mount_management_section.ts b/x-pack/plugins/transform/public/app/mount_management_section.ts
index 1d39d233f8284..1747330818547 100644
--- a/x-pack/plugins/transform/public/app/mount_management_section.ts
+++ b/x-pack/plugins/transform/public/app/mount_management_section.ts
@@ -29,7 +29,7 @@ export async function mountManagementSection(
   const startServices = await getStartServices();
   const [core, plugins] = startServices;
   const { application, chrome, docLinks, i18n, overlays, savedObjects, uiSettings } = core;
-  const { data, share } = plugins;
+  const { data, share, spaces } = plugins;
   const { docTitle } = chrome;
 
   // Initialize services
@@ -53,6 +53,7 @@ export async function mountManagementSection(
     history,
     savedObjectsPlugin: plugins.savedObjects,
     share,
+    spaces,
     ml: await getMlSharedImports(),
   };
 
diff --git a/x-pack/plugins/transform/public/plugin.ts b/x-pack/plugins/transform/public/plugin.ts
index 4ed4e64070344..da280452c1f0f 100644
--- a/x-pack/plugins/transform/public/plugin.ts
+++ b/x-pack/plugins/transform/public/plugin.ts
@@ -13,6 +13,7 @@ import type { HomePublicPluginSetup } from 'src/plugins/home/public';
 import type { SavedObjectsStart } from 'src/plugins/saved_objects/public';
 import type { ManagementSetup } from 'src/plugins/management/public';
 import type { SharePluginStart } from 'src/plugins/share/public';
+import type { SpacesApi } from '../../spaces/public';
 import { registerFeature } from './register_feature';
 import type { PluginSetupContract as AlertingSetup } from '../../alerting/public';
 import type { TriggersAndActionsUIPublicPluginSetup } from '../../triggers_actions_ui/public';
@@ -24,6 +25,7 @@ export interface PluginsDependencies {
   home: HomePublicPluginSetup;
   savedObjects: SavedObjectsStart;
   share: SharePluginStart;
+  spaces?: SpacesApi;
   alerting?: AlertingSetup;
   triggersActionsUi?: TriggersAndActionsUIPublicPluginSetup;
 }
diff --git a/x-pack/plugins/transform/public/shared_imports.ts b/x-pack/plugins/transform/public/shared_imports.ts
index edd27fd43c2af..b8f5d88205858 100644
--- a/x-pack/plugins/transform/public/shared_imports.ts
+++ b/x-pack/plugins/transform/public/shared_imports.ts
@@ -5,9 +5,12 @@
  * 2.0.
  */
 
-export { createSavedSearchesLoader } from '../../../../src/plugins/discover/public';
 export { XJsonMode } from '@kbn/ace';
 export { UseRequestConfig, useRequest } from '../../../../src/plugins/es_ui_shared/public';
+export {
+  getSavedSearch,
+  getSavedSearchUrlConflictMessage,
+} from '../../../../src/plugins/discover/public';
 
 export {
   getMlSharedImports,

From 5fdbd26229d9dfe69885f31c47fc6751c8bc3ddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <sorenlouv@gmail.com>
Date: Wed, 13 Oct 2021 10:33:33 +0200
Subject: [PATCH 007/117] [APM] Fix typo in linting docs (#114764)

---
 x-pack/plugins/apm/dev_docs/linting.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/apm/dev_docs/linting.md b/x-pack/plugins/apm/dev_docs/linting.md
index a4fd3094f121c..7db7053e59061 100644
--- a/x-pack/plugins/apm/dev_docs/linting.md
+++ b/x-pack/plugins/apm/dev_docs/linting.md
@@ -1,6 +1,6 @@
-## Linting
+# Linting
 
-_Note: Run the following commands from the root of Kibana._
+_Note: Run the commands from the root of Kibana._
 
 ### Typescript
 
@@ -19,4 +19,3 @@ yarn prettier  "./x-pack/plugins/apm/**/*.{tsx,ts,js}" --write
 ```
 node scripts/eslint.js x-pack/legacy/plugins/apm
 ```
-diff --git a/x-pack/plugins/apm/dev_docs/feature_flags.md b/x-pack/plugins/apm/dev_docs/feature_flags.md

From 802fb0252d85bb5275376125e1db0b304037533b Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Wed, 13 Oct 2021 11:35:15 +0200
Subject: [PATCH 008/117] [APM] Filter on tx metrics for instance stats
 (#114758)

---
 .../get_service_instances_transaction_statistics.ts           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts b/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts
index a51f4c4e0fb7d..089282d6f1c34 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts
@@ -17,6 +17,7 @@ import { Coordinate } from '../../../../typings/timeseries';
 import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import {
+  getDocumentTypeFilterForAggregatedTransactions,
   getProcessorEventForAggregatedTransactions,
   getTransactionDurationFieldForAggregatedTransactions,
 } from '../../helpers/aggregated_transactions';
@@ -111,6 +112,9 @@ export async function getServiceInstancesTransactionStatistics<
         ...rangeQuery(start, end),
         ...environmentQuery(environment),
         ...kqlQuery(kuery),
+        ...getDocumentTypeFilterForAggregatedTransactions(
+          searchAggregatedTransactions
+        ),
         ...(isComparisonSearch && serviceNodeIds
           ? [{ terms: { [SERVICE_NODE_NAME]: serviceNodeIds } }]
           : []),

From db4bcdee2c3f2cea21ca2f623dfc3a9b7c7c8909 Mon Sep 17 00:00:00 2001
From: Clint Andrew Hall <clint.hall@elastic.co>
Date: Wed, 13 Oct 2021 04:48:20 -0500
Subject: [PATCH 009/117] [fleet] Tweak Header UI (#114704)

---
 ...-plugin-core-public.doclinksstart.links.md |  1 +
 ...kibana-plugin-core-public.doclinksstart.md |  2 +-
 .../public/doc_links/doc_links_service.ts     |  3 ++
 src/core/public/public.api.md                 |  1 +
 .../integrations/layouts/default.tsx          | 50 ++++++++++++-------
 .../fleet/storybook/context/doc_links.ts      |  2 +
 .../translations/translations/ja-JP.json      |  1 -
 .../translations/translations/zh-CN.json      |  1 -
 8 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
index 5871d7df6a7c5..055cf213dea90 100644
--- a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
+++ b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
@@ -9,6 +9,7 @@
 ```typescript
 readonly links: {
         readonly settings: string;
+        readonly elasticStackGetStarted: string;
         readonly apm: {
             readonly kibanaSettings: string;
             readonly supportedServiceMaps: string;
diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
index a4e842c317256..51101c8804680 100644
--- a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
+++ b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
@@ -17,4 +17,4 @@ export interface DocLinksStart
 |  --- | --- | --- |
 |  [DOC\_LINK\_VERSION](./kibana-plugin-core-public.doclinksstart.doc_link_version.md) | <code>string</code> |  |
 |  [ELASTIC\_WEBSITE\_URL](./kibana-plugin-core-public.doclinksstart.elastic_website_url.md) | <code>string</code> |  |
-|  [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code>        readonly settings: string;</code><br/><code>        readonly apm: {</code><br/><code>            readonly kibanaSettings: string;</code><br/><code>            readonly supportedServiceMaps: string;</code><br/><code>            readonly customLinks: string;</code><br/><code>            readonly droppedTransactionSpans: string;</code><br/><code>            readonly upgrading: string;</code><br/><code>            readonly metaData: string;</code><br/><code>        };</code><br/><code>        readonly canvas: {</code><br/><code>            readonly guide: string;</code><br/><code>        };</code><br/><code>        readonly dashboard: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly drilldowns: string;</code><br/><code>            readonly drilldownsTriggerPicker: string;</code><br/><code>            readonly urlDrilldownTemplateSyntax: string;</code><br/><code>            readonly urlDrilldownVariables: string;</code><br/><code>        };</code><br/><code>        readonly discover: Record&lt;string, string&gt;;</code><br/><code>        readonly filebeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly installation: string;</code><br/><code>            readonly configuration: string;</code><br/><code>            readonly elasticsearchOutput: string;</code><br/><code>            readonly elasticsearchModule: string;</code><br/><code>            readonly startup: string;</code><br/><code>            readonly exportedFields: string;</code><br/><code>            readonly suricataModule: string;</code><br/><code>            readonly zeekModule: string;</code><br/><code>        };</code><br/><code>        readonly auditbeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly auditdModule: string;</code><br/><code>            readonly systemModule: string;</code><br/><code>        };</code><br/><code>        readonly metricbeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly configure: string;</code><br/><code>            readonly httpEndpoint: string;</code><br/><code>            readonly install: string;</code><br/><code>            readonly start: string;</code><br/><code>        };</code><br/><code>        readonly enterpriseSearch: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly appSearchBase: string;</code><br/><code>            readonly workplaceSearchBase: string;</code><br/><code>        };</code><br/><code>        readonly heartbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly libbeat: {</code><br/><code>            readonly getStarted: string;</code><br/><code>        };</code><br/><code>        readonly logstash: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly functionbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly winlogbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly aggs: {</code><br/><code>            readonly composite: string;</code><br/><code>            readonly composite_missing_bucket: string;</code><br/><code>            readonly date_histogram: string;</code><br/><code>            readonly date_range: string;</code><br/><code>            readonly date_format_pattern: string;</code><br/><code>            readonly filter: string;</code><br/><code>            readonly filters: string;</code><br/><code>            readonly geohash_grid: string;</code><br/><code>            readonly histogram: string;</code><br/><code>            readonly ip_range: string;</code><br/><code>            readonly range: string;</code><br/><code>            readonly significant_terms: string;</code><br/><code>            readonly terms: string;</code><br/><code>            readonly avg: string;</code><br/><code>            readonly avg_bucket: string;</code><br/><code>            readonly max_bucket: string;</code><br/><code>            readonly min_bucket: string;</code><br/><code>            readonly sum_bucket: string;</code><br/><code>            readonly cardinality: string;</code><br/><code>            readonly count: string;</code><br/><code>            readonly cumulative_sum: string;</code><br/><code>            readonly derivative: string;</code><br/><code>            readonly geo_bounds: string;</code><br/><code>            readonly geo_centroid: string;</code><br/><code>            readonly max: string;</code><br/><code>            readonly median: string;</code><br/><code>            readonly min: string;</code><br/><code>            readonly moving_avg: string;</code><br/><code>            readonly percentile_ranks: string;</code><br/><code>            readonly serial_diff: string;</code><br/><code>            readonly std_dev: string;</code><br/><code>            readonly sum: string;</code><br/><code>            readonly top_hits: string;</code><br/><code>        };</code><br/><code>        readonly runtimeFields: {</code><br/><code>            readonly overview: string;</code><br/><code>            readonly mapping: string;</code><br/><code>        };</code><br/><code>        readonly scriptedFields: {</code><br/><code>            readonly scriptFields: string;</code><br/><code>            readonly scriptAggs: string;</code><br/><code>            readonly painless: string;</code><br/><code>            readonly painlessApi: string;</code><br/><code>            readonly painlessLangSpec: string;</code><br/><code>            readonly painlessSyntax: string;</code><br/><code>            readonly painlessWalkthrough: string;</code><br/><code>            readonly luceneExpressions: string;</code><br/><code>        };</code><br/><code>        readonly search: {</code><br/><code>            readonly sessions: string;</code><br/><code>            readonly sessionLimits: string;</code><br/><code>        };</code><br/><code>        readonly indexPatterns: {</code><br/><code>            readonly introduction: string;</code><br/><code>            readonly fieldFormattersNumber: string;</code><br/><code>            readonly fieldFormattersString: string;</code><br/><code>            readonly runtimeFields: string;</code><br/><code>        };</code><br/><code>        readonly addData: string;</code><br/><code>        readonly kibana: string;</code><br/><code>        readonly upgradeAssistant: string;</code><br/><code>        readonly rollupJobs: string;</code><br/><code>        readonly elasticsearch: Record&lt;string, string&gt;;</code><br/><code>        readonly siem: {</code><br/><code>            readonly privileges: string;</code><br/><code>            readonly guide: string;</code><br/><code>            readonly gettingStarted: string;</code><br/><code>            readonly ml: string;</code><br/><code>            readonly ruleChangeLog: string;</code><br/><code>            readonly detectionsReq: string;</code><br/><code>            readonly networkMap: string;</code><br/><code>        };</code><br/><code>        readonly securitySolution: {</code><br/><code>            readonly trustedApps: string;</code><br/><code>        };</code><br/><code>        readonly query: {</code><br/><code>            readonly eql: string;</code><br/><code>            readonly kueryQuerySyntax: string;</code><br/><code>            readonly luceneQuerySyntax: string;</code><br/><code>            readonly percolate: string;</code><br/><code>            readonly queryDsl: string;</code><br/><code>            readonly autocompleteChanges: string;</code><br/><code>        };</code><br/><code>        readonly date: {</code><br/><code>            readonly dateMath: string;</code><br/><code>            readonly dateMathIndexNames: string;</code><br/><code>        };</code><br/><code>        readonly management: Record&lt;string, string&gt;;</code><br/><code>        readonly ml: Record&lt;string, string&gt;;</code><br/><code>        readonly transforms: Record&lt;string, string&gt;;</code><br/><code>        readonly visualize: Record&lt;string, string&gt;;</code><br/><code>        readonly apis: Readonly&lt;{</code><br/><code>            bulkIndexAlias: string;</code><br/><code>            byteSizeUnits: string;</code><br/><code>            createAutoFollowPattern: string;</code><br/><code>            createFollower: string;</code><br/><code>            createIndex: string;</code><br/><code>            createSnapshotLifecyclePolicy: string;</code><br/><code>            createRoleMapping: string;</code><br/><code>            createRoleMappingTemplates: string;</code><br/><code>            createRollupJobsRequest: string;</code><br/><code>            createApiKey: string;</code><br/><code>            createPipeline: string;</code><br/><code>            createTransformRequest: string;</code><br/><code>            cronExpressions: string;</code><br/><code>            executeWatchActionModes: string;</code><br/><code>            indexExists: string;</code><br/><code>            openIndex: string;</code><br/><code>            putComponentTemplate: string;</code><br/><code>            painlessExecute: string;</code><br/><code>            painlessExecuteAPIContexts: string;</code><br/><code>            putComponentTemplateMetadata: string;</code><br/><code>            putSnapshotLifecyclePolicy: string;</code><br/><code>            putIndexTemplateV1: string;</code><br/><code>            putWatch: string;</code><br/><code>            simulatePipeline: string;</code><br/><code>            timeUnits: string;</code><br/><code>            updateTransform: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly observability: Readonly&lt;{</code><br/><code>            guide: string;</code><br/><code>            infrastructureThreshold: string;</code><br/><code>            logsThreshold: string;</code><br/><code>            metricsThreshold: string;</code><br/><code>            monitorStatus: string;</code><br/><code>            monitorUptime: string;</code><br/><code>            tlsCertificate: string;</code><br/><code>            uptimeDurationAnomaly: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly alerting: Record&lt;string, string&gt;;</code><br/><code>        readonly maps: Record&lt;string, string&gt;;</code><br/><code>        readonly monitoring: Record&lt;string, string&gt;;</code><br/><code>        readonly security: Readonly&lt;{</code><br/><code>            apiKeyServiceSettings: string;</code><br/><code>            clusterPrivileges: string;</code><br/><code>            elasticsearchSettings: string;</code><br/><code>            elasticsearchEnableSecurity: string;</code><br/><code>            indicesPrivileges: string;</code><br/><code>            kibanaTLS: string;</code><br/><code>            kibanaPrivileges: string;</code><br/><code>            mappingRoles: string;</code><br/><code>            mappingRolesFieldRules: string;</code><br/><code>            runAsPrivilege: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly watcher: Record&lt;string, string&gt;;</code><br/><code>        readonly ccs: Record&lt;string, string&gt;;</code><br/><code>        readonly plugins: Record&lt;string, string&gt;;</code><br/><code>        readonly snapshotRestore: Record&lt;string, string&gt;;</code><br/><code>        readonly ingest: Record&lt;string, string&gt;;</code><br/><code>        readonly fleet: Readonly&lt;{</code><br/><code>            guide: string;</code><br/><code>            fleetServer: string;</code><br/><code>            fleetServerAddFleetServer: string;</code><br/><code>            settings: string;</code><br/><code>            settingsFleetServerHostSettings: string;</code><br/><code>            troubleshooting: string;</code><br/><code>            elasticAgent: string;</code><br/><code>            datastreams: string;</code><br/><code>            datastreamsNamingScheme: string;</code><br/><code>            upgradeElasticAgent: string;</code><br/><code>            upgradeElasticAgent712lower: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly ecs: {</code><br/><code>            readonly guide: string;</code><br/><code>        };</code><br/><code>        readonly clients: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly goOverview: string;</code><br/><code>            readonly javaIndex: string;</code><br/><code>            readonly jsIntro: string;</code><br/><code>            readonly netGuide: string;</code><br/><code>            readonly perlGuide: string;</code><br/><code>            readonly phpGuide: string;</code><br/><code>            readonly pythonGuide: string;</code><br/><code>            readonly rubyOverview: string;</code><br/><code>            readonly rustGuide: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
+|  [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code>        readonly settings: string;</code><br/><code>        readonly apm: {</code><br/><code>            readonly kibanaSettings: string;</code><br/><code>            readonly supportedServiceMaps: string;</code><br/><code>            readonly customLinks: string;</code><br/><code>            readonly droppedTransactionSpans: string;</code><br/><code>            readonly upgrading: string;</code><br/><code>            readonly metaData: string;</code><br/><code>        };</code><br/><code>        readonly canvas: {</code><br/><code>            readonly guide: string;</code><br/><code>        };</code><br/><code>        readonly dashboard: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly drilldowns: string;</code><br/><code>            readonly drilldownsTriggerPicker: string;</code><br/><code>            readonly urlDrilldownTemplateSyntax: string;</code><br/><code>            readonly urlDrilldownVariables: string;</code><br/><code>        };</code><br/><code>        readonly discover: Record&lt;string, string&gt;;</code><br/><code>        readonly filebeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly installation: string;</code><br/><code>            readonly configuration: string;</code><br/><code>            readonly elasticsearchOutput: string;</code><br/><code>            readonly elasticsearchModule: string;</code><br/><code>            readonly startup: string;</code><br/><code>            readonly exportedFields: string;</code><br/><code>            readonly suricataModule: string;</code><br/><code>            readonly zeekModule: string;</code><br/><code>        };</code><br/><code>        readonly auditbeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly auditdModule: string;</code><br/><code>            readonly systemModule: string;</code><br/><code>        };</code><br/><code>        readonly metricbeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly configure: string;</code><br/><code>            readonly httpEndpoint: string;</code><br/><code>            readonly install: string;</code><br/><code>            readonly start: string;</code><br/><code>        };</code><br/><code>        readonly enterpriseSearch: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly appSearchBase: string;</code><br/><code>            readonly workplaceSearchBase: string;</code><br/><code>        };</code><br/><code>        readonly heartbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly libbeat: {</code><br/><code>            readonly getStarted: string;</code><br/><code>        };</code><br/><code>        readonly logstash: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly functionbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly winlogbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly aggs: {</code><br/><code>            readonly composite: string;</code><br/><code>            readonly composite_missing_bucket: string;</code><br/><code>            readonly date_histogram: string;</code><br/><code>            readonly date_range: string;</code><br/><code>            readonly date_format_pattern: string;</code><br/><code>            readonly filter: string;</code><br/><code>            readonly filters: string;</code><br/><code>            readonly geohash_grid: string;</code><br/><code>            readonly histogram: string;</code><br/><code>            readonly ip_range: string;</code><br/><code>            readonly range: string;</code><br/><code>            readonly significant_terms: string;</code><br/><code>            readonly terms: string;</code><br/><code>            readonly avg: string;</code><br/><code>            readonly avg_bucket: string;</code><br/><code>            readonly max_bucket: string;</code><br/><code>            readonly min_bucket: string;</code><br/><code>            readonly sum_bucket: string;</code><br/><code>            readonly cardinality: string;</code><br/><code>            readonly count: string;</code><br/><code>            readonly cumulative_sum: string;</code><br/><code>            readonly derivative: string;</code><br/><code>            readonly geo_bounds: string;</code><br/><code>            readonly geo_centroid: string;</code><br/><code>            readonly max: string;</code><br/><code>            readonly median: string;</code><br/><code>            readonly min: string;</code><br/><code>            readonly moving_avg: string;</code><br/><code>            readonly percentile_ranks: string;</code><br/><code>            readonly serial_diff: string;</code><br/><code>            readonly std_dev: string;</code><br/><code>            readonly sum: string;</code><br/><code>            readonly top_hits: string;</code><br/><code>        };</code><br/><code>        readonly runtimeFields: {</code><br/><code>            readonly overview: string;</code><br/><code>            readonly mapping: string;</code><br/><code>        };</code><br/><code>        readonly scriptedFields: {</code><br/><code>            readonly scriptFields: string;</code><br/><code>            readonly scriptAggs: string;</code><br/><code>            readonly painless: string;</code><br/><code>            readonly painlessApi: string;</code><br/><code>            readonly painlessLangSpec: string;</code><br/><code>            readonly painlessSyntax: string;</code><br/><code>            readonly painlessWalkthrough: string;</code><br/><code>            readonly luceneExpressions: string;</code><br/><code>        };</code><br/><code>        readonly search: {</code><br/><code>            readonly sessions: string;</code><br/><code>            readonly sessionLimits: string;</code><br/><code>        };</code><br/><code>        readonly indexPatterns: {</code><br/><code>            readonly introduction: string;</code><br/><code>            readonly fieldFormattersNumber: string;</code><br/><code>            readonly fieldFormattersString: string;</code><br/><code>            readonly runtimeFields: string;</code><br/><code>        };</code><br/><code>        readonly addData: string;</code><br/><code>        readonly kibana: string;</code><br/><code>        readonly upgradeAssistant: string;</code><br/><code>        readonly rollupJobs: string;</code><br/><code>        readonly elasticsearch: Record&lt;string, string&gt;;</code><br/><code>        readonly siem: {</code><br/><code>            readonly privileges: string;</code><br/><code>            readonly guide: string;</code><br/><code>            readonly gettingStarted: string;</code><br/><code>            readonly ml: string;</code><br/><code>            readonly ruleChangeLog: string;</code><br/><code>            readonly detectionsReq: string;</code><br/><code>            readonly networkMap: string;</code><br/><code>        };</code><br/><code>        readonly securitySolution: {</code><br/><code>            readonly trustedApps: string;</code><br/><code>        };</code><br/><code>        readonly query: {</code><br/><code>            readonly eql: string;</code><br/><code>            readonly kueryQuerySyntax: string;</code><br/><code>            readonly luceneQuerySyntax: string;</code><br/><code>            readonly percolate: string;</code><br/><code>            readonly queryDsl: string;</code><br/><code>            readonly autocompleteChanges: string;</code><br/><code>        };</code><br/><code>        readonly date: {</code><br/><code>            readonly dateMath: string;</code><br/><code>            readonly dateMathIndexNames: string;</code><br/><code>        };</code><br/><code>        readonly management: Record&lt;string, string&gt;;</code><br/><code>        readonly ml: Record&lt;string, string&gt;;</code><br/><code>        readonly transforms: Record&lt;string, string&gt;;</code><br/><code>        readonly visualize: Record&lt;string, string&gt;;</code><br/><code>        readonly apis: Readonly&lt;{</code><br/><code>            bulkIndexAlias: string;</code><br/><code>            byteSizeUnits: string;</code><br/><code>            createAutoFollowPattern: string;</code><br/><code>            createFollower: string;</code><br/><code>            createIndex: string;</code><br/><code>            createSnapshotLifecyclePolicy: string;</code><br/><code>            createRoleMapping: string;</code><br/><code>            createRoleMappingTemplates: string;</code><br/><code>            createRollupJobsRequest: string;</code><br/><code>            createApiKey: string;</code><br/><code>            createPipeline: string;</code><br/><code>            createTransformRequest: string;</code><br/><code>            cronExpressions: string;</code><br/><code>            executeWatchActionModes: string;</code><br/><code>            indexExists: string;</code><br/><code>            openIndex: string;</code><br/><code>            putComponentTemplate: string;</code><br/><code>            painlessExecute: string;</code><br/><code>            painlessExecuteAPIContexts: string;</code><br/><code>            putComponentTemplateMetadata: string;</code><br/><code>            putSnapshotLifecyclePolicy: string;</code><br/><code>            putIndexTemplateV1: string;</code><br/><code>            putWatch: string;</code><br/><code>            simulatePipeline: string;</code><br/><code>            timeUnits: string;</code><br/><code>            updateTransform: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly observability: Readonly&lt;{</code><br/><code>            guide: string;</code><br/><code>            infrastructureThreshold: string;</code><br/><code>            logsThreshold: string;</code><br/><code>            metricsThreshold: string;</code><br/><code>            monitorStatus: string;</code><br/><code>            monitorUptime: string;</code><br/><code>            tlsCertificate: string;</code><br/><code>            uptimeDurationAnomaly: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly alerting: Record&lt;string, string&gt;;</code><br/><code>        readonly maps: Record&lt;string, string&gt;;</code><br/><code>        readonly monitoring: Record&lt;string, string&gt;;</code><br/><code>        readonly security: Readonly&lt;{</code><br/><code>            apiKeyServiceSettings: string;</code><br/><code>            clusterPrivileges: string;</code><br/><code>            elasticsearchSettings: string;</code><br/><code>            elasticsearchEnableSecurity: string;</code><br/><code>            indicesPrivileges: string;</code><br/><code>            kibanaTLS: string;</code><br/><code>            kibanaPrivileges: string;</code><br/><code>            mappingRoles: string;</code><br/><code>            mappingRolesFieldRules: string;</code><br/><code>            runAsPrivilege: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly watcher: Record&lt;string, string&gt;;</code><br/><code>        readonly ccs: Record&lt;string, string&gt;;</code><br/><code>        readonly plugins: Record&lt;string, string&gt;;</code><br/><code>        readonly snapshotRestore: Record&lt;string, string&gt;;</code><br/><code>        readonly ingest: Record&lt;string, string&gt;;</code><br/><code>        readonly fleet: Readonly&lt;{</code><br/><code>            guide: string;</code><br/><code>            fleetServer: string;</code><br/><code>            fleetServerAddFleetServer: string;</code><br/><code>            settings: string;</code><br/><code>            settingsFleetServerHostSettings: string;</code><br/><code>            troubleshooting: string;</code><br/><code>            elasticAgent: string;</code><br/><code>            datastreams: string;</code><br/><code>            datastreamsNamingScheme: string;</code><br/><code>            upgradeElasticAgent: string;</code><br/><code>            upgradeElasticAgent712lower: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly ecs: {</code><br/><code>            readonly guide: string;</code><br/><code>        };</code><br/><code>        readonly clients: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly goOverview: string;</code><br/><code>            readonly javaIndex: string;</code><br/><code>            readonly jsIntro: string;</code><br/><code>            readonly netGuide: string;</code><br/><code>            readonly perlGuide: string;</code><br/><code>            readonly phpGuide: string;</code><br/><code>            readonly pythonGuide: string;</code><br/><code>            readonly rubyOverview: string;</code><br/><code>            readonly rustGuide: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
\ No newline at end of file
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
index a4ca5722c6aca..6039a0766a1a1 100644
--- a/src/core/public/doc_links/doc_links_service.ts
+++ b/src/core/public/doc_links/doc_links_service.ts
@@ -26,12 +26,14 @@ export class DocLinksService {
     const PLUGIN_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/plugins/${DOC_LINK_VERSION}/`;
     const APM_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/apm/`;
     const SECURITY_SOLUTION_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/`;
+    const STACK_GETTING_STARTED = `${ELASTIC_WEBSITE_URL}guide/en/elastic-stack-get-started/${DOC_LINK_VERSION}/`;
 
     return deepFreeze({
       DOC_LINK_VERSION,
       ELASTIC_WEBSITE_URL,
       links: {
         settings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/settings.html`,
+        elasticStackGetStarted: `${STACK_GETTING_STARTED}get-started-elastic-stack.html`,
         apm: {
           kibanaSettings: `${KIBANA_DOCS}apm-settings-in-kibana.html`,
           supportedServiceMaps: `${KIBANA_DOCS}service-maps.html#service-maps-supported`,
@@ -508,6 +510,7 @@ export interface DocLinksStart {
   readonly ELASTIC_WEBSITE_URL: string;
   readonly links: {
     readonly settings: string;
+    readonly elasticStackGetStarted: string;
     readonly apm: {
       readonly kibanaSettings: string;
       readonly supportedServiceMaps: string;
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 324066764768d..7b0ec39d4a4d9 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -478,6 +478,7 @@ export interface DocLinksStart {
     // (undocumented)
     readonly links: {
         readonly settings: string;
+        readonly elasticStackGetStarted: string;
         readonly apm: {
             readonly kibanaSettings: string;
             readonly supportedServiceMaps: string;
diff --git a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
index 70e55c9bd56b0..8ced172e696aa 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import React, { memo } from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiImage, EuiSpacer, EuiText } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiImage, EuiSpacer, EuiText, EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { i18n } from '@kbn/i18n';
@@ -17,7 +17,7 @@ import type { EuiTheme } from 'src/plugins/kibana_react/common';
 import { useLink } from '../../../hooks';
 import type { Section } from '../sections';
 
-import { useLinks } from '../hooks';
+import { useLinks, useStartServices } from '../hooks';
 
 import { WithHeaderLayout } from './';
 
@@ -27,10 +27,14 @@ interface Props {
 }
 
 const Illustration = styled(EuiImage)`
-  margin-bottom: -68px;
+  margin-bottom: -77px;
   position: relative;
-  top: -20px;
-  width: 80%;
+  top: -16px;
+  width: 395px;
+`;
+
+const Hero = styled.div`
+  text-align: right;
 `;
 
 const HeroImage = memo(() => {
@@ -39,21 +43,24 @@ const HeroImage = memo(() => {
   const IS_DARK_THEME = theme.darkMode;
 
   return (
-    <Illustration
-      alt={i18n.translate('xpack.fleet.epm.illustrationAltText', {
-        defaultMessage: 'Illustration of an integration',
-      })}
-      url={
-        IS_DARK_THEME
-          ? toSharedAssets('illustration_integrations_darkmode.svg')
-          : toSharedAssets('illustration_integrations_lightmode.svg')
-      }
-    />
+    <Hero>
+      <Illustration
+        alt={i18n.translate('xpack.fleet.epm.illustrationAltText', {
+          defaultMessage: 'Illustration of an integration',
+        })}
+        url={
+          IS_DARK_THEME
+            ? toSharedAssets('illustration_integrations_darkmode.svg')
+            : toSharedAssets('illustration_integrations_lightmode.svg')
+        }
+      />
+    </Hero>
   );
 });
 
 export const DefaultLayout: React.FunctionComponent<Props> = memo(({ section, children }) => {
   const { getHref } = useLink();
+  const { docLinks } = useStartServices();
 
   return (
     <WithHeaderLayout
@@ -64,7 +71,7 @@ export const DefaultLayout: React.FunctionComponent<Props> = memo(({ section, ch
             <h1>
               <FormattedMessage
                 id="xpack.fleet.integrationsHeaderTitle"
-                defaultMessage="Elastic Agent Integrations"
+                defaultMessage="Integrations"
               />
             </h1>
           </EuiText>
@@ -76,7 +83,16 @@ export const DefaultLayout: React.FunctionComponent<Props> = memo(({ section, ch
               <p>
                 <FormattedMessage
                   id="xpack.fleet.epm.pageSubtitle"
-                  defaultMessage="Collect data from popular apps and services using Elastic Agent"
+                  defaultMessage="Collect data from popular applications and services.  To learn more about Integrations, view {link}"
+                  values={{
+                    link: (
+                      <EuiLink target="_blank" href={docLinks.links.elasticStackGetStarted}>
+                        {i18n.translate('xpack.fleet.epm.pageSubtitleLinkText', {
+                          defaultMessage: 'Getting started with Elastic Stack',
+                        })}
+                      </EuiLink>
+                    ),
+                  }}
                 />
               </p>
             </EuiText>
diff --git a/x-pack/plugins/fleet/storybook/context/doc_links.ts b/x-pack/plugins/fleet/storybook/context/doc_links.ts
index 56287dd9116a9..9b86ea03549f3 100644
--- a/x-pack/plugins/fleet/storybook/context/doc_links.ts
+++ b/x-pack/plugins/fleet/storybook/context/doc_links.ts
@@ -10,6 +10,8 @@ import type { DocLinksStart } from 'kibana/public';
 export const getDocLinks = () => {
   const docLinks: DocLinksStart = {
     links: {
+      elasticStackGetStarted:
+        'https://www.elastic.co/guide/en/elastic-stack-get-started/current/get-started-elastic-stack.html',
       fleet: {
         learnMoreBlog:
           'https://www.elastic.co/blog/elastic-agent-and-fleet-make-it-easier-to-integrate-your-systems-with-elastic',
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 84d87cb020fe9..2c828513e9d33 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -10743,7 +10743,6 @@
     "xpack.fleet.epm.packageDetailsNav.packageCustomLinkText": "高度な設定",
     "xpack.fleet.epm.packageDetailsNav.packagePoliciesLinkText": "ポリシー",
     "xpack.fleet.epm.packageDetailsNav.settingsLinkText": "設定",
-    "xpack.fleet.epm.pageSubtitle": "Elasticエージェントを使用して一般的なアプリやサービスからデータを収集します",
     "xpack.fleet.epm.releaseBadge.betaDescription": "この統合は本番環境用ではありません。",
     "xpack.fleet.epm.releaseBadge.betaLabel": "ベータ",
     "xpack.fleet.epm.releaseBadge.experimentalDescription": "この統合は、急に変更されたり、将来のリリースで削除されたりする可能性があります。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index fa78b2eae1432..c0d3975461c7b 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -10857,7 +10857,6 @@
     "xpack.fleet.epm.packageDetailsNav.packageCustomLinkText": "高级",
     "xpack.fleet.epm.packageDetailsNav.packagePoliciesLinkText": "策略",
     "xpack.fleet.epm.packageDetailsNav.settingsLinkText": "设置",
-    "xpack.fleet.epm.pageSubtitle": "使用 Elastic 代理从热门应用和服务中收集数据",
     "xpack.fleet.epm.releaseBadge.betaDescription": "在生产环境中不推荐使用此集成。",
     "xpack.fleet.epm.releaseBadge.betaLabel": "公测版",
     "xpack.fleet.epm.releaseBadge.experimentalDescription": "此集成可能有重大更改或将在未来版本中移除。",

From 0bf0b94ee02a8735a639d27ad61f57948dd0d08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20S=C3=A1nchez?= <davidsansol92@gmail.com>
Date: Wed, 13 Oct 2021 12:03:13 +0200
Subject: [PATCH 010/117] [Security Solution] [Endpoint] Event filters uses the
 new card design (#114126)

* Adds new card design to event filters and also adds comments list

* Adds nested comments

* Hides comments if there are no commentes

* Fixes i18n check error because duplicated key

* Fix wrong type and unit test

* Fixes ts error

* Address pr comments and fix unit tests

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../artifact_entry_card.test.tsx              |  22 +++-
 .../artifact_entry_card.tsx                   |  35 ++++--
 .../artifact_entry_collapsible_card.tsx       |   4 +-
 .../components/card_comments.tsx              |  68 ++++++++++
 .../components/criteria_conditions.tsx        |  57 ++++++++-
 .../components/translations.ts                |  12 ++
 .../artifact_entry_card/test_utils.ts         |   9 ++
 .../components/artifact_entry_card/types.ts   |  16 +--
 .../utils/get_formatted_comments.tsx          |  34 +++++
 .../utils/map_to_artifact_info.ts             |   1 +
 .../view/event_filters_list_page.test.tsx     |  29 ++---
 .../view/event_filters_list_page.tsx          | 118 ++++++++++++------
 .../components/trusted_apps_grid/index.tsx    |   1 +
 13 files changed, 329 insertions(+), 77 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/card_comments.tsx
 create mode 100644 x-pack/plugins/security_solution/public/management/components/artifact_entry_card/utils/get_formatted_comments.tsx

diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.test.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.test.tsx
index 52299679ec87b..bde1961dd782d 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.test.tsx
@@ -25,7 +25,7 @@ describe.each([
   ) => ReturnType<AppContextTestRender['render']>;
 
   beforeEach(() => {
-    item = generateItem();
+    item = generateItem() as AnyArtifact;
     appTestContext = createAppRootMockRenderer();
     render = (props = {}) => {
       renderResult = appTestContext.render(
@@ -77,13 +77,31 @@ describe.each([
     expect(renderResult.getByTestId('testCard-description').textContent).toEqual(item.description);
   });
 
+  it("shouldn't display description", async () => {
+    render({ hideDescription: true });
+    expect(renderResult.queryByTestId('testCard-description')).toBeNull();
+  });
+
   it('should display default empty value if description does not exist', async () => {
     item.description = undefined;
     render();
-
     expect(renderResult.getByTestId('testCard-description').textContent).toEqual('—');
   });
 
+  it('should display comments if one exists', async () => {
+    render();
+    if (isTrustedApp(item)) {
+      expect(renderResult.queryByTestId('testCard-comments')).toBeNull();
+    } else {
+      expect(renderResult.queryByTestId('testCard-comments')).not.toBeNull();
+    }
+  });
+
+  it("shouldn't display comments", async () => {
+    render({ hideComments: true });
+    expect(renderResult.queryByTestId('testCard-comments')).toBeNull();
+  });
+
   it('should display OS and criteria conditions', () => {
     render();
 
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.tsx
index d9709c64e092d..bee9a63c9cf69 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.tsx
@@ -16,10 +16,11 @@ import { useNormalizedArtifact } from './hooks/use_normalized_artifact';
 import { useTestIdGenerator } from '../hooks/use_test_id_generator';
 import { CardContainerPanel } from './components/card_container_panel';
 import { CardSectionPanel } from './components/card_section_panel';
+import { CardComments } from './components/card_comments';
 import { usePolicyNavLinks } from './hooks/use_policy_nav_links';
 import { MaybeImmutable } from '../../../../common/endpoint/types';
 
-export interface ArtifactEntryCardProps extends CommonProps {
+export interface CommonArtifactEntryCardProps extends CommonProps {
   item: MaybeImmutable<AnyArtifact>;
   /**
    * The list of actions for the card. Will display an icon with the actions in a menu if defined.
@@ -34,12 +35,27 @@ export interface ArtifactEntryCardProps extends CommonProps {
   policies?: MenuItemPropsByPolicyId;
 }
 
+export interface ArtifactEntryCardProps extends CommonArtifactEntryCardProps {
+  // A flag to hide description section, false by default
+  hideDescription?: boolean;
+  // A flag to hide comments section, false by default
+  hideComments?: boolean;
+}
+
 /**
  * Display Artifact Items (ex. Trusted App, Event Filter, etc) as a card.
  * This component is a TS Generic that allows you to set what the Item type is
  */
 export const ArtifactEntryCard = memo<ArtifactEntryCardProps>(
-  ({ item, policies, actions, 'data-test-subj': dataTestSubj, ...commonProps }) => {
+  ({
+    item,
+    policies,
+    actions,
+    hideDescription = false,
+    hideComments = false,
+    'data-test-subj': dataTestSubj,
+    ...commonProps
+  }) => {
     const artifact = useNormalizedArtifact(item as AnyArtifact);
     const getTestId = useTestIdGenerator(dataTestSubj);
     const policyNavLinks = usePolicyNavLinks(artifact, policies);
@@ -63,11 +79,16 @@ export const ArtifactEntryCard = memo<ArtifactEntryCardProps>(
 
           <EuiSpacer size="m" />
 
-          <EuiText>
-            <p data-test-subj={getTestId('description')}>
-              {artifact.description || getEmptyValue()}
-            </p>
-          </EuiText>
+          {!hideDescription ? (
+            <EuiText>
+              <p data-test-subj={getTestId('description')}>
+                {artifact.description || getEmptyValue()}
+              </p>
+            </EuiText>
+          ) : null}
+          {!hideComments ? (
+            <CardComments comments={artifact.comments} data-test-subj={getTestId('comments')} />
+          ) : null}
         </CardSectionPanel>
 
         <EuiHorizontalRule margin="none" />
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_collapsible_card.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_collapsible_card.tsx
index 43572ea234d31..673504c18a9df 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_collapsible_card.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_collapsible_card.tsx
@@ -7,7 +7,7 @@
 
 import React, { memo } from 'react';
 import { EuiHorizontalRule } from '@elastic/eui';
-import { ArtifactEntryCardProps } from './artifact_entry_card';
+import { CommonArtifactEntryCardProps } from './artifact_entry_card';
 import { CardContainerPanel } from './components/card_container_panel';
 import { useNormalizedArtifact } from './hooks/use_normalized_artifact';
 import { useTestIdGenerator } from '../hooks/use_test_id_generator';
@@ -15,7 +15,7 @@ import { CardSectionPanel } from './components/card_section_panel';
 import { CriteriaConditions, CriteriaConditionsProps } from './components/criteria_conditions';
 import { CardCompressedHeader } from './components/card_compressed_header';
 
-export interface ArtifactEntryCollapsibleCardProps extends ArtifactEntryCardProps {
+export interface ArtifactEntryCollapsibleCardProps extends CommonArtifactEntryCardProps {
   onExpandCollapse: () => void;
   expanded?: boolean;
 }
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/card_comments.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/card_comments.tsx
new file mode 100644
index 0000000000000..ce539554a722e
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/card_comments.tsx
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo, useMemo, useCallback, useState } from 'react';
+import {
+  CommonProps,
+  EuiAccordion,
+  EuiCommentList,
+  EuiCommentProps,
+  EuiButtonEmpty,
+  EuiSpacer,
+} from '@elastic/eui';
+import { isEmpty } from 'lodash/fp';
+import { useTestIdGenerator } from '../../hooks/use_test_id_generator';
+import { CardActionsFlexItemProps } from './card_actions_flex_item';
+import { ArtifactInfo } from '../types';
+import { getFormattedComments } from '../utils/get_formatted_comments';
+import { SHOW_COMMENTS_LABEL, HIDE_COMMENTS_LABEL } from './translations';
+
+export interface CardCommentsProps
+  extends CardActionsFlexItemProps,
+    Pick<CommonProps, 'data-test-subj'> {
+  comments: ArtifactInfo['comments'];
+}
+
+export const CardComments = memo<CardCommentsProps>(
+  ({ comments, 'data-test-subj': dataTestSubj }) => {
+    const getTestId = useTestIdGenerator(dataTestSubj);
+
+    const [showComments, setShowComments] = useState(false);
+    const onCommentsClick = useCallback((): void => {
+      setShowComments(!showComments);
+    }, [setShowComments, showComments]);
+    const formattedComments = useMemo((): EuiCommentProps[] => {
+      return getFormattedComments(comments);
+    }, [comments]);
+
+    const buttonText = useMemo(
+      () =>
+        showComments ? HIDE_COMMENTS_LABEL(comments.length) : SHOW_COMMENTS_LABEL(comments.length),
+      [comments.length, showComments]
+    );
+
+    return !isEmpty(comments) ? (
+      <div data-test-subj={dataTestSubj}>
+        <EuiSpacer size="s" />
+        <EuiButtonEmpty
+          onClick={onCommentsClick}
+          flush="left"
+          size="xs"
+          data-test-subj={getTestId('label')}
+        >
+          {buttonText}
+        </EuiButtonEmpty>
+        <EuiAccordion id={'1'} arrowDisplay="none" forceState={showComments ? 'open' : 'closed'}>
+          <EuiSpacer size="m" />
+          <EuiCommentList comments={formattedComments} data-test-subj={getTestId('list')} />
+        </EuiAccordion>
+      </div>
+    ) : null;
+  }
+);
+
+CardComments.displayName = 'CardComments';
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/criteria_conditions.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/criteria_conditions.tsx
index 292c06c4f5b8c..260db313ced36 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/criteria_conditions.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/criteria_conditions.tsx
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import React, { memo } from 'react';
-import { CommonProps, EuiExpression } from '@elastic/eui';
+import React, { memo, useCallback } from 'react';
+import { CommonProps, EuiExpression, EuiToken, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import styled from 'styled-components';
 import { ListOperatorTypeEnum } from '@kbn/securitysolution-io-ts-list-types';
 import {
   CONDITION_OS,
@@ -21,7 +22,7 @@ import {
   CONDITION_OPERATOR_TYPE_EXISTS,
   CONDITION_OPERATOR_TYPE_LIST,
 } from './translations';
-import { ArtifactInfo } from '../types';
+import { ArtifactInfo, ArtifactInfoEntry } from '../types';
 import { useTestIdGenerator } from '../../hooks/use_test_id_generator';
 
 const OS_LABELS = Object.freeze({
@@ -39,6 +40,15 @@ const OPERATOR_TYPE_LABELS = Object.freeze({
   [ListOperatorTypeEnum.LIST]: CONDITION_OPERATOR_TYPE_LIST,
 });
 
+const EuiFlexGroupNested = styled(EuiFlexGroup)`
+  margin-left: ${({ theme }) => theme.eui.spacerSizes.l};
+`;
+
+const EuiFlexItemNested = styled(EuiFlexItem)`
+  margin-bottom: 6px !important;
+  margin-top: 6px !important;
+`;
+
 export type CriteriaConditionsProps = Pick<ArtifactInfo, 'os' | 'entries'> &
   Pick<CommonProps, 'data-test-subj'>;
 
@@ -46,6 +56,44 @@ export const CriteriaConditions = memo<CriteriaConditionsProps>(
   ({ os, entries, 'data-test-subj': dataTestSubj }) => {
     const getTestId = useTestIdGenerator(dataTestSubj);
 
+    const getNestedEntriesContent = useCallback(
+      (type: string, nestedEntries: ArtifactInfoEntry[]) => {
+        if (type === 'nested' && nestedEntries.length) {
+          return nestedEntries.map(
+            ({ field: nestedField, type: nestedType, value: nestedValue }) => {
+              return (
+                <EuiFlexGroupNested
+                  data-test-subj={getTestId('nestedCondition')}
+                  key={nestedField + nestedType + nestedValue}
+                  direction="row"
+                  alignItems="center"
+                  gutterSize="m"
+                  responsive={false}
+                >
+                  <EuiFlexItemNested grow={false}>
+                    <EuiToken iconType="tokenNested" size="s" />
+                  </EuiFlexItemNested>
+                  <EuiFlexItemNested grow={false}>
+                    <EuiExpression description={''} value={nestedField} color="subdued" />
+                  </EuiFlexItemNested>
+                  <EuiFlexItemNested grow={false}>
+                    <EuiExpression
+                      description={
+                        OPERATOR_TYPE_LABELS[nestedType as keyof typeof OPERATOR_TYPE_LABELS] ??
+                        nestedType
+                      }
+                      value={nestedValue}
+                    />
+                  </EuiFlexItemNested>
+                </EuiFlexGroupNested>
+              );
+            }
+          );
+        }
+      },
+      [getTestId]
+    );
+
     return (
       <div data-test-subj={dataTestSubj}>
         <div data-test-subj={getTestId('os')}>
@@ -57,7 +105,7 @@ export const CriteriaConditions = memo<CriteriaConditionsProps>(
             />
           </strong>
         </div>
-        {entries.map(({ field, type, value }) => {
+        {entries.map(({ field, type, value, entries: nestedEntries = [] }) => {
           return (
             <div data-test-subj={getTestId('condition')} key={field + type + value}>
               <EuiExpression description={CONDITION_AND} value={field} color="subdued" />
@@ -67,6 +115,7 @@ export const CriteriaConditions = memo<CriteriaConditionsProps>(
                 }
                 value={value}
               />
+              {getNestedEntriesContent(type, nestedEntries)}
             </div>
           );
         })}
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/translations.ts b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/translations.ts
index d98f4589027d4..512724b66d50e 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/translations.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/translations.ts
@@ -114,3 +114,15 @@ export const COLLAPSE_ACTION = i18n.translate(
     defaultMessage: 'Collapse',
   }
 );
+
+export const SHOW_COMMENTS_LABEL = (count: number = 0) =>
+  i18n.translate('xpack.securitySolution.artifactCard.comments.label.show', {
+    defaultMessage: 'Show comments ({count})',
+    values: { count },
+  });
+
+export const HIDE_COMMENTS_LABEL = (count: number = 0) =>
+  i18n.translate('xpack.securitySolution.artifactCard.comments.label.hide', {
+    defaultMessage: 'Hide comments ({count})',
+    values: { count },
+  });
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/test_utils.ts b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/test_utils.ts
index d9ff23b3a2c6a..d7d8899b005ed 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/test_utils.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/test_utils.ts
@@ -6,6 +6,7 @@
  */
 
 import { cloneDeep } from 'lodash';
+import uuid from 'uuid';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { TrustedAppGenerator } from '../../../../common/endpoint/data_generators/trusted_app_generator';
 import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
@@ -54,6 +55,14 @@ export const getExceptionProviderMock = (): ExceptionListItemSchema => {
         },
       ],
       tags: ['policy:all'],
+      comments: [
+        {
+          id: uuid.v4(),
+          comment: 'test',
+          created_at: new Date().toISOString(),
+          created_by: 'Justa',
+        },
+      ],
     })
   );
 };
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/types.ts b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/types.ts
index c506c62ac4351..fe50a15190f11 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/types.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/types.ts
@@ -10,6 +10,13 @@ import { EffectScope, TrustedApp } from '../../../../common/endpoint/types';
 import { ContextMenuItemNavByRouterProps } from '../context_menu_with_router_support/context_menu_item_nav_by_router';
 
 export type AnyArtifact = ExceptionListItemSchema | TrustedApp;
+export interface ArtifactInfoEntry {
+  field: string;
+  type: string;
+  operator: string;
+  value: string;
+}
+type ArtifactInfoEntries = ArtifactInfoEntry & { entries?: ArtifactInfoEntry[] };
 
 /**
  * A normalized structured that is used internally through out the card's components.
@@ -17,16 +24,11 @@ export type AnyArtifact = ExceptionListItemSchema | TrustedApp;
 export interface ArtifactInfo
   extends Pick<
     ExceptionListItemSchema,
-    'name' | 'created_at' | 'updated_at' | 'created_by' | 'updated_by' | 'description'
+    'name' | 'created_at' | 'updated_at' | 'created_by' | 'updated_by' | 'description' | 'comments'
   > {
   effectScope: EffectScope;
   os: string;
-  entries: Array<{
-    field: string;
-    type: string;
-    operator: string;
-    value: string;
-  }>;
+  entries: ArtifactInfoEntries[];
 }
 
 export interface MenuItemPropsByPolicyId {
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/utils/get_formatted_comments.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/utils/get_formatted_comments.tsx
new file mode 100644
index 0000000000000..c9e96c5ce9ec1
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/utils/get_formatted_comments.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 React from 'react';
+import { EuiAvatar, EuiText, EuiCommentProps } from '@elastic/eui';
+import styled from 'styled-components';
+import { CommentsArray } from '@kbn/securitysolution-io-ts-list-types';
+import { COMMENT_EVENT } from '../../../../common/components/exceptions/translations';
+import { FormattedRelativePreferenceDate } from '../../../../common/components/formatted_date';
+
+const CustomEuiAvatar = styled(EuiAvatar)`
+  background-color: ${({ theme }) => theme.eui.euiColorLightShade} !important;
+`;
+
+/**
+ * Formats ExceptionItem.comments into EuiCommentList format
+ *
+ * @param comments ExceptionItem.comments
+ */
+export const getFormattedComments = (comments: CommentsArray): EuiCommentProps[] => {
+  return comments.map((commentItem) => ({
+    username: commentItem.created_by,
+    timestamp: (
+      <FormattedRelativePreferenceDate value={commentItem.created_at} dateFormat="MMM D, YYYY" />
+    ),
+    event: COMMENT_EVENT,
+    timelineIcon: <CustomEuiAvatar size="s" name={commentItem.created_by} />,
+    children: <EuiText size="s">{commentItem.comment}</EuiText>,
+  }));
+};
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/utils/map_to_artifact_info.ts b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/utils/map_to_artifact_info.ts
index dd9e90db327ee..5969cf9d043b4 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/utils/map_to_artifact_info.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/utils/map_to_artifact_info.ts
@@ -24,6 +24,7 @@ export const mapToArtifactInfo = (_item: MaybeImmutable<AnyArtifact>): ArtifactI
     updated_at,
     updated_by,
     description,
+    comments: isTrustedApp(item) ? [] : item.comments,
     entries: entries as unknown as ArtifactInfo['entries'],
     os: isTrustedApp(item) ? item.os : getOsFromExceptionItem(item),
     effectScope: isTrustedApp(item) ? item.effectScope : getEffectScopeFromExceptionItem(item),
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.test.tsx
index 37269108aa10f..0729f95bb44a9 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.test.tsx
@@ -109,19 +109,15 @@ describe('When on the Event Filters List Page', () => {
     it('should render expected fields on card', async () => {
       render();
       await dataReceived();
-      const eventMeta = ([] as HTMLElement[]).map.call(
-        renderResult.getByTestId('exceptionsViewerItemDetails').querySelectorAll('dd'),
-        (ele) => ele.textContent
-      );
 
-      expect(eventMeta).toEqual([
-        'some name',
-        'April 20th 2020 @ 11:25:31',
-        'some user',
-        'April 20th 2020 @ 11:25:31',
-        'some user',
-        'some description',
-      ]);
+      [
+        ['subHeader-touchedBy-createdBy-value', 'some user'],
+        ['subHeader-touchedBy-updatedBy-value', 'some user'],
+        ['header-created-value', '4/20/2020'],
+        ['header-updated-value', '4/20/2020'],
+      ].forEach(([suffix, value]) =>
+        expect(renderResult.getByTestId(`eventFilterCard-${suffix}`).textContent).toEqual(value)
+      );
     });
 
     it('should show API error if one is encountered', async () => {
@@ -143,8 +139,13 @@ describe('When on the Event Filters List Page', () => {
     it('should show modal when delete is clicked on a card', async () => {
       render();
       await dataReceived();
-      act(() => {
-        fireEvent.click(renderResult.getByTestId('exceptionsViewerDeleteBtn'));
+
+      await act(async () => {
+        (await renderResult.findAllByTestId('eventFilterCard-header-actions-button'))[0].click();
+      });
+
+      await act(async () => {
+        (await renderResult.findByTestId('deleteEventFilterAction')).click();
       });
 
       expect(
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.tsx
index e206f85df6548..db4e5dbb531b2 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.tsx
@@ -36,16 +36,20 @@ import {
 } from '../store/selector';
 import { PaginatedContent, PaginatedContentProps } from '../../../components/paginated_content';
 import { Immutable, ListPageRouteState } from '../../../../../common/endpoint/types';
+import { ExceptionItem } from '../../../../common/components/exceptions/viewer/exception_item';
 import {
-  ExceptionItem,
-  ExceptionItemProps,
-} from '../../../../common/components/exceptions/viewer/exception_item';
+  AnyArtifact,
+  ArtifactEntryCard,
+  ArtifactEntryCardProps,
+} from '../../../components/artifact_entry_card';
 import { EventFilterDeleteModal } from './components/event_filter_delete_modal';
 
 import { SearchExceptions } from '../../../components/search_exceptions';
 import { BackToExternalAppButton } from '../../../components/back_to_external_app_button';
 import { ABOUT_EVENT_FILTERS } from './translations';
 
+type ArtifactEntryCardType = typeof ArtifactEntryCard;
+
 type EventListPaginatedContent = PaginatedContentProps<
   Immutable<ExceptionListItemSchema>,
   typeof ExceptionItem
@@ -61,6 +65,20 @@ const AdministrationListPage = styled(_AdministrationListPage)`
   }
 `;
 
+const EDIT_EVENT_FILTER_ACTION_LABEL = i18n.translate(
+  'xpack.securitySolution.eventFilters.list.cardAction.edit',
+  {
+    defaultMessage: 'Edit event filter',
+  }
+);
+
+const DELETE_EVENT_FILTER_ACTION_LABEL = i18n.translate(
+  'xpack.securitySolution.eventFilters.list.cardAction.delete',
+  {
+    defaultMessage: 'Delete event filter',
+  }
+);
+
 export const EventFiltersListPage = memo(() => {
   const { state: routeState } = useLocation<ListPageRouteState | undefined>();
   const history = useHistory();
@@ -133,41 +151,6 @@ export const EventFiltersListPage = memo(() => {
     [navigateCallback]
   );
 
-  const handleItemEdit: ExceptionItemProps['onEditException'] = useCallback(
-    (item: ExceptionListItemSchema) => {
-      navigateCallback({
-        show: 'edit',
-        id: item.id,
-      });
-    },
-    [navigateCallback]
-  );
-
-  const handleItemDelete: ExceptionItemProps['onDeleteException'] = useCallback(
-    ({ id }) => {
-      dispatch({
-        type: 'eventFilterForDeletion',
-        // Casting below needed due to error around the comments array needing to be mutable
-        payload: listItems.find((item) => item.id === id)! as ExceptionListItemSchema,
-      });
-    },
-    [dispatch, listItems]
-  );
-
-  const handleItemComponentProps: EventListPaginatedContent['itemComponentProps'] = useCallback(
-    (exceptionItem) => ({
-      exceptionItem: exceptionItem as ExceptionListItemSchema,
-      loadingItemIds: [],
-      commentsAccordionId: '',
-      onEditException: handleItemEdit,
-      onDeleteException: handleItemDelete,
-      showModified: true,
-      showName: true,
-      'data-test-subj': `eventFilterCard`,
-    }),
-    [handleItemDelete, handleItemEdit]
-  );
-
   const handlePaginatedContentChange: EventListPaginatedContent['onChange'] = useCallback(
     ({ pageIndex, pageSize }) => {
       navigateCallback({
@@ -186,6 +169,59 @@ export const EventFiltersListPage = memo(() => {
     [navigateCallback, dispatch]
   );
 
+  const artifactCardPropsPerItem = useMemo(() => {
+    const cachedCardProps: Record<string, ArtifactEntryCardProps> = {};
+
+    // Casting `listItems` below to remove the `Immutable<>` from it in order to prevent errors
+    // with common component's props
+    for (const eventFilter of listItems as ExceptionListItemSchema[]) {
+      let policies: ArtifactEntryCardProps['policies'];
+
+      cachedCardProps[eventFilter.id] = {
+        item: eventFilter as AnyArtifact,
+        policies,
+        hideDescription: true,
+        'data-test-subj': 'eventFilterCard',
+        actions: [
+          {
+            icon: 'controlsHorizontal',
+            onClick: () => {
+              history.push(
+                getEventFiltersListPath({
+                  ...location,
+                  show: 'edit',
+                  id: eventFilter.id,
+                })
+              );
+            },
+            'data-test-subj': 'editEventFilterAction',
+            children: EDIT_EVENT_FILTER_ACTION_LABEL,
+          },
+          {
+            icon: 'trash',
+            onClick: () => {
+              dispatch({
+                type: 'eventFilterForDeletion',
+                payload: eventFilter,
+              });
+            },
+            'data-test-subj': 'deleteEventFilterAction',
+            children: DELETE_EVENT_FILTER_ACTION_LABEL,
+          },
+        ],
+      };
+    }
+
+    return cachedCardProps;
+  }, [dispatch, history, listItems, location]);
+
+  const handleArtifactCardProps = useCallback(
+    (eventFilter: ExceptionListItemSchema) => {
+      return artifactCardPropsPerItem[eventFilter.id];
+    },
+    [artifactCardPropsPerItem]
+  );
+
   return (
     <AdministrationListPage
       headerBackComponent={backButton}
@@ -244,10 +280,10 @@ export const EventFiltersListPage = memo(() => {
         </>
       )}
 
-      <PaginatedContent<Immutable<ExceptionListItemSchema>, typeof ExceptionItem>
+      <PaginatedContent<ExceptionListItemSchema, ArtifactEntryCardType>
         items={listItems}
-        ItemComponent={ExceptionItem}
-        itemComponentProps={handleItemComponentProps}
+        ItemComponent={ArtifactEntryCard}
+        itemComponentProps={handleArtifactCardProps}
         onChange={handlePaginatedContentChange}
         error={fetchError?.message}
         loading={isLoading}
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.tsx
index ba09d0c7ee0cc..948b454f9cc00 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.tsx
@@ -138,6 +138,7 @@ export const TrustedAppsGrid = memo(() => {
       cachedCardProps[trustedApp.id] = {
         item: trustedApp,
         policies,
+        hideComments: true,
         'data-test-subj': 'trustedAppCard',
         actions: [
           {

From 708f06fc153ff9c92bfe54bd2be5b9b233a80151 Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Wed, 13 Oct 2021 07:15:26 -0500
Subject: [PATCH 011/117] [data views] add getDefaultDataView method  (#113891)

* add new method to data views api

* add tests

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../common/data_views/data_views.test.ts      | 58 +++++++++++++++++--
 .../common/data_views/data_views.ts           | 31 ++++++++++
 2 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/src/plugins/data_views/common/data_views/data_views.test.ts b/src/plugins/data_views/common/data_views/data_views.test.ts
index 9a01e52ce48e2..210c926f92df7 100644
--- a/src/plugins/data_views/common/data_views/data_views.test.ts
+++ b/src/plugins/data_views/common/data_views/data_views.test.ts
@@ -50,9 +50,15 @@ describe('IndexPatterns', () => {
   let indexPatterns: DataViewsService;
   let savedObjectsClient: SavedObjectsClientCommon;
   let SOClientGetDelay = 0;
+  const uiSettings = {
+    get: () => Promise.resolve(false),
+    getAll: () => {},
+    set: () => () => {},
+    remove: jest.fn(),
+  } as any as UiSettingsCommon;
+  const indexPatternObj = { id: 'id', version: 'a', attributes: { title: 'title' } };
 
   beforeEach(() => {
-    const indexPatternObj = { id: 'id', version: 'a', attributes: { title: 'title' } };
     savedObjectsClient = {} as SavedObjectsClientCommon;
     savedObjectsClient.find = jest.fn(
       () => Promise.resolve([indexPatternObj]) as Promise<Array<SavedObject<any>>>
@@ -86,10 +92,7 @@ describe('IndexPatterns', () => {
       });
 
     indexPatterns = new DataViewsService({
-      uiSettings: {
-        get: () => Promise.resolve(false),
-        getAll: () => {},
-      } as any as UiSettingsCommon,
+      uiSettings,
       savedObjectsClient: savedObjectsClient as unknown as SavedObjectsClientCommon,
       apiClient: createFieldsFetcher(),
       fieldFormats,
@@ -274,4 +277,49 @@ describe('IndexPatterns', () => {
     // successful subsequent request
     expect(async () => await indexPatterns.get(id)).toBeDefined();
   });
+
+  describe('getDefaultDataView', () => {
+    test('gets default data view', async () => {
+      indexPatterns.clearCache();
+      jest.clearAllMocks();
+
+      expect(await indexPatterns.getDefaultDataView()).toBeInstanceOf(DataView);
+      // make sure we're not pulling from cache
+      expect(savedObjectsClient.get).toBeCalledTimes(1);
+      expect(savedObjectsClient.find).toBeCalledTimes(1);
+    });
+
+    test('returns undefined if no data views exist', async () => {
+      savedObjectsClient.find = jest.fn(
+        () => Promise.resolve([]) as Promise<Array<SavedObject<any>>>
+      );
+      savedObjectsClient.get = jest.fn(() => Promise.resolve(undefined) as Promise<any>);
+      indexPatterns.clearCache();
+      expect(await indexPatterns.getDefaultDataView()).toBeUndefined();
+    });
+
+    test("default doesn't exist, grabs another data view", async () => {
+      indexPatterns.clearCache();
+      jest.clearAllMocks();
+      uiSettings.get = jest.fn().mockResolvedValue(['bar']);
+
+      savedObjectsClient.find = jest.fn(
+        () => Promise.resolve([indexPatternObj]) as Promise<Array<SavedObject<any>>>
+      );
+
+      savedObjectsClient.get = jest.fn().mockResolvedValue({
+        id: 'bar',
+        version: 'foo',
+        attributes: {
+          title: 'something',
+        },
+      });
+
+      expect(await indexPatterns.getDefaultDataView()).toBeInstanceOf(DataView);
+      // make sure we're not pulling from cache
+      expect(savedObjectsClient.get).toBeCalledTimes(1);
+      expect(savedObjectsClient.find).toBeCalledTimes(1);
+      expect(uiSettings.remove).toBeCalledTimes(1);
+    });
+  });
 });
diff --git a/src/plugins/data_views/common/data_views/data_views.ts b/src/plugins/data_views/common/data_views/data_views.ts
index 77ce1caaaad84..a76b531668162 100644
--- a/src/plugins/data_views/common/data_views/data_views.ts
+++ b/src/plugins/data_views/common/data_views/data_views.ts
@@ -79,6 +79,10 @@ export class DataViewsService {
   private onError: OnError;
   private dataViewCache: ReturnType<typeof createDataViewCache>;
 
+  /**
+   * @deprecated Use `getDefaultDataView` instead (when loading data view) and handle
+   *             'no data view' case in api consumer code - no more auto redirect
+   */
   ensureDefaultDataView: EnsureDefaultDataView;
 
   constructor({
@@ -681,6 +685,33 @@ export class DataViewsService {
     this.dataViewCache.clear(indexPatternId);
     return this.savedObjectsClient.delete(DATA_VIEW_SAVED_OBJECT_TYPE, indexPatternId);
   }
+
+  /**
+   * Returns the default data view as an object. If no default is found, or it is missing
+   * another data view is selected as default and returned.
+   * @returns default data view
+   */
+
+  async getDefaultDataView() {
+    const patterns = await this.getIds();
+    let defaultId = await this.config.get('defaultIndex');
+    let defined = !!defaultId;
+    const exists = patterns.includes(defaultId);
+
+    if (defined && !exists) {
+      await this.config.remove('defaultIndex');
+      defaultId = defined = false;
+    }
+
+    if (patterns.length >= 1 && (await this.hasUserDataView().catch(() => true))) {
+      defaultId = patterns[0];
+      await this.config.set('defaultIndex', defaultId);
+    }
+
+    if (defaultId) {
+      return this.get(defaultId);
+    }
+  }
 }
 
 /**

From 2afb43b8699d91463be52f57e78d277fbd319471 Mon Sep 17 00:00:00 2001
From: Anton Dosov <anton.dosov@elastic.co>
Date: Wed, 13 Oct 2021 14:52:48 +0200
Subject: [PATCH 012/117] Replace EuiCodeEditor with CodeEditor in app-services
 code (#114316)

* code editor scripted fields

* filter_editor

* embeddable example

* clean

* update tests

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../dashboard_embeddable_examples/kibana.json |  3 +-
 .../public/app.tsx                            | 32 ++++++++++++-------
 .../public/by_value/input_editor.tsx          | 13 ++++----
 .../public/plugin.tsx                         |  3 +-
 .../tsconfig.json                             |  2 +-
 .../filter_editor/filter_editor.test.tsx      |  8 ++---
 .../ui/filter_bar/filter_editor/index.tsx     | 15 +++++----
 .../__snapshots__/field_editor.test.tsx.snap  | 28 ++++++++++------
 .../field_editor/field_editor.test.tsx        | 12 +++++--
 .../components/field_editor/field_editor.tsx  | 20 ++++++------
 test/examples/embeddables/dashboard.ts        | 14 ++------
 test/functional/page_objects/settings_page.ts | 10 ++----
 12 files changed, 85 insertions(+), 75 deletions(-)

diff --git a/examples/dashboard_embeddable_examples/kibana.json b/examples/dashboard_embeddable_examples/kibana.json
index e13f19194ef06..ba0c4a84836e7 100644
--- a/examples/dashboard_embeddable_examples/kibana.json
+++ b/examples/dashboard_embeddable_examples/kibana.json
@@ -16,6 +16,5 @@
     "githubTeam": "kibana-presentation"
   },
   "description": "Example app that shows how to embed a dashboard in an application",
-  "optionalPlugins": [],
-  "requiredBundles": ["esUiShared"]
+  "optionalPlugins": []
 }
diff --git a/examples/dashboard_embeddable_examples/public/app.tsx b/examples/dashboard_embeddable_examples/public/app.tsx
index 8a6b5a90a22a8..c44d67c49f3d7 100644
--- a/examples/dashboard_embeddable_examples/public/app.tsx
+++ b/examples/dashboard_embeddable_examples/public/app.tsx
@@ -18,9 +18,10 @@ import {
   EuiSideNav,
 } from '@elastic/eui';
 import 'brace/mode/json';
-import { AppMountParameters } from '../../../src/core/public';
+import { AppMountParameters, IUiSettingsClient } from '../../../src/core/public';
 import { DashboardEmbeddableByValue } from './by_value/embeddable';
 import { DashboardStart } from '../../../src/plugins/dashboard/public';
+import { KibanaContextProvider } from '../../../src/plugins/kibana_react/public';
 
 interface PageDef {
   title: string;
@@ -58,9 +59,14 @@ interface Props {
   DashboardContainerByValueRenderer: ReturnType<
     DashboardStart['getDashboardContainerByValueRenderer']
   >;
+  uiSettings: IUiSettingsClient;
 }
 
-const DashboardEmbeddableExplorerApp = ({ basename, DashboardContainerByValueRenderer }: Props) => {
+const DashboardEmbeddableExplorerApp = ({
+  basename,
+  DashboardContainerByValueRenderer,
+  uiSettings,
+}: Props) => {
   const pages: PageDef[] = [
     {
       title: 'By value dashboard embeddable',
@@ -83,16 +89,18 @@ const DashboardEmbeddableExplorerApp = ({ basename, DashboardContainerByValueRen
   ));
 
   return (
-    <Router basename={basename}>
-      <EuiPage>
-        <EuiPageSideBar>
-          <Nav pages={pages} />
-        </EuiPageSideBar>
-        <EuiPageContent>
-          <EuiPageContentBody>{routes}</EuiPageContentBody>
-        </EuiPageContent>
-      </EuiPage>
-    </Router>
+    <KibanaContextProvider services={{ uiSettings }}>
+      <Router basename={basename}>
+        <EuiPage>
+          <EuiPageSideBar>
+            <Nav pages={pages} />
+          </EuiPageSideBar>
+          <EuiPageContent>
+            <EuiPageContentBody>{routes}</EuiPageContentBody>
+          </EuiPageContent>
+        </EuiPage>
+      </Router>
+    </KibanaContextProvider>
   );
 };
 
diff --git a/examples/dashboard_embeddable_examples/public/by_value/input_editor.tsx b/examples/dashboard_embeddable_examples/public/by_value/input_editor.tsx
index 3e6487ea0b88c..a723712f395d0 100644
--- a/examples/dashboard_embeddable_examples/public/by_value/input_editor.tsx
+++ b/examples/dashboard_embeddable_examples/public/by_value/input_editor.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { EuiButton } from '@elastic/eui';
-import { JsonEditor } from '../../../../src/plugins/es_ui_shared/public';
+import { CodeEditor } from '../../../../src/plugins/kibana_react/public';
 
 export const InputEditor = <T,>(props: { input: T; onSubmit: (value: T) => void }) => {
   const input = JSON.stringify(props.input, null, 4);
@@ -26,12 +26,13 @@ export const InputEditor = <T,>(props: { input: T; onSubmit: (value: T) => void
   }, [input]);
   return (
     <>
-      <JsonEditor
+      <CodeEditor
+        languageId={'json'}
         value={value}
-        onUpdate={(v) => setValue(v.data.raw)}
-        euiCodeEditorProps={{
-          'data-test-subj': 'dashboardEmbeddableByValueInputEditor',
-        }}
+        width={'100%'}
+        height={'400px'}
+        onChange={(v) => setValue(v)}
+        data-test-subj={'dashboardEmbeddableByValueInputEditor'}
       />
       <EuiButton
         onClick={() => props.onSubmit(JSON.parse(value))}
diff --git a/examples/dashboard_embeddable_examples/public/plugin.tsx b/examples/dashboard_embeddable_examples/public/plugin.tsx
index 5fd3e01f2ca71..14bd71523ef2f 100644
--- a/examples/dashboard_embeddable_examples/public/plugin.tsx
+++ b/examples/dashboard_embeddable_examples/public/plugin.tsx
@@ -27,7 +27,7 @@ export class DashboardEmbeddableExamples implements Plugin<void, void, {}, Start
       title: 'Dashboard embeddable examples',
       navLinkStatus: AppNavLinkStatus.hidden,
       async mount(params: AppMountParameters) {
-        const [, depsStart] = await core.getStartServices();
+        const [coreStart, depsStart] = await core.getStartServices();
         const { renderApp } = await import('./app');
         await depsStart.embeddableExamples.createSampleData();
         return renderApp(
@@ -35,6 +35,7 @@ export class DashboardEmbeddableExamples implements Plugin<void, void, {}, Start
             basename: params.appBasePath,
             DashboardContainerByValueRenderer:
               depsStart.dashboard.getDashboardContainerByValueRenderer(),
+            uiSettings: coreStart.uiSettings,
           },
           params.element
         );
diff --git a/examples/dashboard_embeddable_examples/tsconfig.json b/examples/dashboard_embeddable_examples/tsconfig.json
index 1c10d59de561f..f17d3ae29f8e7 100644
--- a/examples/dashboard_embeddable_examples/tsconfig.json
+++ b/examples/dashboard_embeddable_examples/tsconfig.json
@@ -15,7 +15,7 @@
     { "path": "../../src/core/tsconfig.json" },
     { "path": "../../src/plugins/dashboard/tsconfig.json" },
     { "path": "../../src/plugins/embeddable/tsconfig.json" },
-    { "path": "../../src/plugins/es_ui_shared/tsconfig.json" },
+    { "path": "../../src/plugins/kibana_react/tsconfig.json" },
     { "path": "../embeddable_examples/tsconfig.json" },
     { "path": "../developer_examples/tsconfig.json" },
   ]
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/filter_editor.test.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/filter_editor.test.tsx
index 4760968b65539..3a0c0db96c5de 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/filter_editor.test.tsx
+++ b/src/plugins/data/public/ui/filter_bar/filter_editor/filter_editor.test.tsx
@@ -10,14 +10,14 @@ import { registerTestBed, TestBed } from '@kbn/test/jest';
 import { FilterEditor, Props } from '.';
 import React from 'react';
 
-jest.mock('@elastic/eui', () => {
-  const original = jest.requireActual('@elastic/eui');
+jest.mock('../../../../../kibana_react/public', () => {
+  const original = jest.requireActual('../../../../../kibana_react/public');
 
   return {
     ...original,
-    EuiCodeEditor: (props: any) => (
+    CodeEditor: (props: any) => (
       <input
-        data-test-subj={props['data-test-subj'] || 'mockEuiCodeEditor'}
+        data-test-subj={props['data-test-subj'] || 'mockCodeEditor'}
         value={props.value}
         onChange={async (eve: any) => {
           props.onChange(eve.target.value);
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx
index 9bf090b8240a6..aeff61739be4d 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx
+++ b/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx
@@ -9,8 +9,6 @@
 import {
   EuiButton,
   EuiButtonEmpty,
-  // @ts-ignore
-  EuiCodeEditor,
   EuiFieldText,
   EuiFlexGroup,
   EuiFlexItem,
@@ -33,6 +31,7 @@ import {
 } from '@kbn/es-query';
 import { get } from 'lodash';
 import React, { Component } from 'react';
+import { XJsonLang } from '@kbn/monaco';
 import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box';
 import {
   getFieldFromFilter,
@@ -47,6 +46,7 @@ import { PhrasesValuesInput } from './phrases_values_input';
 import { RangeValueInput } from './range_value_input';
 import { getIndexPatternFromFilter } from '../../../query';
 import { IIndexPattern, IFieldType } from '../../..';
+import { CodeEditor } from '../../../../../kibana_react/public';
 
 export interface Props {
   filter: Filter;
@@ -328,13 +328,16 @@ class FilterEditorUI extends Component<Props, State> {
           defaultMessage: 'Elasticsearch Query DSL',
         })}
       >
-        <EuiCodeEditor
+        <CodeEditor
+          languageId={XJsonLang.ID}
+          width="100%"
+          height={'250px'}
           value={this.state.queryDsl}
           onChange={this.onQueryDslChange}
-          mode="json"
-          width="100%"
-          height="250px"
           data-test-subj="customEditorInput"
+          aria-label={i18n.translate('data.filter.filterEditor.queryDslAriaLabel', {
+            defaultMessage: 'Elasticsearch Query DSL editor',
+          })}
         />
       </EuiFormRow>
     );
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/__snapshots__/field_editor.test.tsx.snap b/src/plugins/index_pattern_management/public/components/field_editor/__snapshots__/field_editor.test.tsx.snap
index 933948411cc72..b9d1b3992778f 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/__snapshots__/field_editor.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/field_editor/__snapshots__/field_editor.test.tsx.snap
@@ -172,11 +172,13 @@ exports[`FieldEditor should render create new scripted field correctly 1`] = `
       isInvalid={true}
       label="Script"
     >
-      <eui-code-editor
+      <code-editor
+        aria-label="Script editor"
         data-test-subj="editorFieldScript"
         height="300px"
-        mode="groovy"
+        languageId="painless"
         onChange={[Function]}
+        value=""
         width="100%"
       />
     </eui-form-row>
@@ -407,10 +409,11 @@ exports[`FieldEditor should render edit scripted field correctly 1`] = `
       isInvalid={false}
       label="Script"
     >
-      <eui-code-editor
+      <code-editor
+        aria-label="Script editor"
         data-test-subj="editorFieldScript"
         height="300px"
-        mode="groovy"
+        languageId="painless"
         onChange={[Function]}
         value="doc.test.value"
         width="100%"
@@ -705,11 +708,13 @@ exports[`FieldEditor should show conflict field warning 1`] = `
       isInvalid={true}
       label="Script"
     >
-      <eui-code-editor
+      <code-editor
+        aria-label="Script editor"
         data-test-subj="editorFieldScript"
         height="300px"
-        mode="groovy"
+        languageId="painless"
         onChange={[Function]}
+        value=""
         width="100%"
       />
     </eui-form-row>
@@ -1033,10 +1038,11 @@ exports[`FieldEditor should show deprecated lang warning 1`] = `
       isInvalid={false}
       label="Script"
     >
-      <eui-code-editor
+      <code-editor
+        aria-label="Script editor"
         data-test-subj="editorFieldScript"
         height="300px"
-        mode="groovy"
+        languageId="painless"
         onChange={[Function]}
         value="doc.test.value"
         width="100%"
@@ -1387,11 +1393,13 @@ exports[`FieldEditor should show multiple type field warning with a table contai
       isInvalid={true}
       label="Script"
     >
-      <eui-code-editor
+      <code-editor
+        aria-label="Script editor"
         data-test-subj="editorFieldScript"
         height="300px"
-        mode="groovy"
+        languageId="painless"
         onChange={[Function]}
+        value=""
         width="100%"
       />
     </eui-form-row>
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx
index 584662acbe62f..46255c72c6a99 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx
@@ -10,8 +10,6 @@ import { IndexPattern, IndexPatternField, IndexPatternsService } from 'src/plugi
 import { FieldFormatInstanceType } from 'src/plugins/field_formats/common';
 import { findTestSubject } from '@elastic/eui/lib/test';
 
-jest.mock('brace/mode/groovy', () => ({}));
-
 import { FieldEditor, FieldEdiorProps } from './field_editor';
 
 import { mockManagementPlugin } from '../../mocks';
@@ -23,7 +21,6 @@ jest.mock('@elastic/eui', () => ({
   EuiButtonEmpty: 'eui-button-empty',
   EuiCallOut: 'eui-call-out',
   EuiCode: 'eui-code',
-  EuiCodeEditor: 'eui-code-editor',
   EuiConfirmModal: 'eui-confirm-modal',
   EuiFieldNumber: 'eui-field-number',
   EuiFieldText: 'eui-field-text',
@@ -42,6 +39,15 @@ jest.mock('@elastic/eui', () => ({
   euiPaletteColorBlind: () => ['red'],
 }));
 
+jest.mock('../../../../kibana_react/public', () => {
+  const original = jest.requireActual('../../../../kibana_react/public');
+
+  return {
+    ...original,
+    CodeEditor: `code-editor`,
+  };
+});
+
 jest.mock('../../scripting_languages', () => ({
   getEnabledScriptingLanguages: () => ['painless', 'testlang'],
   getSupportedScriptingLanguages: () => ['painless'],
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx
index bdc18938f9d6c..695d02d0744fb 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx
+++ b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx
@@ -15,7 +15,6 @@ import {
   EuiButtonEmpty,
   EuiCallOut,
   EuiCode,
-  EuiCodeEditor,
   EuiConfirmModal,
   EuiFieldNumber,
   EuiFieldText,
@@ -33,6 +32,7 @@ import {
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { PainlessLang } from '@kbn/monaco';
 import type { FieldFormatInstanceType } from 'src/plugins/field_formats/common';
 import {
   getEnabledScriptingLanguages,
@@ -46,7 +46,7 @@ import {
   ES_FIELD_TYPES,
   DataPublicPluginStart,
 } from '../../../../../plugins/data/public';
-import { context as contextType } from '../../../../kibana_react/public';
+import { context as contextType, CodeEditor } from '../../../../kibana_react/public';
 import {
   ScriptingDisabledCallOut,
   ScriptingWarningCallOut,
@@ -59,9 +59,6 @@ import { IndexPatternManagmentContextValue } from '../../types';
 import { FIELD_TYPES_BY_LANG, DEFAULT_FIELD_TYPES } from './constants';
 import { executeScript, isScriptValid } from './lib';
 
-// This loads Ace editor's "groovy" mode, used below to highlight the script.
-import 'brace/mode/groovy';
-
 const getFieldTypeFormatsList = (
   field: IndexPatternField['spec'],
   defaultFieldFormat: FieldFormatInstanceType,
@@ -594,13 +591,16 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
           isInvalid={isInvalid}
           error={isInvalid ? errorMsg : null}
         >
-          <EuiCodeEditor
-            value={spec.script}
-            data-test-subj="editorFieldScript"
-            onChange={this.onScriptChange}
-            mode="groovy"
+          <CodeEditor
+            languageId={PainlessLang.ID}
             width="100%"
             height="300px"
+            value={spec.script ?? ''}
+            onChange={this.onScriptChange}
+            data-test-subj="editorFieldScript"
+            aria-label={i18n.translate('indexPatternManagement.scriptLabelAriaLabel', {
+              defaultMessage: 'Script editor',
+            })}
           />
         </EuiFormRow>
 
diff --git a/test/examples/embeddables/dashboard.ts b/test/examples/embeddables/dashboard.ts
index 77ad5a5da9eeb..b97905ca9ce6a 100644
--- a/test/examples/embeddables/dashboard.ts
+++ b/test/examples/embeddables/dashboard.ts
@@ -95,10 +95,10 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
   const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
   const pieChart = getService('pieChart');
-  const browser = getService('browser');
   const dashboardExpect = getService('dashboardExpect');
   const elasticChart = getService('elasticChart');
   const PageObjects = getPageObjects(['common', 'visChart']);
+  const monacoEditor = getService('monacoEditor');
 
   describe('dashboard container', () => {
     before(async () => {
@@ -128,17 +128,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
   });
 
   async function updateInput(input: string) {
-    const editorWrapper = await (
-      await testSubjects.find('dashboardEmbeddableByValueInputEditor')
-    ).findByClassName('ace_editor');
-    const editorId = await editorWrapper.getAttribute('id');
-    await browser.execute(
-      (_editorId: string, _input: string) => {
-        return (window as any).ace.edit(_editorId).setValue(_input);
-      },
-      editorId,
-      input
-    );
+    await monacoEditor.setCodeEditorValue(input);
     await testSubjects.click('dashboardEmbeddableByValueInputSubmit');
   }
 }
diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
index 2645148467d58..b929a78072868 100644
--- a/test/functional/page_objects/settings_page.ts
+++ b/test/functional/page_objects/settings_page.ts
@@ -21,6 +21,7 @@ export class SettingsPageObject extends FtrService {
   private readonly header = this.ctx.getPageObject('header');
   private readonly common = this.ctx.getPageObject('common');
   private readonly savedObjects = this.ctx.getPageObject('savedObjects');
+  private readonly monacoEditor = this.ctx.getService('monacoEditor');
 
   async clickNavigation() {
     await this.find.clickDisplayedByCssSelector('.app-link:nth-child(5) a');
@@ -725,14 +726,7 @@ export class SettingsPageObject extends FtrService {
 
   async setScriptedFieldScript(script: string) {
     this.log.debug('set scripted field script = ' + script);
-    const aceEditorCssSelector = '[data-test-subj="editorFieldScript"] .ace_editor';
-    const editor = await this.find.byCssSelector(aceEditorCssSelector);
-    await editor.click();
-    const existingText = await editor.getVisibleText();
-    for (let i = 0; i < existingText.length; i++) {
-      await this.browser.pressKeys(this.browser.keys.BACK_SPACE);
-    }
-    await this.browser.pressKeys(...script.split(''));
+    await this.monacoEditor.setCodeEditorValue(script);
   }
 
   async openScriptedFieldHelp(activeTab: string) {

From 45e07af1fa32c3c4b1a40fb1a513cb97801ec0f7 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Wed, 13 Oct 2021 14:55:06 +0200
Subject: [PATCH 013/117] [Reporting] Add new `data-render-error` attribute
 (#114472)

* added new data-render-error attribute, read it and store it on job object

* added data-render-error to the example app

* added jest test

* address pr feedback

- make renderErrors optional in interfaces
- create separate selectors for data render error selector/attr
- Tidy up mergeMap behaviour

* fix observable.test.ts snapshots and browser driver mock

* updated jest snapshots

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../public/components/app.tsx                 |  7 +-
 .../export_types/common/generate_png.ts       |  3 +
 .../printable_pdf/lib/generate_pdf.ts         |  3 +
 .../printable_pdf_v2/lib/generate_pdf.ts      |  3 +
 .../server/lib/layouts/create_layout.test.ts  |  6 ++
 .../reporting/server/lib/layouts/index.ts     |  4 +
 .../server/lib/screenshots/constants.ts       |  1 +
 .../lib/screenshots/get_render_errors.test.ts | 82 +++++++++++++++++++
 .../lib/screenshots/get_render_errors.ts      | 53 ++++++++++++
 .../reporting/server/lib/screenshots/index.ts |  7 ++
 .../server/lib/screenshots/observable.test.ts |  6 ++
 .../server/lib/screenshots/observable.ts      | 15 +++-
 .../create_mock_browserdriverfactory.ts       |  3 +
 .../create_mock_layoutinstance.ts             |  2 +
 14 files changed, 191 insertions(+), 4 deletions(-)
 create mode 100644 x-pack/plugins/reporting/server/lib/screenshots/get_render_errors.test.ts
 create mode 100644 x-pack/plugins/reporting/server/lib/screenshots/get_render_errors.ts

diff --git a/x-pack/examples/reporting_example/public/components/app.tsx b/x-pack/examples/reporting_example/public/components/app.tsx
index a34cd0ab518de..3e2f08fc89c7b 100644
--- a/x-pack/examples/reporting_example/public/components/app.tsx
+++ b/x-pack/examples/reporting_example/public/components/app.tsx
@@ -244,7 +244,12 @@ export const ReportingExampleApp = ({
                         )}
                       </EuiFlexItem>
                       {logos.map((item, index) => (
-                        <EuiFlexItem key={index} data-shared-item>
+                        <EuiFlexItem
+                          key={index}
+                          data-shared-item
+                          data-shared-render-error
+                          data-render-error="This is an example error"
+                        >
                           <EuiCard
                             icon={<EuiIcon size="xxl" type={`logo${item}`} />}
                             title={`Elastic ${item}`}
diff --git a/x-pack/plugins/reporting/server/export_types/common/generate_png.ts b/x-pack/plugins/reporting/server/export_types/common/generate_png.ts
index b6f9c3fba8ea9..85e9513c4a618 100644
--- a/x-pack/plugins/reporting/server/export_types/common/generate_png.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/generate_png.ts
@@ -54,6 +54,9 @@ export async function generatePngObservableFactory(reporting: ReportingCore) {
           if (current.error) {
             found.push(current.error.message);
           }
+          if (current.renderErrors) {
+            found.push(...current.renderErrors);
+          }
           return found;
         }, [] as string[]),
       })),
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
index 74b013edc8cab..dce6ea678bded 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
@@ -108,6 +108,9 @@ export async function generatePdfObservableFactory(reporting: ReportingCore) {
             if (current.error) {
               found.push(current.error.message);
             }
+            if (current.renderErrors) {
+              found.push(...current.renderErrors);
+            }
             return found;
           }, [] as string[]),
         };
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts
index 9fb31a1104279..b44e2ca4441eb 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts
@@ -120,6 +120,9 @@ export async function generatePdfObservableFactory(reporting: ReportingCore) {
             if (current.error) {
               found.push(current.error.message);
             }
+            if (current.renderErrors) {
+              found.push(...current.renderErrors);
+            }
             return found;
           }, [] as string[]),
         };
diff --git a/x-pack/plugins/reporting/server/lib/layouts/create_layout.test.ts b/x-pack/plugins/reporting/server/lib/layouts/create_layout.test.ts
index f5c2373fc4bf0..aebd20451b834 100644
--- a/x-pack/plugins/reporting/server/lib/layouts/create_layout.test.ts
+++ b/x-pack/plugins/reporting/server/lib/layouts/create_layout.test.ts
@@ -32,6 +32,8 @@ describe('Create Layout', () => {
         "selectors": Object {
           "itemsCountAttribute": "data-shared-items-count",
           "renderComplete": "[data-shared-item]",
+          "renderError": "[data-render-error]",
+          "renderErrorAttribute": "data-render-error",
           "screenshot": "[data-shared-items-container]",
           "timefilterDurationAttribute": "data-shared-timefilter-duration",
         },
@@ -63,6 +65,8 @@ describe('Create Layout', () => {
         "selectors": Object {
           "itemsCountAttribute": "data-shared-items-count",
           "renderComplete": "[data-shared-item]",
+          "renderError": "[data-render-error]",
+          "renderErrorAttribute": "data-render-error",
           "screenshot": "[data-shared-item]",
           "timefilterDurationAttribute": "data-shared-timefilter-duration",
         },
@@ -91,6 +95,8 @@ describe('Create Layout', () => {
         "selectors": Object {
           "itemsCountAttribute": "data-shared-items-count",
           "renderComplete": "[data-shared-item]",
+          "renderError": "[data-render-error]",
+          "renderErrorAttribute": "data-render-error",
           "screenshot": "[data-shared-items-container]",
           "timefilterDurationAttribute": "data-shared-timefilter-duration",
         },
diff --git a/x-pack/plugins/reporting/server/lib/layouts/index.ts b/x-pack/plugins/reporting/server/lib/layouts/index.ts
index 9729508f955c7..b721565b1d771 100644
--- a/x-pack/plugins/reporting/server/lib/layouts/index.ts
+++ b/x-pack/plugins/reporting/server/lib/layouts/index.ts
@@ -13,6 +13,8 @@ import type { Layout } from './layout';
 export interface LayoutSelectorDictionary {
   screenshot: string;
   renderComplete: string;
+  renderError: string;
+  renderErrorAttribute: string;
   itemsCountAttribute: string;
   timefilterDurationAttribute: string;
 }
@@ -33,6 +35,8 @@ export const LayoutTypes = {
 export const getDefaultLayoutSelectors = (): LayoutSelectorDictionary => ({
   screenshot: '[data-shared-items-container]',
   renderComplete: '[data-shared-item]',
+  renderError: '[data-render-error]',
+  renderErrorAttribute: 'data-render-error',
   itemsCountAttribute: 'data-shared-items-count',
   timefilterDurationAttribute: 'data-shared-timefilter-duration',
 });
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/constants.ts b/x-pack/plugins/reporting/server/lib/screenshots/constants.ts
index 226f5bc52d8d9..c62b910630874 100644
--- a/x-pack/plugins/reporting/server/lib/screenshots/constants.ts
+++ b/x-pack/plugins/reporting/server/lib/screenshots/constants.ts
@@ -11,6 +11,7 @@ export const DEFAULT_PAGELOAD_SELECTOR = `.${APP_WRAPPER_CLASS}`;
 export const CONTEXT_GETNUMBEROFITEMS = 'GetNumberOfItems';
 export const CONTEXT_INJECTCSS = 'InjectCss';
 export const CONTEXT_WAITFORRENDER = 'WaitForRender';
+export const CONTEXT_GETRENDERERRORS = 'GetVisualisationsRenderErrors';
 export const CONTEXT_GETTIMERANGE = 'GetTimeRange';
 export const CONTEXT_ELEMENTATTRIBUTES = 'ElementPositionAndAttributes';
 export const CONTEXT_WAITFORELEMENTSTOBEINDOM = 'WaitForElementsToBeInDOM';
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/get_render_errors.test.ts b/x-pack/plugins/reporting/server/lib/screenshots/get_render_errors.test.ts
new file mode 100644
index 0000000000000..d29c0936bfceb
--- /dev/null
+++ b/x-pack/plugins/reporting/server/lib/screenshots/get_render_errors.test.ts
@@ -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.
+ */
+
+import { HeadlessChromiumDriver } from '../../browsers';
+import {
+  createMockBrowserDriverFactory,
+  createMockConfig,
+  createMockConfigSchema,
+  createMockLayoutInstance,
+  createMockLevelLogger,
+  createMockReportingCore,
+} from '../../test_helpers';
+import { CaptureConfig } from '../../types';
+import { LayoutInstance } from '../layouts';
+import { LevelLogger } from '../level_logger';
+import { getRenderErrors } from './get_render_errors';
+
+describe('getRenderErrors', () => {
+  let captureConfig: CaptureConfig;
+  let layout: LayoutInstance;
+  let logger: jest.Mocked<LevelLogger>;
+  let browser: HeadlessChromiumDriver;
+
+  beforeEach(async () => {
+    const schema = createMockConfigSchema();
+    const config = createMockConfig(schema);
+    const core = await createMockReportingCore(schema);
+
+    captureConfig = config.get('capture');
+    layout = createMockLayoutInstance(captureConfig);
+    logger = createMockLevelLogger();
+
+    await createMockBrowserDriverFactory(core, logger, {
+      evaluate: jest.fn(
+        async <T extends (...args: unknown[]) => unknown>({
+          fn,
+          args,
+        }: {
+          fn: T;
+          args: Parameters<T>;
+        }) => fn(...args)
+      ),
+      getCreatePage: (driver) => {
+        browser = driver;
+
+        return jest.fn();
+      },
+    });
+  });
+
+  afterEach(() => {
+    document.body.innerHTML = '';
+  });
+
+  it('should extract the error messages', async () => {
+    document.body.innerHTML = `
+      <div dataRenderErrorSelector="a test error" />
+      <div dataRenderErrorSelector="a test error" />
+      <div dataRenderErrorSelector="a test error" />
+      <div dataRenderErrorSelector="a test error" />
+    `;
+
+    await expect(getRenderErrors(browser, layout, logger)).resolves.toEqual([
+      'a test error',
+      'a test error',
+      'a test error',
+      'a test error',
+    ]);
+  });
+
+  it('should extract the error messages, even when there are none', async () => {
+    document.body.innerHTML = `
+      <renderedSelector />
+    `;
+
+    await expect(getRenderErrors(browser, layout, logger)).resolves.toEqual(undefined);
+  });
+});
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/get_render_errors.ts b/x-pack/plugins/reporting/server/lib/screenshots/get_render_errors.ts
new file mode 100644
index 0000000000000..ded4ed6238872
--- /dev/null
+++ b/x-pack/plugins/reporting/server/lib/screenshots/get_render_errors.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+import type { HeadlessChromiumDriver } from '../../browsers';
+import type { LayoutInstance } from '../layouts';
+import { LevelLogger, startTrace } from '../';
+import { CONTEXT_GETRENDERERRORS } from './constants';
+
+export const getRenderErrors = async (
+  browser: HeadlessChromiumDriver,
+  layout: LayoutInstance,
+  logger: LevelLogger
+): Promise<undefined | string[]> => {
+  const endTrace = startTrace('get_render_errors', 'read');
+  logger.debug('reading render errors');
+  const errorsFound: undefined | string[] = await browser.evaluate(
+    {
+      fn: (errorSelector, errorAttribute) => {
+        const visualizations: Element[] = Array.from(document.querySelectorAll(errorSelector));
+        const errors: string[] = [];
+
+        visualizations.forEach((visualization) => {
+          const errorMessage = visualization.getAttribute(errorAttribute);
+          if (errorMessage) {
+            errors.push(errorMessage);
+          }
+        });
+
+        return errors.length ? errors : undefined;
+      },
+      args: [layout.selectors.renderError, layout.selectors.renderErrorAttribute],
+    },
+    { context: CONTEXT_GETRENDERERRORS },
+    logger
+  );
+  endTrace();
+
+  if (errorsFound?.length) {
+    logger.warning(
+      i18n.translate('xpack.reporting.screencapture.renderErrorsFound', {
+        defaultMessage: 'Found {count} error messages. See report object for more information.',
+        values: { count: errorsFound.length },
+      })
+    );
+  }
+
+  return errorsFound;
+};
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/index.ts b/x-pack/plugins/reporting/server/lib/screenshots/index.ts
index 6615cbdc79c94..1ca8b5e00fee4 100644
--- a/x-pack/plugins/reporting/server/lib/screenshots/index.ts
+++ b/x-pack/plugins/reporting/server/lib/screenshots/index.ts
@@ -53,5 +53,12 @@ export interface ScreenshotResults {
   timeRange: string | null;
   screenshots: Screenshot[];
   error?: Error;
+
+  /**
+   * Individual visualizations might encounter errors at runtime. If there are any they are added to this
+   * field. Any text captured here is intended to be shown to the user for debugging purposes, reporting
+   * does no further sanitization on these strings.
+   */
+  renderErrors?: string[];
   elementsPositionAndAttributes?: ElementsPositionAndAttribute[]; // NOTE: for testing
 }
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts b/x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts
index 901abe7a7b3fb..c33bdad44f9e7 100644
--- a/x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts
+++ b/x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts
@@ -98,6 +98,7 @@ describe('Screenshot Observable Pipeline', () => {
             },
           ],
           "error": undefined,
+          "renderErrors": undefined,
           "screenshots": Array [
             Object {
               "data": Object {
@@ -172,6 +173,7 @@ describe('Screenshot Observable Pipeline', () => {
             },
           ],
           "error": undefined,
+          "renderErrors": undefined,
           "screenshots": Array [
             Object {
               "data": Object {
@@ -223,6 +225,7 @@ describe('Screenshot Observable Pipeline', () => {
             },
           ],
           "error": undefined,
+          "renderErrors": undefined,
           "screenshots": Array [
             Object {
               "data": Object {
@@ -312,6 +315,7 @@ describe('Screenshot Observable Pipeline', () => {
                     },
                   ],
                   "error": [Error: An error occurred when trying to read the page for visualization panel info. You may need to increase 'xpack.reporting.capture.timeouts.waitForElements'. Error: Mock error!],
+                  "renderErrors": undefined,
                   "screenshots": Array [
                     Object {
                       "data": Object {
@@ -354,6 +358,7 @@ describe('Screenshot Observable Pipeline', () => {
                     },
                   ],
                   "error": [Error: An error occurred when trying to read the page for visualization panel info. You may need to increase 'xpack.reporting.capture.timeouts.waitForElements'. Error: Mock error!],
+                  "renderErrors": undefined,
                   "screenshots": Array [
                     Object {
                       "data": Object {
@@ -460,6 +465,7 @@ describe('Screenshot Observable Pipeline', () => {
               },
             ],
             "error": undefined,
+            "renderErrors": undefined,
             "screenshots": Array [
               Object {
                 "data": Object {
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/observable.ts b/x-pack/plugins/reporting/server/lib/screenshots/observable.ts
index 317b50b83548f..b8fecdc91a3f2 100644
--- a/x-pack/plugins/reporting/server/lib/screenshots/observable.ts
+++ b/x-pack/plugins/reporting/server/lib/screenshots/observable.ts
@@ -17,6 +17,7 @@ import { getElementPositionAndAttributes } from './get_element_position_data';
 import { getNumberOfItems } from './get_number_of_items';
 import { getScreenshots } from './get_screenshots';
 import { getTimeRange } from './get_time_range';
+import { getRenderErrors } from './get_render_errors';
 import { injectCustomCss } from './inject_css';
 import { openUrl } from './open_url';
 import { waitForRenderComplete } from './wait_for_render';
@@ -28,6 +29,7 @@ const DEFAULT_SCREENSHOT_CLIP_WIDTH = 1800;
 interface ScreenSetupData {
   elementsPositionAndAttributes: ElementsPositionAndAttribute[] | null;
   timeRange: string | null;
+  renderErrors?: string[];
   error?: Error;
 }
 
@@ -98,16 +100,22 @@ export function getScreenshots$(
               return await Promise.all([
                 getTimeRange(driver, layout, logger),
                 getElementPositionAndAttributes(driver, layout, logger),
-              ]).then(([timeRange, elementsPositionAndAttributes]) => ({
+                getRenderErrors(driver, layout, logger),
+              ]).then(([timeRange, elementsPositionAndAttributes, renderErrors]) => ({
                 elementsPositionAndAttributes,
                 timeRange,
+                renderErrors,
               }));
             }),
             catchError((err) => {
               checkPageIsOpen(driver); // if browser has closed, throw a relevant error about it
 
               logger.error(err);
-              return Rx.of({ elementsPositionAndAttributes: null, timeRange: null, error: err });
+              return Rx.of({
+                elementsPositionAndAttributes: null,
+                timeRange: null,
+                error: err,
+              });
             })
           );
 
@@ -120,11 +128,12 @@ export function getScreenshots$(
                 ? data.elementsPositionAndAttributes
                 : getDefaultElementPosition(layout.getViewport(1));
               const screenshots = await getScreenshots(driver, elements, logger);
-              const { timeRange, error: setupError } = data;
+              const { timeRange, error: setupError, renderErrors } = data;
               return {
                 timeRange,
                 screenshots,
                 error: setupError,
+                renderErrors,
                 elementsPositionAndAttributes: elements,
               };
             })
diff --git a/x-pack/plugins/reporting/server/test_helpers/create_mock_browserdriverfactory.ts b/x-pack/plugins/reporting/server/test_helpers/create_mock_browserdriverfactory.ts
index 83cdc986bb048..d42fb73b447a5 100644
--- a/x-pack/plugins/reporting/server/test_helpers/create_mock_browserdriverfactory.ts
+++ b/x-pack/plugins/reporting/server/test_helpers/create_mock_browserdriverfactory.ts
@@ -78,6 +78,9 @@ mockBrowserEvaluate.mockImplementation(() => {
   if (mockCall === contexts.CONTEXT_ELEMENTATTRIBUTES) {
     return Promise.resolve(getMockElementsPositionAndAttributes('Default Mock Title', 'Default '));
   }
+  if (mockCall === contexts.CONTEXT_GETRENDERERRORS) {
+    return Promise.resolve();
+  }
   throw new Error(mockCall);
 });
 const mockScreenshot = jest.fn(async () => Buffer.from('screenshot'));
diff --git a/x-pack/plugins/reporting/server/test_helpers/create_mock_layoutinstance.ts b/x-pack/plugins/reporting/server/test_helpers/create_mock_layoutinstance.ts
index 0edbea9311db2..e9b94c3c98bec 100644
--- a/x-pack/plugins/reporting/server/test_helpers/create_mock_layoutinstance.ts
+++ b/x-pack/plugins/reporting/server/test_helpers/create_mock_layoutinstance.ts
@@ -18,6 +18,8 @@ export const createMockLayoutInstance = (captureConfig: CaptureConfig) => {
     renderComplete: 'renderedSelector',
     itemsCountAttribute: 'itemsSelector',
     screenshot: 'screenshotSelector',
+    renderError: '[dataRenderErrorSelector]',
+    renderErrorAttribute: 'dataRenderErrorSelector',
     timefilterDurationAttribute: 'timefilterDurationSelector',
   };
   return mockLayout;

From 8068eecbde9d2c53169869b369e9a332f9c6c327 Mon Sep 17 00:00:00 2001
From: Clint Andrew Hall <clint.hall@elastic.co>
Date: Wed, 13 Oct 2021 08:17:49 -0500
Subject: [PATCH 014/117] [fleet] Add Integration Preference selector (#114432)

---
 .../services/stub/fixtures/integrations.ts    | 1861 +------
 .../integrations/hooks/use_local_search.tsx   |    2 +-
 .../integration_preference.stories.tsx        |   36 +
 .../epm/components/integration_preference.tsx |  120 +
 .../epm/components/package_list_grid.tsx      |    2 +-
 .../epm/screens/home/available_packages.tsx   |   50 +-
 .../epm/screens/home/home.stories.tsx         |    1 -
 .../sections/epm/screens/home/index.tsx       |    6 +-
 .../storybook/context/fixtures/packages.ts    | 4680 +----------------
 .../fixtures/replacement_integrations.ts      |   62 +
 .../plugins/fleet/storybook/context/http.ts   |    2 +
 .../plugins/fleet/storybook/context/index.tsx |    5 +-
 12 files changed, 518 insertions(+), 6309 deletions(-)
 create mode 100644 x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/integration_preference.stories.tsx
 create mode 100644 x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/integration_preference.tsx
 create mode 100644 x-pack/plugins/fleet/storybook/context/fixtures/replacement_integrations.ts

diff --git a/src/plugins/custom_integrations/public/services/stub/fixtures/integrations.ts b/src/plugins/custom_integrations/public/services/stub/fixtures/integrations.ts
index 7553deada9e26..5e4427a66cc76 100644
--- a/src/plugins/custom_integrations/public/services/stub/fixtures/integrations.ts
+++ b/src/plugins/custom_integrations/public/services/stub/fixtures/integrations.ts
@@ -10,1875 +10,54 @@ import type { CustomIntegration } from '../../../../common';
 
 export const integrations: CustomIntegration[] = [
   {
-    type: 'ui_link',
-    id: 'System logs',
-    title: 'System logs',
-    categories: ['os_system', 'security'],
-    uiInternalPath: '/app/home#/tutorial/systemLogs',
-    description: 'Collect system logs of common Unix/Linux based distributions.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoLogging',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'system',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'System metrics',
-    title: 'System metrics',
-    categories: ['os_system', 'security'],
-    uiInternalPath: '/app/home#/tutorial/systemMetrics',
-    description: 'Collect CPU, memory, network, and disk statistics from the host.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/system.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'system',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Apache logs',
-    title: 'Apache logs',
-    categories: ['web'],
-    uiInternalPath: '/app/home#/tutorial/apacheLogs',
-    description: 'Collect and parse access and error logs created by the Apache HTTP server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoApache',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'apache',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Apache metrics',
-    title: 'Apache metrics',
-    categories: ['web'],
-    uiInternalPath: '/app/home#/tutorial/apacheMetrics',
-    description: 'Fetch internal metrics from the Apache 2 HTTP server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoApache',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'apache',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Elasticsearch logs',
-    title: 'Elasticsearch logs',
-    categories: ['containers', 'os_system'],
-    uiInternalPath: '/app/home#/tutorial/elasticsearchLogs',
-    description: 'Collect and parse logs created by Elasticsearch.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoElasticsearch',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'elasticsearch',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'IIS logs',
-    title: 'IIS logs',
-    categories: ['web'],
-    uiInternalPath: '/app/home#/tutorial/iisLogs',
-    description: 'Collect and parse access and error logs created by the IIS HTTP server.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/iis.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'iis',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Kafka logs',
-    title: 'Kafka logs',
-    categories: ['message_queue'],
-    uiInternalPath: '/app/home#/tutorial/kafkaLogs',
-    description: 'Collect and parse logs created by Kafka.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoKafka',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'kafka',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Logstash logs',
-    title: 'Logstash logs',
-    categories: ['custom'],
-    uiInternalPath: '/app/home#/tutorial/logstashLogs',
-    description: 'Collect Logstash main and slow logs.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoLogstash',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'logstash',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Nginx logs',
-    title: 'Nginx logs',
-    categories: ['web', 'security'],
-    uiInternalPath: '/app/home#/tutorial/nginxLogs',
-    description: 'Collect and parse access and error logs created by the Nginx HTTP server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoNginx',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'nginx',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Nginx metrics',
-    title: 'Nginx metrics',
-    categories: ['web', 'security'],
-    uiInternalPath: '/app/home#/tutorial/nginxMetrics',
-    description: 'Fetch internal metrics from the Nginx HTTP server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoNginx',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'nginx',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'MySQL logs',
-    title: 'MySQL logs',
-    categories: ['datastore'],
-    uiInternalPath: '/app/home#/tutorial/mysqlLogs',
-    description: 'Collect and parse error and slow logs created by MySQL.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoMySQL',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'mysql',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'MySQL metrics',
-    title: 'MySQL metrics',
-    categories: ['datastore'],
-    uiInternalPath: '/app/home#/tutorial/mysqlMetrics',
-    description: 'Fetch internal metrics from MySQL.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoMySQL',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'mysql',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'MongoDB metrics',
-    title: 'MongoDB metrics',
-    categories: ['datastore'],
-    uiInternalPath: '/app/home#/tutorial/mongodbMetrics',
-    description: 'Fetch internal metrics from MongoDB.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoMongodb',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'mongodb',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Osquery logs',
-    title: 'Osquery logs',
-    categories: ['security', 'os_system'],
-    uiInternalPath: '/app/home#/tutorial/osqueryLogs',
-    description: 'Collect osquery logs in JSON format.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/osquery.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'osquery',
+    id: 'b.ga_beats',
+    categories: ['azure', 'cloud', 'config_management'],
+    description: 'Beats for a GA package that is not installed',
     isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'PHP-FPM metrics',
-    title: 'PHP-FPM metrics',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/phpfpmMetrics',
-    description: 'Fetch internal metrics from PHP-FPM.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoPhp',
-      },
-    ],
     shipper: 'beats',
-    eprOverlap: 'php_fpm',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'PostgreSQL metrics',
-    title: 'PostgreSQL metrics',
-    categories: ['datastore'],
-    uiInternalPath: '/app/home#/tutorial/postgresqlMetrics',
-    description: 'Fetch internal metrics from PostgreSQL.',
     icons: [
       {
         type: 'eui',
-        src: 'logoPostgres',
+        src: 'logoBeats',
       },
     ],
-    shipper: 'beats',
-    eprOverlap: 'postgresql',
-    isBeta: false,
-  },
-  {
+    title: 'b. GA, has Beats',
     type: 'ui_link',
-    id: 'PostgreSQL logs',
-    title: 'PostgreSQL logs',
-    categories: ['datastore'],
-    uiInternalPath: '/app/home#/tutorial/postgresqlLogs',
-    description: 'Collect and parse error and slow logs created by PostgreSQL.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoPostgres',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'postgresql',
-    isBeta: false,
+    uiInternalPath: '/',
+    eprOverlap: 'ga_beats',
   },
   {
-    type: 'ui_link',
-    id: 'RabbitMQ metrics',
-    title: 'RabbitMQ metrics',
-    categories: ['message_queue'],
-    uiInternalPath: '/app/home#/tutorial/rabbitmqMetrics',
-    description: 'Fetch internal metrics from the RabbitMQ server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoRabbitmq',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'rabbitmq',
+    id: 'f.beta_beats',
+    categories: ['azure', 'cloud', 'config_management'],
+    description: 'Beats for a beta package that is not installed',
     isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Redis logs',
-    title: 'Redis logs',
-    categories: ['datastore', 'message_queue'],
-    uiInternalPath: '/app/home#/tutorial/redisLogs',
-    description: 'Collect and parse error and slow logs created by Redis.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoRedis',
-      },
-    ],
     shipper: 'beats',
-    eprOverlap: 'redis',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Redis metrics',
-    title: 'Redis metrics',
-    categories: ['datastore', 'message_queue'],
-    uiInternalPath: '/app/home#/tutorial/redisMetrics',
-    description: 'Fetch internal metrics from Redis.',
     icons: [
       {
         type: 'eui',
-        src: 'logoRedis',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'redis',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Suricata logs',
-    title: 'Suricata logs',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/suricataLogs',
-    description: 'Collect Suricata IDS/IPS/NSM logs.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/suricata.svg',
+        src: 'logoBeats',
       },
     ],
-    shipper: 'beats',
-    eprOverlap: 'suricata',
-    isBeta: false,
-  },
-  {
+    title: 'f. Beta, has Beats',
     type: 'ui_link',
-    id: 'Docker metrics',
-    title: 'Docker metrics',
-    categories: ['containers', 'os_system'],
-    uiInternalPath: '/app/home#/tutorial/dockerMetrics',
-    description: 'Fetch metrics about your Docker containers.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoDocker',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'docker',
-    isBeta: false,
+    uiInternalPath: '/',
+    eprOverlap: 'beta_beats',
   },
   {
-    type: 'ui_link',
-    id: 'Kubernetes metrics',
-    title: 'Kubernetes metrics',
-    categories: ['containers', 'kubernetes'],
-    uiInternalPath: '/app/home#/tutorial/kubernetesMetrics',
-    description: 'Fetch metrics from your Kubernetes installation.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoKubernetes',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'kubernetes',
+    id: 'j.exp_beats',
+    categories: ['azure', 'cloud', 'config_management'],
+    description: 'Beats for an experimental package that is not installed',
     isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'uWSGI metrics',
-    title: 'uWSGI metrics',
-    categories: ['web', 'security'],
-    uiInternalPath: '/app/home#/tutorial/uwsgiMetrics',
-    description: 'Fetch internal metrics from the uWSGI server.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/uwsgi.svg',
-      },
-    ],
     shipper: 'beats',
-    eprOverlap: 'uwsgi',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'NetFlow / IPFIX Collector',
-    title: 'NetFlow / IPFIX Collector',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/netflowLogs',
-    description: 'Collect NetFlow and IPFIX flow records.',
     icons: [
       {
         type: 'eui',
         src: 'logoBeats',
       },
     ],
-    shipper: 'beats',
-    eprOverlap: 'netflow',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Traefik logs',
-    title: 'Traefik logs',
-    categories: ['web', 'security'],
-    uiInternalPath: '/app/home#/tutorial/traefikLogs',
-    description: 'Collect Traefik access logs.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/traefik.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'traefik',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Ceph metrics',
-    title: 'Ceph metrics',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/cephMetrics',
-    description: 'Fetch internal metrics from the Ceph server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoCeph',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'ceph',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Aerospike metrics',
-    title: 'Aerospike metrics',
-    categories: ['web'],
-    uiInternalPath: '/app/home#/tutorial/aerospikeMetrics',
-    description: 'Fetch internal metrics from the Aerospike server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoAerospike',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'aerospike',
-    isBeta: false,
-  },
-  {
+    title: 'j. Experimental, has Beats',
     type: 'ui_link',
-    id: 'Couchbase metrics',
-    title: 'Couchbase metrics',
-    categories: ['security', 'network', 'web'],
-    uiInternalPath: '/app/home#/tutorial/couchbaseMetrics',
-    description: 'Fetch internal metrics from Couchbase.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoCouchbase',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'couchbase',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Dropwizard metrics',
-    title: 'Dropwizard metrics',
-    categories: ['elastic_stack', 'datastore'],
-    uiInternalPath: '/app/home#/tutorial/dropwizardMetrics',
-    description: 'Fetch internal metrics from Dropwizard Java application.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoDropwizard',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'dropwizard',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Elasticsearch metrics',
-    title: 'Elasticsearch metrics',
-    categories: ['elastic_stack', 'datastore'],
-    uiInternalPath: '/app/home#/tutorial/elasticsearchMetrics',
-    description: 'Fetch internal metrics from Elasticsearch.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoElasticsearch',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'elasticsearch',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Etcd metrics',
-    title: 'Etcd metrics',
-    categories: ['elastic_stack', 'datastore'],
-    uiInternalPath: '/app/home#/tutorial/etcdMetrics',
-    description: 'Fetch internal metrics from the Etcd server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoEtcd',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'etcd',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'HAProxy metrics',
-    title: 'HAProxy metrics',
-    categories: ['network', 'web'],
-    uiInternalPath: '/app/home#/tutorial/haproxyMetrics',
-    description: 'Fetch internal metrics from the HAProxy server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoHAproxy',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'haproxy',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Kafka metrics',
-    title: 'Kafka metrics',
-    categories: ['message_queue'],
-    uiInternalPath: '/app/home#/tutorial/kafkaMetrics',
-    description: 'Fetch internal metrics from the Kafka server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoKafka',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'kafka',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Kibana metrics',
-    title: 'Kibana metrics',
-    categories: ['message_queue'],
-    uiInternalPath: '/app/home#/tutorial/kibanaMetrics',
-    description: 'Fetch internal metrics from Kibana.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoKibana',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'kibana',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Memcached metrics',
-    title: 'Memcached metrics',
-    categories: ['custom'],
-    uiInternalPath: '/app/home#/tutorial/memcachedMetrics',
-    description: 'Fetch internal metrics from the Memcached server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoMemcached',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'memcached',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Munin metrics',
-    title: 'Munin metrics',
-    categories: ['datastore'],
-    uiInternalPath: '/app/home#/tutorial/muninMetrics',
-    description: 'Fetch internal metrics from the Munin server.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/munin.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'munin',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'vSphere metrics',
-    title: 'vSphere metrics',
-    categories: ['web', 'security'],
-    uiInternalPath: '/app/home#/tutorial/vsphereMetrics',
-    description: 'Fetch internal metrics from vSphere.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/vsphere.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'vsphere',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Windows metrics',
-    title: 'Windows metrics',
-    categories: ['os_system', 'security'],
-    uiInternalPath: '/app/home#/tutorial/windowsMetrics',
-    description: 'Fetch internal metrics from Windows.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoWindows',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'windows',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Windows Event Log',
-    title: 'Windows Event Log',
-    categories: ['os_system', 'security'],
-    uiInternalPath: '/app/home#/tutorial/windowsEventLogs',
-    description: 'Fetch logs from the Windows Event Log.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoWindows',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'windows',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Golang metrics',
-    title: 'Golang metrics',
-    categories: ['google_cloud', 'cloud', 'network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/golangMetrics',
-    description: 'Fetch internal metrics from a Golang app.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoGolang',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'golang',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Logstash metrics',
-    title: 'Logstash metrics',
-    categories: ['custom'],
-    uiInternalPath: '/app/home#/tutorial/logstashMetrics',
-    description: 'Fetch internal metrics from a Logstash server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoLogstash',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'logstash',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Prometheus metrics',
-    title: 'Prometheus metrics',
-    categories: ['monitoring', 'datastore'],
-    uiInternalPath: '/app/home#/tutorial/prometheusMetrics',
-    description: 'Fetch metrics from a Prometheus exporter.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoPrometheus',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'prometheus',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Zookeeper metrics',
-    title: 'Zookeeper metrics',
-    categories: ['datastore', 'config_management'],
-    uiInternalPath: '/app/home#/tutorial/zookeeperMetrics',
-    description: 'Fetch internal metrics from a Zookeeper server.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/zookeeper.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'zookeeper',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Uptime Monitors',
-    title: 'Uptime Monitors',
-    categories: ['web', 'security'],
-    uiInternalPath: '/app/home#/tutorial/uptimeMonitors',
-    description: 'Monitor services for their availability',
-    icons: [
-      {
-        type: 'eui',
-        src: 'uptimeApp',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'uptime',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'AWS Cloudwatch logs',
-    title: 'AWS Cloudwatch logs',
-    categories: ['security', 'network', 'web'],
-    uiInternalPath: '/app/home#/tutorial/cloudwatchLogs',
-    description: 'Collect Cloudwatch logs with Functionbeat.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoAWS',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'aws',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'AWS metrics',
-    title: 'AWS metrics',
-    categories: ['aws', 'cloud', 'datastore', 'security', 'network'],
-    uiInternalPath: '/app/home#/tutorial/awsMetrics',
-    description: 'Fetch monitoring metrics for EC2 instances from the AWS APIs and Cloudwatch.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoAWS',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'aws',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Microsoft SQL Server Metrics',
-    title: 'Microsoft SQL Server Metrics',
-    categories: ['datastore'],
-    uiInternalPath: '/app/home#/tutorial/mssqlMetrics',
-    description: 'Fetch monitoring metrics from a Microsoft SQL Server instance',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/mssql.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'mssql',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'NATS metrics',
-    title: 'NATS metrics',
-    categories: ['message_queue'],
-    uiInternalPath: '/app/home#/tutorial/natsMetrics',
-    description: 'Fetch monitoring metrics from the Nats server.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/nats.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'nats',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'NATS logs',
-    title: 'NATS logs',
-    categories: ['message_queue'],
-    uiInternalPath: '/app/home#/tutorial/natsLogs',
-    description: 'Collect and parse logs created by Nats.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/nats.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'nats',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Zeek logs',
-    title: 'Zeek logs',
-    categories: ['network', 'monitoring', 'security'],
-    uiInternalPath: '/app/home#/tutorial/zeekLogs',
-    description: 'Collect Zeek network security monitoring logs.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/zeek.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'zeek',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'CoreDNS metrics',
-    title: 'CoreDNS metrics',
-    categories: ['security', 'network', 'web'],
-    uiInternalPath: '/app/home#/tutorial/corednsMetrics',
-    description: 'Fetch monitoring metrics from the CoreDNS server.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/coredns.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'coredns',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'CoreDNS logs',
-    title: 'CoreDNS logs',
-    categories: ['security', 'network', 'web'],
-    uiInternalPath: '/app/home#/tutorial/corednsLogs',
-    description: 'Collect CoreDNS logs.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/coredns.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'coredns',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Auditbeat',
-    title: 'Auditbeat',
-    categories: ['web'],
-    uiInternalPath: '/app/home#/tutorial/auditbeat',
-    description: 'Collect audit data from your hosts.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'securityAnalyticsApp',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'auditbeat',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Iptables logs',
-    title: 'Iptables logs',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/iptablesLogs',
-    description: 'Collect iptables and ip6tables logs.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/linux.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'iptables',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Cisco logs',
-    title: 'Cisco logs',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/ciscoLogs',
-    description: 'Collect Cisco network device logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/cisco.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'cisco',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Envoy Proxy logs',
-    title: 'Envoy Proxy logs',
-    categories: ['elastic_stack', 'datastore'],
-    uiInternalPath: '/app/home#/tutorial/envoyproxyLogs',
-    description: 'Collect Envoy Proxy logs.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/envoyproxy.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'envoyproxy',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'CouchDB metrics',
-    title: 'CouchDB metrics',
-    categories: ['security', 'network', 'web'],
-    uiInternalPath: '/app/home#/tutorial/couchdbMetrics',
-    description: 'Fetch monitoring metrics from the CouchdB server.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/couchdb.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'couchdb',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Consul metrics',
-    title: 'Consul metrics',
-    categories: ['security', 'network', 'web'],
-    uiInternalPath: '/app/home#/tutorial/consulMetrics',
-    description: 'Fetch monitoring metrics from the Consul server.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/consul.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'consul',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'CockroachDB metrics',
-    title: 'CockroachDB metrics',
-    categories: ['security', 'network', 'web'],
-    uiInternalPath: '/app/home#/tutorial/cockroachdbMetrics',
-    description: 'Fetch monitoring metrics from the CockroachDB server.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/cockroachdb.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'cockroachdb',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Traefik metrics',
-    title: 'Traefik metrics',
-    categories: ['web', 'security'],
-    uiInternalPath: '/app/home#/tutorial/traefikMetrics',
-    description: 'Fetch monitoring metrics from Traefik.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/traefik.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'traefik',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'AWS S3 based logs',
-    title: 'AWS S3 based logs',
-    categories: ['aws', 'cloud', 'datastore', 'security', 'network'],
-    uiInternalPath: '/app/home#/tutorial/awsLogs',
-    description: 'Collect AWS logs from S3 bucket with Filebeat.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoAWS',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'aws',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'ActiveMQ logs',
-    title: 'ActiveMQ logs',
-    categories: ['web'],
-    uiInternalPath: '/app/home#/tutorial/activemqLogs',
-    description: 'Collect ActiveMQ logs with Filebeat.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/activemq.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'activemq',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'ActiveMQ metrics',
-    title: 'ActiveMQ metrics',
-    categories: ['web'],
-    uiInternalPath: '/app/home#/tutorial/activemqMetrics',
-    description: 'Fetch monitoring metrics from ActiveMQ instances.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/activemq.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'activemq',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Azure metrics',
-    title: 'Azure metrics',
-    categories: ['azure', 'cloud', 'network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/azureMetrics',
-    description: 'Fetch Azure Monitor metrics.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoAzure',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'azure',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'IBM MQ logs',
-    title: 'IBM MQ logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/ibmmqLogs',
-    description: 'Collect IBM MQ logs with Filebeat.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/ibmmq.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'ibmmq',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'IBM MQ metrics',
-    title: 'IBM MQ metrics',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/ibmmqMetrics',
-    description: 'Fetch monitoring metrics from IBM MQ instances.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/ibmmq.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'ibmmq',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'STAN metrics',
-    title: 'STAN metrics',
-    categories: ['message_queue', 'kubernetes'],
-    uiInternalPath: '/app/home#/tutorial/stanMetrics',
-    description: 'Fetch monitoring metrics from the STAN server.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/stan.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'stan',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Envoy Proxy metrics',
-    title: 'Envoy Proxy metrics',
-    categories: ['elastic_stack', 'datastore'],
-    uiInternalPath: '/app/home#/tutorial/envoyproxyMetrics',
-    description: 'Fetch monitoring metrics from Envoy Proxy.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/envoyproxy.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'envoyproxy',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Statsd metrics',
-    title: 'Statsd metrics',
-    categories: ['message_queue', 'kubernetes'],
-    uiInternalPath: '/app/home#/tutorial/statsdMetrics',
-    description: 'Fetch monitoring metrics from statsd.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/statsd.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'statsd',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Redis Enterprise metrics',
-    title: 'Redis Enterprise metrics',
-    categories: ['datastore', 'message_queue'],
-    uiInternalPath: '/app/home#/tutorial/redisenterpriseMetrics',
-    description: 'Fetch monitoring metrics from Redis Enterprise Server.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoRedis',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'redisenterprise',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'OpenMetrics metrics',
-    title: 'OpenMetrics metrics',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/openmetricsMetrics',
-    description: 'Fetch metrics from an endpoint that serves metrics in OpenMetrics format.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/openmetrics.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'openmetrics',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'oracle metrics',
-    title: 'oracle metrics',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/oracleMetrics',
-    description: 'Fetch internal metrics from a Oracle server.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/oracle.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'oracle',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'IIS Metrics',
-    title: 'IIS Metrics',
-    categories: ['web'],
-    uiInternalPath: '/app/home#/tutorial/iisMetrics',
-    description: 'Collect IIS server related metrics.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/iis.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'iis',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Azure logs',
-    title: 'Azure logs',
-    categories: ['azure', 'cloud', 'network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/azureLogs',
-    description: 'Collects Azure activity and audit related logs.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoAzure',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'azure',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Google Cloud metrics',
-    title: 'Google Cloud metrics',
-    categories: ['google_cloud', 'cloud', 'network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/gcpMetrics',
-    description:
-      'Fetch monitoring metrics from Google Cloud Platform using Stackdriver Monitoring API.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoGCP',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'gcp',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Auditd logs',
-    title: 'Auditd logs',
-    categories: ['os_system'],
-    uiInternalPath: '/app/home#/tutorial/auditdLogs',
-    description: 'Collect logs from the Linux auditd daemon.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/linux.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'auditd',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Barracuda logs',
-    title: 'Barracuda logs',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/barracudaLogs',
-    description: 'Collect Barracuda Web Application Firewall logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/barracuda.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'barracuda',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Bluecoat logs',
-    title: 'Bluecoat logs',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/bluecoatLogs',
-    description: 'Collect Blue Coat Director logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoLogging',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'bluecoat',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'CEF logs',
-    title: 'CEF logs',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/cefLogs',
-    description: 'Collect Common Event Format (CEF) log data over syslog.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoLogging',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'cef',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Check Point logs',
-    title: 'Check Point logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/checkpointLogs',
-    description: 'Collect Check Point firewall logs.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/checkpoint.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'checkpoint',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'CrowdStrike logs',
-    title: 'CrowdStrike logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/crowdstrikeLogs',
-    description: 'Collect CrowdStrike Falcon logs using the Falcon SIEM Connector.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/crowdstrike.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'crowdstrike',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'CylancePROTECT logs',
-    title: 'CylancePROTECT logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/cylanceLogs',
-    description: 'Collect CylancePROTECT logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/cylance.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'cylance',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'F5 logs',
-    title: 'F5 logs',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/f5Logs',
-    description: 'Collect F5 Big-IP Access Policy Manager logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/f5.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'f5',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Fortinet logs',
-    title: 'Fortinet logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/fortinetLogs',
-    description: 'Collect Fortinet FortiOS logs over syslog.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/fortinet.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'fortinet',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Google Cloud logs',
-    title: 'Google Cloud logs',
-    categories: ['google_cloud', 'cloud', 'network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/gcpLogs',
-    description: 'Collect Google Cloud audit, firewall, and VPC flow logs.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoGoogleG',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'gcp',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'GSuite logs',
-    title: 'GSuite logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/gsuiteLogs',
-    description: 'Collect GSuite activity reports.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoGoogleG',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'gsuite',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'HAProxy logs',
-    title: 'HAProxy logs',
-    categories: ['network', 'web'],
-    uiInternalPath: '/app/home#/tutorial/haproxyLogs',
-    description: 'Collect HAProxy logs.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoHAproxy',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'haproxy',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Icinga logs',
-    title: 'Icinga logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/icingaLogs',
-    description: 'Collect Icinga main, debug, and startup logs.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/icinga.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'icinga',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Imperva logs',
-    title: 'Imperva logs',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/impervaLogs',
-    description: 'Collect Imperva SecureSphere logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoLogging',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'imperva',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Infoblox logs',
-    title: 'Infoblox logs',
-    categories: ['network'],
-    uiInternalPath: '/app/home#/tutorial/infobloxLogs',
-    description: 'Collect Infoblox NIOS logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/infoblox.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'infoblox',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Juniper Logs',
-    title: 'Juniper Logs',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/juniperLogs',
-    description: 'Collect Juniper JUNOS logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/juniper.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'juniper',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Kibana Logs',
-    title: 'Kibana Logs',
-    categories: ['message_queue'],
-    uiInternalPath: '/app/home#/tutorial/kibanaLogs',
-    description: 'Collect Kibana logs.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoKibana',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'kibana',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Microsoft Defender ATP logs',
-    title: 'Microsoft Defender ATP logs',
-    categories: ['network', 'security', 'azure'],
-    uiInternalPath: '/app/home#/tutorial/microsoftLogs',
-    description: 'Collect Microsoft Defender ATP alerts.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/microsoft.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'microsoft',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'MISP threat intel logs',
-    title: 'MISP threat intel logs',
-    categories: ['network', 'security', 'azure'],
-    uiInternalPath: '/app/home#/tutorial/mispLogs',
-    description: 'Collect MISP threat intelligence data with Filebeat.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/misp.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'misp',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'MongoDB logs',
-    title: 'MongoDB logs',
-    categories: ['datastore'],
-    uiInternalPath: '/app/home#/tutorial/mongodbLogs',
-    description: 'Collect MongoDB logs.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoMongodb',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'mongodb',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'MSSQL logs',
-    title: 'MSSQL logs',
-    categories: ['datastore'],
-    uiInternalPath: '/app/home#/tutorial/mssqlLogs',
-    description: 'Collect MSSQL logs.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/microsoft.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'mssql',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Arbor Peakflow logs',
-    title: 'Arbor Peakflow logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/netscoutLogs',
-    description: 'Collect Netscout Arbor Peakflow SP logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/netscout.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'netscout',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Office 365 logs',
-    title: 'Office 365 logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/o365Logs',
-    description: 'Collect Office 365 activity logs via the Office 365 API.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/o365.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'o365',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Okta logs',
-    title: 'Okta logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/oktaLogs',
-    description: 'Collect the Okta system log via the Okta API.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/okta.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'okta',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Palo Alto Networks PAN-OS logs',
-    title: 'Palo Alto Networks PAN-OS logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/panwLogs',
-    description:
-      'Collect Palo Alto Networks PAN-OS threat and traffic logs over syslog or from a log file.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/paloalto.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'panw',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'RabbitMQ logs',
-    title: 'RabbitMQ logs',
-    categories: ['message_queue'],
-    uiInternalPath: '/app/home#/tutorial/rabbitmqLogs',
-    description: 'Collect RabbitMQ logs.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/rabbitmq.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'rabbitmq',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Radware DefensePro logs',
-    title: 'Radware DefensePro logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/radwareLogs',
-    description: 'Collect Radware DefensePro logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/radware.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'radware',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Google Santa logs',
-    title: 'Google Santa logs',
-    categories: ['security', 'os_system'],
-    uiInternalPath: '/app/home#/tutorial/santaLogs',
-    description: 'Collect Google Santa logs about process executions on MacOS.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoLogging',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'santa',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Sonicwall FW logs',
-    title: 'Sonicwall FW logs',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/sonicwallLogs',
-    description: 'Collect Sonicwall-FW logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/sonicwall.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'sonicwall',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Sophos logs',
-    title: 'Sophos logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/sophosLogs',
-    description: 'Collect Sophos XG SFOS logs over syslog.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/sophos.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'sophos',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Squid logs',
-    title: 'Squid logs',
-    categories: ['security'],
-    uiInternalPath: '/app/home#/tutorial/squidLogs',
-    description: 'Collect Squid logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'logoLogging',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'squid',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Tomcat logs',
-    title: 'Tomcat logs',
-    categories: ['web', 'security'],
-    uiInternalPath: '/app/home#/tutorial/tomcatLogs',
-    description: 'Collect Apache Tomcat logs over syslog or from a file.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/tomcat.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'tomcat',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'Zscaler Logs',
-    title: 'Zscaler Logs',
-    categories: ['network', 'security'],
-    uiInternalPath: '/app/home#/tutorial/zscalerLogs',
-    description: 'This is a module for receiving Zscaler NSS logs over Syslog or a file.',
-    icons: [
-      {
-        type: 'svg',
-        src: '/dqo/plugins/home/assets/logos/zscaler.svg',
-      },
-    ],
-    shipper: 'beats',
-    eprOverlap: 'zscaler',
-    isBeta: false,
-  },
-  {
-    type: 'ui_link',
-    id: 'apm',
-    title: 'APM',
-    categories: ['web'],
-    uiInternalPath: '/app/home#/tutorial/apm',
-    description: 'Collect in-depth performance metrics and errors from inside your applications.',
-    icons: [
-      {
-        type: 'eui',
-        src: 'apmApp',
-      },
-    ],
-    shipper: 'tutorial',
-    isBeta: false,
-    eprOverlap: 'apm',
+    uiInternalPath: '/',
+    eprOverlap: 'exp_beats',
   },
 ];
diff --git a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_local_search.tsx b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_local_search.tsx
index a8ed849f50a8a..458c4d94f9cd4 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_local_search.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_local_search.tsx
@@ -14,7 +14,7 @@ export const searchIdField = 'id';
 export const fieldsToSearch = ['name', 'title', 'description'];
 
 export function useLocalSearch(packageList: IntegrationCardItem[]) {
-  const localSearchRef = useRef<LocalSearch | null>(null);
+  const localSearchRef = useRef<LocalSearch>(new LocalSearch(searchIdField));
 
   useEffect(() => {
     const localSearch = new LocalSearch(searchIdField);
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/integration_preference.stories.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/integration_preference.stories.tsx
new file mode 100644
index 0000000000000..86b34f2415e2e
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/integration_preference.stories.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import type { Meta } from '@storybook/react';
+
+import { action } from '@storybook/addon-actions';
+
+import { IntegrationPreference as Component } from './integration_preference';
+
+export default {
+  title: 'Sections/EPM/Integration Preference',
+  description: '',
+  decorators: [
+    (storyFn, { globals }) => (
+      <div
+        style={{
+          padding: 40,
+          backgroundColor:
+            globals.euiTheme === 'v8.dark' || globals.euiTheme === 'v7.dark' ? '#1D1E24' : '#FFF',
+          width: 280,
+        }}
+      >
+        {storyFn()}
+      </div>
+    ),
+  ],
+} as Meta;
+
+export const IntegrationPreference = () => {
+  return <Component initialType="recommended" onChange={action('onChange')} />;
+};
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/integration_preference.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/integration_preference.tsx
new file mode 100644
index 0000000000000..ecc5c22c8d8ce
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/integration_preference.tsx
@@ -0,0 +1,120 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import styled from 'styled-components';
+
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiPanel,
+  EuiLink,
+  EuiText,
+  EuiForm,
+  EuiRadioGroup,
+  EuiSpacer,
+  EuiIconTip,
+  EuiFlexGroup,
+  EuiFlexItem,
+} from '@elastic/eui';
+
+export type IntegrationPreferenceType = 'recommended' | 'beats' | 'agent';
+
+interface Option {
+  type: IntegrationPreferenceType;
+  label: React.ReactNode;
+}
+
+export interface Props {
+  initialType: IntegrationPreferenceType;
+  onChange: (type: IntegrationPreferenceType) => void;
+}
+
+const link = (
+  <EuiLink href="#">
+    <FormattedMessage
+      id="xpack.fleet.epm.integrationPreference.titleLink"
+      defaultMessage="Elastic Agent and Beats"
+    />
+  </EuiLink>
+);
+
+const title = (
+  <FormattedMessage
+    id="xpack.fleet.epm.integrationPreference.title"
+    defaultMessage="When an integration is available for {link}, show:"
+    values={{ link }}
+  />
+);
+
+const recommendedTooltip = (
+  <FormattedMessage
+    id="xpack.fleet.epm.integrationPreference.recommendedTooltip"
+    defaultMessage="Generally available (GA) integrations are recommended over beta and experimental."
+  />
+);
+
+const Item = styled(EuiFlexItem)`
+  padding-left: ${(props) => props.theme.eui.euiSizeXS};
+`;
+
+const options: Option[] = [
+  {
+    type: 'recommended',
+    label: (
+      <EuiFlexGroup alignItems="center" gutterSize="none">
+        <EuiFlexItem grow={false}>
+          {i18n.translate('xpack.fleet.epm.integrationPreference.recommendedLabel', {
+            defaultMessage: 'Recommended',
+          })}
+        </EuiFlexItem>
+        <Item>
+          <EuiIconTip content={recommendedTooltip} />
+        </Item>
+      </EuiFlexGroup>
+    ),
+  },
+  {
+    type: 'agent',
+    label: i18n.translate('xpack.fleet.epm.integrationPreference.elasticAgentLabel', {
+      defaultMessage: 'Elastic Agent only',
+    }),
+  },
+  {
+    type: 'beats',
+    label: i18n.translate('xpack.fleet.epm.integrationPreference.beatsLabel', {
+      defaultMessage: 'Beats only',
+    }),
+  },
+];
+
+export const IntegrationPreference = ({ initialType, onChange }: Props) => {
+  const [idSelected, setIdSelected] = React.useState<IntegrationPreferenceType>(initialType);
+  const radios = options.map((option) => ({
+    id: option.type,
+    value: option.type,
+    label: option.label,
+  }));
+
+  return (
+    <EuiPanel hasShadow={false} paddingSize="none">
+      <EuiText size="s">{title}</EuiText>
+      <EuiSpacer size="m" />
+      <EuiForm>
+        <EuiRadioGroup
+          options={radios}
+          idSelected={idSelected}
+          onChange={(id, value) => {
+            setIdSelected(id as IntegrationPreferenceType);
+            onChange(value as IntegrationPreferenceType);
+          }}
+          name="preference"
+        />
+      </EuiForm>
+    </EuiPanel>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_list_grid.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_list_grid.tsx
index 1cffd5292b6a2..2a4cb84f1e6ce 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_list_grid.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_list_grid.tsx
@@ -30,7 +30,7 @@ import { PackageCard } from './package_card';
 
 export interface Props {
   isLoading?: boolean;
-  controls?: ReactNode;
+  controls?: ReactNode | ReactNode[];
   title: string;
   list: IntegrationCardItem[];
   initialSearch?: string;
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx
index 812320261e77f..40f89346c25bf 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import React, { memo, useMemo } from 'react';
+import React, { memo, useMemo, useState } from 'react';
 import { useLocation, useHistory, useParams } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
+import { EuiHorizontalRule } from '@elastic/eui';
 
 import { pagePathGetters } from '../../../../constants';
 import {
@@ -31,6 +32,9 @@ import type { IntegrationCardItem } from '../../../../../../../common/types/mode
 
 import { useMergeEprPackagesWithReplacements } from '../../../../hooks/use_merge_epr_with_replacements';
 
+import type { IntegrationPreferenceType } from '../../components/integration_preference';
+import { IntegrationPreference } from '../../components/integration_preference';
+
 import { mergeCategoriesAndCount } from './util';
 import { ALL_CATEGORY, CategoryFacets } from './category_facets';
 import type { CategoryFacet } from './category_facets';
@@ -96,11 +100,14 @@ const title = i18n.translate('xpack.fleet.epmList.allTitle', {
 // TODO: clintandrewhall - this component is hard to test due to the hooks, particularly those that use `http`
 // or `location` to load data.  Ideally, we'll split this into "connected" and "pure" components.
 export const AvailablePackages: React.FC = memo(() => {
+  const [preference, setPreference] = useState<IntegrationPreferenceType>('recommended');
   useBreadcrumbs('integrations_all');
+
   const { selectedCategory, searchParam } = getParams(
     useParams<CategoryParams>(),
     useLocation().search
   );
+
   const history = useHistory();
   const { getHref, getAbsolutePath } = useLink();
 
@@ -111,6 +118,7 @@ export const AvailablePackages: React.FC = memo(() => {
     })[1];
     history.push(url);
   }
+
   function setSearchTerm(search: string) {
     // Use .replace so the browser's back button is not tied to single keystroke
     history.replace(
@@ -121,25 +129,32 @@ export const AvailablePackages: React.FC = memo(() => {
   const { data: eprPackages, isLoading: isLoadingAllPackages } = useGetPackages({
     category: '',
   });
+
   const eprIntegrationList = useMemo(
     () => packageListToIntegrationsList(eprPackages?.response || []),
     [eprPackages]
   );
+
   const { value: replacementCustomIntegrations } = useGetReplacementCustomIntegrations();
+
   const mergedEprPackages: Array<PackageListItem | CustomIntegration> =
     useMergeEprPackagesWithReplacements(
-      eprIntegrationList || [],
-      replacementCustomIntegrations || []
+      preference === 'beats' ? [] : eprIntegrationList,
+      preference === 'agent' ? [] : replacementCustomIntegrations || []
     );
+
   const { loading: isLoadingAppendCustomIntegrations, value: appendCustomIntegrations } =
     useGetAppendCustomIntegrations();
+
   const eprAndCustomPackages: Array<CustomIntegration | PackageListItem> = [
     ...mergedEprPackages,
     ...(appendCustomIntegrations || []),
   ];
+
   const cards: IntegrationCardItem[] = eprAndCustomPackages.map((item) => {
     return mapToCard(getAbsolutePath, getHref, item);
   });
+
   cards.sort((a, b) => {
     return a.title.localeCompare(b.title);
   });
@@ -147,6 +162,7 @@ export const AvailablePackages: React.FC = memo(() => {
   const { data: eprCategories, isLoading: isLoadingCategories } = useGetCategories({
     include_policy_templates: true,
   });
+
   const categories = useMemo(() => {
     const eprAndCustomCategories: CategoryFacet[] =
       isLoadingCategories || !eprCategories
@@ -169,16 +185,24 @@ export const AvailablePackages: React.FC = memo(() => {
     return null;
   }
 
-  const controls = categories ? (
-    <CategoryFacets
-      isLoading={isLoadingCategories || isLoadingAllPackages || isLoadingAppendCustomIntegrations}
-      categories={categories}
-      selectedCategory={selectedCategory}
-      onCategoryChange={({ id }: CategoryFacet) => {
-        setSelectedCategory(id);
-      }}
-    />
-  ) : null;
+  let controls = [
+    <EuiHorizontalRule />,
+    <IntegrationPreference initialType={preference} onChange={setPreference} />,
+  ];
+
+  if (categories) {
+    controls = [
+      <CategoryFacets
+        isLoading={isLoadingCategories || isLoadingAllPackages || isLoadingAppendCustomIntegrations}
+        categories={categories}
+        selectedCategory={selectedCategory}
+        onCategoryChange={({ id }) => {
+          setSelectedCategory(id);
+        }}
+      />,
+      ...controls,
+    ];
+  }
 
   const filteredCards = cards.filter((c) => {
     if (selectedCategory === '') {
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/home.stories.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/home.stories.tsx
index a95a6b750cddc..5526935ef38e6 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/home.stories.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/home.stories.tsx
@@ -14,7 +14,6 @@ import { INTEGRATIONS_ROUTING_PATHS } from '../../../../constants';
 import { EPMHomePage as Component } from '.';
 
 export default {
-  component: Component,
   title: 'Sections/EPM/Home',
 };
 
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx
index 9528bd73f9192..2d1077f586a1a 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx
@@ -12,6 +12,7 @@ import type { DynamicPage, DynamicPagePathValues, StaticPage } from '../../../..
 import { INTEGRATIONS_ROUTING_PATHS, INTEGRATIONS_SEARCH_QUERYPARAM } from '../../../../constants';
 import { DefaultLayout } from '../../../../layouts';
 
+import type { IntegrationCategory } from '../../../../../../../../../../src/plugins/custom_integrations/common';
 import type { CustomIntegration } from '../../../../../../../../../../src/plugins/custom_integrations/common';
 
 import type { PackageListItem } from '../../../../types';
@@ -31,7 +32,10 @@ export const getParams = (params: CategoryParams, search: string) => {
   const selectedCategory = category || '';
   const queryParams = new URLSearchParams(search);
   const searchParam = queryParams.get(INTEGRATIONS_SEARCH_QUERYPARAM) || '';
-  return { selectedCategory, searchParam };
+  return { selectedCategory, searchParam } as {
+    selectedCategory: IntegrationCategory & '';
+    searchParam: string;
+  };
 };
 
 export const categoryExists = (category: string, categories: CategoryFacet[]) => {
diff --git a/x-pack/plugins/fleet/storybook/context/fixtures/packages.ts b/x-pack/plugins/fleet/storybook/context/fixtures/packages.ts
index 2a6012272d4b8..dfe8e905be089 100644
--- a/x-pack/plugins/fleet/storybook/context/fixtures/packages.ts
+++ b/x-pack/plugins/fleet/storybook/context/fixtures/packages.ts
@@ -6,4527 +6,307 @@
  */
 
 import type { GetPackagesResponse } from '../../../public/types';
-import { ElasticsearchAssetType, KibanaSavedObjectType } from '../../../common/types';
 
 export const response: GetPackagesResponse['response'] = [
   {
-    name: 'apache',
-    title: 'Apache',
-    version: '0.8.1',
-    release: 'experimental',
-    description: 'Apache Integration',
-    type: 'integration',
-    download: '/epr/apache/apache-0.8.1.zip',
-    path: '/package/apache/0.8.1',
-    icons: [
-      {
-        src: '/img/logo_apache.svg',
-        path: '/package/apache/0.8.1/img/logo_apache.svg',
-        title: 'Apache Logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'apache',
-        title: 'Apache logs and metrics',
-        description: 'Collect logs and metrics from Apache instances',
-      },
-    ],
-    id: 'apache',
-    status: 'not_installed',
-  },
-  {
-    name: 'apm',
-    title: 'Elastic APM',
-    version: '0.4.0',
-    release: 'beta',
-    description: 'Ingest APM data',
-    type: 'integration',
-    download: '/epr/apm/apm-0.4.0.zip',
-    path: '/package/apm/0.4.0',
-    icons: [
-      {
-        src: '/img/logo_apm.svg',
-        path: '/package/apm/0.4.0/img/logo_apm.svg',
-        title: 'APM Logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'apmserver',
-        title: 'Elastic APM Integration',
-        description: 'Elastic APM Integration',
-      },
-    ],
-    id: 'apm',
-    status: 'not_installed',
-  },
-  {
-    name: 'auditd',
-    title: 'Auditd',
-    version: '1.2.0',
-    release: 'ga',
-    description: 'This Elastic integration collects and parses logs from the Audit daemon (auditd)',
-    type: 'integration',
-    download: '/epr/auditd/auditd-1.2.0.zip',
-    path: '/package/auditd/1.2.0',
-    icons: [
-      {
-        src: '/img/linux.svg',
-        path: '/package/auditd/1.2.0/img/linux.svg',
-        title: 'linux',
-        size: '299x354',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'auditd',
-        title: 'Auditd logs',
-        description: 'Collect logs from Auditd instances',
-      },
-    ],
-    id: 'auditd',
-    status: 'not_installed',
-  },
-  {
-    name: 'aws',
-    title: 'AWS',
-    version: '0.10.7',
-    release: 'beta',
-    description: 'This integration collects logs and metrics from Amazon Web Services (AWS)',
-    type: 'integration',
-    download: '/epr/aws/aws-0.10.7.zip',
-    path: '/package/aws/0.10.7',
-    icons: [
-      {
-        src: '/img/logo_aws.svg',
-        path: '/package/aws/0.10.7/img/logo_aws.svg',
-        title: 'logo aws',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'billing',
-        title: 'AWS Billing',
-        description: 'Collect AWS billing metrics',
-        icons: [
-          {
-            src: '/img/logo_billing.svg',
-            path: '/package/aws/0.10.7/img/logo_billing.svg',
-            title: 'AWS Billing logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'cloudtrail',
-        title: 'AWS Cloudtrail',
-        description: 'Collect logs from AWS Cloudtrail',
-        icons: [
-          {
-            src: '/img/logo_cloudtrail.svg',
-            path: '/package/aws/0.10.7/img/logo_cloudtrail.svg',
-            title: 'AWS Cloudtrail logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'cloudwatch',
-        title: 'AWS CloudWatch',
-        description: 'Collect logs and metrics from CloudWatch',
-        icons: [
-          {
-            src: '/img/logo_cloudwatch.svg',
-            path: '/package/aws/0.10.7/img/logo_cloudwatch.svg',
-            title: 'AWS CloudWatch logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'dynamodb',
-        title: 'AWS DynamoDB',
-        description: 'Collect AWS DynamoDB metrics',
-        icons: [
-          {
-            src: '/img/logo_dynamodb.svg',
-            path: '/package/aws/0.10.7/img/logo_dynamodb.svg',
-            title: 'AWS DynamoDB logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'ebs',
-        title: 'AWS EBS',
-        description: 'Collect AWS EBS metrics',
-        icons: [
-          {
-            src: '/img/logo_ebs.svg',
-            path: '/package/aws/0.10.7/img/logo_ebs.svg',
-            title: 'AWS EBS logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'ec2',
-        title: 'AWS EC2',
-        description: 'Collect logs and metrics from EC2 service',
-        icons: [
-          {
-            src: '/img/logo_ec2.svg',
-            path: '/package/aws/0.10.7/img/logo_ec2.svg',
-            title: 'AWS EC2 logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'elb',
-        title: 'AWS ELB',
-        description: 'Collect logs and metrics from ELB service',
-        icons: [
-          {
-            src: '/img/logo_elb.svg',
-            path: '/package/aws/0.10.7/img/logo_elb.svg',
-            title: 'AWS ELB logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'lambda',
-        title: 'AWS Lambda',
-        description: 'Collect AWS Lambda metrics',
-        icons: [
-          {
-            src: '/img/logo_lambda.svg',
-            path: '/package/aws/0.10.7/img/logo_lambda.svg',
-            title: 'AWS Lambda logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'natgateway',
-        title: 'AWS NATGateway',
-        description: 'Collect AWS NATGateway metrics',
-        icons: [
-          {
-            src: '/img/logo_natgateway.svg',
-            path: '/package/aws/0.10.7/img/logo_natgateway.svg',
-            title: 'AWS NATGateway logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'rds',
-        title: 'AWS RDS',
-        description: 'Collect AWS RDS metrics',
-        icons: [
-          {
-            src: '/img/logo_rds.svg',
-            path: '/package/aws/0.10.7/img/logo_rds.svg',
-            title: 'AWS RDS logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 's3',
-        title: 'AWS S3',
-        description: 'Collect AWS S3 metrics',
-        icons: [
-          {
-            src: '/img/logo_s3.svg',
-            path: '/package/aws/0.10.7/img/logo_s3.svg',
-            title: 'AWS S3 logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'sns',
-        title: 'AWS SNS',
-        description: 'Collect AWS SNS metrics',
-        icons: [
-          {
-            src: '/img/logo_sns.svg',
-            path: '/package/aws/0.10.7/img/logo_sns.svg',
-            title: 'AWS SNS logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'sqs',
-        title: 'AWS SQS',
-        description: 'Collect AWS SQS metrics',
-        icons: [
-          {
-            src: '/img/logo_sqs.svg',
-            path: '/package/aws/0.10.7/img/logo_sqs.svg',
-            title: 'AWS SQS logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'transitgateway',
-        title: 'AWS Transit Gateway',
-        description: 'Collect AWS Transit Gateway metrics',
-        icons: [
-          {
-            src: '/img/logo_transitgateway.svg',
-            path: '/package/aws/0.10.7/img/logo_transitgateway.svg',
-            title: 'AWS Transit Gateway logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'usage',
-        title: 'AWS Usage',
-        description: 'Collect AWS Usage metrics',
-      },
-      {
-        name: 'vpcflow',
-        title: 'AWS VPC Flow',
-        description: 'Collect AWS vpcflow logs',
-        icons: [
-          {
-            src: '/img/logo_vpcflow.svg',
-            path: '/package/aws/0.10.7/img/logo_vpcflow.svg',
-            title: 'AWS VPC logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'vpn',
-        title: 'AWS VPN',
-        description: 'Collect AWS VPN metrics',
-        icons: [
-          {
-            src: '/img/logo_vpn.svg',
-            path: '/package/aws/0.10.7/img/logo_vpn.svg',
-            title: 'AWS VPN logo',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-    ],
-    id: 'aws',
-    status: 'not_installed',
-  },
-  {
-    name: 'azure',
-    title: 'Azure Logs',
-    version: '0.8.5',
-    release: 'beta',
-    description: 'This Elastic integration collects logs from Azure',
-    type: 'integration',
-    download: '/epr/azure/azure-0.8.5.zip',
-    path: '/package/azure/0.8.5',
-    icons: [
-      {
-        src: '/img/azure_logs_logo.png',
-        path: '/package/azure/0.8.5/img/azure_logs_logo.png',
-        title: 'logo azure',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'adlogs',
-        title: 'Azure Active Directory logs',
-        description: 'Azure Directory logs integration',
-        icons: [
-          {
-            src: '/img/active_directory_logo.png',
-            path: '/package/azure/0.8.5/img/active_directory_logo.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'platformlogs',
-        title: 'Azure platform logs',
-        description: 'Azure platform logs integration',
-        icons: [
-          {
-            src: '/img/platformlogs_logo.png',
-            path: '/package/azure/0.8.5/img/platformlogs_logo.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'activitylogs',
-        title: 'Azure activity logs',
-        description: 'Azure activity logs integration',
-        icons: [
-          {
-            src: '/img/platformlogs_logo.png',
-            path: '/package/azure/0.8.5/img/platformlogs_logo.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'springcloudlogs',
-        title: 'Azure Spring Cloud logs',
-        description: 'Azure Spring Cloud logs integration',
-        icons: [
-          {
-            src: '/img/spring_logs.svg',
-            path: '/package/azure/0.8.5/img/spring_logs.svg',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-    ],
-    id: 'azure',
-    status: 'not_installed',
-  },
-  {
-    name: 'azure_application_insights',
-    title: 'Azure Application Insights Metrics Overview',
-    version: '0.1.0',
-    release: 'beta',
-    description: 'Azure Application Insights',
-    type: 'integration',
-    download: '/epr/azure_application_insights/azure_application_insights-0.1.0.zip',
-    path: '/package/azure_application_insights/0.1.0',
-    icons: [
-      {
-        src: '/img/app_insights.png',
-        path: '/package/azure_application_insights/0.1.0/img/app_insights.png',
-        title: 'logo docker',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'app_insights',
-        title: 'Azure Application Insights metrics',
-        description: 'Azure Application Insights Metrics Integration',
-        icons: [
-          {
-            src: '/img//app_insights.png',
-            path: '/package/azure_application_insights/0.1.0/img/app_insights.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'app_state',
-        title: 'Azure Application State Insights metrics',
-        description: 'Azure Application State Insights Metrics Integration',
-        icons: [
-          {
-            src: '/img/application_insights_blue.png',
-            path: '/package/azure_application_insights/0.1.0/img/application_insights_blue.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-    ],
-    id: 'azure_application_insights',
-    status: 'not_installed',
-  },
-  {
-    name: 'azure_metrics',
-    title: 'Azure resource metrics',
-    version: '0.3.2',
-    release: 'beta',
-    description: 'This Elastic integration collects and aggregates metrics from Azure resources',
-    type: 'integration',
-    download: '/epr/azure_metrics/azure_metrics-0.3.2.zip',
-    path: '/package/azure_metrics/0.3.2',
-    icons: [
-      {
-        src: '/img/azure_metrics_logo.png',
-        path: '/package/azure_metrics/0.3.2/img/azure_metrics_logo.png',
-        title: 'logo docker',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'monitor',
-        title: 'Azure Monitor metrics',
-        description: 'Azure Monitor Metrics Integration',
-        icons: [
-          {
-            src: '/img/monitor_logo.png',
-            path: '/package/azure_metrics/0.3.2/img/monitor_logo.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'compute_vm',
-        title: 'Azure Virtual Machines metrics',
-        description: 'Azure Virtual Machines Metrics Integration',
-        icons: [
-          {
-            src: '/img/compute_vm_logo.png',
-            path: '/package/azure_metrics/0.3.2/img/compute_vm_logo.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'compute_vm_scaleset',
-        title: 'Azure Virtual Machines Scaleset metrics',
-        description: 'Azure Virtual Machines Scaleset Metrics Integration',
-        icons: [
-          {
-            src: '/img/compute_vm_scaleset_logo.png',
-            path: '/package/azure_metrics/0.3.2/img/compute_vm_scaleset_logo.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'container_registry',
-        title: 'Azure Container Registry metrics',
-        description: 'Azure Container Registry Metrics Integration',
-        icons: [
-          {
-            src: '/img/container_registry_logo.png',
-            path: '/package/azure_metrics/0.3.2/img/container_registry_logo.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'container_instance',
-        title: 'Azure Container Instance metrics',
-        description: 'Azure Container Instance Metrics Integration',
-        icons: [
-          {
-            src: '/img/container_instance_logo.png',
-            path: '/package/azure_metrics/0.3.2/img/container_instance_logo.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'container_service',
-        title: 'Azure Container Service metrics',
-        description: 'Azure Container Service Metrics Integration',
-        icons: [
-          {
-            src: '/img/container_service_logo.png',
-            path: '/package/azure_metrics/0.3.2/img/container_service_logo.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'database_account',
-        title: 'Azure Database Account metrics',
-        description: 'Azure Database Account Metrics Integration',
-        icons: [
-          {
-            src: '/img/database_account_logo.png',
-            path: '/package/azure_metrics/0.3.2/img/database_account_logo.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'storage_account',
-        title: 'Azure Storage Account metrics',
-        description: 'Azure Storage Account Metrics Integration',
-        icons: [
-          {
-            src: '/img/storage_account_logo.png',
-            path: '/package/azure_metrics/0.3.2/img/storage_account_logo.png',
-            title: 'logo azure',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-    ],
-    id: 'azure_metrics',
-    status: 'not_installed',
-  },
-  {
-    name: 'barracuda',
-    title: 'Barracuda',
-    version: '0.4.0',
-    release: 'experimental',
-    description: 'Barracuda Integration',
-    type: 'integration',
-    download: '/epr/barracuda/barracuda-0.4.0.zip',
-    path: '/package/barracuda/0.4.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/barracuda/0.4.0/img/logo.svg',
-        title: 'Barracuda logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'barracuda',
-        title: 'Barracuda logs',
-        description: 'Collect Barracuda logs from syslog or a file.',
-      },
-    ],
-    id: 'barracuda',
-    status: 'not_installed',
-  },
-  {
-    name: 'bluecoat',
-    title: 'Blue Coat Director',
-    version: '0.3.0',
-    release: 'experimental',
-    description: 'Blue Coat Director Integration',
-    type: 'integration',
-    download: '/epr/bluecoat/bluecoat-0.3.0.zip',
-    path: '/package/bluecoat/0.3.0',
-    policy_templates: [
-      {
-        name: 'director',
-        title: 'Blue Coat Director',
-        description: 'Collect Blue Coat Director logs from syslog or a file.',
-      },
-    ],
-    id: 'bluecoat',
-    status: 'not_installed',
-  },
-  {
-    name: 'carbonblack_edr',
-    title: 'VMware Carbon Black EDR',
-    version: '0.2.0',
-    release: 'experimental',
-    description: 'Carbon Black EDR Integration',
-    type: 'integration',
-    download: '/epr/carbonblack_edr/carbonblack_edr-0.2.0.zip',
-    path: '/package/carbonblack_edr/0.2.0',
-    policy_templates: [
-      {
-        name: 'log',
-        title: 'Carbon Black EDR logs',
-        description: 'Collect logs from Carbon Black EDR',
-      },
-    ],
-    id: 'carbonblack_edr',
-    status: 'not_installed',
-  },
-  {
-    name: 'cef',
-    title: 'CEF',
-    version: '0.5.2',
-    release: 'experimental',
-    description: 'This Elastic integration collects logs in common event format (CEF)',
-    type: 'integration',
-    download: '/epr/cef/cef-0.5.2.zip',
-    path: '/package/cef/0.5.2',
-    policy_templates: [
-      {
-        name: 'cef',
-        title: 'CEF logs',
-        description: 'Collect logs from CEF instances',
-      },
-    ],
-    id: 'cef',
-    status: 'not_installed',
-  },
-  {
-    name: 'checkpoint',
-    title: 'Check Point',
-    version: '0.8.2',
-    release: 'experimental',
-    description: 'This Elastic integration collects logs from Check Point products',
-    type: 'integration',
-    download: '/epr/checkpoint/checkpoint-0.8.2.zip',
-    path: '/package/checkpoint/0.8.2',
-    icons: [
-      {
-        src: '/img/checkpoint-logo.svg',
-        path: '/package/checkpoint/0.8.2/img/checkpoint-logo.svg',
-        title: 'Check Point',
-        size: '216x216',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'checkpoint',
-        title: 'Check Point logs',
-        description: 'Collect logs from Check Point instances',
-      },
-    ],
-    id: 'checkpoint',
-    status: 'not_installed',
-  },
-  {
-    name: 'cisco',
-    title: 'Cisco',
-    version: '0.10.0',
-    release: 'experimental',
-    description: 'Cisco Integration',
-    type: 'integration',
-    download: '/epr/cisco/cisco-0.10.0.zip',
-    path: '/package/cisco/0.10.0',
-    icons: [
-      {
-        src: '/img/cisco.svg',
-        path: '/package/cisco/0.10.0/img/cisco.svg',
-        title: 'cisco',
-        size: '216x216',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'cisco',
-        title: 'Cisco logs',
-        description: 'Collect logs from Cisco instances',
-      },
-    ],
-    id: 'cisco',
-    status: 'not_installed',
-  },
-  {
-    name: 'crowdstrike',
-    title: 'CrowdStrike',
-    version: '0.6.0',
-    release: 'experimental',
-    description: 'CrowdStrike Integration',
-    type: 'integration',
-    download: '/epr/crowdstrike/crowdstrike-0.6.0.zip',
-    path: '/package/crowdstrike/0.6.0',
-    icons: [
-      {
-        src: '/img/logo-integrations-crowdstrike.svg',
-        path: '/package/crowdstrike/0.6.0/img/logo-integrations-crowdstrike.svg',
-        title: 'CrowdStrike',
-        size: '216x216',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'crowdstrike',
-        title: 'CrowdStrike Falcon logs',
-        description: 'Collect logs from CrowdStrike Falcon',
-      },
-    ],
-    id: 'crowdstrike',
-    status: 'not_installed',
-  },
-  {
-    name: 'cyberark',
-    title: 'Cyber-Ark - Deprecated',
-    version: '0.3.0',
-    release: 'experimental',
-    description:
-      "Cyber-Ark Integration - Deprecated: Use 'CyberArk Privileged Access Security' instead.",
-    type: 'integration',
-    download: '/epr/cyberark/cyberark-0.3.0.zip',
-    path: '/package/cyberark/0.3.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/cyberark/0.3.0/img/logo.svg',
-        title: 'CyberArk logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'cyberark',
-        title: 'CyberArk logs',
-        description: 'Collect CyberArk logs from syslog or a file.',
-      },
-    ],
-    id: 'cyberark',
-    status: 'not_installed',
-  },
-  {
-    name: 'cyberarkpas',
-    title: 'CyberArk Privileged Access Security',
-    version: '1.2.3',
-    release: 'beta',
-    description: 'This Elastic integration collects logs from CyberArk',
-    type: 'integration',
-    download: '/epr/cyberarkpas/cyberarkpas-1.2.3.zip',
-    path: '/package/cyberarkpas/1.2.3',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/cyberarkpas/1.2.3/img/logo.svg',
-        title: 'CyberArk logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'cyberarkpas',
-        title: 'CyberArk Privileged Access Security audit logs',
-        description: 'Collect logs from Vault instances',
-      },
-    ],
-    id: 'cyberarkpas',
-    status: 'not_installed',
-  },
-  {
-    name: 'cylance',
-    title: 'CylanceProtect',
-    version: '0.3.0',
-    release: 'experimental',
-    description: 'CylanceProtect Integration',
-    type: 'integration',
-    download: '/epr/cylance/cylance-0.3.0.zip',
-    path: '/package/cylance/0.3.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/cylance/0.3.0/img/logo.svg',
-        title: 'CylanceProtect logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'protect',
-        title: 'CylanceProtect',
-        description: 'Collect CylanceProtect logs from syslog or a file.',
-      },
-    ],
-    id: 'cylance',
-    status: 'not_installed',
-  },
-  {
-    name: 'elastic_agent',
-    title: 'Elastic Agent',
-    version: '1.0.0',
-    release: 'ga',
-    description: 'This Elastic integration collects metrics from Elastic Agent',
-    type: 'integration',
-    download: '/epr/elastic_agent/elastic_agent-1.0.0.zip',
-    path: '/package/elastic_agent/1.0.0',
-    icons: [
-      {
-        src: '/img/logo_elastic_agent.svg',
-        path: '/package/elastic_agent/1.0.0/img/logo_elastic_agent.svg',
-        title: 'logo Elastic Agent',
-        size: '64x64',
-        type: 'image/svg+xml',
-      },
-    ],
-    id: 'elastic_agent',
-    status: 'installed',
-    savedObject: {
-      type: 'epm-packages',
-      id: 'elastic_agent',
-      attributes: {
-        installed_kibana: [
-          {
-            id: 'elastic_agent-f47f18cc-9c7d-4278-b2ea-a6dee816d395',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'elastic_agent-47d87552-8421-4cfc-bc5d-4a7205f5b007',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'elastic_agent-93a8a11d-b2da-4ef3-81dc-c7040560ffde',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'elastic_agent-a11c250a-865f-4eb2-9441-882d229313be',
-            type: KibanaSavedObjectType.visualization,
-          },
-        ],
-        installed_es: [
-          {
-            id: 'metrics-elastic_agent.elastic_agent',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-elastic_agent.elastic_agent@mappings',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-elastic_agent.elastic_agent@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-        ],
-        package_assets: [
-          {
-            id: '0100ed87-1b21-5959-9ee3-6f6fe60b0126',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '79617489-e64c-5867-aa21-131d3f76d7c0',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'c1da5c89-8489-5a28-b7d8-d71f3680193e',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'e2ebdefd-4511-57c6-81bd-9b206d5de396',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'aae8cab7-af27-5e71-9a95-a76e20ccfd0f',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '14935ecd-d51c-59c8-8c2b-fc0a3c94c3bc',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '0173d8b8-3625-5a87-9ff9-b6885d475e58',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2c518c0e-44b7-5121-9cbe-b9794317fc65',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'c5d0bc02-78bc-558f-a26e-406aeaeb0a6b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '38e9b2ce-4833-594b-95e6-d4dc663ecd6a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '12996859-f0e4-51f5-b842-a34781b11164',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '70b80a43-df71-5e8c-887d-c09114998a72',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'bd50d62b-1f81-56ce-accf-82fe25f2723e',
-            type: 'epm-packages-assets',
-          },
-        ],
-        es_index_patterns: {
-          elastic_agent: 'metrics-elastic_agent.elastic_agent-*',
-        },
-        name: 'elastic_agent',
-        version: '1.0.0',
-        internal: false,
-        removable: false,
-        install_version: '1.0.0',
-        install_status: 'installed',
-        install_started_at: '2021-08-25T19:44:41.090Z',
-        install_source: 'registry',
-        keep_policies_up_to_date: false,
-      },
-      references: [],
-      coreMigrationVersion: '7.14.0',
-      updated_at: '2021-08-25T19:45:01.491Z',
-      version: 'Wzc3NjQsNF0=',
-      // score: 0, TODO: this is not represented in any type, but is returned by the API,
-    },
-  },
-  {
-    name: 'endpoint',
-    title: 'Endpoint Security',
-    version: '1.0.0',
-    release: 'ga',
-    description:
-      'Protect your hosts with threat prevention, detection, and deep security data visibility.',
-    type: 'integration',
-    download: '/epr/endpoint/endpoint-1.0.0.zip',
-    path: '/package/endpoint/1.0.0',
-    icons: [
-      {
-        src: '/img/security-logo-color-64px.svg',
-        path: '/package/endpoint/1.0.0/img/security-logo-color-64px.svg',
-        size: '16x16',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'endpoint',
-        title: 'Endpoint Security Integration',
-        description: 'Interact with the endpoint.',
-      },
-    ],
-    id: 'endpoint',
-    status: 'not_installed',
-  },
-  {
-    name: 'f5',
-    title: 'F5',
-    version: '0.4.0',
-    release: 'experimental',
-    description: 'F5 Integration',
-    type: 'integration',
-    download: '/epr/f5/f5-0.4.0.zip',
-    path: '/package/f5/0.4.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/f5/0.4.0/img/logo.svg',
-        title: 'Big-IP Access Policy Manager logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'F5',
-        title: 'F5 logs',
-        description: 'Collect F5 logs from syslog or a file.',
-      },
-    ],
-    id: 'f5',
-    status: 'not_installed',
-  },
-  {
-    name: 'fleet_server',
-    title: 'Fleet Server',
-    version: '1.0.1',
-    release: 'ga',
-    description: 'Centrally manage Elastic Agents with the Fleet Server integration',
-    type: 'integration',
-    download: '/epr/fleet_server/fleet_server-1.0.1.zip',
-    path: '/package/fleet_server/1.0.1',
-    icons: [
-      {
-        src: '/img/logo_fleet_server.svg',
-        path: '/package/fleet_server/1.0.1/img/logo_fleet_server.svg',
-        title: 'logo Fleet Server',
-        size: '64x64',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'fleet_server',
-        title: 'Fleet Server',
-        description: 'Fleet Server setup',
-      },
-    ],
-    id: 'fleet_server',
-    status: 'installed',
-    savedObject: {
-      type: 'epm-packages',
-      id: 'fleet_server',
-      attributes: {
-        installed_kibana: [],
-        installed_es: [],
-        package_assets: [
-          {
-            id: '4a805c49-0059-52f4-bdc0-56388a9708a7',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '738689f4-0777-5219-ac20-5517c593f6f6',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '1e5f0249-d9a4-5259-8905-e830165185da',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '67e878de-de6e-5123-ad62-caff2e59ef9b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'fa44229e-987c-58d5-bef9-95dbaedbe2d8',
-            type: 'epm-packages-assets',
-          },
-        ],
-        es_index_patterns: {},
-        name: 'fleet_server',
-        version: '1.0.1',
-        internal: false,
-        removable: false,
-        install_version: '1.0.1',
-        install_status: 'installed',
-        install_started_at: '2021-08-25T19:44:37.078Z',
-        install_source: 'registry',
-        keep_policies_up_to_date: false,
-      },
-      references: [],
-      coreMigrationVersion: '7.14.0',
-      updated_at: '2021-08-25T19:44:53.517Z',
-      version: 'WzczMTIsNF0=',
-      // score: 0, TODO: this is not represented in any type, but is returned by the API,
-    },
-  },
-  {
-    name: 'fortinet',
-    title: 'Fortinet',
-    version: '1.1.2',
-    release: 'ga',
-    description: 'This Elastic integration collects logs from Fortinet instances',
-    type: 'integration',
-    download: '/epr/fortinet/fortinet-1.1.2.zip',
-    path: '/package/fortinet/1.1.2',
-    icons: [
-      {
-        src: '/img/fortinet-logo.svg',
-        path: '/package/fortinet/1.1.2/img/fortinet-logo.svg',
-        title: 'Fortinet',
-        size: '216x216',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'fortinet',
-        title: 'Fortinet logs',
-        description: 'Collect logs from Fortinet instances',
-      },
-    ],
-    id: 'fortinet',
-    status: 'not_installed',
-  },
-  {
-    name: 'gcp',
-    title: 'Google Cloud Platform (GCP)',
-    version: '0.2.0',
-    release: 'experimental',
-    description: 'Google Cloud Platform (GCP) Integration',
-    type: 'integration',
-    download: '/epr/gcp/gcp-0.2.0.zip',
-    path: '/package/gcp/0.2.0',
-    icons: [
-      {
-        src: '/img/logo_gcp.svg',
-        path: '/package/gcp/0.2.0/img/logo_gcp.svg',
-        title: 'logo gcp',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'gcp',
-        title: 'Google Cloud Platform (GCP) logs',
-        description: 'Collect logs from Google Cloud Platform (GCP) instances',
-      },
-    ],
-    id: 'gcp',
-    status: 'not_installed',
-  },
-  {
-    name: 'google_workspace',
-    title: 'Google Workspace',
-    version: '0.7.3',
-    release: 'experimental',
-    description: 'This Elastic integration collects logs from Google Workspace APIs',
-    type: 'integration',
-    download: '/epr/google_workspace/google_workspace-0.7.3.zip',
-    path: '/package/google_workspace/0.7.3',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/google_workspace/0.7.3/img/logo.svg',
-        title: 'logo Google',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'google_workspace',
-        title: 'Google Workspace logs',
-        description: 'Collect logs from Google Workspace APIs',
-      },
-    ],
-    id: 'google_workspace',
-    status: 'not_installed',
-  },
-  {
-    name: 'haproxy',
-    title: 'HAProxy',
-    version: '0.4.0',
-    release: 'experimental',
-    description: 'HAProxy Integration',
-    type: 'integration',
-    download: '/epr/haproxy/haproxy-0.4.0.zip',
-    path: '/package/haproxy/0.4.0',
-    icons: [
-      {
-        src: '/img/logo_haproxy.svg',
-        path: '/package/haproxy/0.4.0/img/logo_haproxy.svg',
-        title: 'logo HAProxy',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'haproxy',
-        title: 'HAProxy logs and metrics',
-        description: 'Collect logs and metrics from HAProxy instances',
-      },
-    ],
-    id: 'haproxy',
-    status: 'not_installed',
-  },
-  {
-    name: 'iis',
-    title: 'IIS',
-    version: '0.5.0',
-    release: 'beta',
-    description: 'IIS Integration',
-    type: 'integration',
-    download: '/epr/iis/iis-0.5.0.zip',
-    path: '/package/iis/0.5.0',
-    icons: [
-      {
-        src: '/img/iis.svg',
-        path: '/package/iis/0.5.0/img/iis.svg',
-        title: 'iis',
-        size: '100x100',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'iis',
-        title: 'IIS logs and metrics',
-        description: 'Collect logs and metrics from IIS instances',
-      },
-    ],
-    id: 'iis',
-    status: 'not_installed',
-  },
-  {
-    name: 'imperva',
-    title: 'Imperva SecureSphere',
-    version: '0.3.0',
-    release: 'experimental',
-    description: 'Imperva SecureSphere Integration',
-    type: 'integration',
-    download: '/epr/imperva/imperva-0.3.0.zip',
-    path: '/package/imperva/0.3.0',
-    policy_templates: [
-      {
-        name: 'securesphere',
-        title: 'Imperva SecureSphere',
-        description: 'Collect Imperva SecureSphere logs from syslog or a file.',
-      },
-    ],
-    id: 'imperva',
-    status: 'not_installed',
-  },
-  {
-    name: 'infoblox',
-    title: 'Infoblox NIOS',
-    version: '0.3.0',
-    release: 'experimental',
-    description: 'Infoblox NIOS Integration',
-    type: 'integration',
-    download: '/epr/infoblox/infoblox-0.3.0.zip',
-    path: '/package/infoblox/0.3.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/infoblox/0.3.0/img/logo.svg',
-        title: 'Infoblox NIOS logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'nios',
-        title: 'Infoblox NIOS',
-        description: 'Collect Infoblox NIOS logs from syslog or a file.',
-      },
-    ],
-    id: 'infoblox',
-    status: 'not_installed',
-  },
-  {
-    name: 'iptables',
-    title: 'Iptables',
-    version: '0.5.0',
-    release: 'experimental',
-    description: 'This Elastic integration collects logs from Iptables instances',
-    type: 'integration',
-    download: '/epr/iptables/iptables-0.5.0.zip',
-    path: '/package/iptables/0.5.0',
-    icons: [
-      {
-        src: '/img/linux.svg',
-        path: '/package/iptables/0.5.0/img/linux.svg',
-        title: 'linux',
-        size: '299x354',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'iptables',
-        title: 'Iptables logs',
-        description: 'Collect logs from iptables instances',
-      },
-    ],
-    id: 'iptables',
-    status: 'not_installed',
-  },
-  {
-    name: 'juniper',
-    title: 'Juniper',
-    version: '0.7.0',
-    release: 'experimental',
-    description: 'Juniper Integration',
-    type: 'integration',
-    download: '/epr/juniper/juniper-0.7.0.zip',
-    path: '/package/juniper/0.7.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/juniper/0.7.0/img/logo.svg',
-        title: 'Juniper logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'juniper',
-        title: 'Juniper logs',
-        description: 'Collect Juniper logs from syslog or a file.',
-      },
-    ],
-    id: 'juniper',
-    status: 'not_installed',
-  },
-  {
-    name: 'kafka',
-    title: 'Kafka',
-    version: '0.5.0',
-    release: 'experimental',
-    description: 'Kafka Integration',
-    type: 'integration',
-    download: '/epr/kafka/kafka-0.5.0.zip',
-    path: '/package/kafka/0.5.0',
-    icons: [
-      {
-        src: '/img/logo_kafka.svg',
-        path: '/package/kafka/0.5.0/img/logo_kafka.svg',
-        title: 'logo kafka',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'kafka',
-        title: 'Kafka logs and metrics',
-        description: 'Collect logs and metrics from Kafka brokers',
-      },
-    ],
-    id: 'kafka',
-    status: 'not_installed',
-  },
-  {
-    name: 'kubernetes',
-    title: 'Kubernetes',
-    version: '0.8.0',
-    release: 'experimental',
-    description: 'Kubernetes Integration',
-    type: 'integration',
-    download: '/epr/kubernetes/kubernetes-0.8.0.zip',
-    path: '/package/kubernetes/0.8.0',
-    icons: [
-      {
-        src: '/img/logo_kubernetes.svg',
-        path: '/package/kubernetes/0.8.0/img/logo_kubernetes.svg',
-        title: 'Logo Kubernetes',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'kubelet',
-        title: 'Kubelet',
-        description: 'Collect metrics from Kubernetes Kubelet API',
-        icons: [
-          {
-            src: '/img/logo_kubernetes.svg',
-            path: '/package/kubernetes/0.8.0/img/logo_kubernetes.svg',
-            title: 'Logo Kubernetes',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'kube-state-metrics',
-        title: 'kube-state-metrics',
-        description: 'Collect metrics from kube-state-metrics',
-        icons: [
-          {
-            src: '/img/logo_kubernetes.svg',
-            path: '/package/kubernetes/0.8.0/img/logo_kubernetes.svg',
-            title: 'Logo Kubernetes',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'kube-apiserver',
-        title: 'kube-apiserver',
-        description: 'Collect metrics from Kubernetes API Server',
-        icons: [
-          {
-            src: '/img/logo_kubernetes.svg',
-            path: '/package/kubernetes/0.8.0/img/logo_kubernetes.svg',
-            title: 'Logo Kubernetes',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'kube-proxy',
-        title: 'kube-proxy',
-        description: 'Collect metrics from Kubernetes Proxy',
-        icons: [
-          {
-            src: '/img/logo_kubernetes.svg',
-            path: '/package/kubernetes/0.8.0/img/logo_kubernetes.svg',
-            title: 'Logo Kubernetes',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'kube-scheduler',
-        title: 'kube-scheduler',
-        description: 'Collect metrics from Kubernetes Scheduler',
-        icons: [
-          {
-            src: '/img/logo_kubernetes.svg',
-            path: '/package/kubernetes/0.8.0/img/logo_kubernetes.svg',
-            title: 'Logo Kubernetes',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'kube-controller-manager',
-        title: 'kube-controller-manager',
-        description: 'Collect metrics from Kubernetes controller-manager',
-        icons: [
-          {
-            src: '/img/logo_kubernetes.svg',
-            path: '/package/kubernetes/0.8.0/img/logo_kubernetes.svg',
-            title: 'Logo Kubernetes',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-      {
-        name: 'events',
-        title: 'Events',
-        description: 'Collect events from Kubernetes API server',
-        icons: [
-          {
-            src: '/img/logo_kubernetes.svg',
-            path: '/package/kubernetes/0.8.0/img/logo_kubernetes.svg',
-            title: 'Logo Kubernetes',
-            size: '32x32',
-            type: 'image/svg+xml',
-          },
-        ],
-      },
-    ],
-    id: 'kubernetes',
-    status: 'not_installed',
-  },
-  {
-    name: 'linux',
-    title: 'Linux',
-    version: '0.4.1',
-    release: 'beta',
-    description: 'Linux Integration',
-    type: 'integration',
-    download: '/epr/linux/linux-0.4.1.zip',
-    path: '/package/linux/0.4.1',
-    policy_templates: [
-      {
-        name: 'system',
-        title: 'Linux kernel metrics',
-        description: 'Collect system metrics from Linux operating systems',
-      },
-    ],
-    id: 'linux',
-    status: 'not_installed',
-  },
-  {
-    name: 'log',
-    title: 'Custom logs',
-    version: '0.4.6',
-    release: 'experimental',
-    description: 'Collect your custom logs.\n',
-    type: 'integration',
-    download: '/epr/log/log-0.4.6.zip',
-    path: '/package/log/0.4.6',
-    icons: [
-      {
-        src: '/img/icon.svg',
-        path: '/package/log/0.4.6/img/icon.svg',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'logs',
-        title: 'Custom logs',
-        description: 'Collect your custom log files.',
-      },
-    ],
-    id: 'log',
-    status: 'not_installed',
-  },
-  {
-    name: 'microsoft',
-    title: 'Microsoft',
-    version: '0.6.0',
-    release: 'experimental',
-    description: 'Microsoft Integration',
-    type: 'integration',
-    download: '/epr/microsoft/microsoft-0.6.0.zip',
-    path: '/package/microsoft/0.6.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/microsoft/0.6.0/img/logo.svg',
-        title: 'Microsoft logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'microsoft',
-        title: 'Microsoft',
-        description: 'Collect logs from Microsoft products',
-      },
-    ],
-    id: 'microsoft',
-    status: 'not_installed',
-  },
-  {
-    name: 'mongodb',
-    title: 'MongoDB',
-    version: '0.6.0',
-    release: 'experimental',
-    description: 'MongoDB Integration',
-    type: 'integration',
-    download: '/epr/mongodb/mongodb-0.6.0.zip',
-    path: '/package/mongodb/0.6.0',
-    icons: [
-      {
-        src: '/img/logo_mongodb.svg',
-        path: '/package/mongodb/0.6.0/img/logo_mongodb.svg',
-        title: 'logo mongodb',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'mongodb',
-        title: 'MongoDB logs and metrics',
-        description: 'Collect logs and metrics from MongoDB instances',
-      },
-    ],
-    id: 'mongodb',
-    status: 'not_installed',
-  },
-  {
-    name: 'mysql',
-    title: 'MySQL',
-    version: '0.5.0',
-    release: 'beta',
-    description: 'MySQL Integration',
-    type: 'integration',
-    download: '/epr/mysql/mysql-0.5.0.zip',
-    path: '/package/mysql/0.5.0',
-    icons: [
-      {
-        src: '/img/logo_mysql.svg',
-        path: '/package/mysql/0.5.0/img/logo_mysql.svg',
-        title: 'logo mysql',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'mysql',
-        title: 'MySQL logs and metrics',
-        description: 'Collect logs and metrics from MySQL instances',
-      },
-    ],
-    id: 'mysql',
-    status: 'not_installed',
-  },
-  {
-    name: 'nats',
-    title: 'NATS',
-    version: '0.4.0',
-    release: 'experimental',
-    description: 'NATS Integration',
-    type: 'integration',
-    download: '/epr/nats/nats-0.4.0.zip',
-    path: '/package/nats/0.4.0',
-    icons: [
-      {
-        src: '/img/nats.svg',
-        path: '/package/nats/0.4.0/img/nats.svg',
-        title: 'NATS Logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'nats',
-        title: 'NATS Logs and Metrics',
-        description: 'Collect logs and metrics from NATS instances',
-      },
-    ],
-    id: 'nats',
-    status: 'not_installed',
-  },
-  {
-    name: 'netflow',
-    title: 'NetFlow',
-    version: '1.2.0',
-    release: 'ga',
-    description: 'This Elastic integration collects logs from NetFlow',
-    type: 'integration',
-    download: '/epr/netflow/netflow-1.2.0.zip',
-    path: '/package/netflow/1.2.0',
-    policy_templates: [
-      {
-        name: 'netflow',
-        title: 'NetFlow logs',
-        description: 'Collect Netflow logs from networks via UDP',
-      },
-    ],
-    id: 'netflow',
-    status: 'not_installed',
-  },
-  {
-    name: 'netscout',
-    title: 'Arbor Peakflow SP',
-    version: '0.3.0',
-    release: 'experimental',
-    description: 'Arbor Peakflow SP Integration',
-    type: 'integration',
-    download: '/epr/netscout/netscout-0.3.0.zip',
-    path: '/package/netscout/0.3.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/netscout/0.3.0/img/logo.svg',
-        title: 'Arbor Peakflow SP logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'sightline',
-        title: 'Arbor Peakflow SP',
-        description: 'Collect Arbor Peakflow SP logs from syslog or a file.',
-      },
-    ],
-    id: 'netscout',
-    status: 'not_installed',
-  },
-  {
-    name: 'nginx',
-    title: 'Nginx',
-    version: '0.7.0',
-    release: 'experimental',
-    description: 'Nginx Integration',
-    type: 'integration',
-    download: '/epr/nginx/nginx-0.7.0.zip',
-    path: '/package/nginx/0.7.0',
-    icons: [
-      {
-        src: '/img/logo_nginx.svg',
-        path: '/package/nginx/0.7.0/img/logo_nginx.svg',
-        title: 'logo nginx',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'nginx',
-        title: 'Nginx logs and metrics',
-        description: 'Collect logs and metrics from Nginx instances',
-      },
-    ],
-    id: 'nginx',
-    status: 'not_installed',
-  },
-  {
-    name: 'nginx_ingress_controller',
-    title: 'Nginx Ingress Controller',
-    version: '0.2.0',
-    release: 'experimental',
-    description: 'Nginx Ingress Controller Integration',
-    type: 'integration',
-    download: '/epr/nginx_ingress_controller/nginx_ingress_controller-0.2.0.zip',
-    path: '/package/nginx_ingress_controller/0.2.0',
-    icons: [
-      {
-        src: '/img/logo_nginx.svg',
-        path: '/package/nginx_ingress_controller/0.2.0/img/logo_nginx.svg',
-        title: 'Nginx logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'nginx_ingress_controller',
-        title: 'Nginx Ingress Controller logs',
-        description: 'Collect logs from Nginx Ingress Controller instances',
-      },
-    ],
-    id: 'nginx_ingress_controller',
-    status: 'not_installed',
-  },
-  {
-    name: 'o365',
-    title: 'Office 365',
-    version: '1.1.4',
-    release: 'ga',
-    description: 'This Elastic integration collects events from Microsoft Office 365',
-    type: 'integration',
-    download: '/epr/o365/o365-1.1.4.zip',
-    path: '/package/o365/1.1.4',
-    icons: [
-      {
-        src: '/img/logo-integrations-microsoft-365.svg',
-        path: '/package/o365/1.1.4/img/logo-integrations-microsoft-365.svg',
-        title: 'Microsoft Office 365',
-        size: '216x216',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'o365',
-        title: 'Office 365 logs',
-        description: 'Collect logs from Office 365',
-      },
-    ],
-    id: 'o365',
-    status: 'not_installed',
-  },
-  {
-    name: 'okta',
-    title: 'Okta',
-    version: '1.2.0',
-    release: 'ga',
-    description: 'This Elastic integration collects events from Okta',
-    type: 'integration',
-    download: '/epr/okta/okta-1.2.0.zip',
-    path: '/package/okta/1.2.0',
-    icons: [
-      {
-        src: '/img/okta-logo.svg',
-        path: '/package/okta/1.2.0/img/okta-logo.svg',
-        title: 'Okta',
-        size: '216x216',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'okta',
-        title: 'Okta logs',
-        description: 'Collect logs from Okta',
-      },
-    ],
-    id: 'okta',
-    status: 'not_installed',
-  },
-  {
-    name: 'osquery',
-    title: 'Osquery Log Collection',
-    version: '0.6.0',
-    release: 'experimental',
-    description: 'This Elastic integration collects logs from Osquery instances',
-    type: 'integration',
-    download: '/epr/osquery/osquery-0.6.0.zip',
-    path: '/package/osquery/0.6.0',
-    icons: [
-      {
-        src: '/img/logo_osquery.svg',
-        path: '/package/osquery/0.6.0/img/logo_osquery.svg',
-        title: 'logo osquery',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'osquery',
-        title: 'Osquery logs',
-        description: 'Collect logs from Osquery instances',
-      },
-    ],
-    id: 'osquery',
-    status: 'not_installed',
-  },
-  {
-    name: 'osquery_manager',
-    title: 'Osquery Manager',
-    version: '0.3.2',
-    release: 'beta',
-    description:
-      'Centrally manage osquery deployments, run live queries, and schedule recurring queries',
-    type: 'integration',
-    download: '/epr/osquery_manager/osquery_manager-0.3.2.zip',
-    path: '/package/osquery_manager/0.3.2',
-    icons: [
-      {
-        src: '/img/logo_osquery.svg',
-        path: '/package/osquery_manager/0.3.2/img/logo_osquery.svg',
-        title: 'logo osquery',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'osquery_manager',
-        title: 'Osquery Manager',
-        description:
-          'Send interactive or scheduled queries to the osquery instances executed by the elastic-agent.',
-      },
-    ],
-    id: 'osquery_manager',
-    status: 'not_installed',
-  },
-  {
-    name: 'panw',
-    title: 'Palo Alto Networks',
-    version: '1.1.3',
-    release: 'ga',
-    description: 'Palo Alto Networks Integration',
-    type: 'integration',
-    download: '/epr/panw/panw-1.1.3.zip',
-    path: '/package/panw/1.1.3',
-    icons: [
-      {
-        src: '/img/logo-integrations-paloalto-networks.svg',
-        path: '/package/panw/1.1.3/img/logo-integrations-paloalto-networks.svg',
-        title: 'Palo Alto Networks',
-        size: '216x216',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'panw',
-        title: 'Palo Alto Networks PAN-OS firewall logs',
-        description: 'Collect logs from Palo Alto Networks PAN-OS firewall',
-      },
-    ],
-    id: 'panw',
-    status: 'not_installed',
-  },
-  {
-    name: 'postgresql',
-    title: 'PostgreSQL',
-    version: '0.5.0',
-    release: 'experimental',
-    description: 'PostgreSQL Integration',
-    type: 'integration',
-    download: '/epr/postgresql/postgresql-0.5.0.zip',
-    path: '/package/postgresql/0.5.0',
-    icons: [
-      {
-        src: '/img/logo_postgres.svg',
-        path: '/package/postgresql/0.5.0/img/logo_postgres.svg',
-        title: 'logo postgres',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'postgresql',
-        title: 'PostgreSQL logs and metrics',
-        description: 'Collect logs and metrics from PostgreSQL instances',
-      },
-    ],
-    id: 'postgresql',
-    status: 'not_installed',
-  },
-  {
-    name: 'prometheus',
-    title: 'Prometheus',
-    version: '0.4.1',
-    release: 'experimental',
-    description: 'Prometheus Integration',
-    type: 'integration',
-    download: '/epr/prometheus/prometheus-0.4.1.zip',
-    path: '/package/prometheus/0.4.1',
-    icons: [
-      {
-        src: '/img/logo_prometheus.svg',
-        path: '/package/prometheus/0.4.1/img/logo_prometheus.svg',
-        title: 'logo prometheus',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'prometheus',
-        title: 'Prometheus metrics',
-        description: 'Collect metrics from Prometheus instances',
-      },
-    ],
-    id: 'prometheus',
-    status: 'not_installed',
-  },
-  {
-    name: 'proofpoint',
-    title: 'Proofpoint Email Security',
-    version: '0.2.0',
-    release: 'experimental',
-    description: 'Proofpoint Email Security Integration',
-    type: 'integration',
-    download: '/epr/proofpoint/proofpoint-0.2.0.zip',
-    path: '/package/proofpoint/0.2.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/proofpoint/0.2.0/img/logo.svg',
-        title: 'Proofpoint Email Security logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'proofpoint',
-        title: 'Proofpoint logs',
-        description: 'Collect Proofpoint logs from syslog or a file.',
-      },
-    ],
-    id: 'proofpoint',
-    status: 'not_installed',
-  },
-  {
-    name: 'rabbitmq',
-    title: 'RabbitMQ',
-    version: '0.4.1',
-    release: 'experimental',
-    description: 'RabbitMQ Integration',
-    type: 'integration',
-    download: '/epr/rabbitmq/rabbitmq-0.4.1.zip',
-    path: '/package/rabbitmq/0.4.1',
-    icons: [
-      {
-        src: '/img/logo_rabbitmq.svg',
-        path: '/package/rabbitmq/0.4.1/img/logo_rabbitmq.svg',
-        title: 'RabbitMQ Logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'rabbitmq',
-        title: 'RabbitMQ logs and metrics',
-        description: 'Collect logs and metrics from RabbitMQ instances',
-      },
-    ],
-    id: 'rabbitmq',
-    status: 'not_installed',
-  },
-  {
-    name: 'radware',
-    title: 'Radware DefensePro',
-    version: '0.4.0',
-    release: 'experimental',
-    description: 'This Elastic integration collects logs from Radware DefensePro',
-    type: 'integration',
-    download: '/epr/radware/radware-0.4.0.zip',
-    path: '/package/radware/0.4.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/radware/0.4.0/img/logo.svg',
-        title: 'Radware DefensePro logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'defensepro',
-        title: 'Radware DefensePro',
-        description: 'Collect Radware DefensePro logs from syslog or a file.',
-      },
-    ],
-    id: 'radware',
-    status: 'not_installed',
-  },
-  {
-    name: 'redis',
-    title: 'Redis',
-    version: '0.5.0',
-    release: 'experimental',
-    description: 'Redis Integration',
-    type: 'integration',
-    download: '/epr/redis/redis-0.5.0.zip',
-    path: '/package/redis/0.5.0',
-    icons: [
-      {
-        src: '/img/logo_redis.svg',
-        path: '/package/redis/0.5.0/img/logo_redis.svg',
-        title: 'logo redis',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'redis',
-        title: 'Redis logs and metrics',
-        description: 'Collect logs and metrics from Redis instances',
-      },
-    ],
-    id: 'redis',
-    status: 'not_installed',
-  },
-  {
-    name: 'santa',
-    title: 'Google Santa',
-    version: '0.4.0',
-    release: 'experimental',
-    description: 'This Elastic integration collects logs from Google Santa instances',
-    type: 'integration',
-    download: '/epr/santa/santa-0.4.0.zip',
-    path: '/package/santa/0.4.0',
-    icons: [
-      {
-        src: '/img/icon.svg',
-        path: '/package/santa/0.4.0/img/icon.svg',
-        title: 'Google Santa',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'santa',
-        title: 'Google Santa logs',
-        description: 'Collect logs from Google Santa instances',
-      },
-    ],
-    id: 'santa',
-    status: 'not_installed',
-  },
-  {
-    name: 'security_detection_engine',
-    title: 'Prebuilt Security Detection Rules',
-    version: '0.14.1',
+    name: 'ga_not_installed',
+    title: 'a. GA, Not Installed',
+    version: '0.0.1',
     release: 'ga',
-    description: 'Prebuilt detection rules for Elastic Security',
-    type: 'integration',
-    download: '/epr/security_detection_engine/security_detection_engine-0.14.1.zip',
-    path: '/package/security_detection_engine/0.14.1',
-    icons: [
-      {
-        src: '/img/security-logo-color-64px.svg',
-        path: '/package/security_detection_engine/0.14.1/img/security-logo-color-64px.svg',
-        size: '16x16',
-        type: 'image/svg+xml',
-      },
-    ],
-    id: 'security_detection_engine',
-    status: 'not_installed',
-  },
-  {
-    name: 'sonicwall',
-    title: 'Sonicwall-FW',
-    version: '0.3.0',
-    release: 'experimental',
-    description: 'Sonicwall-FW Integration',
-    type: 'integration',
-    download: '/epr/sonicwall/sonicwall-0.3.0.zip',
-    path: '/package/sonicwall/0.3.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/sonicwall/0.3.0/img/logo.svg',
-        title: 'Sonicwall-FW logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'firewall',
-        title: 'Sonicwall-FW',
-        description: 'Collect Sonicwall-FW logs from syslog or a file.',
-      },
-    ],
-    id: 'sonicwall',
-    status: 'not_installed',
-  },
-  {
-    name: 'sophos',
-    title: 'Sophos',
-    version: '0.4.0',
-    release: 'experimental',
-    description: 'Sophos Integration',
+    description: 'A package that is GA, but not installed',
     type: 'integration',
-    download: '/epr/sophos/sophos-0.4.0.zip',
-    path: '/package/sophos/0.4.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/sophos/0.4.0/img/logo.svg',
-        title: 'Sophos logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'sophos',
-        title: 'Sophos logs',
-        description: 'Collect Sophos logs from syslog or a file.',
-      },
-    ],
-    id: 'sophos',
+    download: '/epr/ga/not_installed',
+    path: '/package/ga/not_installed',
+    id: 'ga_not_installed',
     status: 'not_installed',
+    categories: ['aws', 'azure'],
   },
   {
-    name: 'squid',
-    title: 'Squid',
-    version: '0.3.0',
-    release: 'experimental',
-    description: 'Squid Integration',
+    name: 'ga_beats',
+    title: 'b. GA, has Beats',
+    version: '0.0.2',
+    release: 'ga',
+    description: 'A package that is GA, not installed, with Beats',
     type: 'integration',
-    download: '/epr/squid/squid-0.3.0.zip',
-    path: '/package/squid/0.3.0',
-    policy_templates: [
-      {
-        name: 'log',
-        title: 'Squid',
-        description: 'Collect Squid logs from syslog or a file.',
-      },
-    ],
-    id: 'squid',
+    download: '/epr/ga/not_installed/beats',
+    path: '/package/ga/not_installed/beats',
+    id: 'ga_not_installed_beat',
     status: 'not_installed',
+    categories: ['azure', 'cloud', 'config_management'],
   },
   {
-    name: 'stan',
-    title: 'STAN',
-    version: '0.2.0',
-    release: 'beta',
-    description: 'NATS Streaming Integration',
+    name: 'ga_installed',
+    title: 'c. GA, Installed',
+    version: '0.0.3',
+    release: 'ga',
+    description: 'A package that is GA and installed',
     type: 'integration',
-    download: '/epr/stan/stan-0.2.0.zip',
-    path: '/package/stan/0.2.0',
-    icons: [
-      {
-        src: '/img/stan.svg',
-        path: '/package/stan/0.2.0/img/stan.svg',
-        title: 'STAN Logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'stan',
-        title: 'STAN Logs and Metrics',
-        description: 'Collect logs and metrics from STAN instances',
+    download: '/epr/ga/installed',
+    path: '/package/ga/installed',
+    id: 'ga_installed',
+    status: 'installed',
+    savedObject: {
+      type: 'epm-packages',
+      id: 'ga_installed',
+      attributes: {
+        installed_kibana: [],
+        installed_es: [],
+        package_assets: [],
+        es_index_patterns: {},
+        name: 'ga_installed',
+        version: '0.0.3',
+        internal: false,
+        removable: false,
+        install_version: '0.0.3',
+        install_status: 'installed',
+        install_started_at: '2021-08-25T19:44:37.078Z',
+        install_source: 'registry',
+        keep_policies_up_to_date: false,
       },
-    ],
-    id: 'stan',
-    status: 'not_installed',
+      references: [],
+      coreMigrationVersion: '7.14.0',
+      updated_at: '2021-08-25T19:44:53.517Z',
+      version: 'WzczMTIsNF0=',
+    },
+    categories: ['cloud', 'containers'],
   },
   {
-    name: 'suricata',
-    title: 'Suricata',
-    version: '1.2.0',
+    name: 'ga_installed_update',
+    title: 'd. GA, Installed, Update',
+    version: '0.0.4',
     release: 'ga',
-    description: 'This Elastic integration collects events from Suricata instances',
+    description: 'A package that is GA, installed, with update',
     type: 'integration',
-    download: '/epr/suricata/suricata-1.2.0.zip',
-    path: '/package/suricata/1.2.0',
-    icons: [
-      {
-        src: '/img/suricata.svg',
-        path: '/package/suricata/1.2.0/img/suricata.svg',
-        title: 'suricata',
-        size: '309x309',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'suricata',
-        title: 'Suricata logs',
-        description: 'Collect logs from Suricata instances',
+    download: '/epr/ga/installed/update',
+    path: '/package/ga/installed/update',
+    id: 'ga_installed_update',
+    status: 'installed',
+    savedObject: {
+      type: 'epm-packages',
+      id: 'ga_installed_update',
+      attributes: {
+        installed_kibana: [],
+        installed_es: [],
+        package_assets: [],
+        es_index_patterns: {},
+        name: 'ga_installed_update',
+        version: '0.0.1',
+        internal: false,
+        removable: false,
+        install_version: '0.0.1',
+        install_status: 'installed',
+        install_started_at: '2021-08-25T19:44:37.078Z',
+        install_source: 'registry',
+        keep_policies_up_to_date: false,
       },
-    ],
-    id: 'suricata',
-    status: 'not_installed',
+      references: [],
+      coreMigrationVersion: '7.14.0',
+      updated_at: '2021-08-25T19:44:53.517Z',
+      version: 'WzczMTIsNF0=',
+    },
+    categories: ['cloud', 'crm', 'custom'],
   },
   {
-    name: 'symantec',
-    title: 'Symantec AntiVirus/Endpoint Protection',
-    version: '0.1.2',
-    release: 'experimental',
-    description: 'Symantec AntiVirus/Endpoint Protection Integration',
+    name: 'beta_not_installed',
+    title: 'e. Beta, Not Installed',
+    version: '0.0.5',
+    release: 'beta',
+    description: 'A package that is Beta, and not installed',
     type: 'integration',
-    download: '/epr/symantec/symantec-0.1.2.zip',
-    path: '/package/symantec/0.1.2',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/symantec/0.1.2/img/logo.svg',
-        title: 'Symantec AntiVirus/Endpoint Protection logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'symantec',
-        title: 'Symantec AntiVirus/Endpoint Protection logs',
-        description: 'Collect Symantec AntiVirus/Endpoint Protection logs from syslog or a file.',
-      },
-    ],
-    id: 'symantec',
+    download: '/epr/beta/not_installed',
+    path: '/package/beta/not_installed',
+    id: 'beta_not_installed',
     status: 'not_installed',
   },
   {
-    name: 'synthetics',
-    title: 'Elastic Synthetics',
-    version: '0.3.0',
+    name: 'beta_beats',
+    title: 'f. Beta, has Beats',
+    version: '0.0.6',
     release: 'beta',
-    description: 'This Elastic integration allows you to monitor the availability of your services',
+    description: 'A package that is Beta, not installed, with Beats',
     type: 'integration',
-    download: '/epr/synthetics/synthetics-0.3.0.zip',
-    path: '/package/synthetics/0.3.0',
-    icons: [
-      {
-        src: '/img/uptime-logo-color-64px.svg',
-        path: '/package/synthetics/0.3.0/img/uptime-logo-color-64px.svg',
-        size: '16x16',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'synthetics',
-        title: 'Elastic Synthetics',
-        description: 'Perform synthetic health checks on network endpoints.',
-      },
-    ],
-    id: 'synthetics',
+    download: '/epr/beta/not_installed/beats',
+    path: '/package/beta/not_installed/beats',
+    id: 'beta_beats',
     status: 'not_installed',
+    categories: ['datastore', 'elastic_stack', 'google_cloud'],
   },
   {
-    name: 'system',
-    title: 'System',
-    version: '1.1.2',
-    release: 'ga',
-    description: 'This Elastic integration collects logs and metrics from your servers',
+    name: 'beta_installed',
+    title: 'g. Beta, Installed',
+    version: '0.0.6',
+    release: 'beta',
+    description: 'A package that is Beta and installed',
     type: 'integration',
-    download: '/epr/system/system-1.1.2.zip',
-    path: '/package/system/1.1.2',
-    icons: [
-      {
-        src: '/img/system.svg',
-        path: '/package/system/1.1.2/img/system.svg',
-        title: 'system',
-        size: '1000x1000',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'system',
-        title: 'System logs and metrics',
-        description: 'Collect logs and metrics from System instances',
-      },
-    ],
-    id: 'system',
+    download: '/epr/beta/installed',
+    path: '/package/beta/installed',
+    id: 'beta_installed',
     status: 'installed',
     savedObject: {
       type: 'epm-packages',
-      id: 'system',
+      id: 'beta_installed',
       attributes: {
-        installed_kibana: [
-          {
-            id: 'system-01c54730-fee6-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-035846a0-a249-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-277876d0-fa2c-11e6-bbd3-29c986c96e5a',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-5517a150-f9ce-11e6-8115-a7c18106d86a',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-71f720f0-ff18-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-79ffd6e0-faa0-11e6-947f-177f697178b8',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-8223bed0-b9e9-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-Logs-syslog-dashboard',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-Metrics-system-overview',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-Winlogbeat-dashboard',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-bae11b00-9bfc-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-bb858830-f412-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-d401ef40-a7d5-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-f49f3170-9ffc-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.dashboard,
-          },
-          {
-            id: 'system-006d75f0-9c03-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-0620c3d0-bcd4-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-0622da40-9bfd-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-089b85d0-1b16-11e7-b09e-037021c4f8df',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-0cb2d940-bcde-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-0f2f5280-feeb-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-102efd20-bcdd-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-117f5a30-9b71-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-12667040-fa80-11e6-a1df-a78bd7504d38',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-162d7ab0-a7d6-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-175a5760-a7d5-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-18348f30-a24d-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-19e123b0-4d5a-11e7-aee5-fdc812cc3bec',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-1aae9140-1b93-11e7-8ada-3df93aab833e',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-1b5f17d0-feea-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-1b6725f0-ff1d-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-1f271bc0-231a-11ea-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-2084e300-a884-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-21aadac0-9c0b-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-25f31ee0-9c23-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-26732e20-1b91-11e7-bec4-a5e9ec5cab8b',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-26877510-9b72-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-2c71e0f0-9c0d-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-2dc6b820-b9e8-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-2e224660-1b19-11e7-b09e-037021c4f8df',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-327417e0-8462-11e7-bab8-bd2f0fb42c54',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-33462600-9b47-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-341ffe70-f9ce-11e6-8115-a7c18106d86a',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-346bb290-fa80-11e6-a1df-a78bd7504d38',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-34f97ee0-1b96-11e7-8ada-3df93aab833e',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-3cec3eb0-f9d3-11e6-8a3e-2b904044ea1d',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-3d65d450-a9c3-11e7-af20-67db8aecb295',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-400b63e0-f49a-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-421f0610-af98-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-4ac8f5f0-bcfe-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-4b683ac0-a7d7-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-4bedf650-9ffd-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-4d546850-1b15-11e7-b09e-037021c4f8df',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-4e4bb1e0-1b1b-11e7-b09e-037021c4f8df',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-51164310-fa2b-11e6-bbd3-29c986c96e5a',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-522ee670-1b92-11e7-bec4-a5e9ec5cab8b',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-546febc0-f49b-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-568a8130-bcde-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-58fb9480-9b46-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-590a60f0-5d87-11e7-8884-1bb4c3b890e4',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-5bb93ed0-a249-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-5c7af030-fa2a-11e6-bbd3-29c986c96e5a',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-5c9ee410-9b74-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-5d117970-9ffd-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-5d92b100-bce8-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-5dd15c00-fa78-11e6-ae9b-81e5311e8cab',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-5e19ff80-231c-11ea-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-5e7f0ed0-bcd2-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-5eeaafd0-fee7-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-60301890-ff1d-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-6b7b9a40-faa1-11e6-86b1-cd7735ff7e23',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-6f0f2ea0-f414-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-729443b0-a7d6-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-7322f9f0-ff1c-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-78b74f30-f9cd-11e6-8115-a7c18106d86a',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-7a329a00-a7d5-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-7cdb1330-4d1a-11e7-a196-69b9a7a020a9',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-7de2e3f0-9b4d-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-804dd400-a248-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-825fdb80-4d1d-11e7-b5f2-2b7c1895bf32',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-83e12df0-1b91-11e7-bec4-a5e9ec5cab8b',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-84502430-bce8-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-855899e0-1b1c-11e7-b09e-037021c4f8df',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-855957d0-bcdd-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-860706a0-9bfd-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-8ef59f90-6ab8-11ea-896f-0d70f7ec3956',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-8f20c950-bcd4-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-96976150-4d5d-11e7-aa29-87a97a796de6',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-97c70300-ff1c-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-98884120-f49d-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-99381c80-4d60-11e7-9a4c-ed99bbcaa42b',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-9dd22440-ff1d-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-9e534190-f49d-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-Event-Levels',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-Navigation',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-Number-of-Events-Over-Time-By-Event-Log',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-Number-of-Events',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-Sources',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-Syslog-events-by-hostname',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-Syslog-hostnames-and-processes',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-Top-Event-IDs',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-a13bf640-fee8-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-a3c3f350-9b6d-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-a5f664c0-f49a-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-a79395f0-6aba-11ea-896f-0d70f7ec3956',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-a909b930-685f-11ea-896f-0d70f7ec3956',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-aa31c9d0-9b75-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-ab2d1e90-1b1a-11e7-b09e-037021c4f8df',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-ab6f8d80-bce8-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-abd44840-9c0f-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-abf96c10-bcea-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-b5f38780-fee6-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-b89b0c90-9b41-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-bb9cf7a0-f49d-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-bc165210-f4b8-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-bf45dc50-ff1a-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-bfa5e400-1b16-11e7-b09e-037021c4f8df',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-c2ea73f0-a4bd-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-c359b020-bcdd-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-c5e3cf90-4d60-11e7-9a4c-ed99bbcaa42b',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-c6f2ffd0-4d17-11e7-a196-69b9a7a020a9',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-c9d959f0-ff1d-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-caf4d2b0-9b76-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-ce867840-f49e-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-d16bb400-f9cc-11e6-8115-a7c18106d86a',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-d2e80340-4d5c-11e7-aa29-87a97a796de6',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-d3166e80-1b91-11e7-bec4-a5e9ec5cab8b',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-d3a5fec0-ff18-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-d56ee420-fa79-11e6-a1df-a78bd7504d38',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-d770b040-9b35-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-da2110c0-bcea-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-da5ffe40-bcd9-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-dc589770-fa2b-11e6-bbd3-29c986c96e5a',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-e0f001c0-1b18-11e7-b09e-037021c4f8df',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-e121b140-fa78-11e6-a1df-a78bd7504d38',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-e20c02d0-9b48-11ea-87e4-49f31ec44891',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-e22c6f40-f498-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-e2516c10-a249-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-ee0319a0-bcd4-11e9-b6a2-c9b4015c4baf',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-ee292bc0-f499-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-f398d2f0-fa77-11e6-ae9b-81e5311e8cab',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-f42f3b20-fee6-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-fa876300-231a-11ea-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-fe064790-1b1f-11e7-bec4-a5e9ec5cab8b',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-fee83900-f49f-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-ffebe440-f419-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.visualization,
-          },
-          {
-            id: 'system-06b6b060-7a80-11ea-bc9a-0baf2ca323a3',
-            type: KibanaSavedObjectType.search,
-          },
-          {
-            id: 'system-324686c0-fefb-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.search,
-          },
-          {
-            id: 'system-62439dc0-f9c9-11e6-a747-6121780e0414',
-            type: KibanaSavedObjectType.search,
-          },
-          {
-            id: 'system-6f4071a0-7a78-11ea-bc9a-0baf2ca323a3',
-            type: KibanaSavedObjectType.search,
-          },
-          {
-            id: 'system-757510b0-a87f-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.search,
-          },
-          {
-            id: 'system-7e178c80-fee1-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.search,
-          },
-          {
-            id: 'system-8030c1b0-fa77-11e6-ae9b-81e5311e8cab',
-            type: KibanaSavedObjectType.search,
-          },
-          {
-            id: 'system-9066d5b0-fef2-11e9-8405-516218e3d268',
-            type: KibanaSavedObjectType.search,
-          },
-          {
-            id: 'system-Syslog-system-logs',
-            type: KibanaSavedObjectType.search,
-          },
-          {
-            id: 'system-b6f321e0-fa25-11e6-bbd3-29c986c96e5a',
-            type: KibanaSavedObjectType.search,
-          },
-          {
-            id: 'system-ce71c9a0-a25e-11e9-a422-d144027429da',
-            type: KibanaSavedObjectType.search,
-          },
-          {
-            id: 'system-eb0039f0-fa7f-11e6-a1df-a78bd7504d38',
-            type: KibanaSavedObjectType.search,
-          },
-        ],
-        installed_es: [
-          {
-            id: 'logs-system.application-1.1.2',
-            type: ElasticsearchAssetType.ingestPipeline,
-          },
-          {
-            id: 'logs-system.auth-1.1.2',
-            type: ElasticsearchAssetType.ingestPipeline,
-          },
-          {
-            id: 'logs-system.security-1.1.2',
-            type: ElasticsearchAssetType.ingestPipeline,
-          },
-          {
-            id: 'logs-system.syslog-1.1.2',
-            type: ElasticsearchAssetType.ingestPipeline,
-          },
-          {
-            id: 'logs-system.system-1.1.2',
-            type: ElasticsearchAssetType.ingestPipeline,
-          },
-          {
-            id: 'logs-system.application',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'logs-system.application@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'logs-system.auth',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'logs-system.auth@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-system.core',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-system.core@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-system.cpu',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-system.cpu@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-system.diskio',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-system.diskio@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-system.filesystem',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-system.filesystem@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-system.fsstat',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-system.fsstat@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-system.load',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-system.load@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-system.memory',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-system.memory@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-system.network',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-system.network@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-system.process',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-system.process@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-system.process.summary',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-system.process.summary@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'logs-system.security',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'logs-system.security@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-system.socket_summary',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-system.socket_summary@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'logs-system.syslog',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'logs-system.syslog@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'logs-system.system',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'logs-system.system@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-          {
-            id: 'metrics-system.uptime',
-            type: ElasticsearchAssetType.indexTemplate,
-          },
-          {
-            id: 'metrics-system.uptime@custom',
-            type: ElasticsearchAssetType.componentTemplate,
-          },
-        ],
-        package_assets: [
-          {
-            id: '24d5bf0e-9d18-5d4c-aab5-e9df683e6c33',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '033fb05a-aacc-5c41-8119-13d52078cf32',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '0b9501d6-2870-5324-b9cf-94ff8cb15e7b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '88adfac5-87a3-59dd-82f3-be0b4f05c79c',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '91812a40-865b-532c-85bb-c129f0e5470b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'bbdae0f8-fbc2-506f-9749-e490ee259cac',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'a477e3dd-34ff-584e-a5a7-c1c4c2f0cd50',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '9d8784ac-73e3-53d4-8cee-4f89f0ad8510',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'd4fb583d-0f95-598c-8583-59fc833fad36',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2503b12c-045c-55a4-9091-c9ec8782248a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '559fb8fe-6f73-5c7a-ad8d-cd6baba9fd84',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'cd1d1a1a-f595-5b7f-a416-2f54db379e8e',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '997dc457-7d6e-53c6-b35d-82e6095ac2e5',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '34a2d52c-5041-5c1b-86f7-6edc3384afe9',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '95a53c9e-0a7c-5bb5-9b5c-a2dba086c014',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '1d2390ea-960b-5bd8-ac7c-eb139e57081e',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'd04ed332-2098-53e5-8b0b-974f4cb8034a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '568fdd73-d459-5477-9428-e181f7ccf72b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '97f78283-b529-5993-a841-e8a00eb7da85',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '72db591c-96ed-58ea-a9d7-ee06a2b674d6',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '4102bc21-6624-5a43-90d7-748f0daa6d32',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'b42ab304-eff7-5996-801f-40bf5577f260',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '32311c4b-847a-5bf0-b24c-1b77ef6e9325',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6720333f-5f42-58b0-9661-044119397ec1',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'a021b06f-138b-5927-9abe-3a85d29e6a9a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '8f2e20d2-dd8f-52f5-b30f-52ef101b32fc',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'ecd6a951-5656-5c34-b682-b9db70c0502d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'ab696da3-6e5b-5da8-b0cd-4d80e95129fd',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'ddb89b63-b237-58f3-ba8e-ac7dc7d13bce',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'a45e7e27-141a-5096-8114-bb0b2bae6754',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '4ccce089-3138-54d5-9767-a9434be05289',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'c5fba17b-85d2-578d-9814-80cb70ad6460',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '8eaba418-f01b-5607-a289-6100b6cda900',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '69d3b6ab-8c55-5eff-bfec-a1d5638d113b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'e974ece1-e21d-5ac8-91a2-1d98e6390777',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '1babb631-2aea-5849-ae09-f6438b68694d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'ad6ec580-9a98-5f16-b41f-e12586ed98ee',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'e31da25f-a2ad-5d7a-b8cb-e0c4ff0036e8',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '0b84ce72-ead3-537f-b9f9-79d094d78d4e',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6dc4776d-f0e7-5b22-ba46-6cd2e82510c0',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '5e341b4d-3a5d-57c7-80ff-af294bf9cc5d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'e85af2d2-8d80-5a20-8dc2-43af03df4af9',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '563da411-7931-51df-9086-9e7974d61401',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '4e10bff7-6c0c-55f6-88c0-241844d03eba',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'fd405691-51b6-55e2-ada4-cfe2e7ac05ee',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '55f2d173-9c93-578a-85db-cc1f8c081a6a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'd60b0710-0b00-5bf0-ae84-88fe6867e8b7',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '17b1e231-6c6f-5cdd-aac1-a5d2fb5ad77e',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'b14839c1-f0b1-5972-a33d-c27fffdecdea',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '5c90f8d0-1303-52c9-98fd-c887a10b5156',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '576f2cb7-c3f7-54cd-8867-7f5db0ea0181',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f1d3b54c-ac5c-5b16-bbc8-6fa7a30a830d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '140002b7-becc-5d5e-94cd-6d0d2509fe76',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '00d83ffe-f12c-5b14-bf88-4dd56f61035d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '5bac3cbc-0bfd-5a90-8705-4ce8d009725d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2e69cfa6-1114-5b12-bb3d-1c0c03ee1342',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'c222cb4c-081e-5177-9ba3-d74da589ff3f',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '57bccf05-7422-5d2d-bb77-7483568c9224',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '65891658-69fd-5c65-a6da-49129ce35bad',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'ed38f380-d847-51a5-9642-fc7cabaa05ca',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '4d941e9d-48b2-5d34-8367-e42b94749731',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '97d561ac-86ec-5897-b81c-497bdc2a1161',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'd487aacb-1cfe-5f61-8a15-11537fe0697c',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '4db2b1d9-a85d-5e63-92f2-1b6c2b78cf06',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '03709276-036a-5e07-bfeb-38b2b64139f9',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '7c3b4348-d34c-5e15-bf53-1ed674b05b21',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f01f1b2e-0da0-562e-9b45-7522f7c3e77b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2d997745-8418-561e-86f4-788f2eb4fb0c',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '03a1c87a-a43b-5257-aaf5-3be4f4d632ba',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'a37af953-176e-5e32-85c5-da9671ce4f2e',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '784c1144-fcdb-5684-9aa5-76ff1bc47324',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '5c874611-e4ec-5353-8d4c-7841f09c3051',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'ddf93bfe-6d21-57d4-be98-cdf365bb3f13',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '417e458b-3741-5de1-b5e8-501a1a9e0f6b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '136bbf6d-0a63-5088-8685-2c6d26f03f59',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '1c913ab0-9afa-5f79-865e-e44a47d066f1',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f74391c4-6e8a-5a27-9486-8525f52b36c5',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '087058d0-e7bf-59d0-896a-0dcb9d9a570b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'ce860d2b-f771-5a08-8225-7cf1afd96fcd',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '3a06e9da-ebc7-5531-a980-23e3cb86de02',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '711f1455-9e07-5c3a-a11f-f362c08fb452',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f574e863-e38a-5a0d-b578-0ed946b5468a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '29181820-83c6-5127-988a-269451896254',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '763a3348-e7cb-546a-ad86-81958a1689b9',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'a0dec889-17d3-5ac2-b95d-04bbfdce3157',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'db23f433-b1e1-54ba-9afa-02e70163e83c',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '5f11a1bf-597e-5487-a095-7659c392a5bb',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2e262321-fdb2-593b-a72b-3db407216633',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '58f5919e-5785-5fef-90e8-38395e0038db',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'be985ede-d853-5e83-900b-df3e5aa9bd3a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '79d24ce5-e559-55d4-a472-66d264c25ab6',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'e3efa70d-c7da-5989-b258-887a79bf39de',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '5cc41639-8151-5dcb-91db-9cbc6915b1d3',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '083e964e-4e48-5271-822b-8f7b2dce4dd8',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '8d79b461-55a3-53e6-9d6b-b92864a7d5f0',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '7e761fd5-62c9-5f77-9427-213578f7498f',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '0e06037c-ce0f-50d2-a16a-a32e5f632da8',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'a6a05d73-19a4-52ba-b3d1-02eaaf3d7b9b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'df5075ba-5910-566f-ba84-84bb8c692cc9',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '7f9ae2a5-e086-50c9-924b-45dddb8b76d6',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'b486d488-4f6c-5f29-acf2-f793369d6188',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '389a7808-4698-5039-87cb-6ab4f7e1eae0',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'e02a82bf-bf0b-5e92-9b5a-8285ad1a52eb',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '9379b6e7-e5f5-5ba9-b174-9125cb1ee76c',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '4fd4d826-5ea7-58a7-a246-2b449569f602',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '231f9666-6a08-53d2-a0ab-8da2b82f7ada',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'b8e0ada0-cb83-54ee-b924-f088c198ecc7',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2dbdc626-9a1b-5576-a8c6-aa182c97d228',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '1c12a013-82b5-52da-b873-94798ec7d2ce',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '9d9f32b2-eb0f-584f-972e-a326879e0bfe',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f1431004-2baa-54a0-b791-318d72757154',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'cc411f61-3734-5fb4-97c5-c61ff2e1b05a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '1719a42f-f653-55a6-b879-fa7bca79f77f',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '8d29b0e4-042a-556a-ac3f-9c4de92cf77e',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'd74b45f5-001f-5ec1-8665-e7e95b0f233d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '55fdbd3b-2f4a-5aec-9224-fb34c4f1c212',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'd7215663-4278-5148-a57b-befecdc2123f',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'e1c31072-ca11-5a08-b192-c6b6b330476c',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '7345876f-234b-5bc1-bddd-125e83b60255',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'd3f8cdbd-105c-59c7-b5d8-34bf18b0cb46',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f070a7df-6dae-58d8-96f2-d030c4cc5184',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '9b7a9c7a-c925-51fa-8942-af378816c0bf',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '9af0ba7a-52a7-56a8-a2f4-0d8fef143757',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '91b93121-5088-5930-b9ac-fa9a643537ec',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'b9ed8fdd-58f1-5523-9e74-f20cc12d787b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6e111583-649e-5edf-b66f-01f43467511a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2f72a5e2-6c88-5a63-a599-5862799c6ca9',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6b12bc40-b5a9-52ad-b797-a159448652fb',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '26d03b35-8b9f-5fde-820d-6267f1aebf53',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '059f27cd-e074-5f10-bd40-b0760788ee91',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6c580e87-8fc1-54f6-85ab-9393e0e4d37d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '666e0e06-7597-5c4a-8195-d7972b8f2e08',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '51a0f0e9-2c37-5fb0-8b66-cb6178c52801',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '7b26a89b-a12b-5270-aa62-341b202f8fe8',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '958fad54-be5f-5179-82fa-8f621a9323f0',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '0964f86c-3118-5bc1-8af8-7db1d0394ef0',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'da7acbc4-da77-5f87-a0f2-8e4a3f298172',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'b051c802-cadd-543f-99d2-a9a1d7fba243',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'af53017a-2dba-5fd7-8eea-7752e67e388a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6f9cbba4-a2fb-580b-a9d5-73a79dea8263',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '9b7019a3-66fb-5a45-bee2-00242a1e1770',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f1d12e9e-af81-56d7-81d7-596adb6d1146',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'cd59bacd-892e-5202-9641-a02a720fbdb2',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '4bbda699-6819-58f4-ac75-a59adb263ebe',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '5fad7deb-4489-5ac5-b9fb-5b847204b9ac',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '12aca1cb-f4bb-5878-bfee-d7d45a8c0e81',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f3ab06ad-c1f1-556c-92a1-173e357afb8c',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '165aab12-d901-5568-8f9a-ab5b74e54867',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '87d7174f-dc0a-5f90-a98c-b4777035360c',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '0975161e-aa3a-59ac-bf20-4811844a8aab',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '44d5ce37-7b61-5494-9685-b56968bac54d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'e2e58028-d78d-5702-bb30-8bb081a457ea',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'bda60661-3ee7-5c69-9ef5-5cfd55ff1cae',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f800cd09-c76e-5d2e-b639-da9fa99520eb',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '80aa97ca-d0bc-5cab-afa8-1a8c11682edd',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f815750f-f03c-5cb8-a45e-20b9a3a7bc22',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6f8d92f7-80f4-584c-81a6-50543701adb9',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '93a1a4f5-0554-5089-a59b-6ca3319459ad',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '9ff13f94-2687-520e-be62-c6d0b2c89218',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '672c62d6-c24a-52ba-904e-3a502d591e79',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'b90ac874-628b-57ca-9663-dca9632a8c45',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '3dbe7093-69aa-517e-8301-405e48e59051',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '19752e35-ee5c-5683-8a9b-d129ff71c162',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '93e79ab8-6d64-5d99-974d-89521c354b45',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '46d66f9e-6fac-5004-9bd0-2d6078f0739d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '50257938-fd37-5d8b-8ae9-93ea39a47e9c',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'b799ffc1-7e6e-5da6-b6cd-842bda37d01f',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'a7a292ea-4e3f-5c1a-bb9a-3b466165a429',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'aa66e955-a443-5fe5-96c3-00199a9fb5d0',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '39a22cf9-b766-5241-ad8b-d18b9aa8df50',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '8d0b51b9-2bb4-575a-a149-51733de8003a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '60c3f393-3171-5890-8239-0c631fc3a14a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '69cd3134-5051-548f-9758-494c6354ff35',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6b556824-89f1-5d3b-8bee-d59ecf874c11',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'dc73b22f-a8ac-5170-8cbb-7d4d38d8bc00',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '3b6cc790-f311-5f79-8bbb-d658d81edd38',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '040a0b65-35a6-5813-92e2-feeb6a40b018',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '188f4e4a-45c1-5cc7-8278-feed4336bec6',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '54c52c7a-baec-5382-802e-33c6870d59f9',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '573ec1c9-da4d-57ef-82be-967aef48d83f',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6c737ba6-11c0-587e-b8e0-ec2e866371e1',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '26a2a1b7-38d1-5740-9a27-bd17e027f7b2',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '051fdd40-0212-5321-aeeb-1728e7ae53d7',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '04c6eaec-4640-50b0-9efe-a642b4aae216',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f3a8de34-d8f4-50ca-a886-43baf333f5be',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'd9368d92-e820-597f-9218-b2aa932c434b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'd29075e3-40d0-580a-aaec-b03cdb617cc0',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f1a54648-7c44-5c4f-8424-4042cca607e6',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2861cc7c-b7a2-5b15-b278-4db559dc0a5d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '51d0ae10-229b-5899-9da5-9121b44a86bf',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'dcb7e0df-b8e6-5734-a66d-1ce6bc7c0223',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '9e989e61-490b-526d-9e54-3f91c36e79c7',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'cd257f39-46bf-5f9c-aa3c-39f0e0ca7597',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '33853dbc-7979-5d20-aa98-160e5ebc4244',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '9048c9e2-18a3-5119-981a-d7ca191be801',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '1a1733e0-9f09-5ac6-a419-21d2f1b9666e',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f7ac8629-a4f6-5c98-90fd-b0477fccba74',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '68520af7-8007-5905-899c-072de167f361',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'a2b18338-7df4-51a2-a73d-1a8b437515b8',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '0fc2b9aa-eca6-538c-a837-5201dcb11a71',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '92836dfc-f2c6-5bb2-a894-1380e17b43f8',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '4c0a30e6-c549-569b-b30c-357a30b8da3d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2668e8ff-b1df-5101-aaf0-7a5b05c366d3',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'cf821d9d-2e6c-551a-b531-9ce5c435b7e4',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'dedc165b-ae21-5ac4-a7b3-7c3edc6630ba',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '31e07239-4a6e-57ec-89b5-583d6b2709a5',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '93ffa150-4107-5505-9236-7fdcec538c4f',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '0d97ad87-b383-5ea8-b801-25b680c2d7d0',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '8aa84a63-fb84-50f3-bd3f-c7bb29a89af6',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'c85d8839-6640-5a78-9ea6-7f03ba9fc51a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'c074a913-ea70-5480-b7ed-07a9a93f40cf',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'fbcec175-4095-5e91-ad9e-437a1ac9584f',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '5e3614f8-067a-54bc-b951-b3ea030b9be3',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2974eddc-3a5f-5a09-bc62-93538b50fc70',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'bf6d6ef7-7789-5b9c-aae5-6fe8db72cb24',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'd67e0090-fa3b-5e61-a904-1ad701254182',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '9f9f0f9c-8d63-5665-9fb7-8a9f45fe247a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '23b847fa-f386-5d10-b0b7-504831bf03d3',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '48e9edd3-6275-5651-94dc-f84d59c5e000',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2db92138-78cc-5d57-954f-7384e50e0d46',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '06f39986-ae21-5f3e-b784-01e82f323dc2',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2de02893-ff19-5910-9f99-6dda03d7c5e8',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'f4ab1085-e651-58e3-a3f1-61013e49c52a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'e05ef072-d40c-5e96-95f9-9e5d6b8fdfd8',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6a9e30e1-6e29-51ca-b139-b9455471c4aa',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '25fe3eb0-81f5-50d3-96bf-1cf520fb5f2b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '3b2ff5fb-e011-5996-b4d8-1350dea44011',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '1c403bef-ee6d-5914-9821-ac8493b69842',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '8b020f17-1522-552d-8e6b-c1dd232dcf84',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'e31a648e-9344-5837-919d-60038e37bcc2',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '5b9412ab-3b86-53e3-9d37-ba297e3e9d82',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'd0517d7f-d352-5d42-a69b-be1e8f29facc',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '31b00140-beb8-59b4-bab8-a2b3110ee028',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '7a14010e-0af3-52f9-9cc6-4abbd711a2ec',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '42bf2853-8f0b-51ed-a83f-43a0eef0e69c',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6ab1c44b-fb31-58f2-bea3-89610bb85033',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'b40691b2-a9fa-5ed8-92b6-dddcba93778c',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '8efe38d9-648a-5e7d-8491-51d24406ae87',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '2c02d373-6c2c-5312-9a6d-4c823e95cce9',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '3976bb6c-5bc6-586e-92a9-a94ac1844a80',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '036f7167-6000-5a73-8c21-3dc079973054',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '7c7f845d-4824-5387-94ac-589d1c1b8536',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'af7d2530-6254-50bf-8d6d-1fdb86bbea12',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'cb22ffac-9010-56b5-bb51-feeb1ff49903',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '526b63f6-76da-5cb6-a511-8b6ef368d8be',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '02d6549b-7f9f-5360-bf21-183cb9065b50',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '918f71de-1ab1-5662-a50e-a1a235f9cdfe',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '8d0c593b-c7ae-5190-ba74-caeefb473f06',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'b4928fed-4b26-5721-8982-8e985c54c151',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'dff8573e-b91b-56ee-99e1-7b605e4e0b78',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '999ecb6a-d0ef-5f09-b93b-f5ef5041e928',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '30a65433-4678-5252-8588-1c2d5eb06c82',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '86ab9714-31e7-5625-98c7-d303eac35336',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '3d13b34b-1254-5feb-bf46-84ed005468ba',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6c1f565a-7fb4-5b3e-a4bb-a8072306f869',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '6c305802-12f6-58fd-9979-fc52fc494c74',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'b7cfc3ba-0e9d-50dc-b52a-6d2f91f94d27',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'abc29ba1-5bf2-5685-a518-e8ab9b5ab174',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '85a9890a-7c64-5113-9ca8-0da157eefb1a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '27661e6f-a30a-5365-bd1d-2cb1b5c0d41a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '3b9ddf7f-133c-53c4-bb01-e32e18896ae5',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '08811d02-e3ed-5645-a2a8-f300fe7d166c',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '8f6eb04b-4313-5d5a-ac05-354914d0f98d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '8a871681-368e-5039-b739-4048738a1d62',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '46e7dfa4-17d7-596f-8cba-b675155e527b',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'a67744b6-e2ee-51f7-b366-0a90acd0db55',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'ddf46bcf-9a54-5703-b900-e0eab0387954',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '42fd7566-ac3c-58f9-95f0-f1113bd6c7b4',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '7b4f945b-99a0-5660-8707-2669e601f1de',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'c902879a-cd96-5911-b5c3-b59a299ad537',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '74aee54b-85e5-5022-92ff-f185cfc4206a',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'aeec412b-aa37-5f4c-84ae-d9c2ecab908d',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '1a21a3d5-c1cf-5e91-85e9-208b8b151d73',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: '980d1022-5fa3-5ba0-bb2e-d69404dd6bef',
-            type: 'epm-packages-assets',
-          },
-          {
-            id: 'e4473aed-5c33-5dea-a2d3-a91ac13117d8',
-            type: 'epm-packages-assets',
-          },
-        ],
-        es_index_patterns: {
-          application: 'logs-system.application-*',
-          auth: 'logs-system.auth-*',
-          core: 'metrics-system.core-*',
-          cpu: 'metrics-system.cpu-*',
-          diskio: 'metrics-system.diskio-*',
-          filesystem: 'metrics-system.filesystem-*',
-          fsstat: 'metrics-system.fsstat-*',
-          load: 'metrics-system.load-*',
-          memory: 'metrics-system.memory-*',
-          network: 'metrics-system.network-*',
-          process: 'metrics-system.process-*',
-          process_summary: 'metrics-system.process.summary-*',
-          security: 'logs-system.security-*',
-          socket_summary: 'metrics-system.socket_summary-*',
-          syslog: 'logs-system.syslog-*',
-          system: 'logs-system.system-*',
-          uptime: 'metrics-system.uptime-*',
-        },
-        name: 'system',
-        version: '1.1.2',
+        installed_kibana: [],
+        installed_es: [],
+        package_assets: [],
+        es_index_patterns: {},
+        name: 'beta_installed',
+        version: '0.0.6',
         internal: false,
         removable: false,
-        install_version: '1.1.2',
+        install_version: '0.0.6',
         install_status: 'installed',
-        install_started_at: '2021-08-25T19:44:43.380Z',
+        install_started_at: '2021-08-25T19:44:37.078Z',
         install_source: 'registry',
         keep_policies_up_to_date: false,
       },
       references: [],
       coreMigrationVersion: '7.14.0',
-      updated_at: '2021-08-25T19:45:12.096Z',
-      version: 'Wzc3NjUsNF0=',
-      // score: 0, TODO: this is not represented in any type, but is returned by the API
+      updated_at: '2021-08-25T19:44:53.517Z',
+      version: 'WzczMTIsNF0=',
     },
+    categories: ['elastic_stack', 'languages'],
   },
   {
-    name: 'tomcat',
-    title: 'Apache Tomcat',
-    version: '0.3.0',
-    release: 'experimental',
-    description: 'Apache Tomcat Integration',
+    name: 'beta_installed_update',
+    title: 'h. Beta, Installed, Update',
+    version: '0.0.7',
+    release: 'beta',
+    description: 'A package that is Beta, installed, with update',
     type: 'integration',
-    download: '/epr/tomcat/tomcat-0.3.0.zip',
-    path: '/package/tomcat/0.3.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/tomcat/0.3.0/img/logo.svg',
-        title: 'Apache Tomcat logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'log',
-        title: 'Apache Tomcat',
-        description: 'Collect Apache Tomcat logs from syslog or a file.',
+    download: '/epr/beta/installed',
+    path: '/package/beta/installed',
+    id: 'beta_installed_update',
+    status: 'installed',
+    savedObject: {
+      type: 'epm-packages',
+      id: 'beta_installed_update',
+      attributes: {
+        installed_kibana: [],
+        installed_es: [],
+        package_assets: [],
+        es_index_patterns: {},
+        name: 'beta_installed_update',
+        version: '0.0.3',
+        internal: false,
+        removable: false,
+        install_version: '0.0.3',
+        install_status: 'installed',
+        install_started_at: '2021-08-25T19:44:37.078Z',
+        install_source: 'registry',
+        keep_policies_up_to_date: false,
       },
-    ],
-    id: 'tomcat',
-    status: 'not_installed',
+      references: [],
+      coreMigrationVersion: '7.14.0',
+      updated_at: '2021-08-25T19:44:53.517Z',
+      version: 'WzczMTIsNF0=',
+    },
+    categories: ['message_queue', 'monitoring'],
   },
   {
-    name: 'traefik',
-    title: 'Traefik',
-    version: '0.3.0',
+    name: 'exp_not_installed',
+    title: 'i. Experimental, Not Installed',
+    version: '0.0.8',
     release: 'experimental',
-    description: 'Traefik Integration',
-    type: 'integration',
-    download: '/epr/traefik/traefik-0.3.0.zip',
-    path: '/package/traefik/0.3.0',
-    icons: [
-      {
-        src: '/img/traefik.svg',
-        path: '/package/traefik/0.3.0/img/traefik.svg',
-        title: 'traefik',
-        size: '259x296',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'traefik',
-        title: 'Traefik logs and metrics',
-        description: 'Collect logs and metrics from Traefik instances',
-      },
-    ],
-    id: 'traefik',
-    status: 'not_installed',
-  },
-  {
-    name: 'windows',
-    title: 'Windows',
-    version: '1.0.0',
-    release: 'ga',
-    description: 'Windows Integration',
+    description: 'A package that is Experimental and not installed',
     type: 'integration',
-    download: '/epr/windows/windows-1.0.0.zip',
-    path: '/package/windows/1.0.0',
-    icons: [
-      {
-        src: '/img/logo_windows.svg',
-        path: '/package/windows/1.0.0/img/logo_windows.svg',
-        title: 'logo windows',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'windows',
-        title: 'Windows logs and metrics',
-        description: 'Collect logs and metrics from Windows instances',
-      },
-    ],
-    id: 'windows',
+    download: '/epr/exp/not_installed',
+    path: '/package/exp/not_installed',
+    id: 'exp_not_installed',
     status: 'not_installed',
+    categories: ['monitoring', 'network', 'notification'],
   },
   {
-    name: 'winlog',
-    title: 'Custom Windows event logs',
-    version: '0.4.0',
+    name: 'exp_beats',
+    title: 'j. Experimental, has Beats',
+    version: '0.0.9',
     release: 'experimental',
-    description: 'This Elastic integration collects custom Windows event logs',
-    type: 'integration',
-    download: '/epr/winlog/winlog-0.4.0.zip',
-    path: '/package/winlog/0.4.0',
-    icons: [
-      {
-        src: '/img/logo_windows.svg',
-        path: '/package/winlog/0.4.0/img/logo_windows.svg',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'winlogs',
-        title: 'Custom Windows event logs',
-        description: 'Collect your custom Windows event logs.',
-      },
-    ],
-    id: 'winlog',
-    status: 'not_installed',
-  },
-  {
-    name: 'zeek',
-    title: 'Zeek',
-    version: '1.3.0',
-    release: 'ga',
-    description: 'This Elastic integration collects logs from Zeek',
+    description: 'A package that is Experimental and not installed',
     type: 'integration',
-    download: '/epr/zeek/zeek-1.3.0.zip',
-    path: '/package/zeek/1.3.0',
-    icons: [
-      {
-        src: '/img/zeek.svg',
-        path: '/package/zeek/1.3.0/img/zeek.svg',
-        title: 'zeek',
-        size: '214x203',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'zeek',
-        title: 'Zeek logs',
-        description: 'Collect logs from Zeek instances',
-      },
-    ],
-    id: 'zeek',
+    download: '/epr/exp/not_installed/beats',
+    path: '/package/exp/not_installed/beats',
+    id: 'exp_beats',
     status: 'not_installed',
-  },
-  {
-    name: 'zerofox',
-    title: 'ZeroFox',
-    version: '0.1.1',
-    release: 'experimental',
-    description: 'ZeroFox Cloud Platform',
-    type: 'integration',
-    download: '/epr/zerofox/zerofox-0.1.1.zip',
-    path: '/package/zerofox/0.1.1',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/zerofox/0.1.1/img/logo.svg',
-        title: 'logo ZeroFox',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
     policy_templates: [
       {
-        name: 'zerofox',
-        title: 'ZeroFox Alerts',
-        description: 'Collect alert from the ZeroFox API',
+        name: '',
+        description: '',
+        title: '',
+        categories: ['datastore'],
       },
     ],
-    id: 'zerofox',
-    status: 'not_installed',
+    categories: ['version_control', 'web'],
   },
   {
-    name: 'zookeeper',
-    title: 'ZooKeeper',
-    version: '0.3.1',
+    name: 'exp_installed',
+    title: 'k. Experimental, Installed',
+    version: '0.0.10',
     release: 'experimental',
-    description: 'ZooKeeper Integration',
-    type: 'integration',
-    download: '/epr/zookeeper/zookeeper-0.3.1.zip',
-    path: '/package/zookeeper/0.3.1',
-    icons: [
-      {
-        src: '/img/zookeeper.svg',
-        path: '/package/zookeeper/0.3.1/img/zookeeper.svg',
-        title: 'zookeeper',
-        size: '754x754',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'zookeeper',
-        title: 'ZooKeeper metrics',
-        description: 'Collect metrics from ZooKeeper instances',
-      },
-    ],
-    id: 'zookeeper',
-    status: 'not_installed',
-  },
-  {
-    name: 'zoom',
-    title: 'Zoom',
-    version: '0.6.0',
-    release: 'beta',
-    description: 'This Elastic integration collects logs from Zoom',
+    description: 'A package that is experimental and installed',
     type: 'integration',
-    download: '/epr/zoom/zoom-0.6.0.zip',
-    path: '/package/zoom/0.6.0',
-    icons: [
-      {
-        src: '/img/zoom_blue.svg',
-        path: '/package/zoom/0.6.0/img/zoom_blue.svg',
-        title: 'Zoom',
-        size: '516x240',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'zoom',
-        title: 'Zoom logs',
-        description: 'Collect logs from Zoom instances',
+    download: '/epr/exp/installed',
+    path: '/package/exp/installed',
+    id: 'exp_installed',
+    status: 'installed',
+    savedObject: {
+      type: 'epm-packages',
+      id: 'exp_installed',
+      attributes: {
+        installed_kibana: [],
+        installed_es: [],
+        package_assets: [],
+        es_index_patterns: {},
+        name: 'exp_installed',
+        version: '0.0.10',
+        internal: false,
+        removable: false,
+        install_version: '0.0.10',
+        install_status: 'installed',
+        install_started_at: '2021-08-25T19:44:37.078Z',
+        install_source: 'registry',
+        keep_policies_up_to_date: false,
       },
-    ],
-    id: 'zoom',
-    status: 'not_installed',
+      references: [],
+      coreMigrationVersion: '7.14.0',
+      updated_at: '2021-08-25T19:44:53.517Z',
+      version: 'WzczMTIsNF0=',
+    },
+    categories: ['os_system', 'productivity'],
   },
   {
-    name: 'zscaler',
-    title: 'Zscaler NSS',
-    version: '0.2.0',
+    name: 'exp_installed_update',
+    title: 'l. Experimental, Installed, Update',
+    version: '0.0.11',
     release: 'experimental',
-    description: 'Zscaler NSS Integration',
+    description: 'A package that is experimental, installed, with update',
     type: 'integration',
-    download: '/epr/zscaler/zscaler-0.2.0.zip',
-    path: '/package/zscaler/0.2.0',
-    icons: [
-      {
-        src: '/img/logo.svg',
-        path: '/package/zscaler/0.2.0/img/logo.svg',
-        title: 'Zscaler NSS logo',
-        size: '32x32',
-        type: 'image/svg+xml',
-      },
-    ],
-    policy_templates: [
-      {
-        name: 'zia',
-        title: 'Zscaler NSS',
-        description: 'Collect Zscaler NSS logs from syslog or a file.',
+    download: '/epr/exp/installed',
+    path: '/package/exp/installed',
+    id: 'exp_installed_update',
+    status: 'installed',
+    savedObject: {
+      type: 'epm-packages',
+      id: 'exp_installed_update',
+      attributes: {
+        installed_kibana: [],
+        installed_es: [],
+        package_assets: [],
+        es_index_patterns: {},
+        name: 'exp_installed_update',
+        version: '0.0.8',
+        internal: false,
+        removable: false,
+        install_version: '0.0.8',
+        install_status: 'installed',
+        install_started_at: '2021-08-25T19:44:37.078Z',
+        install_source: 'registry',
+        keep_policies_up_to_date: false,
       },
-    ],
-    id: 'zscaler',
-    status: 'not_installed',
+      references: [],
+      coreMigrationVersion: '7.14.0',
+      updated_at: '2021-08-25T19:44:53.517Z',
+      version: 'WzczMTIsNF0=',
+    },
+    categories: ['aws', 'cloud', 'elastic_stack'],
   },
 ];
diff --git a/x-pack/plugins/fleet/storybook/context/fixtures/replacement_integrations.ts b/x-pack/plugins/fleet/storybook/context/fixtures/replacement_integrations.ts
new file mode 100644
index 0000000000000..db3725ffe664c
--- /dev/null
+++ b/x-pack/plugins/fleet/storybook/context/fixtures/replacement_integrations.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { CustomIntegration } from '../../../../../../src/plugins/custom_integrations/common';
+
+export const integrations: CustomIntegration[] = [
+  {
+    id: 'b.ga_beats',
+    categories: ['azure', 'cloud', 'config_management'],
+    description: 'Beats for a GA package that is not installed',
+    isBeta: false,
+    shipper: 'beats',
+    icons: [
+      {
+        type: 'eui',
+        src: 'logoBeats',
+      },
+    ],
+    title: 'b. GA, has Beats',
+    type: 'ui_link',
+    uiInternalPath: '/',
+    eprOverlap: 'ga_beats',
+  },
+  {
+    id: 'f.beta_beats',
+    categories: ['azure', 'cloud', 'config_management'],
+    description: 'Beats for a beta package that is not installed',
+    isBeta: false,
+    shipper: 'beats',
+    icons: [
+      {
+        type: 'eui',
+        src: 'logoBeats',
+      },
+    ],
+    title: 'f. Beta, has Beats',
+    type: 'ui_link',
+    uiInternalPath: '/',
+    eprOverlap: 'beta_beats',
+  },
+  {
+    id: 'j.exp_beats',
+    categories: ['azure', 'cloud', 'config_management'],
+    description: 'Beats for an experimental package that is not installed',
+    isBeta: false,
+    shipper: 'beats',
+    icons: [
+      {
+        type: 'eui',
+        src: 'logoBeats',
+      },
+    ],
+    title: 'j. Experimental, has Beats',
+    type: 'ui_link',
+    uiInternalPath: '/',
+    eprOverlap: 'exp_beats',
+  },
+];
diff --git a/x-pack/plugins/fleet/storybook/context/http.ts b/x-pack/plugins/fleet/storybook/context/http.ts
index c52429c243ba9..f62970c0c0306 100644
--- a/x-pack/plugins/fleet/storybook/context/http.ts
+++ b/x-pack/plugins/fleet/storybook/context/http.ts
@@ -27,6 +27,7 @@ export const getHttp = (basepath = BASE_PATH) => {
       serverBasePath: basepath,
     },
     get: (async (path: string, options: HttpFetchOptions) => {
+      action('get')(path, options);
       // TODO: all of this needs revision, as it's far too clunky... but it works for now,
       // with the few paths we're supporting.
       if (path === '/api/fleet/agents/setup') {
@@ -74,6 +75,7 @@ export const getHttp = (basepath = BASE_PATH) => {
         return await import('./fixtures/integration.okta');
       }
 
+      action(path)('KP: UNSUPPORTED ROUTE');
       return {};
     }) as HttpHandler,
   } as unknown as HttpStart;
diff --git a/x-pack/plugins/fleet/storybook/context/index.tsx b/x-pack/plugins/fleet/storybook/context/index.tsx
index 6d563346e917d..c9c8e0be5d883 100644
--- a/x-pack/plugins/fleet/storybook/context/index.tsx
+++ b/x-pack/plugins/fleet/storybook/context/index.tsx
@@ -66,7 +66,10 @@ export const StorybookContext: React.FC<{ storyContext?: StoryContext }> = ({
   setHttpClient(startServices.http);
   setCustomIntegrations({
     getAppendCustomIntegrations: async () => [],
-    getReplacementCustomIntegrations: async () => [],
+    getReplacementCustomIntegrations: async () => {
+      const { integrations } = await import('./fixtures/replacement_integrations');
+      return integrations;
+    },
   });
 
   const config = {

From 9fb16d54c520392b933846e902a7afd9520a8a87 Mon Sep 17 00:00:00 2001
From: Gloria Hornero <snootchie.boochies@gmail.com>
Date: Wed, 13 Oct 2021 15:28:36 +0200
Subject: [PATCH 015/117] [Security Solution] [Detections] Improves custom
 query rule upgrade test (#114454)

* improves upgrade test

* fixes type check issues

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../cypress/screens/alerts_detection_rules.ts |   4 +
 .../security_solution/cypress/tasks/common.ts |   6 +
 .../custom_query_rule.spec.ts                 | 149 +++++++++++++++---
 x-pack/plugins/security_solution/package.json |   1 +
 4 files changed, 142 insertions(+), 18 deletions(-)

diff --git a/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts b/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts
index e4e6a5610fdbe..315796a715cd3 100644
--- a/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts
@@ -103,3 +103,7 @@ export const RULES_DELETE_CONFIRMATION_MODAL = '[data-test-subj="allRulesDeleteC
 export const MODAL_CONFIRMATION_BTN = '[data-test-subj="confirmModalConfirmButton"]';
 
 export const RULE_DETAILS_DELETE_BTN = '[data-test-subj="rules-details-delete-rule"]';
+
+export const ALERT_DETAILS_CELLS = '[data-test-subj="dataGridRowCell"]';
+
+export const SERVER_SIDE_EVENT_COUNT = '[data-test-subj="server-side-event-count"]';
diff --git a/x-pack/plugins/security_solution/cypress/tasks/common.ts b/x-pack/plugins/security_solution/cypress/tasks/common.ts
index d726d5daa5cbc..d247b787576b0 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/common.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/common.ts
@@ -7,6 +7,7 @@
 
 import { esArchiverResetKibana } from './es_archiver';
 import { RuleEcs } from '../../common/ecs/rule';
+import { LOADING_INDICATOR } from '../screens/security_header';
 
 const primaryButton = 0;
 
@@ -155,3 +156,8 @@ export const deleteCases = () => {
 };
 
 export const scrollToBottom = () => cy.scrollTo('bottom');
+
+export const waitForPageToBeLoaded = () => {
+  cy.get(LOADING_INDICATOR).should('exist');
+  cy.get(LOADING_INDICATOR).should('not.exist');
+};
diff --git a/x-pack/plugins/security_solution/cypress/upgrade_integration/custom_query_rule.spec.ts b/x-pack/plugins/security_solution/cypress/upgrade_integration/custom_query_rule.spec.ts
index 2718c0735a671..1af7a3f9bed03 100644
--- a/x-pack/plugins/security_solution/cypress/upgrade_integration/custom_query_rule.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/upgrade_integration/custom_query_rule.spec.ts
@@ -5,25 +5,138 @@
  * 2.0.
  */
 
-import { RULE_NAME } from '../screens/alerts_detection_rules';
-
+import { ALERT_DETAILS_CELLS, SERVER_SIDE_EVENT_COUNT } from '../screens/alerts_detection_rules';
 import {
-  goToManageAlertsDetectionRules,
-  waitForAlertsIndexToBeCreated,
-  waitForAlertsPanelToBeLoaded,
-} from '../tasks/alerts';
-import { waitForRulesTableToBeLoaded } from '../tasks/alerts_detection_rules';
-import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
-
-import { ALERTS_URL } from '../urls/navigation';
-
-describe('After an upgrade, the cusom query rule', () => {
-  it('Displays the rule', function () {
-    loginAndWaitForPageWithoutDateRange(ALERTS_URL);
-    waitForAlertsPanelToBeLoaded();
-    waitForAlertsIndexToBeCreated();
-    goToManageAlertsDetectionRules();
+  ADDITIONAL_LOOK_BACK_DETAILS,
+  ABOUT_DETAILS,
+  ABOUT_RULE_DESCRIPTION,
+  CUSTOM_QUERY_DETAILS,
+  DEFINITION_DETAILS,
+  getDetails,
+  INDEX_PATTERNS_DETAILS,
+  RISK_SCORE_DETAILS,
+  RULE_NAME_HEADER,
+  RULE_TYPE_DETAILS,
+  RUNS_EVERY_DETAILS,
+  SCHEDULE_DETAILS,
+  SEVERITY_DETAILS,
+  TIMELINE_TEMPLATE_DETAILS,
+} from '../screens/rule_details';
+
+import { waitForPageToBeLoaded } from '../tasks/common';
+import { waitForRulesTableToBeLoaded, goToRuleDetails } from '../tasks/alerts_detection_rules';
+import { loginAndWaitForPage } from '../tasks/login';
+
+import { DETECTIONS_RULE_MANAGEMENT_URL } from '../urls/navigation';
+
+const EXPECTED_NUMBER_OF_ALERTS = '1';
+
+const alert = {
+  rule: 'Custom query rule for upgrade',
+  severity: 'low',
+  riskScore: '7',
+  reason:
+    'file event with process test, file The file to test, by Security Solution on security-solution.local created low alert Custom query rule for upgrade.',
+  hostName: 'security-solution.local',
+  username: 'test',
+  processName: 'The file to test',
+  fileName: 'The file to test',
+  sourceIp: '127.0.0.1',
+  destinationIp: '127.0.0.2',
+};
+
+const rule = {
+  customQuery: '*:*',
+  name: 'Custom query rule for upgrade',
+  description: 'My description',
+  index: ['auditbeat-*'],
+  severity: 'Low',
+  riskScore: '7',
+  timelineTemplate: 'none',
+  runsEvery: '10s',
+  lookBack: '179999990s',
+  timeline: 'None',
+};
+
+describe('After an upgrade, the custom query rule', () => {
+  before(() => {
+    loginAndWaitForPage(DETECTIONS_RULE_MANAGEMENT_URL);
     waitForRulesTableToBeLoaded();
-    cy.get(RULE_NAME).should('have.text', 'Custom query rule for upgrade');
+    goToRuleDetails();
+    waitForPageToBeLoaded();
+  });
+
+  it('Has the expected alerts number', () => {
+    cy.get(SERVER_SIDE_EVENT_COUNT).contains(EXPECTED_NUMBER_OF_ALERTS);
+  });
+
+  it('Displays the rule details', () => {
+    cy.get(RULE_NAME_HEADER).should('contain', `${rule.name}`);
+    cy.get(ABOUT_RULE_DESCRIPTION).should('have.text', rule.description);
+    cy.get(ABOUT_DETAILS).within(() => {
+      getDetails(SEVERITY_DETAILS).should('have.text', rule.severity);
+      getDetails(RISK_SCORE_DETAILS).should('have.text', rule.riskScore);
+    });
+    cy.get(DEFINITION_DETAILS).within(() => {
+      getDetails(INDEX_PATTERNS_DETAILS).should('have.text', rule.index.join(''));
+      getDetails(CUSTOM_QUERY_DETAILS).should('have.text', rule.customQuery);
+      getDetails(RULE_TYPE_DETAILS).should('have.text', 'Query');
+      getDetails(TIMELINE_TEMPLATE_DETAILS).should('have.text', rule.timeline);
+    });
+    cy.get(SCHEDULE_DETAILS).within(() => {
+      getDetails(RUNS_EVERY_DETAILS).should('have.text', rule.runsEvery);
+      getDetails(ADDITIONAL_LOOK_BACK_DETAILS).should('have.text', rule.lookBack);
+    });
+  });
+
+  it('Displays the alert details', () => {
+    cy.get(ALERT_DETAILS_CELLS).first().focus();
+    cy.get(ALERT_DETAILS_CELLS).first().type('{rightarrow}');
+    cy.get(ALERT_DETAILS_CELLS)
+      .contains(alert.rule)
+      .then(($el) => {
+        cy.wrap($el).type('{rightarrow}');
+      });
+    cy.get(ALERT_DETAILS_CELLS)
+      .contains(alert.severity)
+      .then(($el) => {
+        cy.wrap($el).type('{rightarrow}');
+      });
+    cy.get(ALERT_DETAILS_CELLS)
+      .contains(alert.riskScore)
+      .then(($el) => {
+        cy.wrap($el).type('{rightarrow}');
+      });
+    cy.get(ALERT_DETAILS_CELLS)
+      .contains(alert.reason)
+      .then(($el) => {
+        cy.wrap($el).type('{rightarrow}');
+      });
+    cy.get(ALERT_DETAILS_CELLS)
+      .contains(alert.hostName)
+      .then(($el) => {
+        cy.wrap($el).type('{rightarrow}');
+      });
+    cy.get(ALERT_DETAILS_CELLS)
+      .contains(alert.username)
+      .then(($el) => {
+        cy.wrap($el).type('{rightarrow}');
+      });
+    cy.get(ALERT_DETAILS_CELLS)
+      .contains(alert.processName)
+      .then(($el) => {
+        cy.wrap($el).type('{rightarrow}');
+      });
+    cy.get(ALERT_DETAILS_CELLS)
+      .contains(alert.fileName)
+      .then(($el) => {
+        cy.wrap($el).type('{rightarrow}');
+      });
+    cy.get(ALERT_DETAILS_CELLS)
+      .contains(alert.sourceIp)
+      .then(($el) => {
+        cy.wrap($el).type('{rightarrow}');
+      });
+    cy.get(ALERT_DETAILS_CELLS).contains(alert.destinationIp);
   });
 });
diff --git a/x-pack/plugins/security_solution/package.json b/x-pack/plugins/security_solution/package.json
index 6aa45a02419ba..371ac66004f48 100644
--- a/x-pack/plugins/security_solution/package.json
+++ b/x-pack/plugins/security_solution/package.json
@@ -11,6 +11,7 @@
     "cypress:open": "yarn cypress open --config-file ./cypress/cypress.json",
     "cypress:open:ccs": "yarn cypress:open --config integrationFolder=./cypress/ccs_integration",
     "cypress:open-as-ci": "node ../../../scripts/functional_tests --config ../../test/security_solution_cypress/visual_config.ts",
+    "cypress:open:upgrade": "yarn cypress:open --config integrationFolder=./cypress/upgrade_integration",
     "cypress:run": "yarn cypress:run:reporter --browser chrome --spec './cypress/integration/**/*.spec.ts'; status=$?; yarn junit:merge && exit $status",
     "cypress:run:firefox": "yarn cypress:run:reporter --browser firefox --spec './cypress/integration/**/*.spec.ts'; status=$?; yarn junit:merge && exit $status",
     "cypress:run:reporter": "yarn cypress run --config-file ./cypress/cypress.json --reporter ../../../node_modules/cypress-multi-reporters --reporter-options configFile=./cypress/reporter_config.json",

From ade369d189df10e69dfc2da19f174450d0a92508 Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Wed, 13 Oct 2021 16:55:25 +0300
Subject: [PATCH 016/117] [Visualizations] fix usage of optional dependencies
 (#114286)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 src/plugins/visualizations/public/services.ts | 6 ++++--
 src/plugins/visualize/public/services.ts      | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/plugins/visualizations/public/services.ts b/src/plugins/visualizations/public/services.ts
index b5db56e61ebe4..ed18884d9dc83 100644
--- a/src/plugins/visualizations/public/services.ts
+++ b/src/plugins/visualizations/public/services.ts
@@ -48,8 +48,10 @@ export const [getTimeFilter, setTimeFilter] = createGetterSetter<TimefilterContr
 
 export const [getSearch, setSearch] = createGetterSetter<DataPublicPluginStart['search']>('Search');
 
-export const [getUsageCollector, setUsageCollector] =
-  createGetterSetter<UsageCollectionSetup>('UsageCollection');
+export const [getUsageCollector, setUsageCollector] = createGetterSetter<UsageCollectionSetup>(
+  'UsageCollection',
+  false
+);
 
 export const [getExpressions, setExpressions] = createGetterSetter<ExpressionsStart>('Expressions');
 
diff --git a/src/plugins/visualize/public/services.ts b/src/plugins/visualize/public/services.ts
index 7efb054fc636a..3f91762c60780 100644
--- a/src/plugins/visualize/public/services.ts
+++ b/src/plugins/visualize/public/services.ts
@@ -13,8 +13,10 @@ import type { UsageCollectionStart } from '../../usage_collection/public';
 
 export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
 
-export const [getUsageCollector, setUsageCollector] =
-  createGetterSetter<UsageCollectionStart>('UsageCollection');
+export const [getUsageCollector, setUsageCollector] = createGetterSetter<UsageCollectionStart>(
+  'UsageCollection',
+  false
+);
 
 export const [getVisEditorsRegistry, setVisEditorsRegistry] =
   createGetterSetter<VisEditorsRegistry>('VisEditorsRegistry');

From 38f949a3559f625dcd87b1a9849b53607e1e9f6b Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 13 Oct 2021 14:03:29 +0000
Subject: [PATCH 017/117] skip flaky suite (#68400)

---
 .../apps/saved_objects_management/inspect_saved_objects.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/functional/apps/saved_objects_management/inspect_saved_objects.ts b/test/functional/apps/saved_objects_management/inspect_saved_objects.ts
index 839c262acffa0..7fff2cc001844 100644
--- a/test/functional/apps/saved_objects_management/inspect_saved_objects.ts
+++ b/test/functional/apps/saved_objects_management/inspect_saved_objects.ts
@@ -32,7 +32,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     return bools.every((currBool) => currBool === true);
   };
 
-  describe('saved objects edition page', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/68400
+  describe.skip('saved objects edition page', () => {
     beforeEach(async () => {
       await esArchiver.load(
         'test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object'

From b86bf8382e4e1149885401a9a4e8ed1cc0c9da49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20S=C3=A1nchez?= <davidsansol92@gmail.com>
Date: Wed, 13 Oct 2021 16:44:55 +0200
Subject: [PATCH 018/117] [Security Solution] [Endpoint] Fleet summary card
 adjustments (#114291)

* Fix API call and refactor component to show different summary when size is small

* Refactored fleet trusted app card with new m design

* Removed unused code

* fix ts error

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../components/exception_items_summary.tsx    | 37 ++++++-----
 .../components/fleet_trusted_apps_card.tsx    | 64 ++++++++++++++-----
 .../components/styled_components.tsx          | 11 ++--
 3 files changed, 76 insertions(+), 36 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.tsx
index 5f0c5cca0ad2c..59de05415f86b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.tsx
@@ -60,18 +60,23 @@ interface ExceptionItemsSummaryProps {
 export const ExceptionItemsSummary = memo<ExceptionItemsSummaryProps>(
   ({ stats, isSmall = false }) => {
     const getItem = useCallback(
-      (stat: keyof GetExceptionSummaryResponse) => (
-        <EuiFlexItem key={stat}>
-          <SummaryStat
-            value={stats?.[stat] ?? 0}
-            color={stat === 'total' ? 'primary' : 'default'}
-            key={stat}
-            isSmall={isSmall}
-          >
-            {SUMMARY_LABELS[stat]}
-          </SummaryStat>
-        </EuiFlexItem>
-      ),
+      (stat: keyof GetExceptionSummaryResponse) => {
+        if (stat !== 'total' && isSmall) {
+          return null;
+        }
+        return (
+          <EuiFlexItem key={stat}>
+            <SummaryStat
+              value={stats?.[stat] ?? 0}
+              color={stat === 'total' && !isSmall ? 'primary' : 'default'}
+              key={stat}
+              isSmall={isSmall}
+            >
+              {SUMMARY_LABELS[stat]}
+            </SummaryStat>
+          </EuiFlexItem>
+        );
+      },
       [stats, isSmall]
     );
 
@@ -100,9 +105,11 @@ const SummaryStat: FC<{ value: number; color?: EuiBadgeProps['color']; isSmall?:
           gutterSize={isSmall ? 'xs' : 'l'}
           isSmall={isSmall}
         >
-          <EuiFlexItem grow={false} style={color === 'primary' ? CSS_BOLD : undefined}>
-            {children}
-          </EuiFlexItem>
+          {!isSmall ? (
+            <EuiFlexItem grow={false} style={color === 'primary' ? CSS_BOLD : undefined}>
+              {children}
+            </EuiFlexItem>
+          ) : null}
           <EuiFlexItem grow={false}>
             <EuiBadge color={color}>{value}</EuiBadge>
           </EuiFlexItem>
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx
index 08e8ec39dbaa8..54b1c37c7093f 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { memo, useMemo, useState, useEffect, useRef } from 'react';
-import { EuiPanel, EuiText } from '@elastic/eui';
+import { EuiPanel, EuiText, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { GetExceptionSummaryResponse } from '../../../../../../../../common/endpoint/types';
@@ -14,7 +14,11 @@ import { GetExceptionSummaryResponse } from '../../../../../../../../common/endp
 import { useKibana, useToasts } from '../../../../../../../common/lib/kibana';
 import { ExceptionItemsSummary } from './exception_items_summary';
 import { TrustedAppsHttpService } from '../../../../../trusted_apps/service';
-import { StyledEuiFlexGridGroup, StyledEuiFlexGridItem } from './styled_components';
+import {
+  StyledEuiFlexGridGroup,
+  StyledEuiFlexGridItem,
+  StyledEuiFlexItem,
+} from './styled_components';
 
 interface FleetTrustedAppsCardProps {
   customLink: React.ReactNode;
@@ -38,7 +42,7 @@ export const FleetTrustedAppsCard = memo<FleetTrustedAppsCardProps>(
         try {
           const response = await trustedAppsApi.getTrustedAppsSummary({
             kuery: policyId
-              ? `exception-list-agnostic.attributes.tags:"policy:${policyId}" OR exception-list-agnostic.attributes.tags:"policy:all"`
+              ? `(exception-list-agnostic.attributes.tags:"policy:${policyId}" OR exception-list-agnostic.attributes.tags:"policy:all")`
               : undefined,
           });
           if (isMounted) {
@@ -72,21 +76,49 @@ export const FleetTrustedAppsCard = memo<FleetTrustedAppsCardProps>(
       />
     );
 
+    const cardGrid = useMemo(() => {
+      if (cardSize === 'm') {
+        return (
+          <EuiFlexGroup
+            alignItems="baseline"
+            justifyContent="flexStart"
+            gutterSize="s"
+            direction="row"
+            responsive={false}
+          >
+            <EuiFlexItem grow={false}>
+              <EuiText>
+                <h5>{getTitleMessage()}</h5>
+              </EuiText>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <ExceptionItemsSummary stats={stats} isSmall={true} />
+            </EuiFlexItem>
+            <StyledEuiFlexItem grow={1}>{customLink}</StyledEuiFlexItem>
+          </EuiFlexGroup>
+        );
+      } else {
+        return (
+          <StyledEuiFlexGridGroup alignItems="baseline" justifyContent="center">
+            <StyledEuiFlexGridItem gridarea="title" alignitems="flex-start">
+              <EuiText>
+                <h4>{getTitleMessage()}</h4>
+              </EuiText>
+            </StyledEuiFlexGridItem>
+            <StyledEuiFlexGridItem gridarea="summary" alignitems={'center'}>
+              <ExceptionItemsSummary stats={stats} isSmall={false} />
+            </StyledEuiFlexGridItem>
+            <StyledEuiFlexGridItem gridarea="link" alignitems="flex-end">
+              {customLink}
+            </StyledEuiFlexGridItem>
+          </StyledEuiFlexGridGroup>
+        );
+      }
+    }, [cardSize, customLink, stats]);
+
     return (
       <EuiPanel hasShadow={false} paddingSize="l" hasBorder data-test-subj="fleetTrustedAppsCard">
-        <StyledEuiFlexGridGroup alignItems="baseline" justifyContent="center" cardSize={cardSize}>
-          <StyledEuiFlexGridItem gridarea="title" alignitems="flex-start">
-            <EuiText>
-              {cardSize === 'l' ? <h4>{getTitleMessage()}</h4> : <h5>{getTitleMessage()}</h5>}
-            </EuiText>
-          </StyledEuiFlexGridItem>
-          <StyledEuiFlexGridItem gridarea="summary">
-            <ExceptionItemsSummary stats={stats} isSmall={cardSize === 'm'} />
-          </StyledEuiFlexGridItem>
-          <StyledEuiFlexGridItem gridarea="link" alignitems="flex-end">
-            {customLink}
-          </StyledEuiFlexGridItem>
-        </StyledEuiFlexGridGroup>
+        {cardGrid}
       </EuiPanel>
     );
   }
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/styled_components.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/styled_components.tsx
index d2d5de5d43a3f..ad1d823677f22 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/styled_components.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/styled_components.tsx
@@ -7,12 +7,9 @@
 import styled from 'styled-components';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-export const StyledEuiFlexGridGroup = styled(EuiFlexGroup)<{
-  cardSize?: 'm' | 'l';
-}>`
+export const StyledEuiFlexGridGroup = styled(EuiFlexGroup)`
   display: grid;
-  grid-template-columns: ${({ cardSize = 'l' }) =>
-    cardSize === 'l' ? '25% 45% 30%' : '30% 35% 35%'};
+  grid-template-columns: 25% 45% 30%;
   grid-template-areas: 'title summary link';
 `;
 
@@ -25,3 +22,7 @@ export const StyledEuiFlexGridItem = styled(EuiFlexItem)<{
   margin: 0px;
   padding: 12px;
 `;
+
+export const StyledEuiFlexItem = styled(EuiFlexItem)`
+  flex-direction: row-reverse;
+`;

From c49374138852832a8c872495e1c20e70d78702f5 Mon Sep 17 00:00:00 2001
From: Josh Dover <1813008+joshdover@users.noreply.github.com>
Date: Wed, 13 Oct 2021 08:49:04 -0600
Subject: [PATCH 019/117] Bump EPR snapshot version used for tests (#114529)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 x-pack/test/fleet_api_integration/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/test/fleet_api_integration/config.ts b/x-pack/test/fleet_api_integration/config.ts
index d1c6c3c3f6b1e..d2b61a3f5c321 100644
--- a/x-pack/test/fleet_api_integration/config.ts
+++ b/x-pack/test/fleet_api_integration/config.ts
@@ -15,7 +15,7 @@ import { defineDockerServersConfig } from '@kbn/test';
 // example: https://beats-ci.elastic.co/blue/organizations/jenkins/Ingest-manager%2Fpackage-storage/detail/snapshot/74/pipeline/257#step-302-log-1.
 // It should be updated any time there is a new Docker image published for the Snapshot Distribution of the Package Registry.
 export const dockerImage =
-  'docker.elastic.co/package-registry/distribution@sha256:35cedaaa6adac547947321fa0c3b60a63eba153ba09524b9c1a21f1247a09bd2';
+  'docker.elastic.co/package-registry/distribution@sha256:42dbdbb7fbc7ea61d0c38c0df6dad977ca2ad9cf01e247543054377aef33d377';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));

From d0a6e51d970a1d39df6ae43dc2ded169edfa25a1 Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Wed, 13 Oct 2021 09:51:04 -0500
Subject: [PATCH 020/117] [DOCS] Adds Logstash pipeline settings (#114648)

---
 .../create-logstash.asciidoc                          | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/api/logstash-configuration-management/create-logstash.asciidoc b/docs/api/logstash-configuration-management/create-logstash.asciidoc
index 9bd5a9028ee9a..ffbbf182249ec 100644
--- a/docs/api/logstash-configuration-management/create-logstash.asciidoc
+++ b/docs/api/logstash-configuration-management/create-logstash.asciidoc
@@ -27,7 +27,16 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
   (Required, string) The pipeline definition.
 
 `settings`::
-  (Optional, object) The pipeline settings. Supported settings, represented as object keys, are `pipeline.workers`, `pipeline.batch.size`, `pipeline.batch.delay`, `queue.type`, `queue.max_bytes`, and `queue.checkpoint.writes`.
+  (Optional, object) The pipeline settings. Supported settings, represented as object keys, include the following:
+  
+  * `pipeline.workers`
+  * `pipeline.batch.size`
+  * `pipeline.batch.delay`
+  * `pipeline.ecs_compatibility`
+  * `pipeline.ordered`
+  * `queue.type`
+  * `queue.max_bytes`
+  * `queue.checkpoint.writes`
 
 [[logstash-configuration-management-api-create-codes]]
 ==== Response code

From 767f007bb35b9014aa7813c451bf2b504884e432 Mon Sep 17 00:00:00 2001
From: Giorgos Bamparopoulos <georgios.bamparopoulos@elastic.co>
Date: Wed, 13 Oct 2021 15:57:31 +0100
Subject: [PATCH 021/117] Update namespace for indices (#114612)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update namespace for indices

* Update default index for transactions

Co-authored-by: Søren Louv-Jansen <sorenlouv@gmail.com>
---
 docs/apm/troubleshooting.asciidoc   |  2 +-
 docs/settings/apm-settings.asciidoc | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/apm/troubleshooting.asciidoc b/docs/apm/troubleshooting.asciidoc
index 6e0c3b1decda8..3736d21f44a5b 100644
--- a/docs/apm/troubleshooting.asciidoc
+++ b/docs/apm/troubleshooting.asciidoc
@@ -76,7 +76,7 @@ If you change the default, you must also configure the `setup.template.name` and
 See {apm-server-ref}/configuration-template.html[Load the Elasticsearch index template].
 If the Elasticsearch index template has already been successfully loaded to the index,
 you can customize the indices that the APM app uses to display data.
-Navigate to *APM* > *Settings* > *Indices*, and change all `apm_oss.*Pattern` values to
+Navigate to *APM* > *Settings* > *Indices*, and change all `xpack.apm.*Pattern` values to
 include the new index pattern. For example: `customIndexName-*`.
 
 [float]
diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
index fb96f68355330..fc20685885df7 100644
--- a/docs/settings/apm-settings.asciidoc
+++ b/docs/settings/apm-settings.asciidoc
@@ -87,22 +87,22 @@ Changing these settings may disable features of the APM App.
 | `xpack.apm.agent.migrations.enabled` {ess-icon}
   | Set to `false` to disable cloud APM migrations. Defaults to `true`.
 
-| `xpack.apm.errorIndices` {ess-icon}
-  | Matcher for all {apm-server-ref}/error-indices.html[error indices]. Defaults to `apm-*`.
+| `xpack.apm.indices.error` {ess-icon}
+  | Matcher for all {apm-server-ref}/error-indices.html[error indices]. Defaults to `logs-apm*,apm-*`.
 
-| `xpack.apm.onboardingIndices` {ess-icon}
+| `xpack.apm.indices.onboarding` {ess-icon}
   | Matcher for all onboarding indices. Defaults to `apm-*`.
 
-| `xpack.apm.spanIndices` {ess-icon}
-  | Matcher for all {apm-server-ref}/span-indices.html[span indices]. Defaults to `apm-*`.
+| `xpack.apm.indices.span` {ess-icon}
+  | Matcher for all {apm-server-ref}/span-indices.html[span indices]. Defaults to `traces-apm*,apm-*`.
 
-| `xpack.apm.transactionIndices` {ess-icon}
-  | Matcher for all {apm-server-ref}/transaction-indices.html[transaction indices]. Defaults to `apm-*`.
+| `xpack.apm.indices.transaction` {ess-icon}
+  | Matcher for all {apm-server-ref}/transaction-indices.html[transaction indices]. Defaults to `traces-apm*,apm-*`.
 
-| `xpack.apm.metricsIndices` {ess-icon}
-  | Matcher for all {apm-server-ref}/metricset-indices.html[metrics indices]. Defaults to `apm-*`.
+| `xpack.apm.indices.metric` {ess-icon}
+  | Matcher for all {apm-server-ref}/metricset-indices.html[metrics indices]. Defaults to `metrics-apm*,apm-*`.
 
-| `xpack.apm.sourcemapIndices` {ess-icon}
+| `xpack.apm.indices.sourcemap` {ess-icon}
   | Matcher for all {apm-server-ref}/sourcemap-indices.html[source map indices]. Defaults to `apm-*`.
 
 |===

From fdc0ce749a1f602c16c8fa9c1b842842255f0648 Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Wed, 13 Oct 2021 09:59:50 -0500
Subject: [PATCH 022/117] [DOCS] Indicate reports are a subscription feature
 (#114653)

---
 docs/user/reporting/index.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/user/reporting/index.asciidoc b/docs/user/reporting/index.asciidoc
index 148e9f8ee14a5..c1e131cc057e0 100644
--- a/docs/user/reporting/index.asciidoc
+++ b/docs/user/reporting/index.asciidoc
@@ -13,9 +13,9 @@
 
 You access the options from the *Share* menu in the toolbar. The sharing options include the following:
 
-* *PDF Reports* &mdash; Generate and download a PDF file of a dashboard, visualization, or *Canvas* workpad.
+* *PDF Reports* &mdash; Generate and download a PDF file of a dashboard, visualization, or *Canvas* workpad. PDF reports are a link:https://www.elastic.co/subscriptions[subscription feature].
 
-* *PNG Reports* &mdash; Generate and download a PNG file of a dashboard or visualization.
+* *PNG Reports* &mdash; Generate and download a PNG file of a dashboard or visualization. PNG reports are a link:https://www.elastic.co/subscriptions[subscription feature].
 
 * *CSV Reports* &mdash; Generate and download a CSV file of a *Discover* saved search.
 

From da8264f26a08abf47a50035549f8cccb30fc5875 Mon Sep 17 00:00:00 2001
From: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
Date: Wed, 13 Oct 2021 10:36:07 -0500
Subject: [PATCH 023/117] [Stack Monitoring] Fix hashchange detection on
 sidenav link (#114727)

---
 x-pack/plugins/monitoring/public/application/index.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/monitoring/public/application/index.tsx b/x-pack/plugins/monitoring/public/application/index.tsx
index 7b4c73475338f..2caead4f963a1 100644
--- a/x-pack/plugins/monitoring/public/application/index.tsx
+++ b/x-pack/plugins/monitoring/public/application/index.tsx
@@ -59,9 +59,15 @@ import { LogStashNodePipelinesPage } from './pages/logstash/node_pipelines';
 export const renderApp = (
   core: CoreStart,
   plugins: MonitoringStartPluginDependencies,
-  { element, setHeaderActionMenu }: AppMountParameters,
+  { element, history, setHeaderActionMenu }: AppMountParameters,
   externalConfig: ExternalConfig
 ) => {
+  // dispatch synthetic hash change event to update hash history objects
+  // this is necessary because hash updates triggered by using popState won't trigger this event naturally.
+  const unlistenParentHistory = history.listen(() => {
+    window.dispatchEvent(new HashChangeEvent('hashchange'));
+  });
+
   ReactDOM.render(
     <MonitoringApp
       core={core}
@@ -74,6 +80,7 @@ export const renderApp = (
 
   return () => {
     ReactDOM.unmountComponentAtNode(element);
+    unlistenParentHistory();
   };
 };
 

From 6c5dd08712ac741a45a2732bf53084daae783abe Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Wed, 13 Oct 2021 10:45:27 -0500
Subject: [PATCH 024/117] [ts] Check .d.ts files for all projects in typeCheck
 (#114295)

* enable --skip-lib-check for all projects in typeCheck and fix existing issues

* fix graph types

* transpile TS to ES2019, but not all the way back to es5

Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 src/dev/typescript/run_type_check_cli.ts      | 19 ++-----------------
 .../workspace/graph_client_workspace.d.ts     |  2 +-
 x-pack/plugins/reporting/server/lib/puid.d.ts |  2 +-
 .../security_solution/cypress/tsconfig.json   |  7 +++----
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/dev/typescript/run_type_check_cli.ts b/src/dev/typescript/run_type_check_cli.ts
index 472b9c04757ca..27998f881a03d 100644
--- a/src/dev/typescript/run_type_check_cli.ts
+++ b/src/dev/typescript/run_type_check_cli.ts
@@ -53,23 +53,8 @@ export async function runTypeCheckCli() {
         }
       }
 
-      const nonCompositeProjects = projects.filter((p) => !p.isCompositeProject());
-      if (!nonCompositeProjects.length) {
-        if (projectFilter) {
-          log.success(
-            `${flags.project} is a composite project so its types are validated by scripts/build_ts_refs`
-          );
-        } else {
-          log.success(
-            `All projects are composite so their types are validated by scripts/build_ts_refs`
-          );
-        }
-
-        return;
-      }
-
       const concurrency = Math.min(4, Math.round((Os.cpus() || []).length / 2) || 1) || 1;
-      log.info('running type check in', nonCompositeProjects.length, 'non-composite projects');
+      log.info('running type check in', projects.length, 'projects');
 
       const tscArgs = [
         ...['--emitDeclarationOnly', 'false'],
@@ -81,7 +66,7 @@ export async function runTypeCheckCli() {
       ];
 
       const failureCount = await lastValueFrom(
-        Rx.from(nonCompositeProjects).pipe(
+        Rx.from(projects).pipe(
           mergeMap(async (p) => {
             const relativePath = Path.relative(process.cwd(), p.tsConfigPath);
 
diff --git a/x-pack/plugins/graph/public/services/workspace/graph_client_workspace.d.ts b/x-pack/plugins/graph/public/services/workspace/graph_client_workspace.d.ts
index b369ec6c5762c..18d08d8da31d8 100644
--- a/x-pack/plugins/graph/public/services/workspace/graph_client_workspace.d.ts
+++ b/x-pack/plugins/graph/public/services/workspace/graph_client_workspace.d.ts
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-import { Workspace, WorkspaceOptions } from '../types';
+import { Workspace, WorkspaceOptions } from '../../types';
 
 declare function createWorkspace(options: WorkspaceOptions): Workspace;
diff --git a/x-pack/plugins/reporting/server/lib/puid.d.ts b/x-pack/plugins/reporting/server/lib/puid.d.ts
index 2cf7dad67d06e..4ac240157971f 100644
--- a/x-pack/plugins/reporting/server/lib/puid.d.ts
+++ b/x-pack/plugins/reporting/server/lib/puid.d.ts
@@ -6,7 +6,7 @@
  */
 
 declare module 'puid' {
-  declare class Puid {
+  class Puid {
     generate(): string;
   }
 
diff --git a/x-pack/plugins/security_solution/cypress/tsconfig.json b/x-pack/plugins/security_solution/cypress/tsconfig.json
index 4efb4c5c56296..a779c3f48d346 100644
--- a/x-pack/plugins/security_solution/cypress/tsconfig.json
+++ b/x-pack/plugins/security_solution/cypress/tsconfig.json
@@ -8,15 +8,14 @@
     "target/**/*"
   ],
   "compilerOptions": {
-    "target": "es5",
-    "lib": ["es5", "dom"],
+    "target": "ES2019",
     "outDir": "target/types",
     "types": [
       "cypress",
       "cypress-pipe",
-      "node"
+      "node",
+      "resize-observer-polyfill",
     ],
-    "resolveJsonModule": true,
   },
   "references": [
     { "path": "../tsconfig.json" }

From 330fd83aaf8750fc090722a3cbbb011cf3574be5 Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Wed, 13 Oct 2021 12:00:21 -0400
Subject: [PATCH 025/117] [Security Solution][Endpoint] Policy Details Trusted
 Apps tab Remove action for single card (#114207)

* Remove modal for removing a policy from card
* new `assignPolicyToTrustedApps()` and `removePolicyFromTrustedApps()` methods for TrustedAppsService
* Additional tests for the policy details Trusted Apps List page/tab
* several tests for RemoveTrustedAppFromPolicyModal (but not all)
---
 .../management/pages/mocks/fleet_mocks.ts     |   5 +-
 .../action/policy_trusted_apps_action.ts      |  20 ++-
 .../policy_trusted_apps_middleware.ts         | 131 ++++++++-------
 .../reducer/initial_policy_details_state.ts   |   1 +
 .../reducer/trusted_apps_reducer.ts           |  20 +++
 .../selectors/trusted_apps_selectors.ts       |  21 +++
 .../pages/policy/test_utils/mocks.ts          |   3 +-
 .../public/management/pages/policy/types.ts   |   9 +
 .../pages/policy/view/policy_hooks.ts         |  25 ++-
 .../policy_trusted_apps_flyout.test.tsx       |   5 +
 .../flyout/policy_trusted_apps_flyout.tsx     |  14 +-
 .../list/policy_trusted_apps_list.test.tsx    | 107 ++++++++----
 .../list/policy_trusted_apps_list.tsx         |  50 +++++-
 ...ove_trusted_app_from_policy_modal.test.tsx | 156 ++++++++++++++++++
 .../remove_trusted_app_from_policy_modal.tsx  | 155 +++++++++++++++++
 .../pages/trusted_apps/service/index.ts       |  97 ++++++++++-
 .../trusted_apps/store/middleware.test.ts     |   2 +
 17 files changed, 710 insertions(+), 111 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.tsx

diff --git a/x-pack/plugins/security_solution/public/management/pages/mocks/fleet_mocks.ts b/x-pack/plugins/security_solution/public/management/pages/mocks/fleet_mocks.ts
index c9a972ce29e4c..8f1530c3632dc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/mocks/fleet_mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/mocks/fleet_mocks.ts
@@ -52,9 +52,10 @@ export const fleetGetEndpointPackagePolicyHttpMock =
       path: PACKAGE_POLICY_API_ROUTES.INFO_PATTERN,
       method: 'get',
       handler: () => {
-        return {
-          items: new EndpointDocGenerator('seed').generatePolicyPackagePolicy(),
+        const response: GetPolicyResponse = {
+          item: new EndpointDocGenerator('seed').generatePolicyPackagePolicy(),
         };
+        return response;
       },
     },
   ]);
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action/policy_trusted_apps_action.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action/policy_trusted_apps_action.ts
index 479452968df7a..b3bdfe32ef091 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action/policy_trusted_apps_action.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action/policy_trusted_apps_action.ts
@@ -8,8 +8,10 @@
 import { Action } from 'redux';
 import { AsyncResourceState } from '../../../../../state';
 import {
-  PostTrustedAppCreateResponse,
+  PutTrustedAppUpdateResponse,
   GetTrustedAppsListResponse,
+  TrustedApp,
+  MaybeImmutable,
 } from '../../../../../../../common/endpoint/types';
 import { PolicyArtifactsState } from '../../../types';
 
@@ -21,13 +23,14 @@ export interface PolicyArtifactsAssignableListPageDataChanged {
 export interface PolicyArtifactsUpdateTrustedApps {
   type: 'policyArtifactsUpdateTrustedApps';
   payload: {
-    trustedAppIds: string[];
+    action: 'assign' | 'remove';
+    artifacts: MaybeImmutable<TrustedApp[]>;
   };
 }
 
 export interface PolicyArtifactsUpdateTrustedAppsChanged {
   type: 'policyArtifactsUpdateTrustedAppsChanged';
-  payload: AsyncResourceState<PostTrustedAppCreateResponse[]>;
+  payload: AsyncResourceState<PutTrustedAppUpdateResponse[]>;
 }
 
 export interface PolicyArtifactsAssignableListExistDataChanged {
@@ -58,6 +61,13 @@ export interface PolicyDetailsListOfAllPoliciesStateChanged
 export type PolicyDetailsTrustedAppsForceListDataRefresh =
   Action<'policyDetailsTrustedAppsForceListDataRefresh'>;
 
+export type PolicyDetailsArtifactsResetRemove = Action<'policyDetailsArtifactsResetRemove'>;
+
+export interface PolicyDetailsTrustedAppsRemoveListStateChanged
+  extends Action<'policyDetailsTrustedAppsRemoveListStateChanged'> {
+  payload: PolicyArtifactsState['removeList'];
+}
+
 /**
  * All of the possible actions for Trusted Apps under the Policy Details store
  */
@@ -70,4 +80,6 @@ export type PolicyTrustedAppsAction =
   | PolicyArtifactsDeosAnyTrustedAppExists
   | AssignedTrustedAppsListStateChanged
   | PolicyDetailsListOfAllPoliciesStateChanged
-  | PolicyDetailsTrustedAppsForceListDataRefresh;
+  | PolicyDetailsTrustedAppsForceListDataRefresh
+  | PolicyDetailsTrustedAppsRemoveListStateChanged
+  | PolicyDetailsArtifactsResetRemove;
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_trusted_apps_middleware.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_trusted_apps_middleware.ts
index 360fe9fb99b8d..f50eb342acba1 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_trusted_apps_middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_trusted_apps_middleware.ts
@@ -5,43 +5,44 @@
  * 2.0.
  */
 
-import pMap from 'p-map';
-import { find, isEmpty } from 'lodash/fp';
+import { isEmpty } from 'lodash/fp';
 import {
-  PolicyDetailsState,
-  MiddlewareRunner,
   GetPolicyListResponse,
+  MiddlewareRunner,
   MiddlewareRunnerContext,
   PolicyAssignedTrustedApps,
+  PolicyDetailsState,
   PolicyDetailsStore,
+  PolicyRemoveTrustedApps,
 } from '../../../types';
 import {
-  policyIdFromParams,
-  getAssignableArtifactsList,
   doesPolicyTrustedAppsListNeedUpdate,
+  getCurrentArtifactsLocation,
   getCurrentPolicyAssignedTrustedAppsState,
+  getCurrentTrustedAppsRemoveListState,
+  getCurrentUrlLocationPaginationParams,
   getLatestLoadedPolicyAssignedTrustedAppsState,
+  getTrustedAppsIsRemoving,
   getTrustedAppsPolicyListState,
-  isPolicyTrustedAppListLoading,
-  getCurrentArtifactsLocation,
   isOnPolicyTrustedAppsView,
-  getCurrentUrlLocationPaginationParams,
+  isPolicyTrustedAppListLoading,
+  licensedPolicy,
+  policyIdFromParams,
   getDoesAnyTrustedAppExistsIsLoading,
 } from '../selectors';
 import {
-  ImmutableArray,
-  ImmutableObject,
-  PostTrustedAppCreateRequest,
-  TrustedApp,
   Immutable,
+  MaybeImmutable,
+  PutTrustedAppUpdateResponse,
+  TrustedApp,
 } from '../../../../../../../common/endpoint/types';
 import { ImmutableMiddlewareAPI } from '../../../../../../common/store';
 import { TrustedAppsService } from '../../../../trusted_apps/service';
 import {
+  createFailedResourceState,
   createLoadedResourceState,
   createLoadingResourceState,
   createUninitialisedResourceState,
-  createFailedResourceState,
   isLoadingResourceState,
   isUninitialisedResourceState,
 } from '../../../../../state';
@@ -83,8 +84,13 @@ export const policyTrustedAppsMiddlewareRunner: MiddlewareRunner = async (
       break;
 
     case 'policyArtifactsUpdateTrustedApps':
-      if (getCurrentArtifactsLocation(state).show === 'list') {
-        await updateTrustedApps(store, trustedAppsService, action.payload.trustedAppIds);
+      if (
+        getCurrentArtifactsLocation(state).show === 'list' &&
+        action.payload.action === 'assign'
+      ) {
+        await updateTrustedApps(store, trustedAppsService, action.payload.artifacts);
+      } else if (action.payload.action === 'remove') {
+        removeTrustedAppsFromPolicy(context, store, action.payload.artifacts);
       }
 
       break;
@@ -213,58 +219,26 @@ const searchTrustedApps = async (
   }
 };
 
-interface UpdateTrustedAppWrapperProps {
-  entry: ImmutableObject<TrustedApp>;
-  policies: ImmutableArray<string>;
-}
-
 const updateTrustedApps = async (
   store: ImmutableMiddlewareAPI<PolicyDetailsState, PolicyDetailsAction>,
   trustedAppsService: TrustedAppsService,
-  trustedAppsIds: ImmutableArray<string>
+  trustedApps: MaybeImmutable<TrustedApp[]>
 ) => {
   const state = store.getState();
   const policyId = policyIdFromParams(state);
-  const availavleArtifacts = getAssignableArtifactsList(state);
-
-  if (!availavleArtifacts || !availavleArtifacts.data.length) {
-    return;
-  }
 
   store.dispatch({
     type: 'policyArtifactsUpdateTrustedAppsChanged',
     // Ignore will be fixed with when AsyncResourceState is refactored (#830)
-    // @ts-ignore
+    // @ts-expect-error
     payload: createLoadingResourceState({ previousState: createUninitialisedResourceState() }),
   });
 
   try {
-    const trustedAppsUpdateActions = [];
-
-    const updateTrustedApp = async ({ entry, policies }: UpdateTrustedAppWrapperProps) =>
-      trustedAppsService.updateTrustedApp({ id: entry.id }, {
-        effectScope: { type: 'policy', policies: [...policies, policyId] },
-        name: entry.name,
-        entries: entry.entries,
-        os: entry.os,
-        description: entry.description,
-        version: entry.version,
-      } as PostTrustedAppCreateRequest);
-
-    for (const entryId of trustedAppsIds) {
-      const entry = find({ id: entryId }, availavleArtifacts.data) as ImmutableObject<TrustedApp>;
-      if (entry) {
-        const policies = entry.effectScope.type === 'policy' ? entry.effectScope.policies : [];
-        trustedAppsUpdateActions.push({ entry, policies });
-      }
-    }
-
-    const updatedTrustedApps = await pMap(trustedAppsUpdateActions, updateTrustedApp, {
-      concurrency: 5,
-      /** When set to false, instead of stopping when a promise rejects, it will wait for all the promises to settle
-       * and then reject with an aggregated error containing all the errors from the rejected promises. */
-      stopOnError: false,
-    });
+    const updatedTrustedApps = await trustedAppsService.assignPolicyToTrustedApps(
+      policyId,
+      trustedApps
+    );
 
     store.dispatch({
       type: 'policyArtifactsUpdateTrustedAppsChanged',
@@ -275,9 +249,7 @@ const updateTrustedApps = async (
   } catch (err) {
     store.dispatch({
       type: 'policyArtifactsUpdateTrustedAppsChanged',
-      // Ignore will be fixed with when AsyncResourceState is refactored (#830)
-      // @ts-ignore
-      payload: createFailedResourceState(err.body ?? err),
+      payload: createFailedResourceState<PutTrustedAppUpdateResponse[]>(err.body ?? err),
     });
   }
 };
@@ -371,3 +343,48 @@ const fetchAllPoliciesIfNeeded = async (
     });
   }
 };
+
+const removeTrustedAppsFromPolicy = async (
+  { trustedAppsService }: MiddlewareRunnerContext,
+  { getState, dispatch }: PolicyDetailsStore,
+  trustedApps: MaybeImmutable<TrustedApp[]>
+): Promise<void> => {
+  const state = getState();
+
+  if (getTrustedAppsIsRemoving(state)) {
+    return;
+  }
+
+  dispatch({
+    type: 'policyDetailsTrustedAppsRemoveListStateChanged',
+    // @ts-expect-error will be fixed when AsyncResourceState is refactored (#830)
+    payload: createLoadingResourceState(getCurrentTrustedAppsRemoveListState(state)),
+  });
+
+  try {
+    const currentPolicyId = licensedPolicy(state)?.id;
+
+    if (!currentPolicyId) {
+      throw new Error('current policy id not found');
+    }
+
+    const response = await trustedAppsService.removePolicyFromTrustedApps(
+      currentPolicyId,
+      trustedApps
+    );
+
+    dispatch({
+      type: 'policyDetailsTrustedAppsRemoveListStateChanged',
+      payload: createLoadedResourceState({ artifacts: trustedApps, response }),
+    });
+
+    dispatch({
+      type: 'policyDetailsTrustedAppsForceListDataRefresh',
+    });
+  } catch (error) {
+    dispatch({
+      type: 'policyDetailsTrustedAppsRemoveListStateChanged',
+      payload: createFailedResourceState<PolicyRemoveTrustedApps>(error.body || error),
+    });
+  }
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/reducer/initial_policy_details_state.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/reducer/initial_policy_details_state.ts
index 2ad7ac9c06dac..008bcd262ceff 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/reducer/initial_policy_details_state.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/reducer/initial_policy_details_state.ts
@@ -40,5 +40,6 @@ export const initialPolicyDetailsState: () => Immutable<PolicyDetailsState> = ()
     doesAnyTrustedAppExists: createUninitialisedResourceState(),
     assignedList: createUninitialisedResourceState(),
     policies: createUninitialisedResourceState(),
+    removeList: createUninitialisedResourceState(),
   },
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/reducer/trusted_apps_reducer.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/reducer/trusted_apps_reducer.ts
index fbf498797e804..f9d090647b1b5 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/reducer/trusted_apps_reducer.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/reducer/trusted_apps_reducer.ts
@@ -90,5 +90,25 @@ export const policyTrustedAppsReducer: ImmutableReducer<PolicyDetailsState, AppA
     };
   }
 
+  if (action.type === 'policyDetailsTrustedAppsRemoveListStateChanged') {
+    return {
+      ...state,
+      artifacts: {
+        ...state.artifacts,
+        removeList: action.payload,
+      },
+    };
+  }
+
+  if (action.type === 'policyDetailsArtifactsResetRemove') {
+    return {
+      ...state,
+      artifacts: {
+        ...state.artifacts,
+        removeList: initialPolicyDetailsState().artifacts.removeList,
+      },
+    };
+  }
+
   return state;
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors/trusted_apps_selectors.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors/trusted_apps_selectors.ts
index 3177f13ae77e8..8ddf38fbb32e7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors/trusted_apps_selectors.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors/trusted_apps_selectors.ts
@@ -221,3 +221,24 @@ export const getPolicyTrustedAppListError: PolicyDetailsSelector<
     return currentAssignedTrustedAppsState.error;
   }
 });
+
+export const getCurrentTrustedAppsRemoveListState: PolicyDetailsSelector<
+  PolicyArtifactsState['removeList']
+> = (state) => state.artifacts.removeList;
+
+export const getTrustedAppsIsRemoving: PolicyDetailsSelector<boolean> = createSelector(
+  getCurrentTrustedAppsRemoveListState,
+  (removeListState) => isLoadingResourceState(removeListState)
+);
+
+export const getTrustedAppsRemovalError: PolicyDetailsSelector<ServerApiError | undefined> =
+  createSelector(getCurrentTrustedAppsRemoveListState, (removeListState) => {
+    if (isFailedResourceState(removeListState)) {
+      return removeListState.error;
+    }
+  });
+
+export const getTrustedAppsWasRemoveSuccessful: PolicyDetailsSelector<boolean> = createSelector(
+  getCurrentTrustedAppsRemoveListState,
+  (removeListState) => isLoadedResourceState(removeListState)
+);
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts b/x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts
index be38e591dd9da..aca0971621863 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { HttpFetchOptionsWithPath } from 'kibana/public';
 import {
   composeHttpHandlerMocks,
   httpHandlerMockFactory,
@@ -71,7 +72,7 @@ export const getAPIError = () => ({
 });
 
 type PolicyDetailsTrustedAppsHttpMocksInterface = ResponseProvidersInterface<{
-  policyTrustedAppsList: () => GetTrustedAppsListResponse;
+  policyTrustedAppsList: (options: HttpFetchOptionsWithPath) => GetTrustedAppsListResponse;
 }>;
 
 /**
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/types.ts b/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
index 7f8bf9c3872ea..283c3afb573b6 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/types.ts
@@ -16,6 +16,8 @@ import {
   PostTrustedAppCreateResponse,
   MaybeImmutable,
   GetTrustedAppsListResponse,
+  TrustedApp,
+  PutTrustedAppUpdateResponse,
 } from '../../../../common/endpoint/types';
 import { ServerApiError } from '../../../common/types';
 import {
@@ -78,6 +80,11 @@ export interface PolicyAssignedTrustedApps {
   artifacts: GetTrustedAppsListResponse;
 }
 
+export interface PolicyRemoveTrustedApps {
+  artifacts: TrustedApp[];
+  response: PutTrustedAppUpdateResponse[];
+}
+
 /**
  * Policy artifacts store state
  */
@@ -96,6 +103,8 @@ export interface PolicyArtifactsState {
   assignedList: AsyncResourceState<PolicyAssignedTrustedApps>;
   /** A list of all available polices */
   policies: AsyncResourceState<GetPolicyListResponse>;
+  /** list of artifacts to remove. Holds the ids that were removed and the API response */
+  removeList: AsyncResourceState<PolicyRemoveTrustedApps>;
 }
 
 export enum OS {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_hooks.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_hooks.ts
index 82296730af686..c6b89b4137cc4 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_hooks.ts
@@ -71,6 +71,8 @@ export const usePolicyTrustedAppsNotification = () => {
 
   if (updateSuccessfull && updatedArtifacts && !wasAlreadyHandled.has(updatedArtifacts)) {
     wasAlreadyHandled.add(updatedArtifacts);
+    const updateCount = updatedArtifacts.length;
+
     toasts.addSuccess({
       title: i18n.translate(
         'xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastSuccess.title',
@@ -78,13 +80,22 @@ export const usePolicyTrustedAppsNotification = () => {
           defaultMessage: 'Success',
         }
       ),
-      text: i18n.translate(
-        'xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastSuccess.text',
-        {
-          defaultMessage: '"{names}" has been added to your trusted applications list.',
-          values: { names: updatedArtifacts.map((artifact) => artifact.data.name).join(', ') },
-        }
-      ),
+      text:
+        updateCount > 1
+          ? i18n.translate(
+              'xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastSuccess.textMultiples',
+              {
+                defaultMessage: '{count} trusted applications have been added to your list.',
+                values: { count: updateCount },
+              }
+            )
+          : i18n.translate(
+              'xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastSuccess.textSingle',
+              {
+                defaultMessage: '"{name}" has been added to your trusted applications list.',
+                values: { name: updatedArtifacts[0]!.data.name },
+              }
+            ),
     });
   } else if (updateFailed) {
     toasts.addDanger(
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.test.tsx
index b07005908ed1e..c1d00f7a3f99b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.test.tsx
@@ -38,6 +38,11 @@ describe('Policy trusted apps flyout', () => {
         updateTrustedApp: () => ({
           data: getMockCreateResponse(),
         }),
+        assignPolicyToTrustedApps: () => [
+          {
+            data: getMockCreateResponse(),
+          },
+        ],
       };
     });
     mockedContext = createAppRootMockRenderer();
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx
index cd291ed9f6eb0..63c7d5375476c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx
@@ -25,6 +25,7 @@ import {
   EuiCallOut,
   EuiEmptyPrompt,
 } from '@elastic/eui';
+import { Dispatch } from 'redux';
 import {
   policyDetails,
   getCurrentArtifactsLocation,
@@ -42,10 +43,12 @@ import {
 } from '../../policy_hooks';
 import { PolicyArtifactsAssignableList } from '../../artifacts/assignable';
 import { SearchExceptions } from '../../../../../components/search_exceptions';
+import { AppAction } from '../../../../../../common/store/actions';
+import { MaybeImmutable, TrustedApp } from '../../../../../../../common/endpoint/types';
 
 export const PolicyTrustedAppsFlyout = React.memo(() => {
   usePolicyTrustedAppsNotification();
-  const dispatch = useDispatch();
+  const dispatch = useDispatch<Dispatch<AppAction>>();
   const [selectedArtifactIds, setSelectedArtifactIds] = useState<string[]>([]);
   const location = usePolicyDetailsSelector(getCurrentArtifactsLocation);
   const policyItem = usePolicyDetailsSelector(policyDetails);
@@ -85,9 +88,14 @@ export const PolicyTrustedAppsFlyout = React.memo(() => {
   const handleOnConfirmAction = useCallback(() => {
     dispatch({
       type: 'policyArtifactsUpdateTrustedApps',
-      payload: { trustedAppIds: selectedArtifactIds },
+      payload: {
+        action: 'assign',
+        artifacts: selectedArtifactIds.map<MaybeImmutable<TrustedApp>>((selectedId) => {
+          return assignableArtifactsList?.data?.find((trustedApp) => trustedApp.id === selectedId)!;
+        }),
+      },
     });
-  }, [dispatch, selectedArtifactIds]);
+  }, [assignableArtifactsList?.data, dispatch, selectedArtifactIds]);
 
   const handleOnSearch = useCallback(
     (filter) => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.test.tsx
index 07b62d13e8edc..83709c50b76fa 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.test.tsx
@@ -13,11 +13,19 @@ import { getPolicyDetailsArtifactsListPath } from '../../../../../common/routing
 import { PolicyTrustedAppsList } from './policy_trusted_apps_list';
 import React from 'react';
 import { policyDetailsPageAllApiHttpMocks } from '../../../test_utils';
-import { isFailedResourceState, isLoadedResourceState } from '../../../../../state';
+import {
+  createLoadingResourceState,
+  createUninitialisedResourceState,
+  isFailedResourceState,
+  isLoadedResourceState,
+} from '../../../../../state';
 import { fireEvent, within, act, waitFor } from '@testing-library/react';
 import { APP_ID } from '../../../../../../../common/constants';
 
 describe('when rendering the PolicyTrustedAppsList', () => {
+  // The index (zero based) of the card created by the generator that is policy specific
+  const POLICY_SPECIFIC_CARD_INDEX = 2;
+
   let appTestContext: AppContextTestRender;
   let renderResult: ReturnType<AppContextTestRender['render']>;
   let render: (waitForLoadedState?: boolean) => Promise<ReturnType<AppContextTestRender['render']>>;
@@ -84,8 +92,19 @@ describe('when rendering the PolicyTrustedAppsList', () => {
     };
   });
 
-  // FIXME: implement this test once PR #113802 is merged
-  it.todo('should show loading spinner if checking to see if trusted apps exist');
+  it('should show loading spinner if checking to see if trusted apps exist', async () => {
+    await render();
+    act(() => {
+      appTestContext.store.dispatch({
+        type: 'policyArtifactsDeosAnyTrustedAppExists',
+        // Ignore will be fixed with when AsyncResourceState is refactored (#830)
+        // @ts-ignore
+        payload: createLoadingResourceState({ previousState: createUninitialisedResourceState() }),
+      });
+    });
+
+    expect(renderResult.getByTestId('policyTrustedAppsGrid-loading')).not.toBeNull();
+  });
 
   it('should show total number of of items being displayed', async () => {
     await render();
@@ -163,40 +182,68 @@ describe('when rendering the PolicyTrustedAppsList', () => {
     );
   });
 
-  it('should display policy names on assignment context menu', async () => {
-    const retrieveAllPolicies = waitForAction('policyDetailsListOfAllPoliciesStateChanged', {
-      validate({ payload }) {
-        return isLoadedResourceState(payload);
-      },
-    });
+  it('should show dialog when remove action is clicked', async () => {
     await render();
-    await retrieveAllPolicies;
+    await toggleCardActionMenu(POLICY_SPECIFIC_CARD_INDEX);
     act(() => {
-      fireEvent.click(
-        within(getCardByIndexPosition(2)).getByTestId(
-          'policyTrustedAppsGrid-card-header-effectScope-popupMenu-button'
+      fireEvent.click(renderResult.getByTestId('policyTrustedAppsGrid-removeAction'));
+    });
+
+    await waitFor(() => expect(renderResult.getByTestId('confirmModalBodyText')));
+  });
+
+  describe('and artifact is policy specific', () => {
+    const renderAndClickOnEffectScopePopupButton = async () => {
+      const retrieveAllPolicies = waitForAction('policyDetailsListOfAllPoliciesStateChanged', {
+        validate({ payload }) {
+          return isLoadedResourceState(payload);
+        },
+      });
+      await render();
+      await retrieveAllPolicies;
+      act(() => {
+        fireEvent.click(
+          within(getCardByIndexPosition(POLICY_SPECIFIC_CARD_INDEX)).getByTestId(
+            'policyTrustedAppsGrid-card-header-effectScope-popupMenu-button'
+          )
+        );
+      });
+      await waitFor(() =>
+        expect(
+          renderResult.getByTestId(
+            'policyTrustedAppsGrid-card-header-effectScope-popupMenu-popoverPanel'
+          )
         )
       );
-    });
-    await waitFor(() =>
+    };
+
+    it('should display policy names on assignment context menu', async () => {
+      await renderAndClickOnEffectScopePopupButton();
+
       expect(
-        renderResult.getByTestId(
-          'policyTrustedAppsGrid-card-header-effectScope-popupMenu-popoverPanel'
-        )
-      )
-    );
+        renderResult.getByTestId('policyTrustedAppsGrid-card-header-effectScope-popupMenu-item-0')
+          .textContent
+      ).toEqual('Endpoint Policy 0');
+      expect(
+        renderResult.getByTestId('policyTrustedAppsGrid-card-header-effectScope-popupMenu-item-1')
+          .textContent
+      ).toEqual('Endpoint Policy 1');
+    });
 
-    expect(
-      renderResult.getByTestId('policyTrustedAppsGrid-card-header-effectScope-popupMenu-item-0')
-        .textContent
-    ).toEqual('Endpoint Policy 0');
-    expect(
-      renderResult.getByTestId('policyTrustedAppsGrid-card-header-effectScope-popupMenu-item-1')
-        .textContent
-    ).toEqual('Endpoint Policy 1');
-  });
+    it('should navigate to policy details when clicking policy on assignment context menu', async () => {
+      await renderAndClickOnEffectScopePopupButton();
+
+      act(() => {
+        fireEvent.click(
+          renderResult.getByTestId('policyTrustedAppsGrid-card-header-effectScope-popupMenu-item-0')
+        );
+      });
 
-  it.todo('should navigate to policy details when clicking policy on assignment context menu');
+      expect(appTestContext.history.location.pathname).toEqual(
+        '/administration/policy/ddf6570b-9175-4a6d-b288-61a09771c647/settings'
+      );
+    });
+  });
 
   it('should handle pagination changes', async () => {
     await render();
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.tsx
index 6793bee9c3c01..cb29d0ff868ac 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.tsx
@@ -37,6 +37,7 @@ import { APP_ID } from '../../../../../../../common/constants';
 import { ContextMenuItemNavByRouterProps } from '../../../../../components/context_menu_with_router_support/context_menu_item_nav_by_router';
 import { ArtifactEntryCollapsibleCardProps } from '../../../../../components/artifact_entry_card';
 import { useTestIdGenerator } from '../../../../../components/hooks/use_test_id_generator';
+import { RemoveTrustedAppFromPolicyModal } from './remove_trusted_app_from_policy_modal';
 
 const DATA_TEST_SUBJ = 'policyTrustedAppsGrid';
 
@@ -56,6 +57,8 @@ export const PolicyTrustedAppsList = memo(() => {
   const trustedAppsApiError = usePolicyDetailsSelector(getPolicyTrustedAppListError);
 
   const [isCardExpanded, setCardExpanded] = useState<Record<string, boolean>>({});
+  const [trustedAppsForRemoval, setTrustedAppsForRemoval] = useState<typeof trustedAppItems>([]);
+  const [showRemovalModal, setShowRemovalModal] = useState<boolean>(false);
 
   const handlePageChange = useCallback<ArtifactCardGridProps['onPageChange']>(
     ({ pageIndex, pageSize }) => {
@@ -100,6 +103,7 @@ export const PolicyTrustedAppsList = memo(() => {
     const newCardProps = new Map();
 
     for (const trustedApp of trustedAppItems) {
+      const isGlobal = trustedApp.effectScope.type === 'global';
       const viewUrlPath = getTrustedAppsListPath({ id: trustedApp.id, show: 'edit' });
       const assignedPoliciesMenuItems: ArtifactEntryCollapsibleCardProps['policies'] =
         trustedApp.effectScope.type === 'global'
@@ -142,6 +146,29 @@ export const PolicyTrustedAppsList = memo(() => {
             navigateOptions: { path: viewUrlPath },
             'data-test-subj': getTestId('viewFullDetailsAction'),
           },
+          {
+            icon: 'trash',
+            children: i18n.translate(
+              'xpack.securitySolution.endpoint.policy.trustedApps.list.removeAction',
+              { defaultMessage: 'Remove from policy' }
+            ),
+            onClick: () => {
+              setTrustedAppsForRemoval([trustedApp]);
+              setShowRemovalModal(true);
+            },
+            disabled: isGlobal,
+            toolTipContent: isGlobal
+              ? i18n.translate(
+                  'xpack.securitySolution.endpoint.policy.trustedApps.list.removeActionNotAllowed',
+                  {
+                    defaultMessage:
+                      'Globally applied trusted applications cannot be removed from policy.',
+                  }
+                )
+              : undefined,
+            toolTipPosition: 'top',
+            'data-test-subj': getTestId('removeAction'),
+          },
         ],
         policies: assignedPoliciesMenuItems,
       };
@@ -159,6 +186,15 @@ export const PolicyTrustedAppsList = memo(() => {
     [cardProps]
   );
 
+  const handleRemoveModalClose = useCallback(() => {
+    setShowRemovalModal(false);
+  }, []);
+
+  // Anytime a new set of data (trusted apps) is retrieved, reset the card expand state
+  useEffect(() => {
+    setCardExpanded({});
+  }, [trustedAppItems]);
+
   // if an error occurred while loading the data, show toast
   useEffect(() => {
     if (trustedAppsApiError) {
@@ -170,18 +206,13 @@ export const PolicyTrustedAppsList = memo(() => {
     }
   }, [toasts, trustedAppsApiError]);
 
-  // Anytime a new set of data (trusted apps) is retrieved, reset the card expand state
-  useEffect(() => {
-    setCardExpanded({});
-  }, [trustedAppItems]);
-
   if (hasTrustedApps.loading || isTrustedAppExistsCheckLoading) {
     return (
       <EuiPageTemplate template="centeredContent">
         <EuiLoadingSpinner
           className="essentialAnimation"
           size="xl"
-          data-test-subj={DATA_TEST_SUBJ}
+          data-test-subj={getTestId('loading')}
         />
       </EuiPageTemplate>
     );
@@ -205,6 +236,13 @@ export const PolicyTrustedAppsList = memo(() => {
         pagination={pagination as Pagination}
         data-test-subj={DATA_TEST_SUBJ}
       />
+
+      {showRemovalModal && (
+        <RemoveTrustedAppFromPolicyModal
+          trustedApps={trustedAppsForRemoval}
+          onClose={handleRemoveModalClose}
+        />
+      )}
     </>
   );
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx
new file mode 100644
index 0000000000000..fc2926bc65d3a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx
@@ -0,0 +1,156 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  AppContextTestRender,
+  createAppRootMockRenderer,
+} from '../../../../../../common/mock/endpoint';
+import { getPolicyDetailsArtifactsListPath } from '../../../../../common/routing';
+import { isLoadedResourceState } from '../../../../../state';
+import React from 'react';
+import { fireEvent, act } from '@testing-library/react';
+import { policyDetailsPageAllApiHttpMocks } from '../../../test_utils';
+import {
+  RemoveTrustedAppFromPolicyModal,
+  RemoveTrustedAppFromPolicyModalProps,
+} from './remove_trusted_app_from_policy_modal';
+import { PolicyArtifactsUpdateTrustedApps } from '../../../store/policy_details/action/policy_trusted_apps_action';
+import { Immutable } from '../../../../../../../common/endpoint/types';
+import { HttpFetchOptionsWithPath } from 'kibana/public';
+
+describe('When using the RemoveTrustedAppFromPolicyModal component', () => {
+  let appTestContext: AppContextTestRender;
+  let renderResult: ReturnType<AppContextTestRender['render']>;
+  let render: (waitForLoadedState?: boolean) => Promise<ReturnType<AppContextTestRender['render']>>;
+  let waitForAction: AppContextTestRender['middlewareSpy']['waitForAction'];
+  let mockedApis: ReturnType<typeof policyDetailsPageAllApiHttpMocks>;
+  let onCloseHandler: jest.MockedFunction<RemoveTrustedAppFromPolicyModalProps['onClose']>;
+  let trustedApps: RemoveTrustedAppFromPolicyModalProps['trustedApps'];
+
+  beforeEach(() => {
+    appTestContext = createAppRootMockRenderer();
+    waitForAction = appTestContext.middlewareSpy.waitForAction;
+    onCloseHandler = jest.fn();
+    mockedApis = policyDetailsPageAllApiHttpMocks(appTestContext.coreStart.http);
+    trustedApps = [
+      mockedApis.responseProvider.policyTrustedAppsList({ query: {} } as HttpFetchOptionsWithPath)
+        .data[0],
+    ];
+
+    render = async (waitForLoadedState: boolean = true) => {
+      const pendingDataLoadState = waitForLoadedState
+        ? Promise.all([
+            waitForAction('serverReturnedPolicyDetailsData'),
+            waitForAction('assignedTrustedAppsListStateChanged', {
+              validate({ payload }) {
+                return isLoadedResourceState(payload);
+              },
+            }),
+          ])
+        : Promise.resolve();
+
+      appTestContext.history.push(
+        getPolicyDetailsArtifactsListPath('ddf6570b-9175-4a6d-b288-61a09771c647')
+      );
+      renderResult = appTestContext.render(
+        <RemoveTrustedAppFromPolicyModal trustedApps={trustedApps} onClose={onCloseHandler} />
+      );
+
+      await pendingDataLoadState;
+
+      return renderResult;
+    };
+  });
+
+  const getConfirmButton = (): HTMLButtonElement =>
+    renderResult.getByTestId('confirmModalConfirmButton') as HTMLButtonElement;
+
+  const clickConfirmButton = async (
+    waitForActionDispatch: boolean = false
+  ): Promise<Immutable<PolicyArtifactsUpdateTrustedApps> | undefined> => {
+    const pendingConfirmStoreAction = waitForAction('policyArtifactsUpdateTrustedApps');
+
+    act(() => {
+      fireEvent.click(getConfirmButton());
+    });
+
+    let response: PolicyArtifactsUpdateTrustedApps | undefined;
+
+    if (waitForActionDispatch) {
+      await act(async () => {
+        response = await pendingConfirmStoreAction;
+      });
+    }
+
+    return response;
+  };
+
+  const clickCancelButton = () => {
+    act(() => {
+      fireEvent.click(renderResult.getByTestId('confirmModalCancelButton'));
+    });
+  };
+
+  const clickCloseButton = () => {
+    act(() => {
+      fireEvent.click(renderResult.baseElement.querySelector('button.euiModal__closeIcon')!);
+    });
+  };
+
+  it.each([
+    ['cancel', clickCancelButton],
+    ['close', clickCloseButton],
+  ])('should call `onClose` callback when %s button is clicked', async (__, clickButton) => {
+    await render();
+    clickButton();
+
+    expect(onCloseHandler).toHaveBeenCalled();
+  });
+
+  it('should dispatch action when confirmed', async () => {
+    await render();
+    const confirmedAction = await clickConfirmButton(true);
+
+    expect(confirmedAction!.payload).toEqual({
+      action: 'remove',
+      artifacts: trustedApps,
+    });
+  });
+
+  it.skip('should disable and show loading state on confirm button while update is underway', async () => {
+    await render();
+    await clickConfirmButton(true);
+    const confirmButton = getConfirmButton();
+
+    // FIXME:PT will finish test in a subsequent PR (issue created #1876)
+    //  GETTING ERROR:
+    //  Error: current policy id not found
+    //     //     at removeTrustedAppsFromPolicy (.../x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_trusted_apps_middleware.ts:368:13)
+    //     //     at policyTrustedAppsMiddlewareRunner (.../x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_trusted_apps_middleware.ts:93:9)
+
+    expect(confirmButton.disabled).toBe(true);
+    expect(confirmButton.querySelector('.euiLoadingSpinner')).not.toBeNull();
+  });
+
+  it.each([
+    ['cancel', clickCancelButton],
+    ['close', clickCloseButton],
+  ])(
+    'should prevent dialog dismissal if %s button is clicked while update is underway',
+    (__, clickButton) => {
+      // TODO: implement test
+    }
+  );
+
+  it.todo('should show error toast if removal failed');
+
+  it.todo('should show success toast and close modal when removed is successful');
+
+  it.todo('should show single removal success message');
+
+  it.todo('should show multiples removal success message');
+});
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.tsx
new file mode 100644
index 0000000000000..c43c28ec82829
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.tsx
@@ -0,0 +1,155 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo, useCallback, useEffect, useMemo } from 'react';
+import { EuiCallOut, EuiConfirmModal, EuiSpacer, EuiText } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { useDispatch } from 'react-redux';
+import { Dispatch } from 'redux';
+import { Immutable, TrustedApp } from '../../../../../../../common/endpoint/types';
+import { AppAction } from '../../../../../../common/store/actions';
+import { usePolicyDetailsSelector } from '../../policy_hooks';
+import {
+  getTrustedAppsIsRemoving,
+  getTrustedAppsRemovalError,
+  getTrustedAppsWasRemoveSuccessful,
+  policyDetails,
+} from '../../../store/policy_details/selectors';
+import { useToasts } from '../../../../../../common/lib/kibana';
+
+export interface RemoveTrustedAppFromPolicyModalProps {
+  trustedApps: Immutable<TrustedApp[]>;
+  onClose: () => void;
+}
+
+export const RemoveTrustedAppFromPolicyModal = memo<RemoveTrustedAppFromPolicyModalProps>(
+  ({ trustedApps, onClose }) => {
+    const toasts = useToasts();
+    const dispatch = useDispatch<Dispatch<AppAction>>();
+
+    const policyName = usePolicyDetailsSelector(policyDetails)?.name;
+    const isRemoving = usePolicyDetailsSelector(getTrustedAppsIsRemoving);
+    const removeError = usePolicyDetailsSelector(getTrustedAppsRemovalError);
+    const wasSuccessful = usePolicyDetailsSelector(getTrustedAppsWasRemoveSuccessful);
+
+    const removedToastMessage: string = useMemo(() => {
+      const count = trustedApps.length;
+
+      if (count === 0) {
+        return '';
+      }
+
+      if (count > 1) {
+        return i18n.translate(
+          'xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.successMultiplesToastText',
+          {
+            defaultMessage: '{count} trusted apps have been removed from {policyName} policy',
+            values: { count, policyName },
+          }
+        );
+      }
+
+      return i18n.translate(
+        'xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.successToastText',
+        {
+          defaultMessage: '"{trustedAppName}" has been removed from "{policyName}" policy',
+          values: { trustedAppName: trustedApps[0].name, policyName },
+        }
+      );
+    }, [policyName, trustedApps]);
+
+    const handleModalClose = useCallback(() => {
+      if (!isRemoving) {
+        onClose();
+      }
+    }, [isRemoving, onClose]);
+
+    const handleModalConfirm = useCallback(() => {
+      dispatch({
+        type: 'policyArtifactsUpdateTrustedApps',
+        payload: { action: 'remove', artifacts: trustedApps },
+      });
+    }, [dispatch, trustedApps]);
+
+    useEffect(() => {
+      // When component is un-mounted, reset the state for remove in the store
+      return () => {
+        dispatch({ type: 'policyDetailsArtifactsResetRemove' });
+      };
+    }, [dispatch]);
+
+    useEffect(() => {
+      if (removeError) {
+        toasts.addError(removeError as unknown as Error, {
+          title: i18n.translate(
+            'xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.errorToastTitle',
+            {
+              defaultMessage: 'Error while attempt to remove trusted application',
+            }
+          ),
+        });
+      }
+    }, [removeError, toasts]);
+
+    useEffect(() => {
+      if (wasSuccessful) {
+        toasts.addSuccess({
+          title: i18n.translate(
+            'xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.successToastTitle',
+            { defaultMessage: 'Successfully removed' }
+          ),
+          text: removedToastMessage,
+        });
+        handleModalClose();
+      }
+    }, [handleModalClose, policyName, removedToastMessage, toasts, trustedApps, wasSuccessful]);
+
+    return (
+      <EuiConfirmModal
+        onCancel={handleModalClose}
+        onConfirm={handleModalConfirm}
+        title={i18n.translate(
+          'xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.title',
+          { defaultMessage: 'Remove trusted application from policy' }
+        )}
+        cancelButtonText={i18n.translate(
+          'xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.cancelLabel',
+          { defaultMessage: 'Cancel' }
+        )}
+        confirmButtonText={i18n.translate(
+          'xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.confirmLabel',
+          {
+            defaultMessage: 'Remove from policy',
+          }
+        )}
+        isLoading={isRemoving}
+      >
+        <EuiCallOut color="warning" iconType="help">
+          <p>
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.messageCallout"
+              defaultMessage="This trusted application will be removed only from this policy and can still be found and managed from the trusted applications page."
+            />
+          </p>
+        </EuiCallOut>
+
+        <EuiSpacer />
+
+        <EuiText size="s">
+          <p>
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.message"
+              defaultMessage="Are you sure you wish to continue?"
+            />
+          </p>
+        </EuiText>
+      </EuiConfirmModal>
+    );
+  }
+);
+RemoveTrustedAppFromPolicyModal.displayName = 'RemoveTrustedAppFromPolicyModal';
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/index.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/index.ts
index 09aa80ffae495..b59fb6cfdd2f7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/index.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/index.ts
@@ -7,6 +7,7 @@
 
 import { HttpStart } from 'kibana/public';
 
+import pMap from 'p-map';
 import {
   TRUSTED_APPS_CREATE_API,
   TRUSTED_APPS_DELETE_API,
@@ -29,10 +30,14 @@ import {
   GetOneTrustedAppRequestParams,
   GetOneTrustedAppResponse,
   GetTrustedAppsSummaryRequest,
-} from '../../../../../common/endpoint/types/trusted_apps';
+  TrustedApp,
+  MaybeImmutable,
+} from '../../../../../common/endpoint/types';
 import { resolvePathVariables } from '../../../../common/utils/resolve_path_variables';
 
 import { sendGetEndpointSpecificPackagePolicies } from '../../policy/store/services/ingest';
+import { toUpdateTrustedApp } from '../../../../../common/endpoint/service/trusted_apps/to_update_trusted_app';
+import { isGlobalEffectScope } from '../state/type_guards';
 
 export interface TrustedAppsService {
   getTrustedApp(params: GetOneTrustedAppRequestParams): Promise<GetOneTrustedAppResponse>;
@@ -46,8 +51,23 @@ export interface TrustedAppsService {
   getPolicyList(
     options?: Parameters<typeof sendGetEndpointSpecificPackagePolicies>[1]
   ): ReturnType<typeof sendGetEndpointSpecificPackagePolicies>;
+  assignPolicyToTrustedApps(
+    policyId: string,
+    trustedApps: MaybeImmutable<TrustedApp[]>
+  ): Promise<PutTrustedAppUpdateResponse[]>;
+  removePolicyFromTrustedApps(
+    policyId: string,
+    trustedApps: MaybeImmutable<TrustedApp[]>
+  ): Promise<PutTrustedAppUpdateResponse[]>;
 }
 
+const P_MAP_OPTIONS = Object.freeze<pMap.Options>({
+  concurrency: 5,
+  /** When set to false, instead of stopping when a promise rejects, it will wait for all the promises to settle
+   * and then reject with an aggregated error containing all the errors from the rejected promises. */
+  stopOnError: false,
+});
+
 export class TrustedAppsHttpService implements TrustedAppsService {
   constructor(private http: HttpStart) {}
 
@@ -92,4 +112,79 @@ export class TrustedAppsHttpService implements TrustedAppsService {
   getPolicyList(options?: Parameters<typeof sendGetEndpointSpecificPackagePolicies>[1]) {
     return sendGetEndpointSpecificPackagePolicies(this.http, options);
   }
+
+  /**
+   * Assign a policy to trusted apps. Note that Trusted Apps MUST NOT be global
+   *
+   * @param policyId
+   * @param trustedApps[]
+   */
+  assignPolicyToTrustedApps(
+    policyId: string,
+    trustedApps: MaybeImmutable<TrustedApp[]>
+  ): Promise<PutTrustedAppUpdateResponse[]> {
+    return this._handleAssignOrRemovePolicyId('assign', policyId, trustedApps);
+  }
+
+  /**
+   * Remove a policy from trusted apps. Note that Trusted Apps MUST NOT be global
+   *
+   * @param policyId
+   * @param trustedApps[]
+   */
+  removePolicyFromTrustedApps(
+    policyId: string,
+    trustedApps: MaybeImmutable<TrustedApp[]>
+  ): Promise<PutTrustedAppUpdateResponse[]> {
+    return this._handleAssignOrRemovePolicyId('remove', policyId, trustedApps);
+  }
+
+  private _handleAssignOrRemovePolicyId(
+    action: 'assign' | 'remove',
+    policyId: string,
+    trustedApps: MaybeImmutable<TrustedApp[]>
+  ): Promise<PutTrustedAppUpdateResponse[]> {
+    if (policyId.trim() === '') {
+      throw new Error('policy ID is required');
+    }
+
+    if (trustedApps.length === 0) {
+      throw new Error('at least one trusted app is required');
+    }
+
+    return pMap(
+      trustedApps,
+      async (trustedApp) => {
+        if (isGlobalEffectScope(trustedApp.effectScope)) {
+          throw new Error(
+            `Unable to update trusted app [${trustedApp.id}] policy assignment. It's effectScope is 'global'`
+          );
+        }
+
+        const policies: string[] = !isGlobalEffectScope(trustedApp.effectScope)
+          ? [...trustedApp.effectScope.policies]
+          : [];
+
+        const indexOfPolicyId = policies.indexOf(policyId);
+
+        if (action === 'assign' && indexOfPolicyId === -1) {
+          policies.push(policyId);
+        } else if (action === 'remove' && indexOfPolicyId !== -1) {
+          policies.splice(indexOfPolicyId, 1);
+        }
+
+        return this.updateTrustedApp(
+          { id: trustedApp.id },
+          {
+            ...toUpdateTrustedApp(trustedApp),
+            effectScope: {
+              type: 'policy',
+              policies,
+            },
+          }
+        );
+      },
+      P_MAP_OPTIONS
+    );
+  }
 }
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts
index f64003ec6ad91..4455baddb047c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts
@@ -54,6 +54,8 @@ const createTrustedAppsServiceMock = (): jest.Mocked<TrustedAppsService> => ({
   getPolicyList: jest.fn(),
   updateTrustedApp: jest.fn(),
   getTrustedApp: jest.fn(),
+  assignPolicyToTrustedApps: jest.fn(),
+  removePolicyFromTrustedApps: jest.fn(),
 });
 
 const createStoreSetup = (trustedAppsService: TrustedAppsService) => {

From eeed2ca6ae6af0b2ffcde9beccf166e1462a31c9 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Wed, 13 Oct 2021 11:03:04 -0500
Subject: [PATCH 026/117] [ci] filter out proc-runner logs from stdout on CI
 (#114568)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 .../src/ci_stats_reporter/ci_stats_config.ts  | 10 +++
 .../src/ci_stats_reporter/index.ts            |  1 +
 .../src/proc_runner/proc_runner.ts            |  2 +
 packages/kbn-dev-utils/src/run/cleanup.ts     |  4 +
 packages/kbn-dev-utils/src/run/index.ts       |  1 +
 .../__snapshots__/tooling_log.test.ts.snap    | 19 +++++
 .../kbn-dev-utils/src/tooling_log/index.ts    |  3 +
 .../kbn-dev-utils/src/tooling_log/message.ts  |  8 ++
 .../src/tooling_log/tooling_log.test.ts       | 37 +++++++++
 .../src/tooling_log/tooling_log.ts            | 66 ++++++++++++----
 .../tooling_log_collecting_writer.ts          | 15 ++++
 .../tooling_log/tooling_log_text_writer.ts    | 19 +++++
 .../kbn-dev-utils/src/tooling_log/writer.ts   |  9 +++
 packages/kbn-es/src/cluster.js                |  2 +-
 .../src/integration_tests/cluster.test.js     | 68 +++++++++++++----
 packages/kbn-pm/dist/index.js                 | 75 +++++++++++++++----
 .../lib/mocha/reporter/reporter.js            |  3 +-
 .../kbn-test/src/functional_tests/tasks.ts    |  7 +-
 test/functional/services/remote/remote.ts     |  2 +-
 19 files changed, 303 insertions(+), 48 deletions(-)

diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_config.ts b/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_config.ts
index 9af52ae8d2df0..f73b9c830a2ab 100644
--- a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_config.ts
+++ b/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_config.ts
@@ -8,8 +8,18 @@
 
 import type { ToolingLog } from '../tooling_log';
 
+/**
+ * Information about how CiStatsReporter should talk to the ci-stats service. Normally
+ * it is read from a JSON environment variable using the `parseConfig()` function
+ * exported by this module.
+ */
 export interface Config {
+  /** ApiToken necessary for writing build data to ci-stats service */
   apiToken: string;
+  /**
+   * uuid which should be obtained by first creating a build with the
+   * ci-stats service and then passing it to all subsequent steps
+   */
   buildId: string;
 }
 
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/index.ts b/packages/kbn-dev-utils/src/ci_stats_reporter/index.ts
index 9cb05608526eb..318a2921517f1 100644
--- a/packages/kbn-dev-utils/src/ci_stats_reporter/index.ts
+++ b/packages/kbn-dev-utils/src/ci_stats_reporter/index.ts
@@ -7,5 +7,6 @@
  */
 
 export * from './ci_stats_reporter';
+export type { Config } from './ci_stats_config';
 export * from './ship_ci_stats_cli';
 export { getTimeReporter } from './report_time';
diff --git a/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts b/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts
index 35c910c911105..8ef32411621f8 100644
--- a/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts
+++ b/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts
@@ -37,6 +37,8 @@ export class ProcRunner {
   private signalUnsubscribe: () => void;
 
   constructor(private log: ToolingLog) {
+    this.log = log.withType('ProcRunner');
+
     this.signalUnsubscribe = exitHook(() => {
       this.teardown().catch((error) => {
         log.error(`ProcRunner teardown error: ${error.stack}`);
diff --git a/packages/kbn-dev-utils/src/run/cleanup.ts b/packages/kbn-dev-utils/src/run/cleanup.ts
index 26a6f5c632c46..ba0b762a562ad 100644
--- a/packages/kbn-dev-utils/src/run/cleanup.ts
+++ b/packages/kbn-dev-utils/src/run/cleanup.ts
@@ -13,6 +13,10 @@ import exitHook from 'exit-hook';
 import { ToolingLog } from '../tooling_log';
 import { isFailError } from './fail';
 
+/**
+ * A function which will be called when the CLI is torn-down which should
+ * quickly cleanup whatever it needs.
+ */
 export type CleanupTask = () => void;
 
 export class Cleanup {
diff --git a/packages/kbn-dev-utils/src/run/index.ts b/packages/kbn-dev-utils/src/run/index.ts
index f3c364c774d30..505ef4ee264d6 100644
--- a/packages/kbn-dev-utils/src/run/index.ts
+++ b/packages/kbn-dev-utils/src/run/index.ts
@@ -10,3 +10,4 @@ export * from './run';
 export * from './run_with_commands';
 export * from './flags';
 export * from './fail';
+export type { CleanupTask } from './cleanup';
diff --git a/packages/kbn-dev-utils/src/tooling_log/__snapshots__/tooling_log.test.ts.snap b/packages/kbn-dev-utils/src/tooling_log/__snapshots__/tooling_log.test.ts.snap
index 059e3d49c3688..7742c2bb681d0 100644
--- a/packages/kbn-dev-utils/src/tooling_log/__snapshots__/tooling_log.test.ts.snap
+++ b/packages/kbn-dev-utils/src/tooling_log/__snapshots__/tooling_log.test.ts.snap
@@ -10,6 +10,7 @@ Array [
         "baz",
       ],
       "indent": 0,
+      "source": undefined,
       "type": "debug",
     },
   ],
@@ -24,6 +25,7 @@ Array [
         [Error: error message],
       ],
       "indent": 0,
+      "source": undefined,
       "type": "error",
     },
   ],
@@ -33,6 +35,7 @@ Array [
         "string message",
       ],
       "indent": 0,
+      "source": undefined,
       "type": "error",
     },
   ],
@@ -50,6 +53,7 @@ Array [
       "foo",
     ],
     "indent": 0,
+    "source": undefined,
     "type": "debug",
   },
   Object {
@@ -57,6 +61,7 @@ Array [
       "bar",
     ],
     "indent": 0,
+    "source": undefined,
     "type": "info",
   },
   Object {
@@ -64,6 +69,7 @@ Array [
       "baz",
     ],
     "indent": 0,
+    "source": undefined,
     "type": "verbose",
   },
 ]
@@ -76,6 +82,7 @@ Array [
       "foo",
     ],
     "indent": 0,
+    "source": undefined,
     "type": "debug",
   },
   Object {
@@ -83,6 +90,7 @@ Array [
       "bar",
     ],
     "indent": 0,
+    "source": undefined,
     "type": "info",
   },
   Object {
@@ -90,6 +98,7 @@ Array [
       "baz",
     ],
     "indent": 0,
+    "source": undefined,
     "type": "verbose",
   },
 ]
@@ -103,6 +112,7 @@ Array [
         "foo",
       ],
       "indent": 1,
+      "source": undefined,
       "type": "debug",
     },
   ],
@@ -112,6 +122,7 @@ Array [
         "bar",
       ],
       "indent": 3,
+      "source": undefined,
       "type": "debug",
     },
   ],
@@ -121,6 +132,7 @@ Array [
         "baz",
       ],
       "indent": 6,
+      "source": undefined,
       "type": "debug",
     },
   ],
@@ -130,6 +142,7 @@ Array [
         "box",
       ],
       "indent": 4,
+      "source": undefined,
       "type": "debug",
     },
   ],
@@ -139,6 +152,7 @@ Array [
         "foo",
       ],
       "indent": 0,
+      "source": undefined,
       "type": "debug",
     },
   ],
@@ -155,6 +169,7 @@ Array [
         "baz",
       ],
       "indent": 0,
+      "source": undefined,
       "type": "info",
     },
   ],
@@ -171,6 +186,7 @@ Array [
         "baz",
       ],
       "indent": 0,
+      "source": undefined,
       "type": "success",
     },
   ],
@@ -187,6 +203,7 @@ Array [
         "baz",
       ],
       "indent": 0,
+      "source": undefined,
       "type": "verbose",
     },
   ],
@@ -203,6 +220,7 @@ Array [
         "baz",
       ],
       "indent": 0,
+      "source": undefined,
       "type": "warning",
     },
   ],
@@ -219,6 +237,7 @@ Array [
         "baz",
       ],
       "indent": 0,
+      "source": undefined,
       "type": "write",
     },
   ],
diff --git a/packages/kbn-dev-utils/src/tooling_log/index.ts b/packages/kbn-dev-utils/src/tooling_log/index.ts
index 65dcd3054ef93..4da54ee9bfeae 100644
--- a/packages/kbn-dev-utils/src/tooling_log/index.ts
+++ b/packages/kbn-dev-utils/src/tooling_log/index.ts
@@ -7,6 +7,9 @@
  */
 
 export { ToolingLog } from './tooling_log';
+export type { ToolingLogOptions } from './tooling_log';
 export { ToolingLogTextWriter, ToolingLogTextWriterConfig } from './tooling_log_text_writer';
 export { pickLevelFromFlags, parseLogLevel, LogLevel, ParsedLogLevel } from './log_levels';
 export { ToolingLogCollectingWriter } from './tooling_log_collecting_writer';
+export type { Writer } from './writer';
+export type { Message } from './message';
diff --git a/packages/kbn-dev-utils/src/tooling_log/message.ts b/packages/kbn-dev-utils/src/tooling_log/message.ts
index ebd3a255a73a4..082c0e65d48b2 100644
--- a/packages/kbn-dev-utils/src/tooling_log/message.ts
+++ b/packages/kbn-dev-utils/src/tooling_log/message.ts
@@ -8,8 +8,16 @@
 
 export type MessageTypes = 'verbose' | 'debug' | 'info' | 'success' | 'warning' | 'error' | 'write';
 
+/**
+ * The object shape passed to ToolingLog writers each time the log is used.
+ */
 export interface Message {
+  /** level/type of message */
   type: MessageTypes;
+  /** indentation intended when message written to a text log */
   indent: number;
+  /** type of logger this message came from */
+  source?: string;
+  /** args passed to the logging method */
   args: any[];
 }
diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts b/packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts
index ec63a9fb7e6f2..506f89786917f 100644
--- a/packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts
+++ b/packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts
@@ -155,3 +155,40 @@ describe('#getWritten$()', () => {
     await testWrittenMsgs([{ write: jest.fn(() => false) }, { write: jest.fn(() => false) }]);
   });
 });
+
+describe('#withType()', () => {
+  it('creates a child logger with a unique type that respects all other settings', () => {
+    const writerA = new ToolingLogCollectingWriter();
+    const writerB = new ToolingLogCollectingWriter();
+    const log = new ToolingLog();
+    log.setWriters([writerA]);
+
+    const fork = log.withType('someType');
+    log.info('hello');
+    fork.info('world');
+    fork.indent(2);
+    log.debug('indented');
+    fork.indent(-2);
+    log.debug('not-indented');
+
+    log.setWriters([writerB]);
+    fork.info('to new writer');
+    fork.indent(5);
+    log.info('also to new writer');
+
+    expect(writerA.messages).toMatchInlineSnapshot(`
+      Array [
+        " info hello",
+        " info source[someType] world",
+        " │ debg indented",
+        " debg not-indented",
+      ]
+    `);
+    expect(writerB.messages).toMatchInlineSnapshot(`
+      Array [
+        " info source[someType] to new writer",
+        "    │ info also to new writer",
+      ]
+    `);
+  });
+});
diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log.ts b/packages/kbn-dev-utils/src/tooling_log/tooling_log.ts
index e9fd15afefe4e..84e9159dfcd41 100644
--- a/packages/kbn-dev-utils/src/tooling_log/tooling_log.ts
+++ b/packages/kbn-dev-utils/src/tooling_log/tooling_log.ts
@@ -12,21 +12,45 @@ import { ToolingLogTextWriter, ToolingLogTextWriterConfig } from './tooling_log_
 import { Writer } from './writer';
 import { Message, MessageTypes } from './message';
 
+export interface ToolingLogOptions {
+  /**
+   * type name for this logger, will be assigned to the "source"
+   * properties of messages produced by this logger
+   */
+  type?: string;
+  /**
+   * parent ToolingLog. When a ToolingLog has a parent they will both
+   * share indent and writers state. Changing the indent width or
+   * writers on either log will update the other too.
+   */
+  parent?: ToolingLog;
+}
+
 export class ToolingLog {
-  private indentWidth = 0;
-  private writers: Writer[];
+  private indentWidth$: Rx.BehaviorSubject<number>;
+  private writers$: Rx.BehaviorSubject<Writer[]>;
   private readonly written$: Rx.Subject<Message>;
+  private readonly type: string | undefined;
+
+  constructor(writerConfig?: ToolingLogTextWriterConfig, options?: ToolingLogOptions) {
+    this.indentWidth$ = options?.parent ? options.parent.indentWidth$ : new Rx.BehaviorSubject(0);
 
-  constructor(writerConfig?: ToolingLogTextWriterConfig) {
-    this.writers = writerConfig ? [new ToolingLogTextWriter(writerConfig)] : [];
-    this.written$ = new Rx.Subject();
+    this.writers$ = options?.parent
+      ? options.parent.writers$
+      : new Rx.BehaviorSubject<Writer[]>([]);
+    if (!options?.parent && writerConfig) {
+      this.writers$.next([new ToolingLogTextWriter(writerConfig)]);
+    }
+
+    this.written$ = options?.parent ? options.parent.written$ : new Rx.Subject();
+    this.type = options?.type;
   }
 
   /**
    * Get the current indentation level of the ToolingLog
    */
   public getIndent() {
-    return this.indentWidth;
+    return this.indentWidth$.getValue();
   }
 
   /**
@@ -39,8 +63,8 @@ export class ToolingLog {
    * @param block a function to run and reset any indentation changes after
    */
   public indent<T>(delta = 0, block?: () => Promise<T>) {
-    const originalWidth = this.indentWidth;
-    this.indentWidth = Math.max(this.indentWidth + delta, 0);
+    const originalWidth = this.indentWidth$.getValue();
+    this.indentWidth$.next(Math.max(originalWidth + delta, 0));
     if (!block) {
       return;
     }
@@ -49,7 +73,7 @@ export class ToolingLog {
       try {
         return await block();
       } finally {
-        this.indentWidth = originalWidth;
+        this.indentWidth$.next(originalWidth);
       }
     })();
   }
@@ -83,26 +107,40 @@ export class ToolingLog {
   }
 
   public getWriters() {
-    return this.writers.slice(0);
+    return [...this.writers$.getValue()];
   }
 
   public setWriters(writers: Writer[]) {
-    this.writers = [...writers];
+    this.writers$.next([...writers]);
   }
 
   public getWritten$() {
     return this.written$.asObservable();
   }
 
+  /**
+   * Create a new ToolingLog which sets a different "type", allowing messages to be filtered out by "source"
+   * @param type A string that will be passed along with messages from this logger which can be used to filter messages with `ignoreSources`
+   */
+  public withType(type: string) {
+    return new ToolingLog(undefined, {
+      type,
+      parent: this,
+    });
+  }
+
   private sendToWriters(type: MessageTypes, args: any[]) {
-    const msg = {
+    const indent = this.indentWidth$.getValue();
+    const writers = this.writers$.getValue();
+    const msg: Message = {
       type,
-      indent: this.indentWidth,
+      indent,
+      source: this.type,
       args,
     };
 
     let written = false;
-    for (const writer of this.writers) {
+    for (const writer of writers) {
       if (writer.write(msg)) {
         written = true;
       }
diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts b/packages/kbn-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts
index cc399e40d2cb4..6f73563f4a2c5 100644
--- a/packages/kbn-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts
+++ b/packages/kbn-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts
@@ -8,6 +8,7 @@
 
 import { ToolingLogTextWriter } from './tooling_log_text_writer';
 import { LogLevel } from './log_levels';
+import { Message } from './message';
 
 export class ToolingLogCollectingWriter extends ToolingLogTextWriter {
   messages: string[] = [];
@@ -23,4 +24,18 @@ export class ToolingLogCollectingWriter extends ToolingLogTextWriter {
       },
     });
   }
+
+  /**
+   * Called by ToolingLog, extends messages with the source if message includes one.
+   */
+  write(msg: Message) {
+    if (msg.source) {
+      return super.write({
+        ...msg,
+        args: [`source[${msg.source}]`, ...msg.args],
+      });
+    }
+
+    return super.write(msg);
+  }
 }
diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts b/packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts
index 2b1806eb4b9a2..660dae3fa1f55 100644
--- a/packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts
+++ b/packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts
@@ -28,7 +28,20 @@ const MSG_PREFIXES = {
 const has = <T extends object>(obj: T, key: any): key is keyof T => obj.hasOwnProperty(key);
 
 export interface ToolingLogTextWriterConfig {
+  /**
+   * Log level, messages below this level will be ignored
+   */
   level: LogLevel;
+  /**
+   * List of message sources/ToolingLog types which will be ignored. Create
+   * a logger with `ToolingLog#withType()` to create messages with a specific
+   * source. Ignored messages will be dropped without writing.
+   */
+  ignoreSources?: string[];
+  /**
+   * Target which will receive formatted message lines, a common value for `writeTo`
+   * is process.stdout
+   */
   writeTo: {
     write(s: string): void;
   };
@@ -59,10 +72,12 @@ export class ToolingLogTextWriter implements Writer {
   public readonly writeTo: {
     write(msg: string): void;
   };
+  private readonly ignoreSources?: string[];
 
   constructor(config: ToolingLogTextWriterConfig) {
     this.level = parseLogLevel(config.level);
     this.writeTo = config.writeTo;
+    this.ignoreSources = config.ignoreSources;
 
     if (!this.writeTo || typeof this.writeTo.write !== 'function') {
       throw new Error(
@@ -76,6 +91,10 @@ export class ToolingLogTextWriter implements Writer {
       return false;
     }
 
+    if (this.ignoreSources && msg.source && this.ignoreSources.includes(msg.source)) {
+      return false;
+    }
+
     const prefix = has(MSG_PREFIXES, msg.type) ? MSG_PREFIXES[msg.type] : '';
     ToolingLogTextWriter.write(this.writeTo, prefix, msg);
     return true;
diff --git a/packages/kbn-dev-utils/src/tooling_log/writer.ts b/packages/kbn-dev-utils/src/tooling_log/writer.ts
index fd56f4fe3d3a6..26fec6a780694 100644
--- a/packages/kbn-dev-utils/src/tooling_log/writer.ts
+++ b/packages/kbn-dev-utils/src/tooling_log/writer.ts
@@ -8,6 +8,15 @@
 
 import { Message } from './message';
 
+/**
+ * An object which received ToolingLog `Messages` and sends them to
+ * some interface for collecting logs like stdio, or a file
+ */
 export interface Writer {
+  /**
+   * Called with every log message, should return true if the message
+   * was written and false if it was ignored.
+   * @param msg The log message to write
+   */
   write(msg: Message): boolean;
 }
diff --git a/packages/kbn-es/src/cluster.js b/packages/kbn-es/src/cluster.js
index 0866b14f4ade8..dd9c17055fb18 100644
--- a/packages/kbn-es/src/cluster.js
+++ b/packages/kbn-es/src/cluster.js
@@ -36,7 +36,7 @@ const first = (stream, map) =>
 
 exports.Cluster = class Cluster {
   constructor({ log = defaultLog, ssl = false } = {}) {
-    this._log = log;
+    this._log = log.withType('@kbn/es Cluster');
     this._ssl = ssl;
     this._caCertPromise = ssl ? readFile(CA_CERT_PATH) : undefined;
   }
diff --git a/packages/kbn-es/src/integration_tests/cluster.test.js b/packages/kbn-es/src/integration_tests/cluster.test.js
index c196a89a6b090..0cdbac310bbb1 100644
--- a/packages/kbn-es/src/integration_tests/cluster.test.js
+++ b/packages/kbn-es/src/integration_tests/cluster.test.js
@@ -8,9 +8,11 @@
 
 const {
   ToolingLog,
+  ToolingLogCollectingWriter,
   ES_P12_PATH,
   ES_P12_PASSWORD,
   createAnyInstanceSerializer,
+  createStripAnsiSerializer,
 } = require('@kbn/dev-utils');
 const execa = require('execa');
 const { Cluster } = require('../cluster');
@@ -18,6 +20,7 @@ const { installSource, installSnapshot, installArchive } = require('../install')
 const { extractConfigFiles } = require('../utils/extract_config_files');
 
 expect.addSnapshotSerializer(createAnyInstanceSerializer(ToolingLog));
+expect.addSnapshotSerializer(createStripAnsiSerializer());
 
 jest.mock('../install', () => ({
   installSource: jest.fn(),
@@ -31,6 +34,8 @@ jest.mock('../utils/extract_config_files', () => ({
 }));
 
 const log = new ToolingLog();
+const logWriter = new ToolingLogCollectingWriter();
+log.setWriters([logWriter]);
 
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -76,6 +81,8 @@ const initialEnv = { ...process.env };
 beforeEach(() => {
   jest.resetAllMocks();
   extractConfigFiles.mockImplementation((config) => config);
+  log.indent(-log.getIndent());
+  logWriter.messages.length = 0;
 });
 
 afterEach(() => {
@@ -107,11 +114,21 @@ describe('#installSource()', () => {
     installSource.mockResolvedValue({});
     const cluster = new Cluster({ log });
     await cluster.installSource({ foo: 'bar' });
-    expect(installSource).toHaveBeenCalledTimes(1);
-    expect(installSource).toHaveBeenCalledWith({
-      log,
-      foo: 'bar',
-    });
+    expect(installSource.mock.calls).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          Object {
+            "foo": "bar",
+            "log": <ToolingLog>,
+          },
+        ],
+      ]
+    `);
+    expect(logWriter.messages).toMatchInlineSnapshot(`
+      Array [
+        " info source[@kbn/es Cluster] Installing from source",
+      ]
+    `);
   });
 
   it('rejects if installSource() rejects', async () => {
@@ -146,11 +163,21 @@ describe('#installSnapshot()', () => {
     installSnapshot.mockResolvedValue({});
     const cluster = new Cluster({ log });
     await cluster.installSnapshot({ foo: 'bar' });
-    expect(installSnapshot).toHaveBeenCalledTimes(1);
-    expect(installSnapshot).toHaveBeenCalledWith({
-      log,
-      foo: 'bar',
-    });
+    expect(installSnapshot.mock.calls).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          Object {
+            "foo": "bar",
+            "log": <ToolingLog>,
+          },
+        ],
+      ]
+    `);
+    expect(logWriter.messages).toMatchInlineSnapshot(`
+      Array [
+        " info source[@kbn/es Cluster] Installing from snapshot",
+      ]
+    `);
   });
 
   it('rejects if installSnapshot() rejects', async () => {
@@ -185,11 +212,22 @@ describe('#installArchive(path)', () => {
     installArchive.mockResolvedValue({});
     const cluster = new Cluster({ log });
     await cluster.installArchive('path', { foo: 'bar' });
-    expect(installArchive).toHaveBeenCalledTimes(1);
-    expect(installArchive).toHaveBeenCalledWith('path', {
-      log,
-      foo: 'bar',
-    });
+    expect(installArchive.mock.calls).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          "path",
+          Object {
+            "foo": "bar",
+            "log": <ToolingLog>,
+          },
+        ],
+      ]
+    `);
+    expect(logWriter.messages).toMatchInlineSnapshot(`
+      Array [
+        " info source[@kbn/es Cluster] Installing from an archive",
+      ]
+    `);
   });
 
   it('rejects if installArchive() rejects', async () => {
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index 595b619a7f2a4..721072d9e899b 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -625,12 +625,20 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * Side Public License, v 1.
  */
 class ToolingLog {
-  constructor(writerConfig) {
-    (0, _defineProperty2.default)(this, "indentWidth", 0);
-    (0, _defineProperty2.default)(this, "writers", void 0);
+  constructor(writerConfig, options) {
+    (0, _defineProperty2.default)(this, "indentWidth$", void 0);
+    (0, _defineProperty2.default)(this, "writers$", void 0);
     (0, _defineProperty2.default)(this, "written$", void 0);
-    this.writers = writerConfig ? [new _tooling_log_text_writer.ToolingLogTextWriter(writerConfig)] : [];
-    this.written$ = new Rx.Subject();
+    (0, _defineProperty2.default)(this, "type", void 0);
+    this.indentWidth$ = options !== null && options !== void 0 && options.parent ? options.parent.indentWidth$ : new Rx.BehaviorSubject(0);
+    this.writers$ = options !== null && options !== void 0 && options.parent ? options.parent.writers$ : new Rx.BehaviorSubject([]);
+
+    if (!(options !== null && options !== void 0 && options.parent) && writerConfig) {
+      this.writers$.next([new _tooling_log_text_writer.ToolingLogTextWriter(writerConfig)]);
+    }
+
+    this.written$ = options !== null && options !== void 0 && options.parent ? options.parent.written$ : new Rx.Subject();
+    this.type = options === null || options === void 0 ? void 0 : options.type;
   }
   /**
    * Get the current indentation level of the ToolingLog
@@ -638,7 +646,7 @@ class ToolingLog {
 
 
   getIndent() {
-    return this.indentWidth;
+    return this.indentWidth$.getValue();
   }
   /**
    * Indent the output of the ToolingLog by some character (4 is a good choice usually).
@@ -652,8 +660,8 @@ class ToolingLog {
 
 
   indent(delta = 0, block) {
-    const originalWidth = this.indentWidth;
-    this.indentWidth = Math.max(this.indentWidth + delta, 0);
+    const originalWidth = this.indentWidth$.getValue();
+    this.indentWidth$.next(Math.max(originalWidth + delta, 0));
 
     if (!block) {
       return;
@@ -663,7 +671,7 @@ class ToolingLog {
       try {
         return await block();
       } finally {
-        this.indentWidth = originalWidth;
+        this.indentWidth$.next(originalWidth);
       }
     })();
   }
@@ -697,26 +705,41 @@ class ToolingLog {
   }
 
   getWriters() {
-    return this.writers.slice(0);
+    return [...this.writers$.getValue()];
   }
 
   setWriters(writers) {
-    this.writers = [...writers];
+    this.writers$.next([...writers]);
   }
 
   getWritten$() {
     return this.written$.asObservable();
   }
+  /**
+   * Create a new ToolingLog which sets a different "type", allowing messages to be filtered out by "source"
+   * @param type A string that will be passed along with messages from this logger which can be used to filter messages with `ignoreSources`
+   */
+
+
+  withType(type) {
+    return new ToolingLog(undefined, {
+      type,
+      parent: this
+    });
+  }
 
   sendToWriters(type, args) {
+    const indent = this.indentWidth$.getValue();
+    const writers = this.writers$.getValue();
     const msg = {
       type,
-      indent: this.indentWidth,
+      indent,
+      source: this.type,
       args
     };
     let written = false;
 
-    for (const writer of this.writers) {
+    for (const writer of writers) {
       if (writer.write(msg)) {
         written = true;
       }
@@ -6618,8 +6641,10 @@ class ToolingLogTextWriter {
   constructor(config) {
     (0, _defineProperty2.default)(this, "level", void 0);
     (0, _defineProperty2.default)(this, "writeTo", void 0);
+    (0, _defineProperty2.default)(this, "ignoreSources", void 0);
     this.level = (0, _log_levels.parseLogLevel)(config.level);
     this.writeTo = config.writeTo;
+    this.ignoreSources = config.ignoreSources;
 
     if (!this.writeTo || typeof this.writeTo.write !== 'function') {
       throw new Error('ToolingLogTextWriter requires the `writeTo` option be set to a stream (like process.stdout)');
@@ -6631,6 +6656,10 @@ class ToolingLogTextWriter {
       return false;
     }
 
+    if (this.ignoreSources && msg.source && this.ignoreSources.includes(msg.source)) {
+      return false;
+    }
+
     const prefix = has(MSG_PREFIXES, msg.type) ? MSG_PREFIXES[msg.type] : '';
     ToolingLogTextWriter.write(this.writeTo, prefix, msg);
     return true;
@@ -8773,6 +8802,20 @@ class ToolingLogCollectingWriter extends _tooling_log_text_writer.ToolingLogText
     });
     (0, _defineProperty2.default)(this, "messages", []);
   }
+  /**
+   * Called by ToolingLog, extends messages with the source if message includes one.
+   */
+
+
+  write(msg) {
+    if (msg.source) {
+      return super.write({ ...msg,
+        args: [`source[${msg.source}]`, ...msg.args]
+      });
+    }
+
+    return super.write(msg);
+  }
 
 }
 
@@ -15466,6 +15509,12 @@ exports.parseConfig = parseConfig;
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+
+/**
+ * Information about how CiStatsReporter should talk to the ci-stats service. Normally
+ * it is read from a JSON environment variable using the `parseConfig()` function
+ * exported by this module.
+ */
 function validateConfig(log, config) {
   const validApiToken = typeof config.apiToken === 'string' && config.apiToken.length !== 0;
 
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js b/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js
index 43229ff2d1c98..d6045b71bf3a7 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js
@@ -62,6 +62,7 @@ export function MochaReporterProvider({ getService }) {
         log.setWriters([
           new ToolingLogTextWriter({
             level: 'error',
+            ignoreSources: ['ProcRunner', '@kbn/es Cluster'],
             writeTo: process.stdout,
           }),
           new ToolingLogTextWriter({
@@ -136,7 +137,7 @@ export function MochaReporterProvider({ getService }) {
     onPass = (test) => {
       const time = colors.speed(test.speed, ` (${ms(test.duration)})`);
       const pass = colors.pass(`${symbols.ok} pass`);
-      log.write(`- ${pass} ${time} "${test.fullTitle()}"`);
+      log.write(`- ${pass} ${time}`);
     };
 
     onFail = (runnable) => {
diff --git a/packages/kbn-test/src/functional_tests/tasks.ts b/packages/kbn-test/src/functional_tests/tasks.ts
index c8265c032cbcc..b220c3899a638 100644
--- a/packages/kbn-test/src/functional_tests/tasks.ts
+++ b/packages/kbn-test/src/functional_tests/tasks.ts
@@ -90,7 +90,7 @@ export async function runTests(options: RunTestsParams) {
   log.write('--- determining which ftr configs to run');
   const configPathsWithTests: string[] = [];
   for (const configPath of options.configs) {
-    log.info('testing', configPath);
+    log.info('testing', relative(REPO_ROOT, configPath));
     await log.indent(4, async () => {
       if (await hasTests({ configPath, options: { ...options, log } })) {
         configPathsWithTests.push(configPath);
@@ -98,9 +98,10 @@ export async function runTests(options: RunTestsParams) {
     });
   }
 
-  for (const configPath of configPathsWithTests) {
+  for (const [i, configPath] of configPathsWithTests.entries()) {
     await log.indent(0, async () => {
-      log.write(`--- Running ${relative(REPO_ROOT, configPath)}`);
+      const progress = `${i + 1}/${configPathsWithTests.length}`;
+      log.write(`--- [${progress}] Running ${relative(REPO_ROOT, configPath)}`);
 
       await withProcRunner(log, async (procs) => {
         const config = await readConfigFile(log, configPath);
diff --git a/test/functional/services/remote/remote.ts b/test/functional/services/remote/remote.ts
index 5bf99b4bf1136..653058959b839 100644
--- a/test/functional/services/remote/remote.ts
+++ b/test/functional/services/remote/remote.ts
@@ -92,7 +92,7 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
     .subscribe({
       next({ message, level }) {
         const msg = message.replace(/\\n/g, '\n');
-        log[level === 'SEVERE' || level === 'error' ? 'error' : 'debug'](
+        log[level === 'SEVERE' || level === 'error' ? 'warning' : 'debug'](
           `browser[${level}] ${msg}`
         );
       },

From 9f07f71500ca1871a0a0585b81268c028e60577d Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 13 Oct 2021 09:06:52 -0700
Subject: [PATCH 027/117] [build] Ironbank template updates (#114749)

* [build] Ironbank template updates

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

* Use placeholder

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 .../docker_generator/bundle_dockerfiles.ts    |  10 +-
 .../resources/ironbank/LICENSE                | 280 ------------------
 .../templates/ironbank/README.md              |   4 +-
 .../ironbank/hardening_manifest.yaml          |   4 +
 4 files changed, 12 insertions(+), 286 deletions(-)
 delete mode 100644 src/dev/build/tasks/os_packages/docker_generator/resources/ironbank/LICENSE

diff --git a/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts b/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts
index 5f0665692b46f..02b469820f900 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.ts
@@ -8,8 +8,9 @@
 
 import { resolve } from 'path';
 import { readFileSync } from 'fs';
+import { copyFile } from 'fs/promises';
 
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
 import Mustache from 'mustache';
 
 import { compressTar, copyAll, mkdirp, write, Config } from '../../../lib';
@@ -39,9 +40,10 @@ export async function bundleDockerFiles(config: Config, log: ToolingLog, scope:
   await copyAll(resolve(scope.dockerBuildDir, 'bin'), resolve(dockerFilesBuildDir, 'bin'));
   await copyAll(resolve(scope.dockerBuildDir, 'config'), resolve(dockerFilesBuildDir, 'config'));
   if (scope.ironbank) {
-    await copyAll(resolve(scope.dockerBuildDir), resolve(dockerFilesBuildDir), {
-      select: ['LICENSE'],
-    });
+    await copyFile(
+      resolve(REPO_ROOT, 'licenses/ELASTIC-LICENSE-2.0.txt'),
+      resolve(dockerFilesBuildDir, 'LICENSE')
+    );
     const templates = ['hardening_manifest.yaml', 'README.md'];
     for (const template of templates) {
       const file = readFileSync(resolve(__dirname, 'templates/ironbank', template));
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/ironbank/LICENSE b/src/dev/build/tasks/os_packages/docker_generator/resources/ironbank/LICENSE
deleted file mode 100644
index 632c3abe22e9b..0000000000000
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/ironbank/LICENSE
+++ /dev/null
@@ -1,280 +0,0 @@
-ELASTIC LICENSE AGREEMENT
-
-PLEASE READ CAREFULLY THIS ELASTIC LICENSE AGREEMENT (THIS "AGREEMENT"), WHICH
-CONSTITUTES A LEGALLY BINDING AGREEMENT AND GOVERNS ALL OF YOUR USE OF ALL OF
-THE ELASTIC SOFTWARE WITH WHICH THIS AGREEMENT IS INCLUDED ("ELASTIC SOFTWARE")
-THAT IS PROVIDED IN OBJECT CODE FORMAT, AND, IN ACCORDANCE WITH SECTION 2 BELOW,
-CERTAIN OF THE ELASTIC SOFTWARE THAT IS PROVIDED IN SOURCE CODE FORMAT. BY
-INSTALLING OR USING ANY OF THE ELASTIC SOFTWARE GOVERNED BY THIS AGREEMENT, YOU
-ARE ASSENTING TO THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE
-WITH SUCH TERMS AND CONDITIONS, YOU MAY NOT INSTALL OR USE THE ELASTIC SOFTWARE
-GOVERNED BY THIS AGREEMENT. IF YOU ARE INSTALLING OR USING THE SOFTWARE ON
-BEHALF OF A LEGAL ENTITY, YOU REPRESENT AND WARRANT THAT YOU HAVE THE ACTUAL
-AUTHORITY TO AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT ON BEHALF OF
-SUCH ENTITY.
-
-Posted Date: April 20, 2018
-
-This Agreement is entered into by and between Elasticsearch BV ("Elastic") and
-You, or the legal entity on behalf of whom You are acting (as applicable,
-"You").
-
-1. OBJECT CODE END USER LICENSES, RESTRICTIONS AND THIRD PARTY OPEN SOURCE
-SOFTWARE
-
-  1.1 Object Code End User License. Subject to the terms and conditions of
-  Section 1.2 of this Agreement, Elastic hereby grants to You, AT NO CHARGE and
-  for so long as you are not in breach of any provision of this Agreement, a
-  License to the Basic Features and Functions of the Elastic Software.
-
-  1.2 Reservation of Rights; Restrictions. As between Elastic and You, Elastic
-  and its licensors own all right, title and interest in and to the Elastic
-  Software, and except as expressly set forth in Sections 1.1, and 2.1 of this
-  Agreement, no other license to the Elastic Software is granted to You under
-  this Agreement, by implication, estoppel or otherwise. You agree not to: (i)
-  reverse engineer or decompile, decrypt, disassemble or otherwise reduce any
-  Elastic Software provided to You in Object Code, or any portion thereof, to
-  Source Code, except and only to the extent any such restriction is prohibited
-  by applicable law, (ii) except as expressly permitted in this Agreement,
-  prepare derivative works from, modify, copy or use the Elastic Software Object
-  Code or the Commercial Software Source Code in any manner; (iii) except as
-  expressly permitted in Section 1.1 above, transfer, sell, rent, lease,
-  distribute, sublicense, loan or otherwise transfer, Elastic Software Object
-  Code, in whole or in part, to any third party; (iv) use Elastic Software
-  Object Code for providing time-sharing services, any software-as-a-service,
-  service bureau services or as part of an application services provider or
-  other service offering (collectively, "SaaS Offering") where obtaining access
-  to the Elastic Software or the features and functions of the Elastic Software
-  is a primary reason or substantial motivation for users of the SaaS Offering
-  to access and/or use the SaaS Offering ("Prohibited SaaS Offering"); (v)
-  circumvent the limitations on use of Elastic Software provided to You in
-  Object Code format that are imposed or preserved by any License Key, or (vi)
-  alter or remove any Marks and Notices in the Elastic Software. If You have any
-  question as to whether a specific SaaS Offering constitutes a Prohibited SaaS
-  Offering, or are interested in obtaining Elastic's permission to engage in
-  commercial or non-commercial distribution of the Elastic Software, please
-  contact elastic_license@elastic.co.
-
-  1.3 Third Party Open Source Software. The Commercial Software may contain or
-  be provided with third party open source libraries, components, utilities and
-  other open source software (collectively, "Open Source Software"), which Open
-  Source Software may have applicable license terms as identified on a website
-  designated by Elastic. Notwithstanding anything to the contrary herein, use of
-  the Open Source Software shall be subject to the license terms and conditions
-  applicable to such Open Source Software, to the extent required by the
-  applicable licensor (which terms shall not restrict the license rights granted
-  to You hereunder, but may contain additional rights). To the extent any
-  condition of this Agreement conflicts with any license to the Open Source
-  Software, the Open Source Software license will govern with respect to such
-  Open Source Software only. Elastic may also separately provide you with
-  certain open source software that is licensed by Elastic. Your use of such
-  Elastic open source software will not be governed by this Agreement, but by
-  the applicable open source license terms.
-
-2. COMMERCIAL SOFTWARE SOURCE CODE
-
-  2.1 Limited License. Subject to the terms and conditions of Section 2.2 of
-  this Agreement, Elastic hereby grants to You, AT NO CHARGE and for so long as
-  you are not in breach of any provision of this Agreement, a limited,
-  non-exclusive, non-transferable, fully paid up royalty free right and license
-  to the Commercial Software in Source Code format, without the right to grant
-  or authorize sublicenses, to prepare Derivative Works of the Commercial
-  Software, provided You (i) do not hack the licensing mechanism, or otherwise
-  circumvent the intended limitations on the use of Elastic Software to enable
-  features other than Basic Features and Functions or those features You are
-  entitled to as part of a Subscription, and (ii) use the resulting object code
-  only for reasonable testing purposes.
-
-  2.2 Restrictions. Nothing in Section 2.1 grants You the right to (i) use the
-  Commercial Software Source Code other than in accordance with Section 2.1
-  above, (ii) use a Derivative Work of the Commercial Software outside of a
-  Non-production Environment, in any production capacity, on a temporary or
-  permanent basis, or (iii) transfer, sell, rent, lease, distribute, sublicense,
-  loan or otherwise make available the Commercial Software Source Code, in whole
-  or in part, to any third party. Notwithstanding the foregoing, You may
-  maintain a copy of the repository in which the Source Code of the Commercial
-  Software resides and that copy may be publicly accessible, provided that you
-  include this Agreement with Your copy of the repository.
-
-3. TERMINATION
-
-  3.1 Termination. This Agreement will automatically terminate, whether or not
-  You receive notice of such Termination from Elastic, if You breach any of its
-  provisions.
-
-  3.2 Post Termination. Upon any termination of this Agreement, for any reason,
-  You shall promptly cease the use of the Elastic Software in Object Code format
-  and cease use of the Commercial Software in Source Code format. For the
-  avoidance of doubt, termination of this Agreement will not affect Your right
-  to use Elastic Software, in either Object Code or Source Code formats, made
-  available under the Apache License Version 2.0.
-
-  3.3 Survival. Sections 1.2, 2.2. 3.3, 4 and 5 shall survive any termination or
-  expiration of this Agreement.
-
-4. DISCLAIMER OF WARRANTIES AND LIMITATION OF LIABILITY
-
-  4.1 Disclaimer of Warranties. TO THE MAXIMUM EXTENT PERMITTED UNDER APPLICABLE
-  LAW, THE ELASTIC SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
-  AND ELASTIC AND ITS LICENSORS MAKE NO WARRANTIES WHETHER EXPRESSED, IMPLIED OR
-  STATUTORY REGARDING OR RELATING TO THE ELASTIC SOFTWARE. TO THE MAXIMUM EXTENT
-  PERMITTED UNDER APPLICABLE LAW, ELASTIC AND ITS LICENSORS SPECIFICALLY
-  DISCLAIM ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-  PURPOSE AND NON-INFRINGEMENT WITH RESPECT TO THE ELASTIC SOFTWARE, AND WITH
-  RESPECT TO THE USE OF THE FOREGOING. FURTHER, ELASTIC DOES NOT WARRANT RESULTS
-  OF USE OR THAT THE ELASTIC SOFTWARE WILL BE ERROR FREE OR THAT THE USE OF THE
-  ELASTIC SOFTWARE WILL BE UNINTERRUPTED.
-
-  4.2 Limitation of Liability. IN NO EVENT SHALL ELASTIC OR ITS LICENSORS BE
-  LIABLE TO YOU OR ANY THIRD PARTY FOR ANY DIRECT OR INDIRECT DAMAGES,
-  INCLUDING, WITHOUT LIMITATION, FOR ANY LOSS OF PROFITS, LOSS OF USE, BUSINESS
-  INTERRUPTION, LOSS OF DATA, COST OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY
-  SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND, IN CONNECTION WITH
-  OR ARISING OUT OF THE USE OR INABILITY TO USE THE ELASTIC SOFTWARE, OR THE
-  PERFORMANCE OF OR FAILURE TO PERFORM THIS AGREEMENT, WHETHER ALLEGED AS A
-  BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE, EVEN IF ELASTIC
-  HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-5. MISCELLANEOUS
-
-  This Agreement completely and exclusively states the entire agreement of the
-  parties regarding the subject matter herein, and it supersedes, and its terms
-  govern, all prior proposals, agreements, or other communications between the
-  parties, oral or written, regarding such subject matter. This Agreement may be
-  modified by Elastic from time to time, and any such modifications will be
-  effective upon the "Posted Date" set forth at the top of the modified
-  Agreement. If any provision hereof is held unenforceable, this Agreement will
-  continue without said provision and be interpreted to reflect the original
-  intent of the parties. This Agreement and any non-contractual obligation
-  arising out of or in connection with it, is governed exclusively by Dutch law.
-  This Agreement shall not be governed by the 1980 UN Convention on Contracts
-  for the International Sale of Goods. All disputes arising out of or in
-  connection with this Agreement, including its existence and validity, shall be
-  resolved by the courts with jurisdiction in Amsterdam, The Netherlands, except
-  where mandatory law provides for the courts at another location in The
-  Netherlands to have jurisdiction. The parties hereby irrevocably waive any and
-  all claims and defenses either might otherwise have in any such action or
-  proceeding in any of such courts based upon any alleged lack of personal
-  jurisdiction, improper venue, forum non conveniens or any similar claim or
-  defense. A breach or threatened breach, by You of Section 2 may cause
-  irreparable harm for which damages at law may not provide adequate relief, and
-  therefore Elastic shall be entitled to seek injunctive relief without being
-  required to post a bond. You may not assign this Agreement (including by
-  operation of law in connection with a merger or acquisition), in whole or in
-  part to any third party without the prior written consent of Elastic, which
-  may be withheld or granted by Elastic in its sole and absolute discretion.
-  Any assignment in violation of the preceding sentence is void. Notices to
-  Elastic may also be sent to legal@elastic.co.
-
-6. DEFINITIONS
-
-  The following terms have the meanings ascribed:
-
-  6.1 "Affiliate" means, with respect to a party, any entity that controls, is
-  controlled by, or which is under common control with, such party, where
-  "control" means ownership of at least fifty percent (50%) of the outstanding
-  voting shares of the entity, or the contractual right to establish policy for,
-  and manage the operations of, the entity.
-
-  6.2 "Basic Features and Functions" means those features and functions of the
-  Elastic Software that are eligible for use under a Basic license, as set forth
-  at https://www.elastic.co/subscriptions, as may be modified by Elastic from
-  time to time.
-
-  6.3 "Commercial Software" means the Elastic Software Source Code in any file
-  containing a header stating the contents are subject to the Elastic License or
-  which is contained in the repository folder labeled "x-pack", unless a LICENSE
-  file present in the directory subtree declares a different license.
-
-  6.4 "Derivative Work of the Commercial Software" means, for purposes of this
-  Agreement, any modification(s) or enhancement(s) to the Commercial Software,
-  which represent, as a whole, an original work of authorship.
-
-  6.5 "License" means a limited, non-exclusive, non-transferable, fully paid up,
-  royalty free, right and license, without the right to grant or authorize
-  sublicenses, solely for Your internal business operations to (i) install and
-  use the applicable Features and Functions of the Elastic Software in Object
-  Code, and (ii) permit Contractors and Your Affiliates to use the Elastic
-  software as set forth in (i) above, provided that such use by Contractors must
-  be solely for Your benefit and/or the benefit of Your Affiliates, and You
-  shall be responsible for all acts and omissions of such Contractors and
-  Affiliates in connection with their use of the Elastic software that are
-  contrary to the terms and conditions of this Agreement.
-
-  6.6 "License Key" means a sequence of bytes, including but not limited to a
-  JSON blob, that is used to enable certain features and functions of the
-  Elastic Software.
-
-  6.7 "Marks and Notices" means all Elastic trademarks, trade names, logos and
-  notices present on the Documentation as originally provided by Elastic.
-
-  6.8 "Non-production Environment" means an environment for development, testing
-  or quality assurance, where software is not used for production purposes.
-
-  6.9 "Object Code" means any form resulting from mechanical transformation or
-  translation of Source Code form, including but not limited to compiled object
-  code, generated documentation, and conversions to other media types.
-
-  6.10 "Source Code" means the preferred form of computer software for making
-  modifications, including but not limited to software source code,
-  documentation source, and configuration files.
-
-  6.11 "Subscription" means the right to receive Support Services and a License
-  to the Commercial Software.
-
-  
-GOVERNMENT END USER ADDENDUM TO THE ELASTIC LICENSE AGREEMENT
-
-    This ADDENDUM TO THE ELASTIC LICENSE AGREEMENT (this "Addendum") applies
-only to U.S. Federal Government, State Government, and Local Government
-entities ("Government End Users") of the Elastic Software.  This Addendum is
-subject to, and hereby incorporated into, the Elastic License Agreement,
-which is being entered into as of even date herewith, by Elastic and You (the
-"Agreement").  This Addendum sets forth additional terms and conditions
-related to Your use of the Elastic Software. Capitalized terms not defined in
-this Addendum have the meaning set forth in the Agreement.
-
-    1. LIMITED LICENSE TO DISTRIBUTE (DSOP ONLY).  Subject to the terms and
-conditions of the Agreement (including this Addendum), Elastic grants the
-Department of Defense Enterprise DevSecOps Initiative (DSOP) a royalty-free,
-non-exclusive, non-transferable, limited license to reproduce and distribute
-the Elastic Software solely through a software distribution repository
-controlled and managed by DSOP, provided that DSOP: (i) distributes the
-Elastic Software complete and unmodified, inclusive of the Agreement
-(including this Addendum) and (ii) does not remove or alter any proprietary
-legends or notices contained in the Elastic Software.
-
-    2. CHOICE OF LAW.  The choice of law and venue provisions set forth shall
-prevail over those set forth in Section 5 of the Agreement.
-
-      "For U.S. Federal Government Entity End Users. This Agreement and any
-  non-contractual obligation arising out of or in connection with it, is
-  governed exclusively by U.S. Federal law.  To the extent permitted by
-  federal law, the laws of the State of Delaware (excluding Delaware choice
-  of law rules) will apply in the absence of applicable federal law.
-
-      For State and Local Government Entity End Users. This Agreement and any
-  non-contractual obligation arising out of or in connection with it, is
-  governed exclusively by the laws of the state in which you are located
-  without reference to conflict of laws.  Furthermore, the Parties agree that
-  the Uniform Computer Information Transactions Act or any version  thereof,
-  adopted by any state in  any form ('UCITA'), shall not apply to  this
-  Agreement and, to the extent that UCITA is applicable, the Parties agree to
-  opt out of the applicability of UCITA pursuant to the opt-out provision(s)
-  contained therein."
-
-    3. ELASTIC LICENSE MODIFICATION.  Section 5 of the Agreement is hereby
-amended to replace
-
-      "This Agreement may be modified by Elastic from time to time, and any
-  such modifications will be effective upon the "Posted Date" set forth at
-  the top of the modified Agreement."
-
-        with:
-
-      "This Agreement may be modified by Elastic from time to time; provided,
-  however, that any such modifications shall apply only to Elastic Software
-  that is installed after the "Posted Date" set forth at the top of the
-  modified Agreement." 
-  
-V100820.0
diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/README.md b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/README.md
index d297d135149f4..d81b219900a85 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/README.md
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/README.md
@@ -31,9 +31,9 @@ You can learn more about the Elastic Community and also understand how to get mo
 visiting [Elastic Community](https://www.elastic.co/community).
 
 This software is governed by the [Elastic
-License](https://github.com/elastic/elasticsearch/blob/{{branch}}/licenses/ELASTIC-LICENSE.txt),
+License](https://github.com/elastic/kibana/blob/{{branch}}/licenses/ELASTIC-LICENSE-2.0.txt),
 and includes the full set of [free
 features](https://www.elastic.co/subscriptions).
 
 View the detailed release notes
-[here](https://www.elastic.co/guide/en/elasticsearch/reference/{{branch}}/es-release-notes.html).
+[here](https://www.elastic.co/guide/en/kibana/{{branch}}/release-notes-{{version}}.html).
diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
index 2e65e68bc2882..24614039e5eb7 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
@@ -56,3 +56,7 @@ maintainers:
     name: 'Alexander Klepal'
     username: 'alexander.klepal'
     cht_member: true
+  - email: "yalabe.dukuly@anchore.com"
+    name: "Yalabe Dukuly"
+    username: "yalabe.dukuly"
+    cht_member: true
\ No newline at end of file

From 3ab04b67f878cb126b986474bbfdaa84ad8abbc4 Mon Sep 17 00:00:00 2001
From: Josh Dover <1813008+joshdover@users.noreply.github.com>
Date: Wed, 13 Oct 2021 10:20:20 -0600
Subject: [PATCH 028/117] Allow users with read access to view Integrations app
 (#113925)

---
 .../public/applications/integrations/app.tsx  |  77 ++--------
 .../epm/screens/detail/assets/assets.tsx      |  23 ++-
 .../epm/screens/detail/index.test.tsx         |  13 ++
 .../sections/epm/screens/detail/index.tsx     | 143 ++++++++++++++----
 .../fleet/public/components/header.tsx        |   3 +
 .../fleet/public/hooks/use_request/app.ts     |   9 +-
 x-pack/plugins/fleet/server/mocks/index.ts    |   3 +-
 x-pack/plugins/fleet/server/plugin.ts         |  23 ++-
 .../plugins/fleet/server/routes/app/index.ts  |  27 ++--
 .../plugins/fleet/server/routes/epm/index.ts  |  15 +-
 .../plugins/fleet/server/routes/security.ts   |   8 +
 .../fleet/server/services/app_context.ts      |  21 ++-
 .../server/services/epm/archive/cache.ts      |   8 +
 .../server/services/epm/archive/index.ts      |   4 +
 .../plugins/fleet/storybook/context/http.ts   |   4 +
 .../translations/translations/ja-JP.json      |   3 -
 .../translations/translations/zh-CN.json      |   3 -
 .../fleet_api_integration/apis/agents/list.ts |  57 +------
 .../apis/epm/bulk_upgrade.ts                  |   9 ++
 .../fleet_api_integration/apis/epm/delete.ts  |  10 ++
 .../fleet_api_integration/apis/epm/get.ts     |   9 ++
 .../apis/epm/install_by_upload.ts             |  13 ++
 .../fleet_api_integration/apis/epm/list.ts    |   9 ++
 .../test/fleet_api_integration/apis/index.js  |  10 +-
 .../fleet_api_integration/apis/test_users.ts  |  63 ++++++++
 25 files changed, 370 insertions(+), 197 deletions(-)
 create mode 100644 x-pack/test/fleet_api_integration/apis/test_users.ts

diff --git a/x-pack/plugins/fleet/public/applications/integrations/app.tsx b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
index b10cef9d3ffe4..771b17ae8c3ee 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
@@ -7,12 +7,10 @@
 
 import React, { memo, useEffect, useState } from 'react';
 import type { AppMountParameters } from 'kibana/public';
-import { EuiCode, EuiEmptyPrompt, EuiErrorBoundary, EuiPanel, EuiPortal } from '@elastic/eui';
+import { EuiErrorBoundary, EuiPortal } from '@elastic/eui';
 import type { History } from 'history';
 import { Router, Redirect, Route, Switch } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import styled from 'styled-components';
 import useObservable from 'react-use/lib/useObservable';
 
 import {
@@ -49,29 +47,23 @@ const ErrorLayout = ({ children }: { children: JSX.Element }) => (
   </EuiErrorBoundary>
 );
 
-const Panel = styled(EuiPanel)`
-  max-width: 500px;
-  margin-right: auto;
-  margin-left: auto;
-`;
-
 export const WithPermissionsAndSetup: React.FC = memo(({ children }) => {
   useBreadcrumbs('integrations');
 
   const [isPermissionsLoading, setIsPermissionsLoading] = useState<boolean>(false);
-  const [permissionsError, setPermissionsError] = useState<string>();
   const [isInitialized, setIsInitialized] = useState(false);
   const [initializationError, setInitializationError] = useState<Error | null>(null);
 
   useEffect(() => {
     (async () => {
-      setPermissionsError(undefined);
       setIsInitialized(false);
       setInitializationError(null);
       try {
+        // Attempt Fleet Setup if user has permissions, otherwise skip
         setIsPermissionsLoading(true);
         const permissionsResponse = await sendGetPermissionsCheck();
         setIsPermissionsLoading(false);
+
         if (permissionsResponse.data?.success) {
           try {
             const setupResponse = await sendSetup();
@@ -83,69 +75,20 @@ export const WithPermissionsAndSetup: React.FC = memo(({ children }) => {
           }
           setIsInitialized(true);
         } else {
-          setPermissionsError(permissionsResponse.data?.error || 'REQUEST_ERROR');
+          setIsInitialized(true);
         }
-      } catch (err) {
-        setPermissionsError('REQUEST_ERROR');
+      } catch {
+        // If there's an error checking permissions, default to proceeding without running setup
+        // User will only have access to EPM endpoints if they actually have permission
+        setIsInitialized(true);
       }
     })();
   }, []);
 
-  if (isPermissionsLoading || permissionsError) {
+  if (isPermissionsLoading) {
     return (
       <ErrorLayout>
-        {isPermissionsLoading ? (
-          <Loading />
-        ) : permissionsError === 'REQUEST_ERROR' ? (
-          <Error
-            title={
-              <FormattedMessage
-                id="xpack.fleet.permissionsRequestErrorMessageTitle"
-                defaultMessage="Unable to check permissions"
-              />
-            }
-            error={i18n.translate('xpack.fleet.permissionsRequestErrorMessageDescription', {
-              defaultMessage: 'There was a problem checking Fleet permissions',
-            })}
-          />
-        ) : (
-          <Panel>
-            <EuiEmptyPrompt
-              iconType="securityApp"
-              title={
-                <h2>
-                  {permissionsError === 'MISSING_SUPERUSER_ROLE' ? (
-                    <FormattedMessage
-                      id="xpack.fleet.permissionDeniedErrorTitle"
-                      defaultMessage="Permission denied"
-                    />
-                  ) : (
-                    <FormattedMessage
-                      id="xpack.fleet.securityRequiredErrorTitle"
-                      defaultMessage="Security is not enabled"
-                    />
-                  )}
-                </h2>
-              }
-              body={
-                <p>
-                  {permissionsError === 'MISSING_SUPERUSER_ROLE' ? (
-                    <FormattedMessage
-                      id="xpack.fleet.integrationsPermissionDeniedErrorMessage"
-                      defaultMessage="You are not authorized to access Integrations. Integrations requires {roleName} privileges."
-                      values={{ roleName: <EuiCode>superuser</EuiCode> }}
-                    />
-                  ) : (
-                    <FormattedMessage
-                      id="xpack.fleet.integrationsSecurityRequiredErrorMessage"
-                      defaultMessage="You must enable security in Kibana and Elasticsearch to use Integrations."
-                    />
-                  )}
-                </p>
-              }
-            />
-          </Panel>
-        )}
+        <Loading />
       </ErrorLayout>
     );
   }
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets.tsx
index 6d075faeef308..a8d27580e0bd1 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets.tsx
@@ -9,6 +9,7 @@ import React, { useEffect, useState } from 'react';
 import { Redirect } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFlexGroup, EuiFlexItem, EuiTitle, EuiSpacer } from '@elastic/eui';
+import { groupBy } from 'lodash';
 
 import { Loading, Error, ExtensionWrapper } from '../../../../../components';
 
@@ -67,8 +68,26 @@ export const AssetsPage = ({ packageInfo }: AssetsPanelProps) => {
             id,
             type,
           }));
-          const { savedObjects } = await savedObjectsClient.bulkGet(objectsToGet);
-          setAssetsSavedObjects(savedObjects as AssetSavedObject[]);
+
+          // We don't have an API to know which SO types a user has access to, so instead we make a request for each
+          // SO type and ignore the 403 errors
+          const objectsByType = await Promise.all(
+            Object.entries(groupBy(objectsToGet, 'type')).map(([type, objects]) =>
+              savedObjectsClient
+                .bulkGet(objects)
+                // Ignore privilege errors
+                .catch((e: any) => {
+                  if (e?.body?.statusCode === 403) {
+                    return { savedObjects: [] };
+                  } else {
+                    throw e;
+                  }
+                })
+                .then(({ savedObjects }) => savedObjects as AssetSavedObject[])
+            )
+          );
+
+          setAssetsSavedObjects(objectsByType.flat());
         } catch (e) {
           setFetchError(e);
         } finally {
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 d70b6c68016be..d442f8a13e27e 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
@@ -11,6 +11,7 @@ import { act, cleanup } from '@testing-library/react';
 
 import { INTEGRATIONS_ROUTING_PATHS, pagePathGetters } from '../../../../constants';
 import type {
+  CheckPermissionsResponse,
   GetAgentPoliciesResponse,
   GetFleetStatusResponse,
   GetInfoResponse,
@@ -23,6 +24,7 @@ import type {
 } from '../../../../../../../common/types/models';
 import {
   agentPolicyRouteService,
+  appRoutesService,
   epmRouteService,
   fleetSetupRouteService,
   packagePolicyRouteService,
@@ -260,6 +262,7 @@ interface EpmPackageDetailsResponseProvidersMock {
   fleetSetup: jest.MockedFunction<() => GetFleetStatusResponse>;
   packagePolicyList: jest.MockedFunction<() => GetPackagePoliciesResponse>;
   agentPolicyList: jest.MockedFunction<() => GetAgentPoliciesResponse>;
+  appCheckPermissions: jest.MockedFunction<() => CheckPermissionsResponse>;
 }
 
 const mockApiCalls = (
@@ -740,6 +743,10 @@ On Windows, the module was tested with Nginx installed from the Chocolatey repos
     },
   };
 
+  const appCheckPermissionsResponse: CheckPermissionsResponse = {
+    success: true,
+  };
+
   const mockedApiInterface: MockedApi<EpmPackageDetailsResponseProvidersMock> = {
     waitForApi() {
       return new Promise((resolve) => {
@@ -757,6 +764,7 @@ On Windows, the module was tested with Nginx installed from the Chocolatey repos
       fleetSetup: jest.fn().mockReturnValue(agentsSetupResponse),
       packagePolicyList: jest.fn().mockReturnValue(packagePoliciesResponse),
       agentPolicyList: jest.fn().mockReturnValue(agentPoliciesResponse),
+      appCheckPermissions: jest.fn().mockReturnValue(appCheckPermissionsResponse),
     },
   };
 
@@ -792,6 +800,11 @@ On Windows, the module was tested with Nginx installed from the Chocolatey repos
         return mockedApiInterface.responseProvider.epmGetStats();
       }
 
+      if (path === appRoutesService.getCheckPermissionsPath()) {
+        markApiCallAsHandled();
+        return mockedApiInterface.responseProvider.appCheckPermissions();
+      }
+
       const err = new Error(`API [GET ${path}] is not MOCKED!`);
       // eslint-disable-next-line no-console
       console.error(err);
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.tsx
index 82436eb4d3f51..ade290aab4e5e 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.tsx
@@ -8,10 +8,12 @@ import type { ReactEventHandler } from 'react';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Redirect, Route, Switch, useLocation, useParams, useHistory } from 'react-router-dom';
 import styled from 'styled-components';
+import type { EuiToolTipProps } from '@elastic/eui';
 import {
   EuiBetaBadge,
   EuiButton,
   EuiButtonEmpty,
+  EuiCallOut,
   EuiDescriptionList,
   EuiDescriptionListDescription,
   EuiDescriptionListTitle,
@@ -19,6 +21,7 @@ import {
   EuiFlexItem,
   EuiSpacer,
   EuiText,
+  EuiToolTip,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -30,6 +33,7 @@ import {
   useUIExtension,
   useBreadcrumbs,
   useStartServices,
+  usePermissionCheck,
 } from '../../../../hooks';
 import {
   PLUGIN_ID,
@@ -61,6 +65,7 @@ import { OverviewPage } from './overview';
 import { PackagePoliciesPage } from './policies';
 import { SettingsPage } from './settings';
 import { CustomViewPage } from './custom';
+
 import './index.scss';
 
 export interface DetailParams {
@@ -95,7 +100,11 @@ export function Detail() {
   const { getId: getAgentPolicyId } = useAgentPolicyContext();
   const { pkgkey, panel } = useParams<DetailParams>();
   const { getHref } = useLink();
-  const hasWriteCapabilites = useCapabilities().write;
+  const hasWriteCapabilities = useCapabilities().write;
+  const permissionCheck = usePermissionCheck();
+  const missingSecurityConfiguration =
+    !permissionCheck.data?.success && permissionCheck.data?.error === 'MISSING_SECURITY';
+  const userCanInstallIntegrations = hasWriteCapabilities && permissionCheck.data?.success;
   const history = useHistory();
   const { pathname, search, hash } = useLocation();
   const queryParams = useMemo(() => new URLSearchParams(search), [search]);
@@ -127,9 +136,11 @@ export function Detail() {
   const {
     data: packageInfoData,
     error: packageInfoError,
-    isLoading,
+    isLoading: packageInfoLoading,
   } = useGetPackageInfoByKey(pkgkey);
 
+  const isLoading = packageInfoLoading || permissionCheck.isLoading;
+
   const showCustomTab =
     useUIExtension(packageInfoData?.response.name ?? '', 'package-detail-custom') !== undefined;
 
@@ -327,10 +338,9 @@ export function Detail() {
               { isDivider: true },
               {
                 content: (
-                  // eslint-disable-next-line @elastic/eui/href-or-on-click
-                  <EuiButton
+                  <EuiButtonWithTooltip
                     fill
-                    isDisabled={!hasWriteCapabilites}
+                    isDisabled={!userCanInstallIntegrations}
                     iconType="plusInCircle"
                     href={getHref('add_integration_to_policy', {
                       pkgkey,
@@ -341,6 +351,23 @@ export function Detail() {
                     })}
                     onClick={handleAddIntegrationPolicyClick}
                     data-test-subj="addIntegrationPolicyButton"
+                    tooltip={
+                      !userCanInstallIntegrations
+                        ? {
+                            content: missingSecurityConfiguration ? (
+                              <FormattedMessage
+                                id="xpack.fleet.epm.addPackagePolicyButtonSecurityRequiredTooltip"
+                                defaultMessage="To add Elastic Agent Integrations, you must have security enabled and have the minimum required privileges. Contact your administrator."
+                              />
+                            ) : (
+                              <FormattedMessage
+                                id="xpack.fleet.epm.addPackagePolicyButtonPrivilegesRequiredTooltip"
+                                defaultMessage="To add Elastic Agent integrations, you must have the minimum required privileges. Contact your adminstrator."
+                              />
+                            ),
+                          }
+                        : undefined
+                    }
                   >
                     <FormattedMessage
                       id="xpack.fleet.epm.addPackagePolicyButtonText"
@@ -349,7 +376,7 @@ export function Detail() {
                         packageName: integrationInfo?.title || packageInfo.title,
                       }}
                     />
-                  </EuiButton>
+                  </EuiButtonWithTooltip>
                 ),
               },
             ].map((item, index) => (
@@ -370,16 +397,17 @@ export function Detail() {
         </>
       ) : undefined,
     [
-      getHref,
-      handleAddIntegrationPolicyClick,
-      hasWriteCapabilites,
-      integration,
-      integrationInfo,
       packageInfo,
+      updateAvailable,
       packageInstallStatus,
+      userCanInstallIntegrations,
+      getHref,
       pkgkey,
-      updateAvailable,
+      integration,
       agentPolicyIdFromContext,
+      handleAddIntegrationPolicyClick,
+      missingSecurityConfiguration,
+      integrationInfo?.title,
     ]
   );
 
@@ -407,7 +435,7 @@ export function Detail() {
       },
     ];
 
-    if (packageInstallStatus === InstallStatus.installed) {
+    if (userCanInstallIntegrations && packageInstallStatus === InstallStatus.installed) {
       tabs.push({
         id: 'policies',
         name: (
@@ -443,21 +471,23 @@ export function Detail() {
       });
     }
 
-    tabs.push({
-      id: 'settings',
-      name: (
-        <FormattedMessage
-          id="xpack.fleet.epm.packageDetailsNav.settingsLinkText"
-          defaultMessage="Settings"
-        />
-      ),
-      isSelected: panel === 'settings',
-      'data-test-subj': `tab-settings`,
-      href: getHref('integration_details_settings', {
-        pkgkey: packageInfoKey,
-        ...(integration ? { integration } : {}),
-      }),
-    });
+    if (userCanInstallIntegrations) {
+      tabs.push({
+        id: 'settings',
+        name: (
+          <FormattedMessage
+            id="xpack.fleet.epm.packageDetailsNav.settingsLinkText"
+            defaultMessage="Settings"
+          />
+        ),
+        isSelected: panel === 'settings',
+        'data-test-subj': `tab-settings`,
+        href: getHref('integration_details_settings', {
+          pkgkey: packageInfoKey,
+          ...(integration ? { integration } : {}),
+        }),
+      });
+    }
 
     if (showCustomTab) {
       tabs.push({
@@ -478,13 +508,55 @@ export function Detail() {
     }
 
     return tabs;
-  }, [packageInfo, panel, getHref, integration, packageInstallStatus, showCustomTab, CustomAssets]);
+  }, [
+    packageInfo,
+    panel,
+    getHref,
+    integration,
+    userCanInstallIntegrations,
+    packageInstallStatus,
+    CustomAssets,
+    showCustomTab,
+  ]);
+
+  const securityCallout = missingSecurityConfiguration ? (
+    <>
+      <EuiCallOut
+        color="warning"
+        iconType="lock"
+        title={
+          <FormattedMessage
+            id="xpack.fleet.epm.packageDetailsSecurityRequiredCalloutTitle"
+            defaultMessage="Security needs to be enabled in order to add Elastic Agent integrations"
+          />
+        }
+      >
+        <FormattedMessage
+          id="xpack.fleet.epm.packageDetailsSecurityRequiredCalloutDescription"
+          defaultMessage="In order to fully use Fleet, you must enable Elasticsearch and Kibana security features.
+        Follow the {guideLink} to enable security."
+          values={{
+            guideLink: (
+              <a href={services.http.basePath.prepend('/app/fleet')}>
+                <FormattedMessage
+                  id="xpack.fleet.epm.packageDetailsSecurityRequiredCalloutDescriptionGuideLink"
+                  defaultMessage="steps in this guide"
+                />
+              </a>
+            ),
+          }}
+        />
+      </EuiCallOut>
+      <EuiSpacer />
+    </>
+  ) : undefined;
 
   return (
     <WithHeaderLayout
       leftColumn={headerLeftContent}
       rightColumn={headerRightContent}
       rightColumnGrow={false}
+      topContent={securityCallout}
       tabs={headerTabs}
       tabsClassName="fleet__epm__shiftNavTabs"
     >
@@ -526,3 +598,16 @@ export function Detail() {
     </WithHeaderLayout>
   );
 }
+
+type EuiButtonPropsFull = Parameters<typeof EuiButton>[0];
+
+const EuiButtonWithTooltip: React.FC<EuiButtonPropsFull & { tooltip?: Partial<EuiToolTipProps> }> =
+  ({ tooltip: tooltipProps, ...buttonProps }) => {
+    return tooltipProps ? (
+      <EuiToolTip {...tooltipProps}>
+        <EuiButton {...buttonProps} />
+      </EuiToolTip>
+    ) : (
+      <EuiButton {...buttonProps} />
+    );
+  };
diff --git a/x-pack/plugins/fleet/public/components/header.tsx b/x-pack/plugins/fleet/public/components/header.tsx
index 80cebe3b0b304..2a8b20240a4f6 100644
--- a/x-pack/plugins/fleet/public/components/header.tsx
+++ b/x-pack/plugins/fleet/public/components/header.tsx
@@ -43,6 +43,7 @@ export interface HeaderProps {
   leftColumn?: JSX.Element;
   rightColumn?: JSX.Element;
   rightColumnGrow?: EuiFlexItemProps['grow'];
+  topContent?: JSX.Element;
   tabs?: Array<Omit<EuiTabProps, 'name'> & { name?: JSX.Element | string }>;
   tabsClassName?: string;
   'data-test-subj'?: string;
@@ -61,6 +62,7 @@ export const Header: React.FC<HeaderProps> = ({
   leftColumn,
   rightColumn,
   rightColumnGrow,
+  topContent,
   tabs,
   maxWidth,
   tabsClassName,
@@ -68,6 +70,7 @@ export const Header: React.FC<HeaderProps> = ({
 }) => (
   <Container data-test-subj={dataTestSubj}>
     <Wrapper maxWidth={maxWidth}>
+      {topContent}
       <HeaderColumns
         leftColumn={leftColumn}
         rightColumn={rightColumn}
diff --git a/x-pack/plugins/fleet/public/hooks/use_request/app.ts b/x-pack/plugins/fleet/public/hooks/use_request/app.ts
index c84dd0fd15b44..c4a0f94869827 100644
--- a/x-pack/plugins/fleet/public/hooks/use_request/app.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_request/app.ts
@@ -8,7 +8,7 @@
 import { appRoutesService } from '../../services';
 import type { CheckPermissionsResponse, GenerateServiceTokenResponse } from '../../types';
 
-import { sendRequest } from './use_request';
+import { sendRequest, useRequest } from './use_request';
 
 export const sendGetPermissionsCheck = () => {
   return sendRequest<CheckPermissionsResponse>({
@@ -23,3 +23,10 @@ export const sendGenerateServiceToken = () => {
     method: 'post',
   });
 };
+
+export const usePermissionCheck = () => {
+  return useRequest<CheckPermissionsResponse>({
+    path: appRoutesService.getCheckPermissionsPath(),
+    method: 'get',
+  });
+};
diff --git a/x-pack/plugins/fleet/server/mocks/index.ts b/x-pack/plugins/fleet/server/mocks/index.ts
index 43b455045e72b..0e7b335da6775 100644
--- a/x-pack/plugins/fleet/server/mocks/index.ts
+++ b/x-pack/plugins/fleet/server/mocks/index.ts
@@ -37,7 +37,8 @@ export const createAppContextStartContractMock = (): FleetAppContext => {
     data: dataPluginMock.createStartContract(),
     encryptedSavedObjectsStart: encryptedSavedObjectsMock.createStart(),
     savedObjects: savedObjectsServiceMock.createStartContract(),
-    security: securityMock.createStart(),
+    securitySetup: securityMock.createSetup(),
+    securityStart: securityMock.createStart(),
     logger: loggingSystemMock.create().get(),
     isProductionMode: true,
     configInitialValue: {
diff --git a/x-pack/plugins/fleet/server/plugin.ts b/x-pack/plugins/fleet/server/plugin.ts
index 6aad028666ee8..a706ca6a54fdc 100644
--- a/x-pack/plugins/fleet/server/plugin.ts
+++ b/x-pack/plugins/fleet/server/plugin.ts
@@ -37,6 +37,7 @@ import {
   AGENT_POLICY_SAVED_OBJECT_TYPE,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PACKAGES_SAVED_OBJECT_TYPE,
+  ASSETS_SAVED_OBJECT_TYPE,
   AGENT_SAVED_OBJECT_TYPE,
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
   PRECONFIGURATION_DELETION_RECORD_SAVED_OBJECT_TYPE,
@@ -103,7 +104,8 @@ export interface FleetAppContext {
   data: DataPluginStart;
   encryptedSavedObjectsStart?: EncryptedSavedObjectsPluginStart;
   encryptedSavedObjectsSetup?: EncryptedSavedObjectsPluginSetup;
-  security?: SecurityPluginStart;
+  securitySetup?: SecurityPluginSetup;
+  securityStart?: SecurityPluginStart;
   config$?: Observable<FleetConfigType>;
   configInitialValue: FleetConfigType;
   savedObjects: SavedObjectsServiceStart;
@@ -122,6 +124,7 @@ const allSavedObjectTypes = [
   AGENT_POLICY_SAVED_OBJECT_TYPE,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PACKAGES_SAVED_OBJECT_TYPE,
+  ASSETS_SAVED_OBJECT_TYPE,
   AGENT_SAVED_OBJECT_TYPE,
   ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
   PRECONFIGURATION_DELETION_RECORD_SAVED_OBJECT_TYPE,
@@ -164,14 +167,15 @@ export class FleetPlugin
   private licensing$!: Observable<ILicense>;
   private config$: Observable<FleetConfigType>;
   private configInitialValue: FleetConfigType;
-  private cloud: CloudSetup | undefined;
-  private logger: Logger | undefined;
+  private cloud?: CloudSetup;
+  private logger?: Logger;
 
   private isProductionMode: FleetAppContext['isProductionMode'];
   private kibanaVersion: FleetAppContext['kibanaVersion'];
   private kibanaBranch: FleetAppContext['kibanaBranch'];
-  private httpSetup: HttpServiceSetup | undefined;
-  private encryptedSavedObjectsSetup: EncryptedSavedObjectsPluginSetup | undefined;
+  private httpSetup?: HttpServiceSetup;
+  private securitySetup?: SecurityPluginSetup;
+  private encryptedSavedObjectsSetup?: EncryptedSavedObjectsPluginSetup;
 
   constructor(private readonly initializerContext: PluginInitializerContext) {
     this.config$ = this.initializerContext.config.create<FleetConfigType>();
@@ -187,6 +191,7 @@ export class FleetPlugin
     this.licensing$ = deps.licensing.license$;
     this.encryptedSavedObjectsSetup = deps.encryptedSavedObjects;
     this.cloud = deps.cloud;
+    this.securitySetup = deps.security;
     const config = this.configInitialValue;
 
     registerSavedObjects(core.savedObjects, deps.encryptedSavedObjects);
@@ -233,6 +238,10 @@ export class FleetPlugin
 
     // Always register app routes for permissions checking
     registerAppRoutes(router);
+    // Allow read-only users access to endpoints necessary for Integrations UI
+    // Only some endpoints require superuser so we pass a raw IRouter here
+    registerEPMRoutes(router);
+
     // For all the routes we enforce the user to have role superuser
     const routerSuperuserOnly = makeRouterEnforcingSuperuser(router);
     // Register rest of routes only if security is enabled
@@ -243,7 +252,6 @@ export class FleetPlugin
       registerOutputRoutes(routerSuperuserOnly);
       registerSettingsRoutes(routerSuperuserOnly);
       registerDataStreamRoutes(routerSuperuserOnly);
-      registerEPMRoutes(routerSuperuserOnly);
       registerPreconfigurationRoutes(routerSuperuserOnly);
 
       // Conditional config routes
@@ -260,7 +268,8 @@ export class FleetPlugin
       data: plugins.data,
       encryptedSavedObjectsStart: plugins.encryptedSavedObjects,
       encryptedSavedObjectsSetup: this.encryptedSavedObjectsSetup,
-      security: plugins.security,
+      securitySetup: this.securitySetup,
+      securityStart: plugins.security,
       configInitialValue: this.configInitialValue,
       config$: this.config$,
       savedObjects: core.savedObjects,
diff --git a/x-pack/plugins/fleet/server/routes/app/index.ts b/x-pack/plugins/fleet/server/routes/app/index.ts
index 025da6d79702c..43614f3a286b0 100644
--- a/x-pack/plugins/fleet/server/routes/app/index.ts
+++ b/x-pack/plugins/fleet/server/routes/app/index.ts
@@ -17,13 +17,15 @@ export const getCheckPermissionsHandler: RequestHandler = async (context, reques
     success: false,
     error: 'MISSING_SECURITY',
   };
-  const body: CheckPermissionsResponse = { success: true };
-  try {
-    const security = await appContextService.getSecurity();
+
+  if (!appContextService.hasSecurity() || !appContextService.getSecurityLicense().isEnabled()) {
+    return response.ok({ body: missingSecurityBody });
+  } else {
+    const security = appContextService.getSecurity();
     const user = security.authc.getCurrentUser(request);
 
-    // when ES security is disabled, but Kibana security plugin is not explicitly disabled,
-    // `authc.getCurrentUser()` does not error, instead it comes back as `null`
+    // Defensively handle situation where user is undefined (should only happen when ES security is disabled)
+    // This should be covered by the `getSecurityLicense().isEnabled()` check above, but we leave this for robustness.
     if (!user) {
       return response.ok({
         body: missingSecurityBody,
@@ -31,20 +33,15 @@ export const getCheckPermissionsHandler: RequestHandler = async (context, reques
     }
 
     if (!user?.roles.includes('superuser')) {
-      body.success = false;
-      body.error = 'MISSING_SUPERUSER_ROLE';
       return response.ok({
-        body,
+        body: {
+          success: false,
+          error: 'MISSING_SUPERUSER_ROLE',
+        } as CheckPermissionsResponse,
       });
     }
 
-    return response.ok({ body: { success: true } });
-  } catch (e) {
-    // when Kibana security plugin is explicitly disabled,
-    // `appContextService.getSecurity()` returns an error, so we catch it here
-    return response.ok({
-      body: missingSecurityBody,
-    });
+    return response.ok({ body: { success: true } as CheckPermissionsResponse });
   }
 };
 
diff --git a/x-pack/plugins/fleet/server/routes/epm/index.ts b/x-pack/plugins/fleet/server/routes/epm/index.ts
index 684547dc1862c..0f49b3cfa772d 100644
--- a/x-pack/plugins/fleet/server/routes/epm/index.ts
+++ b/x-pack/plugins/fleet/server/routes/epm/index.ts
@@ -20,6 +20,7 @@ import {
   GetStatsRequestSchema,
   UpdatePackageRequestSchema,
 } from '../../types';
+import { enforceSuperUser } from '../security';
 
 import {
   getCategoriesHandler,
@@ -60,7 +61,7 @@ export const registerRoutes = (router: IRouter) => {
     {
       path: EPM_API_ROUTES.LIMITED_LIST_PATTERN,
       validate: false,
-      options: { tags: [`access:${PLUGIN_ID}`] },
+      options: { tags: [`access:${PLUGIN_ID}-read`] },
     },
     getLimitedListHandler
   );
@@ -69,7 +70,7 @@ export const registerRoutes = (router: IRouter) => {
     {
       path: EPM_API_ROUTES.STATS_PATTERN,
       validate: GetStatsRequestSchema,
-      options: { tags: [`access:${PLUGIN_ID}`] },
+      options: { tags: [`access:${PLUGIN_ID}-read`] },
     },
     getStatsHandler
   );
@@ -98,7 +99,7 @@ export const registerRoutes = (router: IRouter) => {
       validate: UpdatePackageRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-all`] },
     },
-    updatePackageHandler
+    enforceSuperUser(updatePackageHandler)
   );
 
   router.post(
@@ -107,7 +108,7 @@ export const registerRoutes = (router: IRouter) => {
       validate: InstallPackageFromRegistryRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-all`] },
     },
-    installPackageFromRegistryHandler
+    enforceSuperUser(installPackageFromRegistryHandler)
   );
 
   router.post(
@@ -116,7 +117,7 @@ export const registerRoutes = (router: IRouter) => {
       validate: BulkUpgradePackagesFromRegistryRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-all`] },
     },
-    bulkInstallPackagesFromRegistryHandler
+    enforceSuperUser(bulkInstallPackagesFromRegistryHandler)
   );
 
   router.post(
@@ -132,7 +133,7 @@ export const registerRoutes = (router: IRouter) => {
         },
       },
     },
-    installPackageByUploadHandler
+    enforceSuperUser(installPackageByUploadHandler)
   );
 
   router.delete(
@@ -141,6 +142,6 @@ export const registerRoutes = (router: IRouter) => {
       validate: DeletePackageRequestSchema,
       options: { tags: [`access:${PLUGIN_ID}-all`] },
     },
-    deletePackageHandler
+    enforceSuperUser(deletePackageHandler)
   );
 };
diff --git a/x-pack/plugins/fleet/server/routes/security.ts b/x-pack/plugins/fleet/server/routes/security.ts
index 60011dcf3d33f..8efea34ed8164 100644
--- a/x-pack/plugins/fleet/server/routes/security.ts
+++ b/x-pack/plugins/fleet/server/routes/security.ts
@@ -13,6 +13,14 @@ export function enforceSuperUser<T1, T2, T3>(
   handler: RequestHandler<T1, T2, T3>
 ): RequestHandler<T1, T2, T3> {
   return function enforceSuperHandler(context, req, res) {
+    if (!appContextService.hasSecurity() || !appContextService.getSecurityLicense().isEnabled()) {
+      return res.forbidden({
+        body: {
+          message: `Access to this API requires that security is enabled`,
+        },
+      });
+    }
+
     const security = appContextService.getSecurity();
     const user = security.authc.getCurrentUser(req);
     if (!user) {
diff --git a/x-pack/plugins/fleet/server/services/app_context.ts b/x-pack/plugins/fleet/server/services/app_context.ts
index 1fb34a9a399eb..a1e6ef4545aef 100644
--- a/x-pack/plugins/fleet/server/services/app_context.ts
+++ b/x-pack/plugins/fleet/server/services/app_context.ts
@@ -22,7 +22,7 @@ import type {
   EncryptedSavedObjectsPluginSetup,
 } from '../../../encrypted_saved_objects/server';
 
-import type { SecurityPluginStart } from '../../../security/server';
+import type { SecurityPluginStart, SecurityPluginSetup } from '../../../security/server';
 import type { FleetConfigType } from '../../common';
 import type {
   ExternalCallback,
@@ -39,7 +39,8 @@ class AppContextService {
   private encryptedSavedObjectsSetup: EncryptedSavedObjectsPluginSetup | undefined;
   private data: DataPluginStart | undefined;
   private esClient: ElasticsearchClient | undefined;
-  private security: SecurityPluginStart | undefined;
+  private securitySetup: SecurityPluginSetup | undefined;
+  private securityStart: SecurityPluginStart | undefined;
   private config$?: Observable<FleetConfigType>;
   private configSubject$?: BehaviorSubject<FleetConfigType>;
   private savedObjects: SavedObjectsServiceStart | undefined;
@@ -56,7 +57,8 @@ class AppContextService {
     this.esClient = appContext.elasticsearch.client.asInternalUser;
     this.encryptedSavedObjects = appContext.encryptedSavedObjectsStart?.getClient();
     this.encryptedSavedObjectsSetup = appContext.encryptedSavedObjectsSetup;
-    this.security = appContext.security;
+    this.securitySetup = appContext.securitySetup;
+    this.securityStart = appContext.securityStart;
     this.savedObjects = appContext.savedObjects;
     this.isProductionMode = appContext.isProductionMode;
     this.cloud = appContext.cloud;
@@ -92,14 +94,21 @@ class AppContextService {
   }
 
   public getSecurity() {
-    if (!this.security) {
+    if (!this.hasSecurity()) {
       throw new Error('Security service not set.');
     }
-    return this.security;
+    return this.securityStart!;
+  }
+
+  public getSecurityLicense() {
+    if (!this.hasSecurity()) {
+      throw new Error('Security service not set.');
+    }
+    return this.securitySetup!.license;
   }
 
   public hasSecurity() {
-    return !!this.security;
+    return !!this.securitySetup && !!this.securityStart;
   }
 
   public getCloud() {
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/cache.ts b/x-pack/plugins/fleet/server/services/epm/archive/cache.ts
index 7f479dc5d6b63..676c3aa571a0f 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/cache.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/cache.ts
@@ -67,3 +67,11 @@ export const setPackageInfo = ({
 };
 
 export const deletePackageInfo = (args: SharedKey) => packageInfoCache.delete(sharedKey(args));
+
+export const clearPackageFileCache = (args: SharedKey) => {
+  const fileList = getArchiveFilelist(args) ?? [];
+  fileList.forEach((filePath) => {
+    deleteArchiveEntry(filePath);
+  });
+  deleteArchiveFilelist(args);
+};
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/index.ts b/x-pack/plugins/fleet/server/services/epm/archive/index.ts
index b08ec815a394d..7c590eb1bcd39 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/index.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/index.ts
@@ -16,6 +16,7 @@ import {
   setArchiveFilelist,
   deleteArchiveFilelist,
   deletePackageInfo,
+  clearPackageFileCache,
 } from './cache';
 import type { SharedKey } from './cache';
 import { getBufferExtractor } from './extract';
@@ -42,6 +43,9 @@ export async function unpackBufferToCache({
   archiveBuffer: Buffer;
   installSource: InstallSource;
 }): Promise<string[]> {
+  // Make sure any buffers from previous installations from registry or upload are deleted first
+  clearPackageFileCache({ name, version });
+
   const entries = await unpackBufferEntries(archiveBuffer, contentType);
   const paths: string[] = [];
   entries.forEach((entry) => {
diff --git a/x-pack/plugins/fleet/storybook/context/http.ts b/x-pack/plugins/fleet/storybook/context/http.ts
index f62970c0c0306..3e515c075a595 100644
--- a/x-pack/plugins/fleet/storybook/context/http.ts
+++ b/x-pack/plugins/fleet/storybook/context/http.ts
@@ -75,6 +75,10 @@ export const getHttp = (basepath = BASE_PATH) => {
         return await import('./fixtures/integration.okta');
       }
 
+      if (path.startsWith('/api/fleet/check-permissions')) {
+        return { success: true };
+      }
+
       action(path)('KP: UNSUPPORTED ROUTE');
       return {};
     }) as HttpHandler,
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 2c828513e9d33..482a493865a47 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -10873,8 +10873,6 @@
     "xpack.fleet.integrations.updatePackage.updatePackageButtonLabel": "最新バージョンに更新",
     "xpack.fleet.integrationsAppTitle": "統合",
     "xpack.fleet.integrationsHeaderTitle": "Elasticエージェント統合",
-    "xpack.fleet.integrationsPermissionDeniedErrorMessage": "統合にアクセスする権限がありません。統合には{roleName}権限が必要です。",
-    "xpack.fleet.integrationsSecurityRequiredErrorMessage": "統合を使用するには、KibanaとElasticsearchでセキュリティを有効にする必要があります。",
     "xpack.fleet.invalidLicenseDescription": "現在のライセンスは期限切れです。登録されたビートエージェントは引き続き動作しますが、Elastic Fleet インターフェイスにアクセスするには有効なライセンスが必要です。",
     "xpack.fleet.invalidLicenseTitle": "ライセンスの期限切れ",
     "xpack.fleet.multiTextInput.addRow": "行の追加",
@@ -10946,7 +10944,6 @@
     "xpack.fleet.preconfiguration.missingIDError": "{agentPolicyName}には「id」フィールドがありません。ポリシーのis_defaultまたはis_default_fleet_serverに設定されている場合をのぞき、「id」は必須です。",
     "xpack.fleet.preconfiguration.packageMissingError": "{agentPolicyName}を追加できませんでした。{pkgName}がインストールされていません。{pkgName}を`{packagesConfigValue}`に追加するか、{packagePolicyName}から削除してください。",
     "xpack.fleet.preconfiguration.policyDeleted": "構成済みのポリシー{id}が削除されました。作成をスキップしています",
-    "xpack.fleet.securityRequiredErrorTitle": "セキュリティが有効ではありません",
     "xpack.fleet.serverError.agentPolicyDoesNotExist": "エージェントポリシー{agentPolicyId}が存在しません",
     "xpack.fleet.serverError.enrollmentKeyDuplicate": "エージェントポリシーの{agentPolicyId}登録キー{providedKeyName}はすでに存在します",
     "xpack.fleet.serverError.returnedIncorrectKey": "find enrollmentKeyByIdで正しくないキーが返されました",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index c0d3975461c7b..2322f6213149f 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -10987,8 +10987,6 @@
     "xpack.fleet.integrations.updatePackage.updatePackageButtonLabel": "更新到最新版本",
     "xpack.fleet.integrationsAppTitle": "集成",
     "xpack.fleet.integrationsHeaderTitle": "Elastic 代理集成",
-    "xpack.fleet.integrationsPermissionDeniedErrorMessage": "您无权访问“集成”。“集成”需要 {roleName} 权限。",
-    "xpack.fleet.integrationsSecurityRequiredErrorMessage": "必须在 Kibana 和 Elasticsearch 中启用安全性，才能使用“集成”。",
     "xpack.fleet.invalidLicenseDescription": "您当前的许可证已过期。已注册 Beats 代理将继续工作，但您需要有效的许可证，才能访问 Elastic Fleet 界面。",
     "xpack.fleet.invalidLicenseTitle": "已过期许可证",
     "xpack.fleet.multiTextInput.addRow": "添加行",
@@ -11060,7 +11058,6 @@
     "xpack.fleet.preconfiguration.missingIDError": "{agentPolicyName} 缺失 `id` 字段。`id` 是必需的，但标记为 is_default 或 is_default_fleet_server 的策略除外。",
     "xpack.fleet.preconfiguration.packageMissingError": "{agentPolicyName} 无法添加。{pkgName} 未安装，请将 {pkgName} 添加到 `{packagesConfigValue}` 或将其从 {packagePolicyName} 中移除。",
     "xpack.fleet.preconfiguration.policyDeleted": "预配置的策略 {id} 已删除；将跳过创建",
-    "xpack.fleet.securityRequiredErrorTitle": "安全性未启用",
     "xpack.fleet.serverError.agentPolicyDoesNotExist": "代理策略 {agentPolicyId} 不存在",
     "xpack.fleet.serverError.enrollmentKeyDuplicate": "称作 {providedKeyName} 的注册密钥对于代理策略 {agentPolicyId} 已存在",
     "xpack.fleet.serverError.returnedIncorrectKey": "find enrollmentKeyById 返回错误的密钥",
diff --git a/x-pack/test/fleet_api_integration/apis/agents/list.ts b/x-pack/test/fleet_api_integration/apis/agents/list.ts
index a11f4d49fe0f1..3795734f60fe0 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/list.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/list.ts
@@ -8,66 +8,15 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { testUsers } from '../test_users';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const supertest = getService('supertest');
-  const security = getService('security');
-  const users: { [rollName: string]: { username: string; password: string; permissions?: any } } = {
-    kibana_basic_user: {
-      permissions: {
-        feature: {
-          dashboards: ['read'],
-        },
-        spaces: ['*'],
-      },
-      username: 'kibana_basic_user',
-      password: 'changeme',
-    },
-    fleet_user: {
-      permissions: {
-        feature: {
-          fleet: ['read'],
-        },
-        spaces: ['*'],
-      },
-      username: 'fleet_user',
-      password: 'changeme',
-    },
-    fleet_admin: {
-      permissions: {
-        feature: {
-          fleet: ['all'],
-        },
-        spaces: ['*'],
-      },
-      username: 'fleet_admin',
-      password: 'changeme',
-    },
-  };
 
   describe('fleet_list_agent', () => {
     before(async () => {
-      for (const roleName in users) {
-        if (users.hasOwnProperty(roleName)) {
-          const user = users[roleName];
-
-          if (user.permissions) {
-            await security.role.create(roleName, {
-              kibana: [user.permissions],
-            });
-          }
-
-          // Import a repository first
-          await security.user.create(user.username, {
-            password: user.password,
-            roles: [roleName],
-            full_name: user.username,
-          });
-        }
-      }
-
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/fleet/agents');
     });
     after(async () => {
@@ -77,13 +26,13 @@ export default function ({ getService }: FtrProviderContext) {
     it('should return a 403 if a user without the superuser role try to access the APU', async () => {
       await supertestWithoutAuth
         .get(`/api/fleet/agents`)
-        .auth(users.fleet_admin.username, users.fleet_admin.password)
+        .auth(testUsers.fleet_all.username, testUsers.fleet_all.password)
         .expect(403);
     });
     it('should not return the list of agents when requesting as a user without fleet permissions', async () => {
       await supertestWithoutAuth
         .get(`/api/fleet/agents`)
-        .auth(users.kibana_basic_user.username, users.kibana_basic_user.password)
+        .auth(testUsers.fleet_no_access.username, testUsers.fleet_no_access.password)
         .expect(403);
     });
 
diff --git a/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts b/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts
index bb75629e222a5..3b3ccb03e56f3 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts
@@ -14,10 +14,12 @@ import {
   IBulkInstallPackageHTTPError,
 } from '../../../../plugins/fleet/common';
 import { setupFleetAndAgents } from '../agents/services';
+import { testUsers } from '../test_users';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
   const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   const deletePackage = async (pkgkey: string) => {
     await supertest.delete(`/api/fleet/epm/packages/${pkgkey}`).set('kbn-xsrf', 'xxxx');
@@ -44,6 +46,13 @@ export default function (providerContext: FtrProviderContext) {
       it('should return 400 if no packages are requested for upgrade', async function () {
         await supertest.post(`/api/fleet/epm/packages/_bulk`).set('kbn-xsrf', 'xxxx').expect(400);
       });
+      it('should return 403 if read only user requests upgrade', async function () {
+        await supertestWithoutAuth
+          .post(`/api/fleet/epm/packages/_bulk`)
+          .auth(testUsers.fleet_read_only.username, testUsers.fleet_read_only.password)
+          .set('kbn-xsrf', 'xxxx')
+          .expect(403);
+      });
       it('should return 200 and an array for upgrading a package', async function () {
         const { body }: { body: BulkInstallPackagesResponse } = await supertest
           .post(`/api/fleet/epm/packages/_bulk`)
diff --git a/x-pack/test/fleet_api_integration/apis/epm/delete.ts b/x-pack/test/fleet_api_integration/apis/epm/delete.ts
index 40650c4c176f7..9980d85ac171e 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/delete.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/delete.ts
@@ -8,10 +8,12 @@
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
+import { testUsers } from '../test_users';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
   const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
   const requiredPackage = 'elastic_agent-0.0.7';
 
   const installPackage = async (pkgkey: string) => {
@@ -52,5 +54,13 @@ export default function (providerContext: FtrProviderContext) {
         .send({ force: true })
         .expect(200);
     });
+
+    it('should return 403 for read-only users', async () => {
+      await supertestWithoutAuth
+        .delete(`/api/fleet/epm/packages/${requiredPackage}`)
+        .auth(testUsers.fleet_read_only.username, testUsers.fleet_read_only.password)
+        .set('kbn-xsrf', 'xxxx')
+        .expect(403);
+    });
   });
 }
diff --git a/x-pack/test/fleet_api_integration/apis/epm/get.ts b/x-pack/test/fleet_api_integration/apis/epm/get.ts
index 014fe0808d255..13533a9a82af0 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/get.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/get.ts
@@ -11,11 +11,13 @@ import path from 'path';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
+import { testUsers } from '../test_users';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
 
   const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   const testPkgKey = 'apache-0.1.4';
 
@@ -91,5 +93,12 @@ export default function (providerContext: FtrProviderContext) {
     it('returns a 400 for a package key without a proper semver version', async function () {
       await supertest.get('/api/fleet/epm/packages/endpoint-0.1.0.1.2.3').expect(400);
     });
+
+    it('allows user with only read permission to access', async () => {
+      await supertestWithoutAuth
+        .get(`/api/fleet/epm/packages/${testPkgKey}`)
+        .auth(testUsers.fleet_read_only.username, testUsers.fleet_read_only.password)
+        .expect(200);
+    });
   });
 }
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts b/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
index 23feacbcee374..86928874f8a34 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
@@ -12,10 +12,12 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
+import { testUsers } from '../test_users';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
   const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
   const dockerServers = getService('dockerServers');
 
   const testPkgArchiveTgz = path.join(
@@ -190,5 +192,16 @@ export default function (providerContext: FtrProviderContext) {
         '{"statusCode":400,"error":"Bad Request","message":"Name thisIsATypo and version 0.1.4 do not match top-level directory apache-0.1.4"}'
       );
     });
+
+    it('should not allow users without all access', async () => {
+      const buf = fs.readFileSync(testPkgArchiveTgz);
+      await supertestWithoutAuth
+        .post(`/api/fleet/epm/packages`)
+        .auth(testUsers.fleet_read_only.username, testUsers.fleet_read_only.password)
+        .set('kbn-xsrf', 'xxxx')
+        .type('application/gzip')
+        .send(buf)
+        .expect(403);
+    });
   });
 }
diff --git a/x-pack/test/fleet_api_integration/apis/epm/list.ts b/x-pack/test/fleet_api_integration/apis/epm/list.ts
index 931e494798220..56f3e6ca1f2fa 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/list.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/list.ts
@@ -9,10 +9,12 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
+import { testUsers } from '../test_users';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
   const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 
   // use function () {} and not () => {} here
@@ -54,6 +56,13 @@ export default function (providerContext: FtrProviderContext) {
 
         expect(listResponse.response).to.eql(['endpoint']);
       });
+
+      it('allows user with only read permission to access', async () => {
+        await supertestWithoutAuth
+          .get('/api/fleet/epm/packages')
+          .auth(testUsers.fleet_read_only.username, testUsers.fleet_read_only.password)
+          .expect(200);
+      });
     });
   });
 }
diff --git a/x-pack/test/fleet_api_integration/apis/index.js b/x-pack/test/fleet_api_integration/apis/index.js
index 387433b787728..fd5ac05247fd2 100644
--- a/x-pack/test/fleet_api_integration/apis/index.js
+++ b/x-pack/test/fleet_api_integration/apis/index.js
@@ -5,10 +5,16 @@
  * 2.0.
  */
 
-export default function ({ loadTestFile }) {
+import { setupTestUsers } from './test_users';
+
+export default function ({ loadTestFile, getService }) {
   describe('Fleet Endpoints', function () {
+    before(async () => {
+      await setupTestUsers(getService('security'));
+    });
+
     // EPM
-    loadTestFile(require.resolve('./epm/index'));
+    loadTestFile(require.resolve('./epm'));
 
     // Fleet setup
     loadTestFile(require.resolve('./fleet_setup'));
diff --git a/x-pack/test/fleet_api_integration/apis/test_users.ts b/x-pack/test/fleet_api_integration/apis/test_users.ts
new file mode 100644
index 0000000000000..a1df6d3a31b71
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/test_users.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SecurityService } from '../../../../test/common/services/security/security';
+
+export const testUsers: {
+  [rollName: string]: { username: string; password: string; permissions?: any };
+} = {
+  fleet_no_access: {
+    permissions: {
+      feature: {
+        dashboards: ['read'],
+      },
+      spaces: ['*'],
+    },
+    username: 'fleet_no_access',
+    password: 'changeme',
+  },
+  fleet_read_only: {
+    permissions: {
+      feature: {
+        fleet: ['read'],
+      },
+      spaces: ['*'],
+    },
+    username: 'fleet_read_only',
+    password: 'changeme',
+  },
+  fleet_all: {
+    permissions: {
+      feature: {
+        fleet: ['all'],
+      },
+      spaces: ['*'],
+    },
+    username: 'fleet_all',
+    password: 'changeme',
+  },
+};
+
+export const setupTestUsers = async (security: SecurityService) => {
+  for (const roleName in testUsers) {
+    if (testUsers.hasOwnProperty(roleName)) {
+      const user = testUsers[roleName];
+
+      if (user.permissions) {
+        await security.role.create(roleName, {
+          kibana: [user.permissions],
+        });
+      }
+
+      await security.user.create(user.username, {
+        password: user.password,
+        roles: [roleName],
+        full_name: user.username,
+      });
+    }
+  }
+};

From bfc790ae924bfa2d58c6d1fb54152b414846b38e Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Wed, 13 Oct 2021 12:46:11 -0500
Subject: [PATCH 029/117] fix codeowners file (#114783)

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 17150e3c98cec..91a8f8c2d5998 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -63,7 +63,7 @@
 /packages/kbn-interpreter/ @elastic/kibana-app-services
 /src/plugins/bfetch/ @elastic/kibana-app-services
 /src/plugins/data/ @elastic/kibana-app-services
-/src/plugins/data-views/ @elastic/kibana-app-services
+/src/plugins/data_views/ @elastic/kibana-app-services
 /src/plugins/embeddable/ @elastic/kibana-app-services
 /src/plugins/expressions/ @elastic/kibana-app-services
 /src/plugins/field_formats/ @elastic/kibana-app-services

From eaf25d64e4b9dfa88371e0b54fc0ca0986359d13 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Wed, 13 Oct 2021 19:48:01 +0200
Subject: [PATCH 030/117] [APM] Generate breakdown metrics (#114390)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 packages/elastic-apm-generator/src/index.ts   |   1 +
 .../src/lib/base_span.ts                      |  31 +++-
 .../elastic-apm-generator/src/lib/entity.ts   |   4 +
 .../src/lib/output/to_elasticsearch_output.ts |   4 +-
 .../elastic-apm-generator/src/lib/service.ts  |   1 +
 .../elastic-apm-generator/src/lib/span.ts     |  12 --
 .../src/lib/transaction.ts                    |  28 ++--
 .../src/lib/utils/aggregate.ts                |  45 ++++++
 .../src/lib/utils/create_picker.ts            |  16 ++
 .../src/lib/utils/get_breakdown_metrics.ts    | 145 ++++++++++++++++++
 .../lib/utils/get_span_destination_metrics.ts |  54 +++----
 .../src/lib/utils/get_transaction_metrics.ts  |  90 +++++------
 .../src/scripts/examples/01_simple_trace.ts   |  20 ++-
 .../test/scenarios/01_simple_trace.test.ts    |   2 +
 .../scenarios/04_breakdown_metrics.test.ts    | 105 +++++++++++++
 .../01_simple_trace.test.ts.snap              |  30 ++++
 ...ervice_instances_transaction_statistics.ts |   3 +
 .../apm_api_integration/common/trace_data.ts  |   8 +-
 .../instances_main_statistics.ts              | 145 ++++++++++++++++++
 19 files changed, 621 insertions(+), 123 deletions(-)
 create mode 100644 packages/elastic-apm-generator/src/lib/utils/aggregate.ts
 create mode 100644 packages/elastic-apm-generator/src/lib/utils/create_picker.ts
 create mode 100644 packages/elastic-apm-generator/src/lib/utils/get_breakdown_metrics.ts
 create mode 100644 packages/elastic-apm-generator/src/test/scenarios/04_breakdown_metrics.test.ts

diff --git a/packages/elastic-apm-generator/src/index.ts b/packages/elastic-apm-generator/src/index.ts
index fd83ce483ad4f..7007e92012a66 100644
--- a/packages/elastic-apm-generator/src/index.ts
+++ b/packages/elastic-apm-generator/src/index.ts
@@ -12,3 +12,4 @@ export { getTransactionMetrics } from './lib/utils/get_transaction_metrics';
 export { getSpanDestinationMetrics } from './lib/utils/get_span_destination_metrics';
 export { getObserverDefaults } from './lib/defaults/get_observer_defaults';
 export { toElasticsearchOutput } from './lib/output/to_elasticsearch_output';
+export { getBreakdownMetrics } from './lib/utils/get_breakdown_metrics';
diff --git a/packages/elastic-apm-generator/src/lib/base_span.ts b/packages/elastic-apm-generator/src/lib/base_span.ts
index 24a51282687f4..6288c16d339b6 100644
--- a/packages/elastic-apm-generator/src/lib/base_span.ts
+++ b/packages/elastic-apm-generator/src/lib/base_span.ts
@@ -8,10 +8,12 @@
 
 import { Fields } from './entity';
 import { Serializable } from './serializable';
+import { Span } from './span';
+import { Transaction } from './transaction';
 import { generateTraceId } from './utils/generate_id';
 
 export class BaseSpan extends Serializable {
-  private _children: BaseSpan[] = [];
+  private readonly _children: BaseSpan[] = [];
 
   constructor(fields: Fields) {
     super({
@@ -22,20 +24,29 @@ export class BaseSpan extends Serializable {
     });
   }
 
-  traceId(traceId: string) {
-    this.fields['trace.id'] = traceId;
+  parent(span: BaseSpan) {
+    this.fields['trace.id'] = span.fields['trace.id'];
+    this.fields['parent.id'] = span.isSpan()
+      ? span.fields['span.id']
+      : span.fields['transaction.id'];
+
+    if (this.isSpan()) {
+      this.fields['transaction.id'] = span.fields['transaction.id'];
+    }
     this._children.forEach((child) => {
-      child.fields['trace.id'] = traceId;
+      child.parent(this);
     });
+
     return this;
   }
 
   children(...children: BaseSpan[]) {
-    this._children.push(...children);
     children.forEach((child) => {
-      child.traceId(this.fields['trace.id']!);
+      child.parent(this);
     });
 
+    this._children.push(...children);
+
     return this;
   }
 
@@ -52,4 +63,12 @@ export class BaseSpan extends Serializable {
   serialize(): Fields[] {
     return [this.fields, ...this._children.flatMap((child) => child.serialize())];
   }
+
+  isSpan(): this is Span {
+    return this.fields['processor.event'] === 'span';
+  }
+
+  isTransaction(): this is Transaction {
+    return this.fields['processor.event'] === 'transaction';
+  }
 }
diff --git a/packages/elastic-apm-generator/src/lib/entity.ts b/packages/elastic-apm-generator/src/lib/entity.ts
index e0a048c876213..2a4beee652cf7 100644
--- a/packages/elastic-apm-generator/src/lib/entity.ts
+++ b/packages/elastic-apm-generator/src/lib/entity.ts
@@ -10,9 +10,11 @@ export type Fields = Partial<{
   '@timestamp': number;
   'agent.name': string;
   'agent.version': string;
+  'container.id': string;
   'ecs.version': string;
   'event.outcome': string;
   'event.ingested': number;
+  'host.name': string;
   'metricset.name': string;
   'observer.version': string;
   'observer.version_major': number;
@@ -42,6 +44,8 @@ export type Fields = Partial<{
   'span.destination.service.type': string;
   'span.destination.service.response_time.sum.us': number;
   'span.destination.service.response_time.count': number;
+  'span.self_time.count': number;
+  'span.self_time.sum.us': number;
 }>;
 
 export class Entity {
diff --git a/packages/elastic-apm-generator/src/lib/output/to_elasticsearch_output.ts b/packages/elastic-apm-generator/src/lib/output/to_elasticsearch_output.ts
index ded94f9ad2276..b4cae1b41b9a6 100644
--- a/packages/elastic-apm-generator/src/lib/output/to_elasticsearch_output.ts
+++ b/packages/elastic-apm-generator/src/lib/output/to_elasticsearch_output.ts
@@ -14,10 +14,12 @@ export function toElasticsearchOutput(events: Fields[], versionOverride?: string
   return events.map((event) => {
     const values = {
       ...event,
+      ...getObserverDefaults(),
       '@timestamp': new Date(event['@timestamp']!).toISOString(),
       'timestamp.us': event['@timestamp']! * 1000,
       'ecs.version': '1.4',
-      ...getObserverDefaults(),
+      'service.node.name':
+        event['service.node.name'] || event['container.id'] || event['host.name'],
     };
 
     const document = {};
diff --git a/packages/elastic-apm-generator/src/lib/service.ts b/packages/elastic-apm-generator/src/lib/service.ts
index 8ddbd827e842e..859afa18aab03 100644
--- a/packages/elastic-apm-generator/src/lib/service.ts
+++ b/packages/elastic-apm-generator/src/lib/service.ts
@@ -14,6 +14,7 @@ export class Service extends Entity {
     return new Instance({
       ...this.fields,
       ['service.node.name']: instanceName,
+      'container.id': instanceName,
     });
   }
 }
diff --git a/packages/elastic-apm-generator/src/lib/span.ts b/packages/elastic-apm-generator/src/lib/span.ts
index da9ba9cdff722..36f7f44816d01 100644
--- a/packages/elastic-apm-generator/src/lib/span.ts
+++ b/packages/elastic-apm-generator/src/lib/span.ts
@@ -19,18 +19,6 @@ export class Span extends BaseSpan {
     });
   }
 
-  children(...children: BaseSpan[]) {
-    super.children(...children);
-
-    children.forEach((child) =>
-      child.defaults({
-        'parent.id': this.fields['span.id'],
-      })
-    );
-
-    return this;
-  }
-
   duration(duration: number) {
     this.fields['span.duration.us'] = duration * 1000;
     return this;
diff --git a/packages/elastic-apm-generator/src/lib/transaction.ts b/packages/elastic-apm-generator/src/lib/transaction.ts
index 14ed6ac1ea85e..f615f46710996 100644
--- a/packages/elastic-apm-generator/src/lib/transaction.ts
+++ b/packages/elastic-apm-generator/src/lib/transaction.ts
@@ -11,6 +11,8 @@ import { Fields } from './entity';
 import { generateEventId } from './utils/generate_id';
 
 export class Transaction extends BaseSpan {
+  private _sampled: boolean = true;
+
   constructor(fields: Fields) {
     super({
       ...fields,
@@ -19,19 +21,25 @@ export class Transaction extends BaseSpan {
       'transaction.sampled': true,
     });
   }
-  children(...children: BaseSpan[]) {
-    super.children(...children);
-    children.forEach((child) =>
-      child.defaults({
-        'transaction.id': this.fields['transaction.id'],
-        'parent.id': this.fields['transaction.id'],
-      })
-    );
-    return this;
-  }
 
   duration(duration: number) {
     this.fields['transaction.duration.us'] = duration * 1000;
     return this;
   }
+
+  sample(sampled: boolean = true) {
+    this._sampled = sampled;
+    return this;
+  }
+
+  serialize() {
+    const [transaction, ...spans] = super.serialize();
+
+    const events = [transaction];
+    if (this._sampled) {
+      events.push(...spans);
+    }
+
+    return events;
+  }
 }
diff --git a/packages/elastic-apm-generator/src/lib/utils/aggregate.ts b/packages/elastic-apm-generator/src/lib/utils/aggregate.ts
new file mode 100644
index 0000000000000..81b72f6fa01e9
--- /dev/null
+++ b/packages/elastic-apm-generator/src/lib/utils/aggregate.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 moment from 'moment';
+import { pickBy } from 'lodash';
+import objectHash from 'object-hash';
+import { Fields } from '../entity';
+import { createPicker } from './create_picker';
+
+export function aggregate(events: Fields[], fields: string[]) {
+  const picker = createPicker(fields);
+
+  const metricsets = new Map<string, { key: Fields; events: Fields[] }>();
+
+  function getMetricsetKey(span: Fields) {
+    const timestamp = moment(span['@timestamp']).valueOf();
+    return {
+      '@timestamp': timestamp - (timestamp % (60 * 1000)),
+      ...pickBy(span, picker),
+    };
+  }
+
+  for (const event of events) {
+    const key = getMetricsetKey(event);
+    const id = objectHash(key);
+
+    let metricset = metricsets.get(id);
+
+    if (!metricset) {
+      metricset = {
+        key: { ...key, 'processor.event': 'metric', 'processor.name': 'metric' },
+        events: [],
+      };
+      metricsets.set(id, metricset);
+    }
+
+    metricset.events.push(event);
+  }
+
+  return Array.from(metricsets.values());
+}
diff --git a/packages/elastic-apm-generator/src/lib/utils/create_picker.ts b/packages/elastic-apm-generator/src/lib/utils/create_picker.ts
new file mode 100644
index 0000000000000..7fce23b6fc966
--- /dev/null
+++ b/packages/elastic-apm-generator/src/lib/utils/create_picker.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+export function createPicker(fields: string[]) {
+  const wildcards = fields
+    .filter((field) => field.endsWith('.*'))
+    .map((field) => field.replace('*', ''));
+
+  return (value: unknown, key: string) => {
+    return fields.includes(key) || wildcards.some((field) => key.startsWith(field));
+  };
+}
diff --git a/packages/elastic-apm-generator/src/lib/utils/get_breakdown_metrics.ts b/packages/elastic-apm-generator/src/lib/utils/get_breakdown_metrics.ts
new file mode 100644
index 0000000000000..8eae0941c6bdd
--- /dev/null
+++ b/packages/elastic-apm-generator/src/lib/utils/get_breakdown_metrics.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 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 objectHash from 'object-hash';
+import { groupBy, pickBy } from 'lodash';
+import { Fields } from '../entity';
+import { createPicker } from './create_picker';
+
+const instanceFields = [
+  'container.*',
+  'kubernetes.*',
+  'agent.*',
+  'process.*',
+  'cloud.*',
+  'service.*',
+  'host.*',
+];
+
+const instancePicker = createPicker(instanceFields);
+
+const metricsetPicker = createPicker([
+  'transaction.type',
+  'transaction.name',
+  'span.type',
+  'span.subtype',
+]);
+
+export function getBreakdownMetrics(events: Fields[]) {
+  const txWithSpans = groupBy(
+    events.filter(
+      (event) => event['processor.event'] === 'span' || event['processor.event'] === 'transaction'
+    ),
+    (event) => event['transaction.id']
+  );
+
+  const metricsets: Map<string, Fields> = new Map();
+
+  Object.keys(txWithSpans).forEach((transactionId) => {
+    const txEvents = txWithSpans[transactionId];
+    const transaction = txEvents.find((event) => event['processor.event'] === 'transaction')!;
+
+    const eventsById: Record<string, Fields> = {};
+    const activityByParentId: Record<string, Array<{ from: number; to: number }>> = {};
+    for (const event of txEvents) {
+      const id =
+        event['processor.event'] === 'transaction' ? event['transaction.id'] : event['span.id'];
+      eventsById[id!] = event;
+
+      const parentId = event['parent.id'];
+
+      if (!parentId) {
+        continue;
+      }
+
+      if (!activityByParentId[parentId]) {
+        activityByParentId[parentId] = [];
+      }
+
+      const from = event['@timestamp']! * 1000;
+      const to =
+        from +
+        (event['processor.event'] === 'transaction'
+          ? event['transaction.duration.us']!
+          : event['span.duration.us']!);
+
+      activityByParentId[parentId].push({ from, to });
+    }
+
+    // eslint-disable-next-line guard-for-in
+    for (const id in eventsById) {
+      const event = eventsById[id];
+      const activities = activityByParentId[id] || [];
+
+      const timeStart = event['@timestamp']! * 1000;
+
+      let selfTime = 0;
+      let lastMeasurement = timeStart;
+      const changeTimestamps = [
+        ...new Set([
+          timeStart,
+          ...activities.flatMap((activity) => [activity.from, activity.to]),
+          timeStart +
+            (event['processor.event'] === 'transaction'
+              ? event['transaction.duration.us']!
+              : event['span.duration.us']!),
+        ]),
+      ];
+
+      for (const timestamp of changeTimestamps) {
+        const hasActiveChildren = activities.some(
+          (activity) => activity.from < timestamp && activity.to >= timestamp
+        );
+
+        if (!hasActiveChildren) {
+          selfTime += timestamp - lastMeasurement;
+        }
+
+        lastMeasurement = timestamp;
+      }
+
+      const key = {
+        '@timestamp': event['@timestamp']! - (event['@timestamp']! % (30 * 1000)),
+        'transaction.type': transaction['transaction.type'],
+        'transaction.name': transaction['transaction.name'],
+        ...pickBy(event, metricsetPicker),
+      };
+
+      const instance = pickBy(event, instancePicker);
+
+      const metricsetId = objectHash(key);
+
+      let metricset = metricsets.get(metricsetId);
+
+      if (!metricset) {
+        metricset = {
+          ...key,
+          ...instance,
+          'processor.event': 'metric',
+          'processor.name': 'metric',
+          'metricset.name': `span_breakdown`,
+          'span.self_time.count': 0,
+          'span.self_time.sum.us': 0,
+        };
+
+        if (event['processor.event'] === 'transaction') {
+          metricset['span.type'] = 'app';
+        } else {
+          metricset['span.type'] = event['span.type'];
+          metricset['span.subtype'] = event['span.subtype'];
+        }
+
+        metricsets.set(metricsetId, metricset);
+      }
+
+      metricset['span.self_time.count']!++;
+      metricset['span.self_time.sum.us']! += selfTime;
+    }
+  });
+
+  return Array.from(metricsets.values());
+}
diff --git a/packages/elastic-apm-generator/src/lib/utils/get_span_destination_metrics.ts b/packages/elastic-apm-generator/src/lib/utils/get_span_destination_metrics.ts
index 3740ad685735e..decf2f71a9be4 100644
--- a/packages/elastic-apm-generator/src/lib/utils/get_span_destination_metrics.ts
+++ b/packages/elastic-apm-generator/src/lib/utils/get_span_destination_metrics.ts
@@ -6,46 +6,34 @@
  * Side Public License, v 1.
  */
 
-import { pick } from 'lodash';
-import moment from 'moment';
-import objectHash from 'object-hash';
 import { Fields } from '../entity';
+import { aggregate } from './aggregate';
 
 export function getSpanDestinationMetrics(events: Fields[]) {
   const exitSpans = events.filter((event) => !!event['span.destination.service.resource']);
 
-  const metricsets = new Map<string, Fields>();
+  const metricsets = aggregate(exitSpans, [
+    'event.outcome',
+    'agent.name',
+    'service.environment',
+    'service.name',
+    'span.destination.service.resource',
+  ]);
 
-  function getSpanBucketKey(span: Fields) {
-    return {
-      '@timestamp': moment(span['@timestamp']).startOf('minute').valueOf(),
-      ...pick(span, [
-        'event.outcome',
-        'agent.name',
-        'service.environment',
-        'service.name',
-        'span.destination.service.resource',
-      ]),
-    };
-  }
-
-  for (const span of exitSpans) {
-    const key = getSpanBucketKey(span);
-    const id = objectHash(key);
+  return metricsets.map((metricset) => {
+    let count = 0;
+    let sum = 0;
 
-    let metricset = metricsets.get(id);
-    if (!metricset) {
-      metricset = {
-        ['processor.event']: 'metric',
-        ...key,
-        'span.destination.service.response_time.sum.us': 0,
-        'span.destination.service.response_time.count': 0,
-      };
-      metricsets.set(id, metricset);
+    for (const event of metricset.events) {
+      count++;
+      sum += event['span.duration.us']!;
     }
-    metricset['span.destination.service.response_time.count']! += 1;
-    metricset['span.destination.service.response_time.sum.us']! += span['span.duration.us']!;
-  }
 
-  return [...Array.from(metricsets.values())];
+    return {
+      ...metricset.key,
+      ['metricset.name']: 'span_destination',
+      'span.destination.service.response_time.sum.us': sum,
+      'span.destination.service.response_time.count': count,
+    };
+  });
 }
diff --git a/packages/elastic-apm-generator/src/lib/utils/get_transaction_metrics.ts b/packages/elastic-apm-generator/src/lib/utils/get_transaction_metrics.ts
index 62ecb9e20006f..4d46461c6dcc9 100644
--- a/packages/elastic-apm-generator/src/lib/utils/get_transaction_metrics.ts
+++ b/packages/elastic-apm-generator/src/lib/utils/get_transaction_metrics.ts
@@ -6,10 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { pick, sortBy } from 'lodash';
-import moment from 'moment';
-import objectHash from 'object-hash';
+import { sortBy } from 'lodash';
 import { Fields } from '../entity';
+import { aggregate } from './aggregate';
 
 function sortAndCompressHistogram(histogram?: { values: number[]; counts: number[] }) {
   return sortBy(histogram?.values).reduce(
@@ -30,60 +29,45 @@ function sortAndCompressHistogram(histogram?: { values: number[]; counts: number
 }
 
 export function getTransactionMetrics(events: Fields[]) {
-  const transactions = events.filter((event) => event['processor.event'] === 'transaction');
+  const transactions = events
+    .filter((event) => event['processor.event'] === 'transaction')
+    .map((transaction) => {
+      return {
+        ...transaction,
+        ['trace.root']: transaction['parent.id'] === undefined,
+      };
+    });
 
-  const metricsets = new Map<string, Fields>();
+  const metricsets = aggregate(transactions, [
+    'trace.root',
+    'transaction.name',
+    'transaction.type',
+    'event.outcome',
+    'transaction.result',
+    'agent.name',
+    'service.environment',
+    'service.name',
+    'service.version',
+    'host.name',
+    'container.id',
+    'kubernetes.pod.name',
+  ]);
 
-  function getTransactionBucketKey(transaction: Fields) {
-    return {
-      '@timestamp': moment(transaction['@timestamp']).startOf('minute').valueOf(),
-      'trace.root': transaction['parent.id'] === undefined,
-      ...pick(transaction, [
-        'transaction.name',
-        'transaction.type',
-        'event.outcome',
-        'transaction.result',
-        'agent.name',
-        'service.environment',
-        'service.name',
-        'service.version',
-        'host.name',
-        'container.id',
-        'kubernetes.pod.name',
-      ]),
+  return metricsets.map((metricset) => {
+    const histogram = {
+      values: [] as number[],
+      counts: [] as number[],
     };
-  }
 
-  for (const transaction of transactions) {
-    const key = getTransactionBucketKey(transaction);
-    const id = objectHash(key);
-    let metricset = metricsets.get(id);
-    if (!metricset) {
-      metricset = {
-        ...key,
-        ['processor.event']: 'metric',
-        'transaction.duration.histogram': {
-          values: [],
-          counts: [],
-        },
-      };
-      metricsets.set(id, metricset);
+    for (const transaction of metricset.events) {
+      histogram.counts.push(1);
+      histogram.values.push(Number(transaction['transaction.duration.us']));
     }
-    metricset['transaction.duration.histogram']?.counts.push(1);
-    metricset['transaction.duration.histogram']?.values.push(
-      Number(transaction['transaction.duration.us'])
-    );
-  }
 
-  return [
-    ...Array.from(metricsets.values()).map((metricset) => {
-      return {
-        ...metricset,
-        ['transaction.duration.histogram']: sortAndCompressHistogram(
-          metricset['transaction.duration.histogram']
-        ),
-        _doc_count: metricset['transaction.duration.histogram']!.values.length,
-      };
-    }),
-  ];
+    return {
+      ...metricset.key,
+      'transaction.duration.histogram': sortAndCompressHistogram(histogram),
+      _doc_count: metricset.events.length,
+    };
+  });
 }
diff --git a/packages/elastic-apm-generator/src/scripts/examples/01_simple_trace.ts b/packages/elastic-apm-generator/src/scripts/examples/01_simple_trace.ts
index eef3e6cc40560..7aae2986919c8 100644
--- a/packages/elastic-apm-generator/src/scripts/examples/01_simple_trace.ts
+++ b/packages/elastic-apm-generator/src/scripts/examples/01_simple_trace.ts
@@ -7,17 +7,18 @@
  */
 
 import { service, timerange, getTransactionMetrics, getSpanDestinationMetrics } from '../..';
+import { getBreakdownMetrics } from '../../lib/utils/get_breakdown_metrics';
 
 export function simpleTrace(from: number, to: number) {
   const instance = service('opbeans-go', 'production', 'go').instance('instance');
 
   const range = timerange(from, to);
 
-  const transactionName = '100rpm (75% success) failed 1000ms';
+  const transactionName = '100rpm (80% success) failed 1000ms';
 
   const successfulTraceEvents = range
-    .interval('1m')
-    .rate(75)
+    .interval('30s')
+    .rate(40)
     .flatMap((timestamp) =>
       instance
         .transaction(transactionName)
@@ -31,14 +32,14 @@ export function simpleTrace(from: number, to: number) {
             .success()
             .destination('elasticsearch')
             .timestamp(timestamp),
-          instance.span('custom_operation', 'app').duration(50).success().timestamp(timestamp)
+          instance.span('custom_operation', 'custom').duration(100).success().timestamp(timestamp)
         )
         .serialize()
     );
 
   const failedTraceEvents = range
-    .interval('1m')
-    .rate(25)
+    .interval('30s')
+    .rate(10)
     .flatMap((timestamp) =>
       instance
         .transaction(transactionName)
@@ -50,5 +51,10 @@ export function simpleTrace(from: number, to: number) {
 
   const events = successfulTraceEvents.concat(failedTraceEvents);
 
-  return events.concat(getTransactionMetrics(events)).concat(getSpanDestinationMetrics(events));
+  return [
+    ...events,
+    ...getTransactionMetrics(events),
+    ...getSpanDestinationMetrics(events),
+    ...getBreakdownMetrics(events),
+  ];
 }
diff --git a/packages/elastic-apm-generator/src/test/scenarios/01_simple_trace.test.ts b/packages/elastic-apm-generator/src/test/scenarios/01_simple_trace.test.ts
index 6bae70507dcbe..733093ce0a71c 100644
--- a/packages/elastic-apm-generator/src/test/scenarios/01_simple_trace.test.ts
+++ b/packages/elastic-apm-generator/src/test/scenarios/01_simple_trace.test.ts
@@ -68,6 +68,7 @@ describe('simple trace', () => {
     expect(transaction).toEqual({
       '@timestamp': 1609459200000,
       'agent.name': 'java',
+      'container.id': 'instance-1',
       'event.outcome': 'success',
       'processor.event': 'transaction',
       'processor.name': 'transaction',
@@ -89,6 +90,7 @@ describe('simple trace', () => {
     expect(span).toEqual({
       '@timestamp': 1609459200050,
       'agent.name': 'java',
+      'container.id': 'instance-1',
       'event.outcome': 'success',
       'parent.id': 'e7433020f2745625',
       'processor.event': 'span',
diff --git a/packages/elastic-apm-generator/src/test/scenarios/04_breakdown_metrics.test.ts b/packages/elastic-apm-generator/src/test/scenarios/04_breakdown_metrics.test.ts
new file mode 100644
index 0000000000000..aeb944f35faf6
--- /dev/null
+++ b/packages/elastic-apm-generator/src/test/scenarios/04_breakdown_metrics.test.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 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 { sumBy } from 'lodash';
+import { Fields } from '../../lib/entity';
+import { service } from '../../lib/service';
+import { timerange } from '../../lib/timerange';
+import { getBreakdownMetrics } from '../../lib/utils/get_breakdown_metrics';
+
+describe('breakdown metrics', () => {
+  let events: Fields[];
+
+  const LIST_RATE = 2;
+  const LIST_SPANS = 2;
+  const ID_RATE = 4;
+  const ID_SPANS = 2;
+  const INTERVALS = 6;
+
+  beforeEach(() => {
+    const javaService = service('opbeans-java', 'production', 'java');
+    const javaInstance = javaService.instance('instance-1');
+
+    const start = new Date('2021-01-01T00:00:00.000Z').getTime();
+
+    const range = timerange(start, start + INTERVALS * 30 * 1000 - 1);
+
+    events = getBreakdownMetrics([
+      ...range
+        .interval('30s')
+        .rate(LIST_RATE)
+        .flatMap((timestamp) =>
+          javaInstance
+            .transaction('GET /api/product/list')
+            .timestamp(timestamp)
+            .duration(1000)
+            .children(
+              javaInstance
+                .span('GET apm-*/_search', 'db', 'elasticsearch')
+                .timestamp(timestamp + 150)
+                .duration(500),
+              javaInstance.span('GET foo', 'db', 'redis').timestamp(timestamp).duration(100)
+            )
+            .serialize()
+        ),
+      ...range
+        .interval('30s')
+        .rate(ID_RATE)
+        .flatMap((timestamp) =>
+          javaInstance
+            .transaction('GET /api/product/:id')
+            .timestamp(timestamp)
+            .duration(1000)
+            .children(
+              javaInstance
+                .span('GET apm-*/_search', 'db', 'elasticsearch')
+                .duration(500)
+                .timestamp(timestamp + 100)
+                .children(
+                  javaInstance
+                    .span('bar', 'external', 'http')
+                    .timestamp(timestamp + 200)
+                    .duration(100)
+                )
+            )
+            .serialize()
+        ),
+    ]).filter((event) => event['processor.event'] === 'metric');
+  });
+
+  it('generates the right amount of breakdown metrics', () => {
+    expect(events.length).toBe(INTERVALS * (LIST_SPANS + 1 + ID_SPANS + 1));
+  });
+
+  it('calculates breakdown metrics for the right amount of transactions and spans', () => {
+    expect(sumBy(events, (event) => event['span.self_time.count']!)).toBe(
+      INTERVALS * LIST_RATE * (LIST_SPANS + 1) + INTERVALS * ID_RATE * (ID_SPANS + 1)
+    );
+  });
+
+  it('generates app metricsets for transaction self time', () => {
+    expect(events.some((event) => event['span.type'] === 'app' && !event['span.subtype'])).toBe(
+      true
+    );
+  });
+
+  it('generates the right statistic', () => {
+    const elasticsearchSets = events.filter((event) => event['span.subtype'] === 'elasticsearch');
+
+    const expectedCountFromListTransaction = INTERVALS * LIST_RATE;
+
+    const expectedCountFromIdTransaction = INTERVALS * ID_RATE;
+
+    const expectedCount = expectedCountFromIdTransaction + expectedCountFromListTransaction;
+
+    expect(sumBy(elasticsearchSets, (set) => set['span.self_time.count']!)).toBe(expectedCount);
+
+    expect(sumBy(elasticsearchSets, (set) => set['span.self_time.sum.us']!)).toBe(
+      expectedCountFromListTransaction * 500 * 1000 + expectedCountFromIdTransaction * 400 * 1000
+    );
+  });
+});
diff --git a/packages/elastic-apm-generator/src/test/scenarios/__snapshots__/01_simple_trace.test.ts.snap b/packages/elastic-apm-generator/src/test/scenarios/__snapshots__/01_simple_trace.test.ts.snap
index 6eec0ce38ba30..00a55cb87b125 100644
--- a/packages/elastic-apm-generator/src/test/scenarios/__snapshots__/01_simple_trace.test.ts.snap
+++ b/packages/elastic-apm-generator/src/test/scenarios/__snapshots__/01_simple_trace.test.ts.snap
@@ -5,6 +5,7 @@ Array [
   Object {
     "@timestamp": 1609459200000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -21,6 +22,7 @@ Array [
   Object {
     "@timestamp": 1609459200050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "36c16f18e75058f8",
     "processor.event": "span",
@@ -39,6 +41,7 @@ Array [
   Object {
     "@timestamp": 1609459260000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -55,6 +58,7 @@ Array [
   Object {
     "@timestamp": 1609459260050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "65ce74106eb050be",
     "processor.event": "span",
@@ -73,6 +77,7 @@ Array [
   Object {
     "@timestamp": 1609459320000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -89,6 +94,7 @@ Array [
   Object {
     "@timestamp": 1609459320050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "91fa709d90625fff",
     "processor.event": "span",
@@ -107,6 +113,7 @@ Array [
   Object {
     "@timestamp": 1609459380000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -123,6 +130,7 @@ Array [
   Object {
     "@timestamp": 1609459380050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "6c500d1d19835e68",
     "processor.event": "span",
@@ -141,6 +149,7 @@ Array [
   Object {
     "@timestamp": 1609459440000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -157,6 +166,7 @@ Array [
   Object {
     "@timestamp": 1609459440050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "1b3246cc83595869",
     "processor.event": "span",
@@ -175,6 +185,7 @@ Array [
   Object {
     "@timestamp": 1609459500000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -191,6 +202,7 @@ Array [
   Object {
     "@timestamp": 1609459500050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "12b49e3c83fe58d5",
     "processor.event": "span",
@@ -209,6 +221,7 @@ Array [
   Object {
     "@timestamp": 1609459560000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -225,6 +238,7 @@ Array [
   Object {
     "@timestamp": 1609459560050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "d9272009dd4354a1",
     "processor.event": "span",
@@ -243,6 +257,7 @@ Array [
   Object {
     "@timestamp": 1609459620000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -259,6 +274,7 @@ Array [
   Object {
     "@timestamp": 1609459620050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "bc52ca08063c505b",
     "processor.event": "span",
@@ -277,6 +293,7 @@ Array [
   Object {
     "@timestamp": 1609459680000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -293,6 +310,7 @@ Array [
   Object {
     "@timestamp": 1609459680050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "186858dd88b75d59",
     "processor.event": "span",
@@ -311,6 +329,7 @@ Array [
   Object {
     "@timestamp": 1609459740000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -327,6 +346,7 @@ Array [
   Object {
     "@timestamp": 1609459740050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "0d5f44d48189546c",
     "processor.event": "span",
@@ -345,6 +365,7 @@ Array [
   Object {
     "@timestamp": 1609459800000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -361,6 +382,7 @@ Array [
   Object {
     "@timestamp": 1609459800050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "7483e0606e435c83",
     "processor.event": "span",
@@ -379,6 +401,7 @@ Array [
   Object {
     "@timestamp": 1609459860000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -395,6 +418,7 @@ Array [
   Object {
     "@timestamp": 1609459860050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "f142c4cbc7f3568e",
     "processor.event": "span",
@@ -413,6 +437,7 @@ Array [
   Object {
     "@timestamp": 1609459920000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -429,6 +454,7 @@ Array [
   Object {
     "@timestamp": 1609459920050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "2e3a47fa2d905519",
     "processor.event": "span",
@@ -447,6 +473,7 @@ Array [
   Object {
     "@timestamp": 1609459980000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -463,6 +490,7 @@ Array [
   Object {
     "@timestamp": 1609459980050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "de5eaa1e47dc56b1",
     "processor.event": "span",
@@ -481,6 +509,7 @@ Array [
   Object {
     "@timestamp": 1609460040000,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "processor.event": "transaction",
     "processor.name": "transaction",
@@ -497,6 +526,7 @@ Array [
   Object {
     "@timestamp": 1609460040050,
     "agent.name": "java",
+    "container.id": "instance-1",
     "event.outcome": "success",
     "parent.id": "af7eac7ae61e576a",
     "processor.event": "span",
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts b/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts
index 089282d6f1c34..ec76e0d35e5c0 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_instances/get_service_instances_transaction_statistics.ts
@@ -109,6 +109,9 @@ export async function getServiceInstancesTransactionStatistics<
       filter: [
         { term: { [SERVICE_NAME]: serviceName } },
         { term: { [TRANSACTION_TYPE]: transactionType } },
+        ...getDocumentTypeFilterForAggregatedTransactions(
+          searchAggregatedTransactions
+        ),
         ...rangeQuery(start, end),
         ...environmentQuery(environment),
         ...kqlQuery(kuery),
diff --git a/x-pack/test/apm_api_integration/common/trace_data.ts b/x-pack/test/apm_api_integration/common/trace_data.ts
index 9c96d3fa1e0b0..84bbb4beea4f4 100644
--- a/x-pack/test/apm_api_integration/common/trace_data.ts
+++ b/x-pack/test/apm_api_integration/common/trace_data.ts
@@ -6,6 +6,7 @@
  */
 
 import {
+  getBreakdownMetrics,
   getSpanDestinationMetrics,
   getTransactionMetrics,
   toElasticsearchOutput,
@@ -20,7 +21,12 @@ export async function traceData(context: InheritedFtrProviderContext) {
   return {
     index: (events: any[]) => {
       const esEvents = toElasticsearchOutput(
-        events.concat(getTransactionMetrics(events)).concat(getSpanDestinationMetrics(events)),
+        [
+          ...events,
+          ...getTransactionMetrics(events),
+          ...getSpanDestinationMetrics(events),
+          ...getBreakdownMetrics(events),
+        ],
         '7.14.0'
       );
 
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts
index 2d165f4ceb902..cdf62053a821b 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts
@@ -8,6 +8,7 @@
 import expect from '@kbn/expect';
 import { pick, sortBy } from 'lodash';
 import moment from 'moment';
+import { service, timerange } from '@elastic/apm-generator';
 import { APIReturnType } from '../../../../plugins/apm/public/services/rest/createCallApmApi';
 import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
@@ -15,9 +16,12 @@ import archives from '../../common/fixtures/es_archiver/archives_metadata';
 import { registry } from '../../common/registry';
 
 import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
+import { ENVIRONMENT_ALL } from '../../../../plugins/apm/common/environment_filter_values';
+import { SERVICE_NODE_NAME_MISSING } from '../../../../plugins/apm/common/service_nodes';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const apmApiClient = getService('apmApiClient');
+  const traceData = getService('traceData');
 
   const archiveName = 'apm_8.0.0';
   const { start, end } = archives[archiveName];
@@ -278,4 +282,145 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
     }
   );
+
+  registry.when(
+    'Service overview instances main statistics when data is generated',
+    { config: 'basic', archives: ['apm_8.0.0_empty'] },
+    () => {
+      describe('for two go instances and one java instance', () => {
+        const GO_A_INSTANCE_RATE_SUCCESS = 10;
+        const GO_A_INSTANCE_RATE_FAILURE = 5;
+        const GO_B_INSTANCE_RATE_SUCCESS = 15;
+
+        const JAVA_INSTANCE_RATE = 20;
+
+        const rangeStart = new Date('2021-01-01T12:00:00.000Z').getTime();
+        const rangeEnd = new Date('2021-01-01T12:15:00.000Z').getTime() - 1;
+
+        before(async () => {
+          const goService = service('opbeans-go', 'production', 'go');
+          const javaService = service('opbeans-java', 'production', 'java');
+
+          const goInstanceA = goService.instance('go-instance-a');
+          const goInstanceB = goService.instance('go-instance-b');
+          const javaInstance = javaService.instance('java-instance');
+
+          const interval = timerange(rangeStart, rangeEnd).interval('1m');
+
+          // include exit spans to generate span_destination metrics
+          // that should not be included
+          function withSpans(timestamp: number) {
+            return new Array(3).fill(undefined).map(() =>
+              goInstanceA
+                .span('GET apm-*/_search', 'db', 'elasticsearch')
+                .timestamp(timestamp + 100)
+                .duration(300)
+                .destination('elasticsearch')
+                .success()
+            );
+          }
+
+          return traceData.index([
+            ...interval.rate(GO_A_INSTANCE_RATE_SUCCESS).flatMap((timestamp) =>
+              goInstanceA
+                .transaction('GET /api/product/list')
+                .success()
+                .duration(500)
+                .timestamp(timestamp)
+                .children(...withSpans(timestamp))
+                .serialize()
+            ),
+            ...interval.rate(GO_A_INSTANCE_RATE_FAILURE).flatMap((timestamp) =>
+              goInstanceA
+                .transaction('GET /api/product/list')
+                .failure()
+                .duration(500)
+                .timestamp(timestamp)
+                .children(...withSpans(timestamp))
+                .serialize()
+            ),
+            ...interval.rate(GO_B_INSTANCE_RATE_SUCCESS).flatMap((timestamp) =>
+              goInstanceB
+                .transaction('GET /api/product/list')
+                .success()
+                .duration(500)
+                .timestamp(timestamp)
+                .children(...withSpans(timestamp))
+                .serialize()
+            ),
+            ...interval.rate(JAVA_INSTANCE_RATE).flatMap((timestamp) =>
+              javaInstance
+                .transaction('GET /api/product/list')
+                .success()
+                .duration(500)
+                .timestamp(timestamp)
+                .children(...withSpans(timestamp))
+                .serialize()
+            ),
+          ]);
+        });
+
+        after(async () => {
+          return traceData.clean();
+        });
+
+        describe('for the go service', () => {
+          let body: APIReturnType<'GET /internal/apm/services/{serviceName}/service_overview_instances/main_statistics'>;
+
+          before(async () => {
+            body = (
+              await apmApiClient.readUser({
+                endpoint:
+                  'GET /internal/apm/services/{serviceName}/service_overview_instances/main_statistics',
+                params: {
+                  path: {
+                    serviceName: 'opbeans-go',
+                  },
+                  query: {
+                    start: new Date(rangeStart).toISOString(),
+                    end: new Date(rangeEnd + 1).toISOString(),
+                    environment: ENVIRONMENT_ALL.value,
+                    kuery: '',
+                    latencyAggregationType: LatencyAggregationType.avg,
+                    transactionType: 'request',
+                  },
+                },
+              })
+            ).body;
+          });
+
+          it('returns statistics for the go instances', () => {
+            const goAStats = body.currentPeriod.find(
+              (stat) => stat.serviceNodeName === 'go-instance-a'
+            );
+            const goBStats = body.currentPeriod.find(
+              (stat) => stat.serviceNodeName === 'go-instance-b'
+            );
+
+            expect(goAStats?.throughput).to.eql(
+              GO_A_INSTANCE_RATE_SUCCESS + GO_A_INSTANCE_RATE_FAILURE
+            );
+
+            expect(goBStats?.throughput).to.eql(GO_B_INSTANCE_RATE_SUCCESS);
+          });
+
+          it('does not return data for the java service', () => {
+            const javaStats = body.currentPeriod.find(
+              (stat) => stat.serviceNodeName === 'java-instance'
+            );
+
+            expect(javaStats).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
+            );
+
+            expect(missingNameStats).to.be(undefined);
+          });
+        });
+      });
+    }
+  );
 }

From 6d5354a99df279221166648fb6c5fa3381201d81 Mon Sep 17 00:00:00 2001
From: Clint Andrew Hall <clint.hall@elastic.co>
Date: Wed, 13 Oct 2021 12:50:20 -0500
Subject: [PATCH 031/117] [fleet][integrations] Provide Deployment Details on
 Cloud (#114287)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 ...-plugin-core-public.doclinksstart.links.md |   1 +
 .../public/doc_links/doc_links_service.ts     |   2 +
 src/core/public/public.api.md                 |   1 +
 x-pack/plugins/fleet/kibana.json              |   2 +-
 .../public/applications/integrations/app.tsx  |  77 ++++++-----
 .../header/deployment_details.component.tsx   | 120 ++++++++++++++++++
 .../header/deployment_details.stories.tsx     |  56 ++++++++
 .../components/header/deployment_details.tsx  |  51 ++++++++
 .../integrations/components/header/header.tsx |  32 +++++
 .../components/header/header_portal.tsx       |  35 +++++
 .../integrations/components/header/index.ts   |   8 ++
 .../applications/integrations/index.tsx       |   6 +-
 .../public/mock/create_test_renderer.tsx      |   4 +
 .../fleet/public/mock/plugin_dependencies.ts  |   2 +
 x-pack/plugins/fleet/public/plugin.ts         |   5 +
 .../plugins/fleet/storybook/context/cloud.ts  |  23 ++++
 .../fleet/storybook/context/doc_links.ts      |   1 +
 .../plugins/fleet/storybook/context/index.tsx |  27 +++-
 .../plugins/fleet/storybook/context/share.ts  |  22 ++++
 .../plugins/fleet/storybook/context/stubs.tsx |   4 +-
 x-pack/plugins/fleet/storybook/decorator.tsx  |   2 +-
 21 files changed, 436 insertions(+), 45 deletions(-)
 create mode 100644 x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.component.tsx
 create mode 100644 x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.stories.tsx
 create mode 100644 x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.tsx
 create mode 100644 x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx
 create mode 100644 x-pack/plugins/fleet/public/applications/integrations/components/header/header_portal.tsx
 create mode 100644 x-pack/plugins/fleet/public/applications/integrations/components/header/index.ts
 create mode 100644 x-pack/plugins/fleet/storybook/context/cloud.ts
 create mode 100644 x-pack/plugins/fleet/storybook/context/share.ts

diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
index 055cf213dea90..e79bc7a0db026 100644
--- a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
+++ b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
@@ -240,6 +240,7 @@ readonly links: {
             upgradeElasticAgent: string;
             upgradeElasticAgent712lower: string;
             learnMoreBlog: string;
+            apiKeysLearnMore: string;
         }>;
         readonly ecs: {
             readonly guide: string;
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
index 6039a0766a1a1..ac0aac3466f5f 100644
--- a/src/core/public/doc_links/doc_links_service.ts
+++ b/src/core/public/doc_links/doc_links_service.ts
@@ -482,6 +482,7 @@ export class DocLinksService {
           upgradeElasticAgent: `${FLEET_DOCS}upgrade-elastic-agent.html`,
           upgradeElasticAgent712lower: `${FLEET_DOCS}upgrade-elastic-agent.html#upgrade-7.12-lower`,
           learnMoreBlog: `${ELASTIC_WEBSITE_URL}blog/elastic-agent-and-fleet-make-it-easier-to-integrate-your-systems-with-elastic`,
+          apiKeysLearnMore: `${KIBANA_DOCS}api-keys.html`,
         },
         ecs: {
           guide: `${ELASTIC_WEBSITE_URL}guide/en/ecs/current/index.html`,
@@ -741,6 +742,7 @@ export interface DocLinksStart {
       upgradeElasticAgent: string;
       upgradeElasticAgent712lower: string;
       learnMoreBlog: string;
+      apiKeysLearnMore: string;
     }>;
     readonly ecs: {
       readonly guide: string;
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 7b0ec39d4a4d9..50c9bcf925969 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -709,6 +709,7 @@ export interface DocLinksStart {
             upgradeElasticAgent: string;
             upgradeElasticAgent712lower: string;
             learnMoreBlog: string;
+            apiKeysLearnMore: string;
         }>;
         readonly ecs: {
             readonly guide: string;
diff --git a/x-pack/plugins/fleet/kibana.json b/x-pack/plugins/fleet/kibana.json
index c4782156b1982..9de538ee91b8c 100644
--- a/x-pack/plugins/fleet/kibana.json
+++ b/x-pack/plugins/fleet/kibana.json
@@ -8,7 +8,7 @@
   "server": true,
   "ui": true,
   "configPath": ["xpack", "fleet"],
-  "requiredPlugins": ["licensing", "data", "encryptedSavedObjects", "navigation", "customIntegrations"],
+  "requiredPlugins": ["licensing", "data", "encryptedSavedObjects", "navigation", "customIntegrations", "share"],
   "optionalPlugins": ["security", "features", "cloud", "usageCollection", "home", "globalSearch"],
   "extraPublicDirs": ["common"],
   "requiredBundles": ["kibanaReact", "esUiShared", "home", "infra", "kibanaUtils"]
diff --git a/x-pack/plugins/fleet/public/applications/integrations/app.tsx b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
index 771b17ae8c3ee..c2f6f53627e38 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
@@ -40,6 +40,7 @@ import { EPMApp } from './sections/epm';
 import { DefaultLayout } from './layouts';
 import { PackageInstallProvider } from './hooks';
 import { useBreadcrumbs, UIExtensionsContext } from './hooks';
+import { IntegrationsHeader } from './components/header';
 
 const ErrorLayout = ({ children }: { children: JSX.Element }) => (
   <EuiErrorBoundary>
@@ -127,41 +128,53 @@ export const IntegrationsAppContext: React.FC<{
   history: AppMountParameters['history'];
   kibanaVersion: string;
   extensions: UIExtensionsStorage;
+  setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
   /** For testing purposes only */
   routerHistory?: History<any>; // TODO remove
-}> = memo(({ children, startServices, config, history, kibanaVersion, extensions }) => {
-  const isDarkMode = useObservable<boolean>(startServices.uiSettings.get$('theme:darkMode'));
+}> = memo(
+  ({
+    children,
+    startServices,
+    config,
+    history,
+    kibanaVersion,
+    extensions,
+    setHeaderActionMenu,
+  }) => {
+    const isDarkMode = useObservable<boolean>(startServices.uiSettings.get$('theme:darkMode'));
 
-  return (
-    <RedirectAppLinks application={startServices.application}>
-      <startServices.i18n.Context>
-        <KibanaContextProvider services={{ ...startServices }}>
-          <EuiErrorBoundary>
-            <ConfigContext.Provider value={config}>
-              <KibanaVersionContext.Provider value={kibanaVersion}>
-                <EuiThemeProvider darkMode={isDarkMode}>
-                  <UIExtensionsContext.Provider value={extensions}>
-                    <FleetStatusProvider>
-                      <startServices.customIntegrations.ContextProvider>
-                        <Router history={history}>
-                          <AgentPolicyContextProvider>
-                            <PackageInstallProvider notifications={startServices.notifications}>
-                              {children}
-                            </PackageInstallProvider>
-                          </AgentPolicyContextProvider>
-                        </Router>
-                      </startServices.customIntegrations.ContextProvider>
-                    </FleetStatusProvider>
-                  </UIExtensionsContext.Provider>
-                </EuiThemeProvider>
-              </KibanaVersionContext.Provider>
-            </ConfigContext.Provider>
-          </EuiErrorBoundary>
-        </KibanaContextProvider>
-      </startServices.i18n.Context>
-    </RedirectAppLinks>
-  );
-});
+    return (
+      <RedirectAppLinks application={startServices.application}>
+        <startServices.i18n.Context>
+          <KibanaContextProvider services={{ ...startServices }}>
+            <EuiErrorBoundary>
+              <ConfigContext.Provider value={config}>
+                <KibanaVersionContext.Provider value={kibanaVersion}>
+                  <EuiThemeProvider darkMode={isDarkMode}>
+                    <UIExtensionsContext.Provider value={extensions}>
+                      <FleetStatusProvider>
+                        <startServices.customIntegrations.ContextProvider>
+                          <Router history={history}>
+                            <AgentPolicyContextProvider>
+                              <PackageInstallProvider notifications={startServices.notifications}>
+                                <IntegrationsHeader {...{ setHeaderActionMenu }} />
+                                {children}
+                              </PackageInstallProvider>
+                            </AgentPolicyContextProvider>
+                          </Router>
+                        </startServices.customIntegrations.ContextProvider>
+                      </FleetStatusProvider>
+                    </UIExtensionsContext.Provider>
+                  </EuiThemeProvider>
+                </KibanaVersionContext.Provider>
+              </ConfigContext.Provider>
+            </EuiErrorBoundary>
+          </KibanaContextProvider>
+        </startServices.i18n.Context>
+      </RedirectAppLinks>
+    );
+  }
+);
 
 export const AppRoutes = memo(() => {
   const { modal, setModal } = useUrlModal();
diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.component.tsx b/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.component.tsx
new file mode 100644
index 0000000000000..1fa673890fa82
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.component.tsx
@@ -0,0 +1,120 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import styled from 'styled-components';
+
+import {
+  EuiPopover,
+  EuiText,
+  EuiForm,
+  EuiFormRow,
+  EuiFieldText,
+  EuiCopy,
+  EuiButtonIcon,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButton,
+  EuiLink,
+  EuiHeaderLink,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+export interface Props {
+  endpointUrl: string;
+  cloudId: string;
+  managementUrl?: string;
+  learnMoreUrl: string;
+}
+
+const Description = styled(EuiText)`
+  margin-bottom: ${({ theme }) => theme.eui.euiSizeL};
+`;
+
+export const DeploymentDetails = ({ endpointUrl, cloudId, learnMoreUrl, managementUrl }: Props) => {
+  const [isOpen, setIsOpen] = React.useState(false);
+
+  const button = (
+    <EuiHeaderLink onClick={() => setIsOpen(!isOpen)} iconType="iInCircle" iconSide="left" isActive>
+      {i18n.translate('xpack.fleet.integrations.deploymentButton', {
+        defaultMessage: 'View deployment details',
+      })}
+    </EuiHeaderLink>
+  );
+
+  const management = managementUrl ? (
+    <EuiFormRow label="API keys" fullWidth>
+      <EuiFlexGroup gutterSize="m" alignItems="center">
+        <EuiFlexItem>
+          <EuiButton href={managementUrl}>Create and manage API keys</EuiButton>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiLink external href={learnMoreUrl} target="_blank">
+            Learn more
+          </EuiLink>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiFormRow>
+  ) : null;
+
+  return (
+    <EuiPopover
+      isOpen={isOpen}
+      closePopover={() => setIsOpen(false)}
+      button={button}
+      anchorPosition="downCenter"
+    >
+      <div style={{ width: 450 }}>
+        <Description>
+          Send data to Elastic from your applications by referencing your deployment and
+          Elasticsearch information.
+        </Description>
+        <EuiForm component="div">
+          <EuiFormRow label="Elasticsearch endpoint" fullWidth isDisabled>
+            <EuiFlexGroup gutterSize="s">
+              <EuiFlexItem>
+                <EuiFieldText value={endpointUrl} fullWidth disabled />
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <EuiCopy textToCopy={endpointUrl}>
+                  {(copy) => (
+                    <EuiButtonIcon
+                      onClick={copy}
+                      iconType="copyClipboard"
+                      display="base"
+                      size="m"
+                    />
+                  )}
+                </EuiCopy>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFormRow>
+          <EuiFormRow label="Cloud ID" fullWidth>
+            <EuiFlexGroup gutterSize="s">
+              <EuiFlexItem>
+                <EuiFieldText value={cloudId} fullWidth disabled />
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <EuiCopy textToCopy={cloudId}>
+                  {(copy) => (
+                    <EuiButtonIcon
+                      onClick={copy}
+                      iconType="copyClipboard"
+                      display="base"
+                      size="m"
+                    />
+                  )}
+                </EuiCopy>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFormRow>
+          {management}
+        </EuiForm>
+      </div>
+    </EuiPopover>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.stories.tsx b/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.stories.tsx
new file mode 100644
index 0000000000000..445bf471c0fe9
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.stories.tsx
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import type { Meta } from '@storybook/react';
+import { EuiHeader } from '@elastic/eui';
+
+import { DeploymentDetails as ConnectedComponent } from './deployment_details';
+import type { Props as PureComponentProps } from './deployment_details.component';
+import { DeploymentDetails as PureComponent } from './deployment_details.component';
+
+export default {
+  title: 'Sections/EPM/Deployment Details',
+  description: '',
+  decorators: [
+    (storyFn) => {
+      const sections = [{ items: [] }, { items: [storyFn()] }];
+      return <EuiHeader sections={sections} />;
+    },
+  ],
+} as Meta;
+
+export const DeploymentDetails = () => {
+  return <ConnectedComponent />;
+};
+
+DeploymentDetails.args = {
+  isCloudEnabled: true,
+};
+
+DeploymentDetails.argTypes = {
+  isCloudEnabled: {
+    type: {
+      name: 'boolean',
+    },
+    defaultValue: true,
+    control: {
+      type: 'boolean',
+    },
+  },
+};
+
+export const Component = (props: PureComponentProps) => {
+  return <PureComponent {...props} />;
+};
+
+Component.args = {
+  cloudId: 'cloud-id',
+  endpointUrl: 'https://endpoint-url',
+  learnMoreUrl: 'https://learn-more-url',
+  managementUrl: 'https://management-url',
+};
diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.tsx b/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.tsx
new file mode 100644
index 0000000000000..48c8fa56fb91b
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.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 from 'react';
+
+import { useStartServices } from '../../hooks';
+
+import { DeploymentDetails as Component } from './deployment_details.component';
+
+export const DeploymentDetails = () => {
+  const { share, cloud, docLinks } = useStartServices();
+
+  // If the cloud plugin isn't enabled, we can't display the flyout.
+  if (!cloud) {
+    return null;
+  }
+
+  const { isCloudEnabled, cloudId, cname } = cloud;
+
+  // If cloud isn't enabled, we don't have a cloudId or a cname, we can't display the flyout.
+  if (!isCloudEnabled || !cloudId || !cname) {
+    return null;
+  }
+
+  // If the cname doesn't start with a known prefix, we can't display the flyout.
+  // TODO: dover - this is a short term solution, see https://github.com/elastic/kibana/pull/114287#issuecomment-940111026
+  if (
+    !(
+      cname.endsWith('elastic-cloud.com') ||
+      cname.endsWith('found.io') ||
+      cname.endsWith('found.no')
+    )
+  ) {
+    return null;
+  }
+
+  const cnameNormalized = cname.startsWith('.') ? cname.substring(1) : cname;
+  const endpointUrl = `https://${cloudId}.${cnameNormalized}`;
+
+  const managementUrl = share.url.locators
+    .get('MANAGEMENT_APP_LOCATOR')
+    ?.useUrl({ sectionId: 'security', appId: 'api_keys' });
+
+  const learnMoreUrl = docLinks.links.fleet.apiKeysLearnMore;
+
+  return <Component {...{ cloudId, endpointUrl, managementUrl, learnMoreUrl }} />;
+};
diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx b/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx
new file mode 100644
index 0000000000000..e87c63e98ef28
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx
@@ -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 React from 'react';
+import { EuiHeaderSectionItem, EuiHeaderSection, EuiHeaderLinks } from '@elastic/eui';
+
+import type { AppMountParameters } from 'kibana/public';
+
+import { HeaderPortal } from './header_portal';
+import { DeploymentDetails } from './deployment_details';
+
+export const IntegrationsHeader = ({
+  setHeaderActionMenu,
+}: {
+  setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
+}) => {
+  return (
+    <HeaderPortal {...{ setHeaderActionMenu }}>
+      <EuiHeaderSection grow={false}>
+        <EuiHeaderSectionItem>
+          <EuiHeaderLinks>
+            <DeploymentDetails />
+          </EuiHeaderLinks>
+        </EuiHeaderSectionItem>
+      </EuiHeaderSection>
+    </HeaderPortal>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/header/header_portal.tsx b/x-pack/plugins/fleet/public/applications/integrations/components/header/header_portal.tsx
new file mode 100644
index 0000000000000..d3dbbcf9628ec
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/components/header/header_portal.tsx
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { AppMountParameters } from 'kibana/public';
+import type { FC } from 'react';
+import React, { useEffect, useMemo } from 'react';
+import { createPortalNode, InPortal, OutPortal } from 'react-reverse-portal';
+
+import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
+
+export interface Props {
+  setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
+}
+
+export const HeaderPortal: FC<Props> = ({ children, setHeaderActionMenu }) => {
+  const portalNode = useMemo(() => createPortalNode(), []);
+
+  useEffect(() => {
+    setHeaderActionMenu((element) => {
+      const mount = toMountPoint(<OutPortal node={portalNode} />);
+      return mount(element);
+    });
+
+    return () => {
+      portalNode.unmount();
+      setHeaderActionMenu(undefined);
+    };
+  }, [portalNode, setHeaderActionMenu]);
+
+  return <InPortal node={portalNode}>{children}</InPortal>;
+};
diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/header/index.ts b/x-pack/plugins/fleet/public/applications/integrations/components/header/index.ts
new file mode 100644
index 0000000000000..e0a342326d972
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/components/header/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { IntegrationsHeader } from './header';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/index.tsx
index da8959a019ce5..0abb78f850076 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/index.tsx
@@ -37,6 +37,7 @@ interface IntegrationsAppProps {
   history: AppMountParameters['history'];
   kibanaVersion: string;
   extensions: UIExtensionsStorage;
+  setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
 }
 const IntegrationsApp = ({
   basepath,
@@ -45,6 +46,7 @@ const IntegrationsApp = ({
   history,
   kibanaVersion,
   extensions,
+  setHeaderActionMenu,
 }: IntegrationsAppProps) => {
   return (
     <IntegrationsAppContext
@@ -54,6 +56,7 @@ const IntegrationsApp = ({
       history={history}
       kibanaVersion={kibanaVersion}
       extensions={extensions}
+      setHeaderActionMenu={setHeaderActionMenu}
     >
       <WithPermissionsAndSetup>
         <AppRoutes />
@@ -64,7 +67,7 @@ const IntegrationsApp = ({
 
 export function renderApp(
   startServices: FleetStartServices,
-  { element, appBasePath, history }: AppMountParameters,
+  { element, appBasePath, history, setHeaderActionMenu }: AppMountParameters,
   config: FleetConfigType,
   kibanaVersion: string,
   extensions: UIExtensionsStorage
@@ -77,6 +80,7 @@ export function renderApp(
       history={history}
       kibanaVersion={kibanaVersion}
       extensions={extensions}
+      setHeaderActionMenu={setHeaderActionMenu}
     />,
     element
   );
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 d0724545ee902..a0a9ef405540a 100644
--- a/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
+++ b/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
@@ -41,6 +41,7 @@ export interface TestRenderer {
   kibanaVersion: string;
   AppWrapper: React.FC<any>;
   render: UiRender;
+  setHeaderActionMenu: Function;
 }
 
 export const createFleetTestRendererMock = (): TestRenderer => {
@@ -55,6 +56,7 @@ export const createFleetTestRendererMock = (): TestRenderer => {
     config: createConfigurationMock(),
     startInterface: createStartMock(extensions),
     kibanaVersion: '8.0.0',
+    setHeaderActionMenu: jest.fn(),
     AppWrapper: memo(({ children }) => {
       return (
         <FleetAppContext
@@ -96,6 +98,7 @@ export const createIntegrationsTestRendererMock = (): TestRenderer => {
     config: createConfigurationMock(),
     startInterface: createStartMock(extensions),
     kibanaVersion: '8.0.0',
+    setHeaderActionMenu: jest.fn(),
     AppWrapper: memo(({ children }) => {
       return (
         <IntegrationsAppContext
@@ -106,6 +109,7 @@ export const createIntegrationsTestRendererMock = (): TestRenderer => {
           kibanaVersion={testRendererMocks.kibanaVersion}
           extensions={extensions}
           routerHistory={testRendererMocks.history}
+          setHeaderActionMenu={() => {}}
         >
           {children}
         </IntegrationsAppContext>
diff --git a/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts b/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts
index f78fe58a6ad88..0bf0213905e72 100644
--- a/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts
+++ b/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts
@@ -10,6 +10,7 @@ import { licensingMock } from '../../../licensing/public/mocks';
 import { homePluginMock } from '../../../../../src/plugins/home/public/mocks';
 import { navigationPluginMock } from '../../../../../src/plugins/navigation/public/mocks';
 import { customIntegrationsMock } from '../../../../../src/plugins/custom_integrations/public/mocks';
+import { sharePluginMock } from '../../../../../src/plugins/share/public/mocks';
 
 import type { MockedFleetSetupDeps, MockedFleetStartDeps } from './types';
 
@@ -27,5 +28,6 @@ export const createStartDepsMock = (): MockedFleetStartDeps => {
     data: dataPluginMock.createStartContract(),
     navigation: navigationPluginMock.createStartContract(),
     customIntegrations: customIntegrationsMock.createStart(),
+    share: sharePluginMock.createStartContract(),
   };
 };
diff --git a/x-pack/plugins/fleet/public/plugin.ts b/x-pack/plugins/fleet/public/plugin.ts
index d23bfcfe7b888..e1f263b0763e8 100644
--- a/x-pack/plugins/fleet/public/plugin.ts
+++ b/x-pack/plugins/fleet/public/plugin.ts
@@ -21,6 +21,8 @@ import type {
   CustomIntegrationsSetup,
 } from 'src/plugins/custom_integrations/public';
 
+import type { SharePluginStart } from 'src/plugins/share/public';
+
 import { DEFAULT_APP_CATEGORIES, AppNavLinkStatus } from '../../../../src/core/public';
 
 import type {
@@ -81,10 +83,12 @@ export interface FleetStartDeps {
   data: DataPublicPluginStart;
   navigation: NavigationPublicPluginStart;
   customIntegrations: CustomIntegrationsStart;
+  share: SharePluginStart;
 }
 
 export interface FleetStartServices extends CoreStart, FleetStartDeps {
   storage: Storage;
+  share: SharePluginStart;
   cloud?: CloudSetup;
 }
 
@@ -134,6 +138,7 @@ export class FleetPlugin implements Plugin<FleetSetup, FleetStart, FleetSetupDep
           ...coreStartServices,
           ...startDepsServices,
           storage: this.storage,
+          cloud: deps.cloud,
         };
         const { renderApp, teardownIntegrations } = await import('./applications/integrations');
         const unmount = renderApp(startServices, params, config, kibanaVersion, extensions);
diff --git a/x-pack/plugins/fleet/storybook/context/cloud.ts b/x-pack/plugins/fleet/storybook/context/cloud.ts
new file mode 100644
index 0000000000000..bed72c8ac4db7
--- /dev/null
+++ b/x-pack/plugins/fleet/storybook/context/cloud.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { CloudSetup } from '../../../cloud/public';
+
+export const getCloud = ({ isCloudEnabled }: { isCloudEnabled: boolean }) => {
+  const cloud: CloudSetup = {
+    isCloudEnabled,
+    baseUrl: 'https://base.url',
+    cloudId: 'cloud-id',
+    cname: 'found.io',
+    deploymentUrl: 'https://deployment.url',
+    organizationUrl: 'https://organization.url',
+    profileUrl: 'https://profile.url',
+    snapshotsUrl: 'https://snapshots.url',
+  };
+
+  return cloud;
+};
diff --git a/x-pack/plugins/fleet/storybook/context/doc_links.ts b/x-pack/plugins/fleet/storybook/context/doc_links.ts
index 9b86ea03549f3..bb6d8086d1cd8 100644
--- a/x-pack/plugins/fleet/storybook/context/doc_links.ts
+++ b/x-pack/plugins/fleet/storybook/context/doc_links.ts
@@ -15,6 +15,7 @@ export const getDocLinks = () => {
       fleet: {
         learnMoreBlog:
           'https://www.elastic.co/blog/elastic-agent-and-fleet-make-it-easier-to-integrate-your-systems-with-elastic',
+        apiKeysLearnMore: 'https://www.elastic.co/guide/en/kibana/master/api-keys.html',
       },
     },
   } as unknown as DocLinksStart;
diff --git a/x-pack/plugins/fleet/storybook/context/index.tsx b/x-pack/plugins/fleet/storybook/context/index.tsx
index c9c8e0be5d883..e6c0726e755c2 100644
--- a/x-pack/plugins/fleet/storybook/context/index.tsx
+++ b/x-pack/plugins/fleet/storybook/context/index.tsx
@@ -28,6 +28,8 @@ import { getUiSettings } from './ui_settings';
 import { getNotifications } from './notifications';
 import { stubbedStartServices } from './stubs';
 import { getDocLinks } from './doc_links';
+import { getCloud } from './cloud';
+import { getShare } from './share';
 
 // TODO: clintandrewhall - this is not ideal, or complete.  The root context of Fleet applications
 // requires full start contracts of its dependencies.  As a result, we have to mock all of those contracts
@@ -36,6 +38,7 @@ import { getDocLinks } from './doc_links';
 //
 // Expect this to grow as components that are given Stories need access to mocked services.
 export const StorybookContext: React.FC<{ storyContext?: StoryContext }> = ({
+  storyContext,
   children: storyChildren,
 }) => {
   const basepath = '';
@@ -46,10 +49,12 @@ export const StorybookContext: React.FC<{ storyContext?: StoryContext }> = ({
     ...stubbedStartServices,
     application: getApplication(),
     chrome: getChrome(),
+    cloud: getCloud({ isCloudEnabled: storyContext?.args.isCloudEnabled }),
+    customIntegrations: {
+      ContextProvider: getStorybookContextProvider(),
+    },
     docLinks: getDocLinks(),
     http: getHttp(),
-    notifications: getNotifications(),
-    uiSettings: getUiSettings(),
     i18n: {
       Context: function I18nContext({ children }) {
         return <I18nProvider>{children}</I18nProvider>;
@@ -58,9 +63,9 @@ export const StorybookContext: React.FC<{ storyContext?: StoryContext }> = ({
     injectedMetadata: {
       getInjectedVar: () => null,
     },
-    customIntegrations: {
-      ContextProvider: getStorybookContextProvider(),
-    },
+    notifications: getNotifications(),
+    share: getShare(),
+    uiSettings: getUiSettings(),
   };
 
   setHttpClient(startServices.http);
@@ -81,12 +86,20 @@ export const StorybookContext: React.FC<{ storyContext?: StoryContext }> = ({
   } as unknown as FleetConfigType;
 
   const extensions = {};
-
   const kibanaVersion = '1.2.3';
+  const setHeaderActionMenu = () => {};
 
   return (
     <IntegrationsAppContext
-      {...{ kibanaVersion, basepath, config, history, startServices, extensions }}
+      {...{
+        kibanaVersion,
+        basepath,
+        config,
+        history,
+        startServices,
+        extensions,
+        setHeaderActionMenu,
+      }}
     >
       {storyChildren}
     </IntegrationsAppContext>
diff --git a/x-pack/plugins/fleet/storybook/context/share.ts b/x-pack/plugins/fleet/storybook/context/share.ts
new file mode 100644
index 0000000000000..b6a8dfbcdcb67
--- /dev/null
+++ b/x-pack/plugins/fleet/storybook/context/share.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 { SharePluginStart } from 'src/plugins/share/public';
+
+export const getShare = () => {
+  const share: SharePluginStart = {
+    url: {
+      locators: {
+        get: () => ({
+          useUrl: () => 'https://locator.url',
+        }),
+      },
+    },
+  } as unknown as SharePluginStart;
+
+  return share;
+};
diff --git a/x-pack/plugins/fleet/storybook/context/stubs.tsx b/x-pack/plugins/fleet/storybook/context/stubs.tsx
index a7db4bd8f68cd..f72b176bd8d7b 100644
--- a/x-pack/plugins/fleet/storybook/context/stubs.tsx
+++ b/x-pack/plugins/fleet/storybook/context/stubs.tsx
@@ -14,8 +14,7 @@ type Stubs =
   | 'fatalErrors'
   | 'navigation'
   | 'overlays'
-  | 'savedObjects'
-  | 'cloud';
+  | 'savedObjects';
 
 type StubbedStartServices = Pick<FleetStartServices, Stubs>;
 
@@ -27,5 +26,4 @@ export const stubbedStartServices: StubbedStartServices = {
   navigation: {} as FleetStartServices['navigation'],
   overlays: {} as FleetStartServices['overlays'],
   savedObjects: {} as FleetStartServices['savedObjects'],
-  cloud: {} as FleetStartServices['cloud'],
 };
diff --git a/x-pack/plugins/fleet/storybook/decorator.tsx b/x-pack/plugins/fleet/storybook/decorator.tsx
index 8e68249809574..93870809c94bb 100644
--- a/x-pack/plugins/fleet/storybook/decorator.tsx
+++ b/x-pack/plugins/fleet/storybook/decorator.tsx
@@ -11,5 +11,5 @@ import type { DecoratorFn } from '@storybook/react';
 import { StorybookContext } from './context';
 
 export const decorator: DecoratorFn = (story, storybook) => {
-  return <StorybookContext>{story()}</StorybookContext>;
+  return <StorybookContext storyContext={storybook}>{story()}</StorybookContext>;
 };

From 5de36a8229e563a1920bef28b37c49a4231b4098 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Wed, 13 Oct 2021 12:50:35 -0500
Subject: [PATCH 032/117] [kbn/optimizer] fix --update-limit docs (#114840)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 packages/kbn-optimizer/src/cli.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kbn-optimizer/src/cli.ts b/packages/kbn-optimizer/src/cli.ts
index 7f0c39ccd0e55..41ca656259fc6 100644
--- a/packages/kbn-optimizer/src/cli.ts
+++ b/packages/kbn-optimizer/src/cli.ts
@@ -207,7 +207,7 @@ export function runKbnOptimizerCli(options: { defaultLimitsPath: string }) {
           --no-inspect-workers  when inspecting the parent process, don't inspect the workers
           --limits           path to a limits.yml file to read, defaults to $KBN_OPTIMIZER_LIMITS_PATH or source file
           --validate-limits  validate the limits.yml config to ensure that there are limits defined for every bundle
-          --update-limits    run a build and rewrite the limits file to include the current bundle sizes +5kb
+          --update-limits    run a build and rewrite the limits file to include the current bundle sizes +15kb
         `,
       },
     }

From 6d24de9d6eaf95d115a250e70eacf3ae7d1e76f6 Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Wed, 13 Oct 2021 12:00:15 -0600
Subject: [PATCH 033/117] [Stack Monitoring] Fix shard size alerts (#114357)

* [Stack Monitoring] Fix shard size alerts

* Removing the source filter for source_node.*

* Removing superfluous types

* Removing superfluous nodeId and nodeName from test
---
 x-pack/plugins/monitoring/common/types/alerts.ts  |  4 +++-
 .../server/alerts/large_shard_size_rule.test.ts   |  4 ----
 .../server/lib/alerts/fetch_index_shard_size.ts   | 15 +++------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/x-pack/plugins/monitoring/common/types/alerts.ts b/x-pack/plugins/monitoring/common/types/alerts.ts
index bbd217169469d..9abca4cbdc948 100644
--- a/x-pack/plugins/monitoring/common/types/alerts.ts
+++ b/x-pack/plugins/monitoring/common/types/alerts.ts
@@ -208,9 +208,11 @@ export interface CCRReadExceptionsUIMeta extends CCRReadExceptionsStats {
   itemLabel: string;
 }
 
-export interface IndexShardSizeStats extends AlertNodeStats {
+export interface IndexShardSizeStats {
   shardIndex: string;
   shardSize: number;
+  clusterUuid: string;
+  ccs?: string;
 }
 
 export interface IndexShardSizeUIMeta extends IndexShardSizeStats {
diff --git a/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.test.ts
index 0b8509c4fa56a..f7d6081edd306 100644
--- a/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.test.ts
@@ -85,14 +85,10 @@ describe('LargeShardSizeRule', () => {
     const shardSize = 0;
     const clusterUuid = 'abc123';
     const clusterName = 'testCluster';
-    const nodeId = 'myNodeId';
-    const nodeName = 'myNodeName';
     const stat = {
       shardIndex,
       shardSize,
       clusterUuid,
-      nodeId,
-      nodeName,
     };
 
     const replaceState = jest.fn();
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.ts
index 98bb546b43ab9..9259adc63e546 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.ts
@@ -11,12 +11,8 @@ import { ElasticsearchIndexStats, ElasticsearchResponseHit } from '../../../comm
 import { ESGlobPatterns, RegExPatterns } from '../../../common/es_glob_patterns';
 import { Globals } from '../../static_globals';
 
-interface SourceNode {
-  name: string;
-  uuid: string;
-}
 type TopHitType = ElasticsearchResponseHit & {
-  _source: { index_stats?: Partial<ElasticsearchIndexStats>; source_node?: SourceNode };
+  _source: { index_stats?: Partial<ElasticsearchIndexStats> };
 };
 
 const memoizedIndexPatterns = (globPatterns: string) => {
@@ -90,8 +86,6 @@ export async function fetchIndexShardSize(
                         '_index',
                         'index_stats.shards.primaries',
                         'index_stats.primaries.store.size_in_bytes',
-                        'source_node.name',
-                        'source_node.uuid',
                       ],
                     },
                     size: 1,
@@ -135,10 +129,10 @@ export async function fetchIndexShardSize(
       }
       const {
         _index: monitoringIndexName,
-        _source: { source_node: sourceNode, index_stats: indexStats },
+        _source: { index_stats: indexStats },
       } = topHit;
 
-      if (!indexStats || !indexStats.primaries || !sourceNode) {
+      if (!indexStats || !indexStats.primaries) {
         continue;
       }
 
@@ -151,7 +145,6 @@ export async function fetchIndexShardSize(
        * We can only calculate the average primary shard size at this point, since we don't have
        * data (in .monitoring-es* indices) to give us individual shards. This might change in the future
        */
-      const { name: nodeName, uuid: nodeId } = sourceNode;
       const avgShardSize = primaryShardSizeBytes / totalPrimaryShards;
       if (avgShardSize < thresholdBytes) {
         continue;
@@ -161,8 +154,6 @@ export async function fetchIndexShardSize(
         shardIndex,
         shardSize,
         clusterUuid,
-        nodeName,
-        nodeId,
         ccs: monitoringIndexName.includes(':') ? monitoringIndexName.split(':')[0] : undefined,
       });
     }

From feed7391a0cd0909e1eefb1953c4a8fc81328118 Mon Sep 17 00:00:00 2001
From: Stacey Gammon <gammon@elastic.co>
Date: Wed, 13 Oct 2021 14:01:46 -0400
Subject: [PATCH 034/117] Update kibana_platform_plugin_intro with more details
 on packages vs plugins (#114713)

* Update kibana_platform_plugin_intro.mdx

* updates

* Update kibana_platform_plugin_intro.mdx

* Update kibana_platform_plugin_intro.mdx

* Update kibana_platform_plugin_intro.mdx

* Update dev_docs/key_concepts/kibana_platform_plugin_intro.mdx

Co-authored-by: Tyler Smalley <tylersmalley@gmail.com>

* Update dev_docs/key_concepts/kibana_platform_plugin_intro.mdx

Co-authored-by: Tyler Smalley <tylersmalley@gmail.com>

* Update dev_docs/key_concepts/kibana_platform_plugin_intro.mdx

Co-authored-by: Tyler Smalley <tylersmalley@gmail.com>

* Update dev_docs/key_concepts/kibana_platform_plugin_intro.mdx

Co-authored-by: Brandon Kobel <brandon.kobel@gmail.com>

* Update dev_docs/key_concepts/kibana_platform_plugin_intro.mdx

Co-authored-by: Brandon Kobel <brandon.kobel@gmail.com>

Co-authored-by: Tyler Smalley <tylersmalley@gmail.com>
Co-authored-by: Brandon Kobel <brandon.kobel@gmail.com>
---
 .../kibana_platform_plugin_intro.mdx          | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/dev_docs/key_concepts/kibana_platform_plugin_intro.mdx b/dev_docs/key_concepts/kibana_platform_plugin_intro.mdx
index 133b96f44da88..737b9d8708f29 100644
--- a/dev_docs/key_concepts/kibana_platform_plugin_intro.mdx
+++ b/dev_docs/key_concepts/kibana_platform_plugin_intro.mdx
@@ -33,13 +33,28 @@ At a super high-level, Kibana is composed of **plugins**, **core**, and **Kibana
 
 <DocAccordion buttonContent="(Internal only) FAQ: Should I put my code in a plugin or a package?" color="warning">
 <DocCallOut color="warning">
-If it's stateful, it has to go in a plugin, but packages are often a good choices for stateless utilities. Stateless code exported publicly from a plugin will increase the page load bundle size of _every single page_, even if none of those plugin's services are actually needed. With packages, however, only code that is needed for the current page is downloaded.
+When the [Bazel migration](https://github.com/elastic/kibana/blob/master/legacy_rfcs/text/0015_bazel.md) is complete, all code, including plugins, will be a package. With that, packages won't be required to be in the `packages/` directory and can be located somewhere that makes more sense structurally.
 
-The downside however is that the packages folder is far away from the plugins folder so having a part of your code in a plugin and the rest in a package may make it hard to find, leading to duplication.
+In the meantime, the following can be used to determine whether it makes sense to add code to a package inside the `packages` folder, or a plugin inside `src/plugins` or `x-pack/plugins`. 
 
-The Operations team hopes to resolve this conundrum by supporting co-located packages and plugins and automatically putting all stateless code inside a package. You can track this work by following [this issue](https://github.com/elastic/kibana/issues/112886).
 
-Until then, consider whether it makes sense to logically separate the code, and consider the size of the exports, when determining whether you should put stateless public exports in a package or a plugin.
+**If the code is stateful, it has to be exposed from a plugin's <DocLink id="kibPlatformIntro" section="lifecycle-methods" text="lifecycle methods"/>. Do not statically export stateful code.**
+
+Benefits to packages:
+
+1. <b>_Potentially_ reduced page load time</b>. All code that is statically exported from plugins will be downloaded on _every single page load_, even if that code isn't needed. With packages, only code that is imported is downloaded, which can be minimized by using async imports.
+2. <b>Puts the consumer is in charge of how and when to async import</b>. If a consumer async imports code exported from a plugin, it makes no difference, because of the above point. It's already been downloaded. However, simply moving code into a package is _not_ a guaranteed performance improvement. It does give the consumer the power to make smart performance choices, however. If they require code from multiple packages, the consumer can async import from multiple packages at the same time. Read more in our <DocLink id="kibDevPerformance" text="performance docs"/>.
+
+Downsides to packages:
+
+1. <b>It's not <DocLink id="kibDevPrinciples" text="organized by domain"/></b>. The packages folder is far away from the plugins folder. Having your stateless code in a plugin and the rest in a package may make it hard to find, leading to duplication. The Operations team hopes to fix this by supporting packages and plugins existing in the same folder. You can track this work by following [this issue](https://github.com/elastic/kibana/issues/112886).
+
+2. <b>Development overhead</b>. Developers have to run `yarn kbn watch` to have changes rebuilt automatically. [Phase II](https://github.com/elastic/kibana/blob/master/legacy_rfcs/text/0015_bazel.md#phase-ii---docs-developer-experience) of the Bazel migration work will bring the development experience on par with plugin development. This work can be tracked [here](https://github.com/elastic/kibana/issues/104519). 
+
+3. <b>Development performance</b>. Rebuild time is typically longer than it would be for the same code in a plugin. The reasons are captured in [this issue](https://github.com/elastic/kibana/issues/107648). The ops team is actively working to reduce this performance increase.
+
+
+As you can see, the answer to "Should I put my code in a plugin or a package" is 'It Depends'. If you are still having a hard time determining what the best path location is, reach out to the Kibana Operations Team (#kibana-operations) for help.
 
 </DocCallOut>
 </DocAccordion>

From dab5a59fc294061dd1a8a35811573d09285741cb Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 13 Oct 2021 18:25:23 +0000
Subject: [PATCH 035/117] skip suite failing es promotion (#114885)

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

diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/package.ts b/x-pack/test/security_solution_endpoint_api_int/apis/package.ts
index a8fd5a612b306..fdacc07426871 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/package.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/package.ts
@@ -66,7 +66,8 @@ export default function ({ getService }: FtrProviderContext) {
     });
   };
 
-  describe('Endpoint package', () => {
+  // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/114885
+  describe.skip('Endpoint package', () => {
     describe('network processors', () => {
       let networkIndexData: InsertedEvents;
 

From 21f45283be5712b494ed60f0630b2828c2807e9a Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Wed, 13 Oct 2021 13:29:50 -0500
Subject: [PATCH 036/117] [DOCS] Documents
 monitoring.cluster_alerts.allowedSpaces (#114669)

* [DOCS] Documents monitoring.cluster_alerts.allowedSpaces

* Update docs/settings/spaces-settings.asciidoc

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>

Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com>
---
 docs/settings/spaces-settings.asciidoc | 29 ++++++++++++++------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/docs/settings/spaces-settings.asciidoc b/docs/settings/spaces-settings.asciidoc
index 30b7beceb70ba..969adb93185d0 100644
--- a/docs/settings/spaces-settings.asciidoc
+++ b/docs/settings/spaces-settings.asciidoc
@@ -5,20 +5,23 @@
 <titleabbrev>Spaces settings</titleabbrev>
 ++++
 
-By default, Spaces is enabled in Kibana, and you can secure Spaces using
-roles when Security is enabled.
-
-[float]
-[[spaces-settings]]
-==== Spaces settings
+By default, spaces is enabled in {kib}. To secure spaces, <<security-settings-kb,enable security>>.
 
 `xpack.spaces.enabled`::
-deprecated:[7.16.0,"In 8.0 and later, this setting will no longer be supported."]
-Set to `true` (default) to enable Spaces in {kib}.
-This setting is deprecated. Starting in 8.0, it will not be possible to disable this plugin.
+deprecated:[7.16.0,"In 8.0 and later, this setting will no longer be supported and it will not be possible to disable this plugin."]
+To enable spaces, set to `true`. 
+The default is `true`.
 
 `xpack.spaces.maxSpaces`::
-The maximum amount of Spaces that can be used with this instance of {kib}. Some operations
-in {kib} return all spaces using a single `_search` from {es}, so this must be
-set lower than the `index.max_result_window` in {es}.
-Defaults to `1000`.
+The maximum number of spaces that you can use with the {kib} instance. Some {kib} operations
+return all spaces using a single `_search` from {es}, so you must
+configure this setting lower than the `index.max_result_window` in {es}.
+The default is `1000`.
+
+`monitoring.cluster_alerts-allowedSpaces` {ess-icon}:: 
+Specifies the spaces where cluster alerts are automatically generated. 
+You must specify all spaces where you want to generate alerts, including the default space. 
+When the default space is unspecified, {kib} is unable to generate an alert for the default space.
+{es} clusters that run on {es} services are all containers. To send monitoring data 
+from your self-managed {es} installation to {es} services, set to `false`. 
+The default is `true`.

From 95cd74d7fa744afec65e9fe72ceaf7abda30e262 Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Wed, 13 Oct 2021 19:35:51 +0100
Subject: [PATCH 037/117] [ML] Using data views service for loading data views
 (#113961)

* [ML] Using data views service for loading data views

* removing more saved object client uses

* removing IIndexPattern use

* removing IndexPattern use

* removing more depricated types

* fixing teste

* fixing index pattern loading

* tiny refactor

* fixing rollup index test

* changes based on review

* adding size to find calls

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 x-pack/plugins/ml/common/types/kibana.ts      |   2 -
 x-pack/plugins/ml/kibana.json                 |   1 +
 x-pack/plugins/ml/public/application/app.tsx  |   1 +
 .../components/data_grid/common.ts            |  17 +-
 .../data_recognizer/data_recognizer.d.ts      |   4 +-
 .../full_time_range_selector.test.tsx         |  10 +-
 .../full_time_range_selector.tsx              |   7 +-
 .../full_time_range_selector_service.ts       |   6 +-
 .../scatterplot_matrix/scatterplot_matrix.tsx |   4 +-
 .../use_scatterplot_field_options.ts          |   4 +-
 .../contexts/ml/__mocks__/index_pattern.ts    |   4 +-
 .../contexts/ml/__mocks__/index_patterns.ts   |   4 +-
 .../application/contexts/ml/ml_context.ts     |   6 +-
 .../common/use_results_view_config.ts         |   6 +-
 .../hooks/use_index_data.ts                   |   7 +-
 .../expandable_section_results.tsx            |   4 +-
 .../exploration_query_bar.tsx                 |   4 +-
 .../exploration_results_table.tsx             |   4 +-
 .../use_exploration_results.ts                |   4 +-
 .../outlier_exploration/use_outlier_data.ts   |   4 +-
 .../action_clone/clone_action_name.tsx        |  21 +--
 .../action_delete/delete_action_name.test.tsx |   2 +-
 .../action_delete/use_delete_action.tsx       |  21 +--
 .../source_selection.test.tsx                 |   1 +
 .../index_based/data_loader/data_loader.ts    |   9 +-
 .../explorer_query_bar/explorer_query_bar.tsx |   6 +-
 .../custom_url_editor/editor.test.tsx         |   4 +-
 .../components/custom_url_editor/editor.tsx   |   4 +-
 .../components/custom_url_editor/utils.d.ts   |   4 +-
 .../edit_job_flyout/edit_utils.d.ts           |   4 +-
 .../components/edit_job_flyout/edit_utils.js  |  28 +--
 .../edit_job_flyout/tabs/custom_urls.tsx      |   4 +-
 .../common/chart_loader/chart_loader.ts       |   4 +-
 .../new_job/common/index_pattern_context.ts   |   4 +-
 .../job_creator/advanced_job_creator.ts       |   8 +-
 .../job_creator/categorization_job_creator.ts |   8 +-
 .../new_job/common/job_creator/job_creator.ts |  10 +-
 .../common/job_creator/job_creator_factory.ts |   4 +-
 .../job_creator/multi_metric_job_creator.ts   |   8 +-
 .../job_creator/population_job_creator.ts     |   8 +-
 .../common/job_creator/rare_job_creator.ts    |   8 +-
 .../job_creator/single_metric_job_creator.ts  |   8 +-
 .../categorization_examples_loader.ts         |   4 +-
 .../preconfigured_job_redirect.ts             |   6 +-
 .../jobs/new_job/utils/new_job_utils.test.ts  |   4 +-
 .../public/application/routing/resolvers.ts   |   4 +-
 .../ml/public/application/routing/router.tsx  |  12 +-
 .../services/field_format_service.ts          |   8 +-
 .../load_new_job_capabilities.ts              |   6 +-
 .../new_job_capabilities._service.test.ts     |   4 +-
 .../new_job_capabilities_service.ts           |   5 +-
 .../new_job_capabilities_service_analytics.ts |   5 +-
 .../remove_nested_field_children.test.ts      |   4 +-
 .../application/util/dependency_cache.ts      |  15 +-
 .../util/field_types_utils.test.ts            |  19 +-
 .../application/util/field_types_utils.ts     |   5 +-
 .../ml/public/application/util/index_utils.ts |  50 ++----
 .../anomaly_charts_embeddable.tsx             |   4 +-
 x-pack/plugins/ml/public/embeddables/types.ts |   4 +-
 .../plugins/ml/server/lib/data_views_utils.ts |  26 +++
 x-pack/plugins/ml/server/lib/route_guard.ts   |  23 ++-
 .../data_frame_analytics/index_patterns.ts    |  22 +--
 .../data_recognizer/data_recognizer.test.ts   |  12 +-
 .../models/data_recognizer/data_recognizer.ts |  62 ++++---
 .../ml/server/models/data_recognizer/index.ts |   2 +-
 .../data_view_rollup_cloudwatch.json          | 151 ++++++++++++++++
 .../responses/kibana_saved_objects.json       |  35 ----
 .../job_service/new_job_caps/field_service.ts |  20 +--
 .../new_job_caps/new_job_caps.test.ts         |  16 +-
 .../job_service/new_job_caps/new_job_caps.ts  |   9 +-
 .../models/job_service/new_job_caps/rollup.ts |  44 ++---
 x-pack/plugins/ml/server/plugin.ts            |  22 ++-
 .../ml/server/routes/data_frame_analytics.ts  | 170 +++++++++---------
 .../plugins/ml/server/routes/job_service.ts   |  35 ++--
 x-pack/plugins/ml/server/routes/modules.ts    |  80 +++++++--
 .../shared_services/providers/modules.ts      |  42 ++---
 .../server/shared_services/shared_services.ts |  36 +++-
 x-pack/plugins/ml/server/types.ts             |   2 +
 x-pack/plugins/ml/tsconfig.json               |   1 +
 79 files changed, 721 insertions(+), 529 deletions(-)
 create mode 100644 x-pack/plugins/ml/server/lib/data_views_utils.ts
 create mode 100644 x-pack/plugins/ml/server/models/job_service/new_job_caps/__mocks__/responses/data_view_rollup_cloudwatch.json
 delete mode 100644 x-pack/plugins/ml/server/models/job_service/new_job_caps/__mocks__/responses/kibana_saved_objects.json

diff --git a/x-pack/plugins/ml/common/types/kibana.ts b/x-pack/plugins/ml/common/types/kibana.ts
index 7783a02c2dd37..cc7b68b40149f 100644
--- a/x-pack/plugins/ml/common/types/kibana.ts
+++ b/x-pack/plugins/ml/common/types/kibana.ts
@@ -8,7 +8,6 @@
 // custom edits or fixes for default kibana types which are incomplete
 
 import type { SimpleSavedObject } from 'kibana/public';
-import type { IndexPatternAttributes } from 'src/plugins/data/common';
 import type { FieldFormatsRegistry } from '../../../../../src/plugins/field_formats/common';
 
 export type IndexPatternTitle = string;
@@ -18,7 +17,6 @@ export interface Route {
   k7Breadcrumbs: () => any;
 }
 
-export type IndexPatternSavedObject = SimpleSavedObject<IndexPatternAttributes>;
 // TODO define saved object type
 export type SavedSearchSavedObject = SimpleSavedObject<any>;
 
diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json
index 310ac5d65c986..9ed05bbdc2edf 100644
--- a/x-pack/plugins/ml/kibana.json
+++ b/x-pack/plugins/ml/kibana.json
@@ -8,6 +8,7 @@
   ],
   "requiredPlugins": [
     "data",
+    "dataViews",
     "cloud",
     "features",
     "dataVisualizer",
diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx
index c7e457c0b5e00..6259cecae78b5 100644
--- a/x-pack/plugins/ml/public/application/app.tsx
+++ b/x-pack/plugins/ml/public/application/app.tsx
@@ -135,6 +135,7 @@ export const renderApp = (
     urlGenerators: deps.share.urlGenerators,
     maps: deps.maps,
     dataVisualizer: deps.dataVisualizer,
+    dataViews: deps.data.dataViews,
   });
 
   appMountParams.onAppLeave((actions) => actions.default());
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/common.ts b/x-pack/plugins/ml/public/application/components/data_grid/common.ts
index a64594e86a757..6fc6f298e73d8 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/common.ts
+++ b/x-pack/plugins/ml/public/application/components/data_grid/common.ts
@@ -19,12 +19,9 @@ import { i18n } from '@kbn/i18n';
 
 import { CoreSetup } from 'src/core/public';
 
-import {
-  IndexPattern,
-  IFieldType,
-  ES_FIELD_TYPES,
-  KBN_FIELD_TYPES,
-} from '../../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+
+import type { DataView, DataViewField } from '../../../../../../../src/plugins/data_views/common';
 
 import { DEFAULT_RESULTS_FIELD } from '../../../../common/constants/data_frame_analytics';
 import { extractErrorMessage } from '../../../../common/util/errors';
@@ -72,7 +69,7 @@ export const euiDataGridToolbarSettings = {
   showFullScreenSelector: false,
 };
 
-export const getFieldsFromKibanaIndexPattern = (indexPattern: IndexPattern): string[] => {
+export const getFieldsFromKibanaIndexPattern = (indexPattern: DataView): string[] => {
   const allFields = indexPattern.fields.map((f) => f.name);
   const indexPatternFields: string[] = allFields.filter((f) => {
     if (indexPattern.metaFields.includes(f)) {
@@ -98,7 +95,7 @@ export const getFieldsFromKibanaIndexPattern = (indexPattern: IndexPattern): str
  * @param RuntimeMappings
  */
 export function getCombinedRuntimeMappings(
-  indexPattern: IndexPattern | undefined,
+  indexPattern: DataView | undefined,
   runtimeMappings?: RuntimeMappings
 ): RuntimeMappings | undefined {
   let combinedRuntimeMappings = {};
@@ -219,7 +216,7 @@ export const getDataGridSchemaFromESFieldType = (
 };
 
 export const getDataGridSchemaFromKibanaFieldType = (
-  field: IFieldType | undefined
+  field: DataViewField | undefined
 ): string | undefined => {
   // Built-in values are ['boolean', 'currency', 'datetime', 'numeric', 'json']
   // To fall back to the default string schema it needs to be undefined.
@@ -312,7 +309,7 @@ export const getTopClasses = (row: Record<string, any>, mlResultsField: string):
 };
 
 export const useRenderCellValue = (
-  indexPattern: IndexPattern | undefined,
+  indexPattern: DataView | undefined,
   pagination: IndexPagination,
   tableItems: DataGridItem[],
   resultsField?: string,
diff --git a/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts b/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
index ff6363ea2cc6e..fb9648f5ef4af 100644
--- a/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
+++ b/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
@@ -7,10 +7,10 @@
 
 import { FC } from 'react';
 import { SavedSearchSavedObject } from '../../../../common/types/kibana';
-import type { IIndexPattern } from '../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 
 declare const DataRecognizer: FC<{
-  indexPattern: IIndexPattern;
+  indexPattern: DataView;
   savedSearch: SavedSearchSavedObject | null;
   results: {
     count: number;
diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
index f9f8d9a370bab..72641499fe6af 100644
--- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
@@ -8,15 +8,15 @@
 import React from 'react';
 import { shallowWithIntl } from '@kbn/test/jest';
 import { FullTimeRangeSelector } from './index';
-import { Query } from 'src/plugins/data/public';
-import { IndexPattern } from '../../../../../../../src/plugins/data/public';
+import type { Query } from 'src/plugins/data/public';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 
 // Create a mock for the setFullTimeRange function in the service.
 // The mock is hoisted to the top, so need to prefix the mock function
 // with 'mock' so it can be used lazily.
-const mockSetFullTimeRange = jest.fn((indexPattern: IndexPattern, query: Query) => true);
+const mockSetFullTimeRange = jest.fn((indexPattern: DataView, query: Query) => true);
 jest.mock('./full_time_range_selector_service', () => ({
-  setFullTimeRange: (indexPattern: IndexPattern, query: Query) =>
+  setFullTimeRange: (indexPattern: DataView, query: Query) =>
     mockSetFullTimeRange(indexPattern, query),
 }));
 
@@ -26,7 +26,7 @@ describe('FullTimeRangeSelector', () => {
     fields: [],
     title: 'test-index-pattern',
     timeFieldName: '@timestamp',
-  } as unknown as IndexPattern;
+  } as unknown as DataView;
 
   const query: Query = {
     language: 'kuery',
diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
index f087754bd275b..3c9689c8c108b 100644
--- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
+++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
@@ -8,12 +8,13 @@
 import React, { FC } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n/react';
-import { Query, IndexPattern } from 'src/plugins/data/public';
+import type { Query } from 'src/plugins/data/public';
 import { EuiButton } from '@elastic/eui';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { setFullTimeRange } from './full_time_range_selector_service';
 
 interface Props {
-  indexPattern: IndexPattern;
+  indexPattern: DataView;
   query: Query;
   disabled: boolean;
   callback?: (a: any) => void;
@@ -23,7 +24,7 @@ interface Props {
 // to the time range of data in the index(es) mapped to the supplied Kibana index pattern or query.
 export const FullTimeRangeSelector: FC<Props> = ({ indexPattern, query, disabled, callback }) => {
   // wrapper around setFullTimeRange to allow for the calling of the optional callBack prop
-  async function setRange(i: IndexPattern, q: Query) {
+  async function setRange(i: DataView, q: Query) {
     const fullTimeRange = await setFullTimeRange(i, q);
     if (typeof callback === 'function') {
       callback(fullTimeRange);
diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts
index 1e9c1e2c1b74d..8f0d344a36f36 100644
--- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts
+++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts
@@ -8,11 +8,11 @@
 import moment from 'moment';
 
 import { i18n } from '@kbn/i18n';
-import { Query } from 'src/plugins/data/public';
+import type { Query } from 'src/plugins/data/public';
 import dateMath from '@elastic/datemath';
 import { getTimefilter, getToastNotifications } from '../../util/dependency_cache';
 import { ml, GetTimeFieldRangeResponse } from '../../services/ml_api_service';
-import { IndexPattern } from '../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { isPopulatedObject } from '../../../../common/util/object_utils';
 import { RuntimeMappings } from '../../../../common/types/fields';
 
@@ -22,7 +22,7 @@ export interface TimeRange {
 }
 
 export async function setFullTimeRange(
-  indexPattern: IndexPattern,
+  indexPattern: DataView,
   query: Query
 ): Promise<GetTimeFieldRangeResponse> {
   try {
diff --git a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx
index b83965b52befc..d64a180bfa8b6 100644
--- a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx
+++ b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx
@@ -24,7 +24,7 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
-import { IndexPattern } from '../../../../../../../src/plugins/data/public';
+import { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { extractErrorMessage } from '../../../../common';
 import { isRuntimeMappings } from '../../../../common/util/runtime_field_utils';
 import { stringHash } from '../../../../common/util/string_utils';
@@ -89,7 +89,7 @@ export interface ScatterplotMatrixProps {
   legendType?: LegendType;
   searchQuery?: ResultsSearchQuery;
   runtimeMappings?: RuntimeMappings;
-  indexPattern?: IndexPattern;
+  indexPattern?: DataView;
 }
 
 export const ScatterplotMatrix: FC<ScatterplotMatrixProps> = ({
diff --git a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts
index d8b5b23f68847..543ab0a0c0982 100644
--- a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts
+++ b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts
@@ -7,12 +7,12 @@
 
 import { useMemo } from 'react';
 
-import type { IndexPattern } from '../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 
 import { ML__INCREMENTAL_ID } from '../../data_frame_analytics/common/fields';
 
 export const useScatterplotFieldOptions = (
-  indexPattern?: IndexPattern,
+  indexPattern?: DataView,
   includes?: string[],
   excludes?: string[],
   resultsField = ''
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts
index 9d53efad86d38..93f92002c4bfd 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { IndexPattern } from '../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../src/plugins/data_views/public';
 
 export const indexPatternMock = {
   id: 'the-index-pattern-id',
   title: 'the-index-pattern-title',
   fields: [],
-} as unknown as IndexPattern;
+} as unknown as DataView;
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts
index 7dfbcf1675692..571ce8ac3f423 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IndexPatternsContract } from '../../../../../../../../src/plugins/data/public';
+import type { DataViewsContract } from '../../../../../../../../src/plugins/data_views/public';
 
 export const indexPatternsMock = new (class {
   fieldFormats = [];
@@ -19,4 +19,4 @@ export const indexPatternsMock = new (class {
   getIds = jest.fn();
   getTitles = jest.fn();
   make = jest.fn();
-})() as unknown as IndexPatternsContract;
+})() as unknown as DataViewsContract;
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts b/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
index 02c0945cf998f..cd7059b5302f2 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
@@ -6,15 +6,15 @@
  */
 
 import React from 'react';
-import { IndexPattern, IndexPatternsContract } from '../../../../../../../src/plugins/data/public';
+import { DataView, DataViewsContract } from '../../../../../../../src/plugins/data_views/public';
 import { SavedSearchSavedObject } from '../../../../common/types/kibana';
 import { MlServicesContext } from '../../app';
 
 export interface MlContextValue {
   combinedQuery: any;
-  currentIndexPattern: IndexPattern; // TODO this should be IndexPattern or null
+  currentIndexPattern: DataView; // TODO this should be IndexPattern or null
   currentSavedSearch: SavedSearchSavedObject | null;
-  indexPatterns: IndexPatternsContract;
+  indexPatterns: DataViewsContract;
   kibanaConfig: any; // IUiSettingsClient;
   kibanaVersion: string;
 }
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
index e1f0db4e9291c..a235885a9a5b7 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
@@ -9,7 +9,7 @@ import { useEffect, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { IndexPattern } from '../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 
 import { extractErrorMessage } from '../../../../common/util/errors';
 
@@ -34,7 +34,7 @@ export const useResultsViewConfig = (jobId: string) => {
   const mlContext = useMlContext();
   const trainedModelsApiService = useTrainedModelsApiService();
 
-  const [indexPattern, setIndexPattern] = useState<IndexPattern | undefined>(undefined);
+  const [indexPattern, setIndexPattern] = useState<DataView | undefined>(undefined);
   const [indexPatternErrorMessage, setIndexPatternErrorMessage] = useState<undefined | string>(
     undefined
   );
@@ -99,7 +99,7 @@ export const useResultsViewConfig = (jobId: string) => {
               ? jobConfigUpdate.dest.index[0]
               : jobConfigUpdate.dest.index;
             const destIndexPatternId = getIndexPatternIdFromName(destIndex) || destIndex;
-            let indexP: IndexPattern | undefined;
+            let indexP: DataView | undefined;
 
             try {
               indexP = await mlContext.indexPatterns.get(destIndexPatternId);
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
index 60a5a548c8621..f3779e1968985 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
@@ -11,7 +11,7 @@ import { estypes } from '@elastic/elasticsearch';
 import { EuiDataGridColumn } from '@elastic/eui';
 import { CoreSetup } from 'src/core/public';
 
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { isRuntimeMappings } from '../../../../../../common/util/runtime_field_utils';
 import { RuntimeMappings } from '../../../../../../common/types/fields';
 import { DEFAULT_SAMPLER_SHARD_SIZE } from '../../../../../../common/constants/field_histograms';
@@ -52,13 +52,14 @@ function getRuntimeFieldColumns(runtimeMappings: RuntimeMappings) {
   });
 }
 
-function getIndexPatternColumns(indexPattern: IndexPattern, fieldsFilter: string[]) {
+function getIndexPatternColumns(indexPattern: DataView, fieldsFilter: string[]) {
   const { fields } = newJobCapsServiceAnalytics;
 
   return fields
     .filter((field) => fieldsFilter.includes(field.name))
     .map((field) => {
       const schema =
+        // @ts-expect-error field is not DataViewField
         getDataGridSchemaFromESFieldType(field.type) || getDataGridSchemaFromKibanaFieldType(field);
 
       return {
@@ -71,7 +72,7 @@ function getIndexPatternColumns(indexPattern: IndexPattern, fieldsFilter: string
 }
 
 export const useIndexData = (
-  indexPattern: IndexPattern,
+  indexPattern: DataView,
   query: Record<string, any> | undefined,
   toastNotifications: CoreSetup['notifications']['toasts'],
   runtimeMappings?: RuntimeMappings
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 d67473d9d3220..2c2df0cd3d905 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
@@ -12,7 +12,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { EuiDataGridColumn, EuiSpacer, EuiText } from '@elastic/eui';
 
-import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
 
 import {
   isClassificationAnalysis,
@@ -104,7 +104,7 @@ const getResultsSectionHeaderItems = (
 interface ExpandableSectionResultsProps {
   colorRange?: ReturnType<typeof useColorRange>;
   indexData: UseIndexDataReturnType;
-  indexPattern?: IndexPattern;
+  indexPattern?: DataView;
   jobConfig?: DataFrameAnalyticsConfig;
   needsDestIndexPattern: boolean;
   searchQuery: SavedSearchQuery;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
index 1a5f1bad997e2..3639836c6be01 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
@@ -13,7 +13,7 @@ import { debounce } from 'lodash';
 import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@kbn/es-query';
 import { estypes } from '@elastic/elasticsearch';
 import { Dictionary } from '../../../../../../../common/types/common';
-import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common';
+import { DataView } from '../../../../../../../../../../src/plugins/data_views/common';
 import { Query, QueryStringInput } from '../../../../../../../../../../src/plugins/data/public';
 
 import {
@@ -29,7 +29,7 @@ interface ErrorMessage {
 }
 
 export interface ExplorationQueryBarProps {
-  indexPattern: IIndexPattern;
+  indexPattern: DataView;
   setSearchQuery: (update: {
     queryString: string;
     query?: SavedSearchQuery;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx
index 416d2f8b29d3b..41c434c7160cf 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx
@@ -7,7 +7,7 @@
 
 import React, { FC } from 'react';
 
-import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
 
 import { getToastNotifications } from '../../../../../util/dependency_cache';
 import { useMlKibana } from '../../../../../contexts/kibana';
@@ -22,7 +22,7 @@ import { ExpandableSectionResults } from '../expandable_section';
 import { useExplorationResults } from './use_exploration_results';
 
 interface Props {
-  indexPattern: IndexPattern;
+  indexPattern: DataView;
   jobConfig: DataFrameAnalyticsConfig;
   jobStatus?: DataFrameTaskStateType;
   needsDestIndexPattern: boolean;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
index 02e3f0abac4be..6e0d513a35b9a 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
@@ -13,7 +13,7 @@ import { CoreSetup } from 'src/core/public';
 
 import { i18n } from '@kbn/i18n';
 import { MlApiServices } from '../../../../../services/ml_api_service';
-import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
 
 import { DataLoader } from '../../../../../datavisualizer/index_based/data_loader';
 
@@ -41,7 +41,7 @@ import { FeatureImportanceBaseline } from '../../../../../../../common/types/fea
 import { useExplorationDataGrid } from './use_exploration_data_grid';
 
 export const useExplorationResults = (
-  indexPattern: IndexPattern | undefined,
+  indexPattern: DataView | undefined,
   jobConfig: DataFrameAnalyticsConfig | undefined,
   searchQuery: SavedSearchQuery,
   toastNotifications: CoreSetup['notifications']['toasts'],
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts
index d630fedc72d3f..d0f048ac02606 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts
@@ -9,7 +9,7 @@ import { useEffect, useMemo } from 'react';
 
 import { EuiDataGridColumn } from '@elastic/eui';
 
-import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
 
 import { DataLoader } from '../../../../../datavisualizer/index_based/data_loader';
 
@@ -41,7 +41,7 @@ import { getFeatureCount, getOutlierScoreFieldName } from './common';
 import { useExplorationDataGrid } from '../exploration_results_table/use_exploration_data_grid';
 
 export const useOutlierData = (
-  indexPattern: IndexPattern | undefined,
+  indexPattern: DataView | undefined,
   jobConfig: DataFrameAnalyticsConfig | undefined,
   searchQuery: SavedSearchQuery
 ): UseIndexDataReturnType => {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx
index a3f18801b88f9..8ef743d2eea9f 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx
@@ -9,7 +9,6 @@ import { EuiToolTip } from '@elastic/eui';
 import React, { FC } from 'react';
 import { cloneDeep, isEqual } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { IIndexPattern } from 'src/plugins/data/common';
 import { DeepReadonly } from '../../../../../../../common/types/common';
 import { DataFrameAnalyticsConfig, isOutlierAnalysis } from '../../../../common';
 import { isClassificationAnalysis, isRegressionAnalysis } from '../../../../common/analytics';
@@ -401,13 +400,11 @@ export const useNavigateToWizardWithClonedJob = () => {
   const {
     services: {
       notifications: { toasts },
-      savedObjects,
+      data: { dataViews },
     },
   } = useMlKibana();
   const navigateToPath = useNavigateToPath();
 
-  const savedObjectsClient = savedObjects.client;
-
   return async (item: Pick<DataFrameAnalyticsListRow, 'config' | 'stats'>) => {
     const sourceIndex = Array.isArray(item.config.source.index)
       ? item.config.source.index.join(',')
@@ -415,19 +412,9 @@ export const useNavigateToWizardWithClonedJob = () => {
     let sourceIndexId;
 
     try {
-      const response = await savedObjectsClient.find<IIndexPattern>({
-        type: 'index-pattern',
-        perPage: 10,
-        search: `"${sourceIndex}"`,
-        searchFields: ['title'],
-        fields: ['title'],
-      });
-
-      const ip = response.savedObjects.find(
-        (obj) => obj.attributes.title.toLowerCase() === sourceIndex.toLowerCase()
-      );
-      if (ip !== undefined) {
-        sourceIndexId = ip.id;
+      const dv = (await dataViews.find(sourceIndex)).find(({ title }) => title === sourceIndex);
+      if (dv !== undefined) {
+        sourceIndexId = dv.id;
       } else {
         toasts.addDanger(
           i18n.translate('xpack.ml.dataframe.analyticsList.noSourceIndexPatternForClone', {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx
index 6b26e3823d2ef..ad6a59bf01c0e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx
@@ -30,7 +30,7 @@ jest.mock('../../../../../../application/util/dependency_cache', () => ({
 
 jest.mock('../../../../../contexts/kibana', () => ({
   useMlKibana: () => ({
-    services: mockCoreServices.createStart(),
+    services: { ...mockCoreServices.createStart(), data: { data_view: { find: jest.fn() } } },
   }),
   useNotifications: () => {
     return {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx
index 91871015d2add..0d2025c0d049a 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx
@@ -8,9 +8,6 @@
 import React, { useEffect, useMemo, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
-
-import { IIndexPattern } from 'src/plugins/data/common';
-
 import { extractErrorMessage } from '../../../../../../../common/util/errors';
 
 import { useMlKibana } from '../../../../../contexts/kibana';
@@ -48,8 +45,9 @@ export const useDeleteAction = (canDeleteDataFrameAnalytics: boolean) => {
   const [indexPatternExists, setIndexPatternExists] = useState<boolean>(false);
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
-  const { savedObjects } = useMlKibana().services;
-  const savedObjectsClient = savedObjects.client;
+  const {
+    data: { dataViews },
+  } = useMlKibana().services;
 
   const indexName = item?.config.dest.index ?? '';
 
@@ -57,17 +55,8 @@ export const useDeleteAction = (canDeleteDataFrameAnalytics: boolean) => {
 
   const checkIndexPatternExists = async () => {
     try {
-      const response = await savedObjectsClient.find<IIndexPattern>({
-        type: 'index-pattern',
-        perPage: 10,
-        search: `"${indexName}"`,
-        searchFields: ['title'],
-        fields: ['title'],
-      });
-      const ip = response.savedObjects.find(
-        (obj) => obj.attributes.title.toLowerCase() === indexName.toLowerCase()
-      );
-      if (ip !== undefined) {
+      const dv = (await dataViews.find(indexName)).find(({ title }) => title === indexName);
+      if (dv !== undefined) {
         setIndexPatternExists(true);
       } else {
         setIndexPatternExists(false);
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
index 7e90a4e3ed44a..6e663318d2dc6 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
@@ -87,6 +87,7 @@ jest.mock('../../../../../util/index_utils', () => {
       async (id: string): Promise<IndexPatternAndSavedSearch> => {
         return {
           indexPattern: {
+            // @ts-expect-error fields should not be empty
             fields: [],
             title:
               id === 'the-remote-saved-search-id'
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts
index a5fabc12c83df..1dccd54f68a38 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts
@@ -7,7 +7,7 @@
 
 import { CoreSetup } from 'src/core/public';
 
-import { IndexPattern } from '../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../src/plugins/data_views/public';
 
 import { SavedSearchQuery } from '../../../contexts/ml';
 import { OMIT_FIELDS } from '../../../../../common/constants/field_types';
@@ -22,15 +22,12 @@ import { RuntimeMappings } from '../../../../../common/types/fields';
 const MAX_EXAMPLES_DEFAULT: number = 10;
 
 export class DataLoader {
-  private _indexPattern: IndexPattern;
+  private _indexPattern: DataView;
   private _runtimeMappings: RuntimeMappings;
   private _indexPatternTitle: IndexPatternTitle = '';
   private _maxExamples: number = MAX_EXAMPLES_DEFAULT;
 
-  constructor(
-    indexPattern: IndexPattern,
-    toastNotifications?: CoreSetup['notifications']['toasts']
-  ) {
+  constructor(indexPattern: DataView, toastNotifications?: CoreSetup['notifications']['toasts']) {
     this._indexPattern = indexPattern;
     this._runtimeMappings = this._indexPattern.getComputedFields().runtimeFields as RuntimeMappings;
     this._indexPatternTitle = indexPattern.title;
diff --git a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
index 6e8b5f762558f..f57d2c1b01d98 100644
--- a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
@@ -10,7 +10,7 @@ import { EuiCode, EuiInputPopover } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@kbn/es-query';
 import { Query, QueryStringInput } from '../../../../../../../../src/plugins/data/public';
-import { IIndexPattern } from '../../../../../../../../src/plugins/data/common';
+import { DataView } from '../../../../../../../../src/plugins/data_views/common';
 import { SEARCH_QUERY_LANGUAGE, ErrorMessage } from '../../../../../common/constants/search';
 import { explorerService } from '../../explorer_dashboard_service';
 import { InfluencersFilterQuery } from '../../../../../common/types/es_client';
@@ -24,7 +24,7 @@ export function getKqlQueryValues({
 }: {
   inputString: string | { [key: string]: any };
   queryLanguage: string;
-  indexPattern: IIndexPattern;
+  indexPattern: DataView;
 }): { clearSettings: boolean; settings: any } {
   let influencersFilterQuery: InfluencersFilterQuery = {};
   const filteredFields: string[] = [];
@@ -89,7 +89,7 @@ function getInitSearchInputState({
 interface ExplorerQueryBarProps {
   filterActive: boolean;
   filterPlaceHolder: string;
-  indexPattern: IIndexPattern;
+  indexPattern: DataView;
   queryString?: string;
   updateLanguage: (language: string) => void;
 }
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx
index f6769abb610b8..11e4c14cd4ab2 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx
@@ -16,7 +16,7 @@ import React from 'react';
 import { CustomUrlEditor } from './editor';
 import { TIME_RANGE_TYPE, URL_TYPE } from './constants';
 import { CustomUrlSettings } from './utils';
-import { IIndexPattern } from '../../../../../../../../src/plugins/data/common';
+import { DataView } from '../../../../../../../../src/plugins/data_views/common';
 
 function prepareTest(customUrl: CustomUrlSettings, setEditCustomUrlFn: (url: UrlConfig) => void) {
   const savedCustomUrls = [
@@ -50,7 +50,7 @@ function prepareTest(customUrl: CustomUrlSettings, setEditCustomUrlFn: (url: Url
   const indexPatterns = [
     { id: 'pattern1', title: 'Index Pattern 1' },
     { id: 'pattern2', title: 'Index Pattern 2' },
-  ] as IIndexPattern[];
+  ] as DataView[];
 
   const queryEntityFieldNames = ['airline'];
 
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx
index e22eb1484df2e..7dd779ead7892 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx
@@ -29,7 +29,7 @@ import { isValidLabel } from '../../../util/custom_url_utils';
 
 import { TIME_RANGE_TYPE, URL_TYPE } from './constants';
 import { UrlConfig } from '../../../../../common/types/custom_urls';
-import { IIndexPattern } from '../../../../../../../../src/plugins/data/common';
+import { DataView } from '../../../../../../../../src/plugins/data_views/common';
 
 function getLinkToOptions() {
   return [
@@ -59,7 +59,7 @@ interface CustomUrlEditorProps {
   setEditCustomUrl: (url: any) => void;
   savedCustomUrls: UrlConfig[];
   dashboards: any[];
-  indexPatterns: IIndexPattern[];
+  indexPatterns: DataView[];
   queryEntityFieldNames: string[];
 }
 
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts
index 87000cdabd913..1f815759c6242 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IIndexPattern } from 'src/plugins/data/common';
+import { DataView } from '../../../../../../../../src/plugins/data_views/common';
 import { UrlConfig } from '../../../../../common/types/custom_urls';
 import { Job } from '../../../../../common/types/anomaly_detection_jobs';
 import { TimeRangeType } from './constants';
@@ -34,7 +34,7 @@ export function isValidCustomUrlSettingsTimeRange(timeRangeSettings: any): boole
 export function getNewCustomUrlDefaults(
   job: Job,
   dashboards: any[],
-  indexPatterns: IIndexPattern[]
+  indexPatterns: DataView[]
 ): CustomUrlSettings;
 export function getQueryEntityFieldNames(job: Job): string[];
 export function isValidCustomUrlSettings(
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts
index 3a14715bca4b9..32e99e3e433e0 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IIndexPattern } from 'src/plugins/data/common';
+import type { DataView } from 'src/plugins/data_views/common';
 
 export function loadSavedDashboards(maxNumber: number): Promise<any[]>;
-export function loadIndexPatterns(maxNumber: number): Promise<IIndexPattern[]>;
+export function loadIndexPatterns(maxNumber: number): Promise<DataView[]>;
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.js
index 8ce92ffa38479..ad192a738174e 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.js
@@ -8,7 +8,7 @@
 import { difference } from 'lodash';
 import { getNewJobLimits } from '../../../../services/ml_server_info';
 import { processCreatedBy } from '../../../../../../common/util/job_utils';
-import { getSavedObjectsClient } from '../../../../util/dependency_cache';
+import { getSavedObjectsClient, getDataViews } from '../../../../util/dependency_cache';
 import { ml } from '../../../../services/ml_api_service';
 
 export function saveJob(job, newJobData, finish) {
@@ -107,26 +107,12 @@ export function loadIndexPatterns(maxNumber) {
   // TODO - amend loadIndexPatterns in index_utils.js to do the request,
   // without needing an Angular Provider.
   return new Promise((resolve, reject) => {
-    const savedObjectsClient = getSavedObjectsClient();
-    savedObjectsClient
-      .find({
-        type: 'index-pattern',
-        fields: ['title'],
-        perPage: maxNumber,
-      })
-      .then((resp) => {
-        const savedObjects = resp.savedObjects;
-        if (savedObjects !== undefined) {
-          const indexPatterns = savedObjects.map((savedObj) => {
-            return { id: savedObj.id, title: savedObj.attributes.title };
-          });
-
-          indexPatterns.sort((dash1, dash2) => {
-            return dash1.title.localeCompare(dash2.title);
-          });
-
-          resolve(indexPatterns);
-        }
+    const dataViewsContract = getDataViews();
+    dataViewsContract
+      .find('*', maxNumber)
+      .then((dataViews) => {
+        const sortedDataViews = dataViews.sort((a, b) => a.title.localeCompare(b.title));
+        resolve(sortedDataViews);
       })
       .catch((resp) => {
         reject(resp);
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx
index ce93080558016..46ac1dbd01b7f 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx
@@ -37,7 +37,7 @@ import { loadSavedDashboards, loadIndexPatterns } from '../edit_utils';
 import { openCustomUrlWindow } from '../../../../../util/custom_url_utils';
 import { Job } from '../../../../../../../common/types/anomaly_detection_jobs';
 import { UrlConfig } from '../../../../../../../common/types/custom_urls';
-import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common';
+import { DataView } from '../../../../../../../../../../src/plugins/data_views/common';
 import { MlKibanaReactContextValue } from '../../../../../contexts/kibana';
 
 const MAX_NUMBER_DASHBOARDS = 1000;
@@ -54,7 +54,7 @@ interface CustomUrlsProps {
 interface CustomUrlsState {
   customUrls: UrlConfig[];
   dashboards: any[];
-  indexPatterns: IIndexPattern[];
+  indexPatterns: DataView[];
   queryEntityFieldNames: string[];
   editorOpen: boolean;
   editorSettings?: CustomUrlSettings;
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
index 9c8f34260def0..5898a9dec1ad3 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
@@ -19,7 +19,7 @@ import { ml } from '../../../../services/ml_api_service';
 import { mlResultsService } from '../../../../services/results_service';
 import { getCategoryFields as getCategoryFieldsOrig } from './searches';
 import { aggFieldPairsCanBeCharted } from '../job_creator/util/general';
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/common';
+import type { DataView } from '../../../../../../../../../src/plugins/data_views/common';
 
 type DetectorIndex = number;
 export interface LineChartPoint {
@@ -41,7 +41,7 @@ export class ChartLoader {
   private _timeFieldName: string = '';
   private _query: object = {};
 
-  constructor(indexPattern: IndexPattern, query: object) {
+  constructor(indexPattern: DataView, query: object) {
     this._indexPatternTitle = indexPattern.title;
     this._query = query;
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts
index cb842937f1ede..9667465eb210d 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { IIndexPattern } from 'src/plugins/data/public';
+import { DataView } from '../../../../../../../../src/plugins/data_views/common';
 
-export type IndexPatternContextValue = IIndexPattern | null;
+export type IndexPatternContextValue = DataView | null;
 export const IndexPatternContext = React.createContext<IndexPatternContextValue>(null);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
index 35847839b02a0..3d8c34e0e5967 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
@@ -21,7 +21,7 @@ import { JOB_TYPE } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
 import { isValidJson } from '../../../../../../common/util/validation_utils';
 import { ml } from '../../../../services/ml_api_service';
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 
 export interface RichDetector {
   agg: Aggregation | null;
@@ -40,11 +40,7 @@ export class AdvancedJobCreator extends JobCreator {
   private _richDetectors: RichDetector[] = [];
   private _queryString: string;
 
-  constructor(
-    indexPattern: IndexPattern,
-    savedSearch: SavedSearchSavedObject | null,
-    query: object
-  ) {
+  constructor(indexPattern: DataView, savedSearch: SavedSearchSavedObject | null, query: object) {
     super(indexPattern, savedSearch, query);
 
     this._queryString = JSON.stringify(this._datafeed_config.query);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts
index 128a541ff9f96..b46d3b539b44a 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEqual } from 'lodash';
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { JobCreator } from './job_creator';
 import { Field, Aggregation, mlCategory } from '../../../../../../common/types/fields';
@@ -47,11 +47,7 @@ export class CategorizationJobCreator extends JobCreator {
   private _partitionFieldName: string | null = null;
   private _ccsVersionFailure: boolean = false;
 
-  constructor(
-    indexPattern: IndexPattern,
-    savedSearch: SavedSearchSavedObject | null,
-    query: object
-  ) {
+  constructor(indexPattern: DataView, savedSearch: SavedSearchSavedObject | null, query: object) {
     super(indexPattern, savedSearch, query);
     this.createdBy = CREATED_BY_LABEL.CATEGORIZATION;
     this._examplesLoader = new CategorizationExamplesLoader(this, indexPattern, query);
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 e6cfe52933617..a44b4bdef60c4 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
@@ -40,13 +40,13 @@ import { filterRuntimeMappings } from './util/filter_runtime_mappings';
 import { parseInterval } from '../../../../../../common/util/parse_interval';
 import { Calendar } from '../../../../../../common/types/calendars';
 import { mlCalendarService } from '../../../../services/calendar_service';
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { getDatafeedAggregations } from '../../../../../../common/util/datafeed_utils';
 import { getFirstKeyInObject } from '../../../../../../common/util/object_utils';
 
 export class JobCreator {
   protected _type: JOB_TYPE = JOB_TYPE.SINGLE_METRIC;
-  protected _indexPattern: IndexPattern;
+  protected _indexPattern: DataView;
   protected _savedSearch: SavedSearchSavedObject | null;
   protected _indexPatternTitle: IndexPatternTitle = '';
   protected _job_config: Job;
@@ -74,11 +74,7 @@ export class JobCreator {
   protected _wizardInitialized$ = new BehaviorSubject<boolean>(false);
   public wizardInitialized$ = this._wizardInitialized$.asObservable();
 
-  constructor(
-    indexPattern: IndexPattern,
-    savedSearch: SavedSearchSavedObject | null,
-    query: object
-  ) {
+  constructor(indexPattern: DataView, savedSearch: SavedSearchSavedObject | null, query: object) {
     this._indexPattern = indexPattern;
     this._savedSearch = savedSearch;
     this._indexPatternTitle = indexPattern.title;
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
index 8c77ae5def102..6af3df888514c 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
@@ -10,7 +10,7 @@ import { SingleMetricJobCreator } from './single_metric_job_creator';
 import { MultiMetricJobCreator } from './multi_metric_job_creator';
 import { PopulationJobCreator } from './population_job_creator';
 import { AdvancedJobCreator } from './advanced_job_creator';
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { CategorizationJobCreator } from './categorization_job_creator';
 import { RareJobCreator } from './rare_job_creator';
 
@@ -18,7 +18,7 @@ import { JOB_TYPE } from '../../../../../../common/constants/new_job';
 
 export const jobCreatorFactory =
   (jobType: JOB_TYPE) =>
-  (indexPattern: IndexPattern, savedSearch: SavedSearchSavedObject | null, query: object) => {
+  (indexPattern: DataView, savedSearch: SavedSearchSavedObject | null, query: object) => {
     let jc;
     switch (jobType) {
       case JOB_TYPE.SINGLE_METRIC:
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts
index f63aa1b569a2c..12543f34003d5 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts
@@ -17,7 +17,7 @@ import { Job, Datafeed, Detector } from '../../../../../../common/types/anomaly_
 import { createBasicDetector } from './util/default_configs';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { isSparseDataJob } from './util/general';
 
 export class MultiMetricJobCreator extends JobCreator {
@@ -27,11 +27,7 @@ export class MultiMetricJobCreator extends JobCreator {
 
   protected _type: JOB_TYPE = JOB_TYPE.MULTI_METRIC;
 
-  constructor(
-    indexPattern: IndexPattern,
-    savedSearch: SavedSearchSavedObject | null,
-    query: object
-  ) {
+  constructor(indexPattern: DataView, savedSearch: SavedSearchSavedObject | null, query: object) {
     super(indexPattern, savedSearch, query);
     this.createdBy = CREATED_BY_LABEL.MULTI_METRIC;
     this._wizardInitialized$.next(true);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts
index 24b3192231211..7f001ce334462 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts
@@ -17,7 +17,7 @@ import { Job, Datafeed, Detector } from '../../../../../../common/types/anomaly_
 import { createBasicDetector } from './util/default_configs';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 
 export class PopulationJobCreator extends JobCreator {
   // a population job has one overall over (split) field, which is the same for all detectors
@@ -26,11 +26,7 @@ export class PopulationJobCreator extends JobCreator {
   private _byFields: SplitField[] = [];
   protected _type: JOB_TYPE = JOB_TYPE.POPULATION;
 
-  constructor(
-    indexPattern: IndexPattern,
-    savedSearch: SavedSearchSavedObject | null,
-    query: object
-  ) {
+  constructor(indexPattern: DataView, savedSearch: SavedSearchSavedObject | null, query: object) {
     super(indexPattern, savedSearch, query);
     this.createdBy = CREATED_BY_LABEL.POPULATION;
     this._wizardInitialized$.next(true);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts
index 73050dc4b7834..8973aa655b83d 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts
@@ -11,7 +11,7 @@ import { Field, SplitField, Aggregation } from '../../../../../../common/types/f
 import { Job, Datafeed, Detector } from '../../../../../../common/types/anomaly_detection_jobs';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { isSparseDataJob } from './util/general';
 import { ML_JOB_AGGREGATION } from '../../../../../../common/constants/aggregation_types';
 
@@ -26,11 +26,7 @@ export class RareJobCreator extends JobCreator {
   private _rareAgg: Aggregation;
   private _freqRareAgg: Aggregation;
 
-  constructor(
-    indexPattern: IndexPattern,
-    savedSearch: SavedSearchSavedObject | null,
-    query: object
-  ) {
+  constructor(indexPattern: DataView, savedSearch: SavedSearchSavedObject | null, query: object) {
     super(indexPattern, savedSearch, query);
     this.createdBy = CREATED_BY_LABEL.RARE;
     this._wizardInitialized$.next(true);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts
index 57ff76979ea14..9c4fd52888c82 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts
@@ -22,17 +22,13 @@ import {
 } from '../../../../../../common/constants/aggregation_types';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { isSparseDataJob } from './util/general';
 
 export class SingleMetricJobCreator extends JobCreator {
   protected _type: JOB_TYPE = JOB_TYPE.SINGLE_METRIC;
 
-  constructor(
-    indexPattern: IndexPattern,
-    savedSearch: SavedSearchSavedObject | null,
-    query: object
-  ) {
+  constructor(indexPattern: DataView, savedSearch: SavedSearchSavedObject | null, query: object) {
     super(indexPattern, savedSearch, query);
     this.createdBy = CREATED_BY_LABEL.SINGLE_METRIC;
     this._wizardInitialized$.next(true);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
index 641eda3dbf3e8..6e65bde879379 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { IndexPatternTitle } from '../../../../../../common/types/kibana';
 import { CategorizationJobCreator } from '../job_creator';
 import { ml } from '../../../../services/ml_api_service';
@@ -20,7 +20,7 @@ export class CategorizationExamplesLoader {
   private _timeFieldName: string = '';
   private _query: object = {};
 
-  constructor(jobCreator: CategorizationJobCreator, indexPattern: IndexPattern, query: object) {
+  constructor(jobCreator: CategorizationJobCreator, indexPattern: DataView, query: object) {
     this._jobCreator = jobCreator;
     this._indexPatternTitle = indexPattern.title;
     this._query = query;
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
index ba750795e4f8f..03428bd47e490 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { ApplicationStart } from 'kibana/public';
-import { IndexPatternsContract } from '../../../../../../../../../src/plugins/data/public';
+import type { ApplicationStart } from 'kibana/public';
+import type { DataViewsContract } from '../../../../../../../../../src/plugins/data_views/public';
 import { mlJobService } from '../../../../services/job_service';
 import { loadIndexPatterns, getIndexPatternIdFromName } from '../../../../util/index_utils';
 import { Datafeed, Job } from '../../../../../../common/types/anomaly_detection_jobs';
 import { CREATED_BY_LABEL, JOB_TYPE } from '../../../../../../common/constants/new_job';
 
 export async function preConfiguredJobRedirect(
-  indexPatterns: IndexPatternsContract,
+  indexPatterns: DataViewsContract,
   basePath: string,
   navigateToUrl: ApplicationStart['navigateToUrl']
 ) {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts b/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts
index 3f19f3137934e..12beda414bbea 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { IUiSettingsClient } from 'kibana/public';
-import { IIndexPattern } from '../../../../../../../../src/plugins/data/common';
+import { DataView } from '../../../../../../../../src/plugins/data_views/common';
 import { SavedSearchSavedObject } from '../../../../../common/types/kibana';
 import { createSearchItems } from './new_job_utils';
 
@@ -14,7 +14,7 @@ describe('createSearchItems', () => {
   const kibanaConfig = {} as IUiSettingsClient;
   const indexPattern = {
     fields: [],
-  } as unknown as IIndexPattern;
+  } as unknown as DataView;
 
   let savedSearch = {} as unknown as SavedSearchSavedObject;
   beforeEach(() => {
diff --git a/x-pack/plugins/ml/public/application/routing/resolvers.ts b/x-pack/plugins/ml/public/application/routing/resolvers.ts
index f6364ecc6568f..3479005809efb 100644
--- a/x-pack/plugins/ml/public/application/routing/resolvers.ts
+++ b/x-pack/plugins/ml/public/application/routing/resolvers.ts
@@ -11,7 +11,7 @@ import { checkGetJobsCapabilitiesResolver } from '../capabilities/check_capabili
 import { getMlNodeCount } from '../ml_nodes_check/check_ml_nodes';
 import { loadMlServerInfo } from '../services/ml_server_info';
 
-import { IndexPatternsContract } from '../../../../../../src/plugins/data/public';
+import type { DataViewsContract } from '../../../../../../src/plugins/data_views/public';
 
 export interface Resolvers {
   [name: string]: () => Promise<any>;
@@ -21,7 +21,7 @@ export interface ResolverResults {
 }
 
 interface BasicResolverDependencies {
-  indexPatterns: IndexPatternsContract;
+  indexPatterns: DataViewsContract;
   redirectToMlAccessDeniedPage: () => Promise<void>;
 }
 
diff --git a/x-pack/plugins/ml/public/application/routing/router.tsx b/x-pack/plugins/ml/public/application/routing/router.tsx
index c2129ef18df3a..847dcc1ae1107 100644
--- a/x-pack/plugins/ml/public/application/routing/router.tsx
+++ b/x-pack/plugins/ml/public/application/routing/router.tsx
@@ -9,9 +9,13 @@ import React, { useEffect, FC } from 'react';
 import { useHistory, useLocation, Router, Route, RouteProps } from 'react-router-dom';
 import { Location } from 'history';
 
-import { AppMountParameters, IUiSettingsClient, ChromeStart } from 'kibana/public';
-import { ChromeBreadcrumb } from 'kibana/public';
-import { IndexPatternsContract } from 'src/plugins/data/public';
+import type {
+  AppMountParameters,
+  IUiSettingsClient,
+  ChromeStart,
+  ChromeBreadcrumb,
+} from 'kibana/public';
+import type { DataViewsContract } from 'src/plugins/data_views/public';
 
 import { useMlKibana, useNavigateToPath } from '../contexts/kibana';
 import { MlContext, MlContextValue } from '../contexts/ml';
@@ -39,7 +43,7 @@ export interface PageProps {
 interface PageDependencies {
   config: IUiSettingsClient;
   history: AppMountParameters['history'];
-  indexPatterns: IndexPatternsContract;
+  indexPatterns: DataViewsContract;
   setBreadcrumbs: ChromeStart['setBreadcrumbs'];
   redirectToMlAccessDeniedPage: () => Promise<void>;
 }
diff --git a/x-pack/plugins/ml/public/application/services/field_format_service.ts b/x-pack/plugins/ml/public/application/services/field_format_service.ts
index 18b489682318e..fe6fc7751bb85 100644
--- a/x-pack/plugins/ml/public/application/services/field_format_service.ts
+++ b/x-pack/plugins/ml/public/application/services/field_format_service.ts
@@ -8,7 +8,7 @@
 import { mlFunctionToESAggregation } from '../../../common/util/job_utils';
 import { getIndexPatternById, getIndexPatternIdFromName } from '../util/index_utils';
 import { mlJobService } from './job_service';
-import { IndexPattern } from '../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../src/plugins/data_views/public';
 
 type FormatsByJobId = Record<string, any>;
 type IndexPatternIdsByJob = Record<string, any>;
@@ -66,11 +66,7 @@ class FieldFormatService {
 
   // Utility for returning the FieldFormat from a full populated Kibana index pattern object
   // containing the list of fields by name with their formats.
-  getFieldFormatFromIndexPattern(
-    fullIndexPattern: IndexPattern,
-    fieldName: string,
-    esAggName: string
-  ) {
+  getFieldFormatFromIndexPattern(fullIndexPattern: DataView, fieldName: string, esAggName: string) {
     // Don't use the field formatter for distinct count detectors as
     // e.g. distinct_count(clientip) should be formatted as a count, not as an IP address.
     let fieldFormat;
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts
index d3b407c2bb65a..02b2e573f8c69 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IIndexPattern, IndexPatternsContract } from '../../../../../../../src/plugins/data/public';
+import { DataView, DataViewsContract } from '../../../../../../../src/plugins/data_views/public';
 import { getIndexPatternAndSavedSearch } from '../../util/index_utils';
 import { JobType } from '../../../../common/types/saved_objects';
 import { newJobCapsServiceAnalytics } from '../new_job_capabilities/new_job_capabilities_service_analytics';
@@ -19,7 +19,7 @@ export const DATA_FRAME_ANALYTICS = 'data-frame-analytics';
 export function loadNewJobCapabilities(
   indexPatternId: string,
   savedSearchId: string,
-  indexPatterns: IndexPatternsContract,
+  indexPatterns: DataViewsContract,
   jobType: JobType
 ) {
   return new Promise(async (resolve, reject) => {
@@ -29,7 +29,7 @@ export function loadNewJobCapabilities(
 
       if (indexPatternId !== undefined) {
         // index pattern is being used
-        const indexPattern: IIndexPattern = await indexPatterns.get(indexPatternId);
+        const indexPattern: DataView = await indexPatterns.get(indexPatternId);
         await serviceToUse.initializeFromIndexPattern(indexPattern);
         resolve(serviceToUse.newJobCaps);
       } else if (savedSearchId !== undefined) {
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts
index 8c515255927b4..49c8b08007d52 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { newJobCapsService } from './new_job_capabilities_service';
-import { IndexPattern } from '../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 
 // there is magic happening here. starting the include name with `mock..`
 // ensures it can be lazily loaded by the jest.mock function below.
@@ -23,7 +23,7 @@ jest.mock('../ml_api_service', () => ({
 const indexPattern = {
   id: 'cloudwatch-*',
   title: 'cloudwatch-*',
-} as unknown as IndexPattern;
+} as unknown as DataView;
 
 describe('new_job_capabilities_service', () => {
   describe('cloudwatch newJobCaps()', () => {
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
index c17f379355cea..45dc71ed6a6b9 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
@@ -11,7 +11,8 @@ import {
   FieldId,
   EVENT_RATE_FIELD_ID,
 } from '../../../../common/types/fields';
-import { ES_FIELD_TYPES, IIndexPattern } from '../../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { ml } from '../ml_api_service';
 import { processTextAndKeywordFields, NewJobCapabilitiesServiceBase } from './new_job_capabilities';
 
@@ -36,7 +37,7 @@ class NewJobCapsService extends NewJobCapabilitiesServiceBase {
   }
 
   public async initializeFromIndexPattern(
-    indexPattern: IIndexPattern,
+    indexPattern: DataView,
     includeEventRateField = true,
     removeTextFields = true
   ) {
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts
index 3a362a88e40bb..f8f9ae6b2b0a3 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts
@@ -6,7 +6,8 @@
  */
 
 import { Field, NewJobCapsResponse } from '../../../../common/types/fields';
-import { ES_FIELD_TYPES, IIndexPattern } from '../../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { processTextAndKeywordFields, NewJobCapabilitiesServiceBase } from './new_job_capabilities';
 import { ml } from '../ml_api_service';
 
@@ -42,7 +43,7 @@ export function removeNestedFieldChildren(resp: NewJobCapsResponse, indexPattern
 }
 
 class NewJobCapsServiceAnalytics extends NewJobCapabilitiesServiceBase {
-  public async initializeFromIndexPattern(indexPattern: IIndexPattern) {
+  public async initializeFromIndexPattern(indexPattern: DataView) {
     try {
       const resp: NewJobCapsResponse = await ml.dataFrameAnalytics.newJobCapsAnalytics(
         indexPattern.title,
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts
index eaf30d9894f60..ec2a2a1077a7f 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { removeNestedFieldChildren } from './new_job_capabilities_service_analytics';
-import { IndexPattern } from '../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 
 // there is magic happening here. starting the include name with `mock..`
 // ensures it can be lazily loaded by the jest.mock function below.
@@ -15,7 +15,7 @@ import nestedFieldIndexResponse from '../__mocks__/nested_field_index_response.j
 const indexPattern = {
   id: 'nested-field-index',
   title: 'nested-field-index',
-} as unknown as IndexPattern;
+} as unknown as DataView;
 
 describe('removeNestedFieldChildren', () => {
   describe('cloudwatch newJobCapsAnalytics()', () => {
diff --git a/x-pack/plugins/ml/public/application/util/dependency_cache.ts b/x-pack/plugins/ml/public/application/util/dependency_cache.ts
index 4a3194ed4113f..7b6b75677dddd 100644
--- a/x-pack/plugins/ml/public/application/util/dependency_cache.ts
+++ b/x-pack/plugins/ml/public/application/util/dependency_cache.ts
@@ -19,8 +19,9 @@ import type {
   ChromeRecentlyAccessed,
   IBasePath,
 } from 'kibana/public';
-import type { IndexPatternsContract, DataPublicPluginStart } from 'src/plugins/data/public';
+import type { DataPublicPluginStart } from 'src/plugins/data/public';
 import type { SharePluginStart } from 'src/plugins/share/public';
+import type { DataViewsContract } from '../../../../../../src/plugins/data_views/public';
 import type { SecurityPluginSetup } from '../../../../security/public';
 import type { MapsStartApi } from '../../../../maps/public';
 import type { DataVisualizerPluginStart } from '../../../../data_visualizer/public';
@@ -28,7 +29,7 @@ import type { DataVisualizerPluginStart } from '../../../../data_visualizer/publ
 export interface DependencyCache {
   timefilter: DataPublicPluginSetup['query']['timefilter'] | null;
   config: IUiSettingsClient | null;
-  indexPatterns: IndexPatternsContract | null;
+  indexPatterns: DataViewsContract | null;
   chrome: ChromeStart | null;
   docLinks: DocLinksStart | null;
   toastNotifications: ToastsStart | null;
@@ -45,6 +46,7 @@ export interface DependencyCache {
   urlGenerators: SharePluginStart['urlGenerators'] | null;
   maps: MapsStartApi | null;
   dataVisualizer: DataVisualizerPluginStart | null;
+  dataViews: DataViewsContract | null;
 }
 
 const cache: DependencyCache = {
@@ -67,6 +69,7 @@ const cache: DependencyCache = {
   urlGenerators: null,
   maps: null,
   dataVisualizer: null,
+  dataViews: null,
 };
 
 export function setDependencyCache(deps: Partial<DependencyCache>) {
@@ -88,6 +91,7 @@ export function setDependencyCache(deps: Partial<DependencyCache>) {
   cache.i18n = deps.i18n || null;
   cache.urlGenerators = deps.urlGenerators || null;
   cache.dataVisualizer = deps.dataVisualizer || null;
+  cache.dataViews = deps.dataViews || null;
 }
 
 export function getTimefilter() {
@@ -208,6 +212,13 @@ export function getGetUrlGenerator() {
   return cache.urlGenerators.getUrlGenerator;
 }
 
+export function getDataViews() {
+  if (cache.dataViews === null) {
+    throw new Error("dataViews hasn't been initialized");
+  }
+  return cache.dataViews;
+}
+
 export function clearCache() {
   Object.keys(cache).forEach((k) => {
     cache[k as keyof DependencyCache] = null;
diff --git a/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts b/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts
index 440ac411e8ee7..0c50dc9efa343 100644
--- a/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts
+++ b/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { IFieldType, KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
+import { DataViewField } from '../../../../../../src/plugins/data_views/common';
 import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 import {
   kbnTypeToMLJobType,
@@ -16,28 +17,34 @@ import {
 describe('ML - field type utils', () => {
   describe('kbnTypeToMLJobType', () => {
     test('returns correct ML_JOB_FIELD_TYPES for KBN_FIELD_TYPES', () => {
-      const field: IFieldType = {
+      // @ts-ignore reassigning missing properties
+      const field: DataViewField = {
         type: KBN_FIELD_TYPES.NUMBER,
         name: KBN_FIELD_TYPES.NUMBER,
         aggregatable: true,
       };
       expect(kbnTypeToMLJobType(field)).toBe(ML_JOB_FIELD_TYPES.NUMBER);
 
+      // @ts-ignore reassigning read-only type
       field.type = KBN_FIELD_TYPES.DATE;
       expect(kbnTypeToMLJobType(field)).toBe(ML_JOB_FIELD_TYPES.DATE);
 
+      // @ts-ignore reassigning read-only type
       field.type = KBN_FIELD_TYPES.IP;
       expect(kbnTypeToMLJobType(field)).toBe(ML_JOB_FIELD_TYPES.IP);
 
+      // @ts-ignore reassigning read-only type
       field.type = KBN_FIELD_TYPES.BOOLEAN;
       expect(kbnTypeToMLJobType(field)).toBe(ML_JOB_FIELD_TYPES.BOOLEAN);
 
+      // @ts-ignore reassigning read-only type
       field.type = KBN_FIELD_TYPES.GEO_POINT;
       expect(kbnTypeToMLJobType(field)).toBe(ML_JOB_FIELD_TYPES.GEO_POINT);
     });
 
     test('returns ML_JOB_FIELD_TYPES.KEYWORD for aggregatable KBN_FIELD_TYPES.STRING', () => {
-      const field: IFieldType = {
+      // @ts-ignore reassigning missing properties
+      const field: DataViewField = {
         type: KBN_FIELD_TYPES.STRING,
         name: KBN_FIELD_TYPES.STRING,
         aggregatable: true,
@@ -46,7 +53,8 @@ describe('ML - field type utils', () => {
     });
 
     test('returns ML_JOB_FIELD_TYPES.TEXT for non-aggregatable KBN_FIELD_TYPES.STRING', () => {
-      const field: IFieldType = {
+      // @ts-ignore reassigning missing properties
+      const field: DataViewField = {
         type: KBN_FIELD_TYPES.STRING,
         name: KBN_FIELD_TYPES.STRING,
         aggregatable: false,
@@ -55,7 +63,8 @@ describe('ML - field type utils', () => {
     });
 
     test('returns undefined for non-aggregatable "foo"', () => {
-      const field: IFieldType = {
+      // @ts-ignore reassigning missing properties
+      const field: DataViewField = {
         type: 'foo',
         name: 'foo',
         aggregatable: false,
diff --git a/x-pack/plugins/ml/public/application/util/field_types_utils.ts b/x-pack/plugins/ml/public/application/util/field_types_utils.ts
index 0cb21fec1862f..c02a1cbec56ec 100644
--- a/x-pack/plugins/ml/public/application/util/field_types_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/field_types_utils.ts
@@ -8,12 +8,13 @@
 import { i18n } from '@kbn/i18n';
 import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 
-import { IFieldType, KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
+import { DataViewField } from '../../../../../../src/plugins/data_views/common';
 
 // convert kibana types to ML Job types
 // this is needed because kibana types only have string and not text and keyword.
 // and we can't use ES_FIELD_TYPES because it has no NUMBER type
-export function kbnTypeToMLJobType(field: IFieldType) {
+export function kbnTypeToMLJobType(field: DataViewField) {
   // Return undefined if not one of the supported data visualizer field types.
   let type;
   switch (field.type) {
diff --git a/x-pack/plugins/ml/public/application/util/index_utils.ts b/x-pack/plugins/ml/public/application/util/index_utils.ts
index 9d705c8cd725f..b4f46d4df0cbb 100644
--- a/x-pack/plugins/ml/public/application/util/index_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/index_utils.ts
@@ -6,33 +6,20 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  IndexPattern,
-  IIndexPattern,
-  IndexPatternsContract,
-  Query,
-  IndexPatternAttributes,
-} from '../../../../../../src/plugins/data/public';
-import { getToastNotifications, getSavedObjectsClient } from './dependency_cache';
-import { IndexPatternSavedObject, SavedSearchSavedObject } from '../../../common/types/kibana';
-
-let indexPatternCache: IndexPatternSavedObject[] = [];
+import type { Query } from '../../../../../../src/plugins/data/public';
+import type { DataView, DataViewsContract } from '../../../../../../src/plugins/data_views/public';
+import type { SavedSearchSavedObject } from '../../../common/types/kibana';
+import { getToastNotifications, getSavedObjectsClient, getDataViews } from './dependency_cache';
+
+let indexPatternCache: DataView[] = [];
 let savedSearchesCache: SavedSearchSavedObject[] = [];
-let indexPatternsContract: IndexPatternsContract | null = null;
+let indexPatternsContract: DataViewsContract | null = null;
 
-export function loadIndexPatterns(indexPatterns: IndexPatternsContract) {
+export async function loadIndexPatterns(indexPatterns: DataViewsContract) {
   indexPatternsContract = indexPatterns;
-  const savedObjectsClient = getSavedObjectsClient();
-  return savedObjectsClient
-    .find<IndexPatternAttributes>({
-      type: 'index-pattern',
-      fields: ['id', 'title', 'type', 'fields'],
-      perPage: 10000,
-    })
-    .then((response) => {
-      indexPatternCache = response.savedObjects;
-      return indexPatternCache;
-    });
+  const dataViewsContract = getDataViews();
+  indexPatternCache = await dataViewsContract.find('*', 10000);
+  return indexPatternCache;
 }
 
 export function loadSavedSearches() {
@@ -63,20 +50,15 @@ export function getIndexPatternsContract() {
 }
 
 export function getIndexPatternNames() {
-  return indexPatternCache.map((i) => i.attributes && i.attributes.title);
+  return indexPatternCache.map((i) => i.title);
 }
 
 export function getIndexPatternIdFromName(name: string) {
-  for (let j = 0; j < indexPatternCache.length; j++) {
-    if (indexPatternCache[j].get('title') === name) {
-      return indexPatternCache[j].id;
-    }
-  }
-  return null;
+  return indexPatternCache.find((i) => i.title === name)?.id ?? null;
 }
 export interface IndexPatternAndSavedSearch {
   savedSearch: SavedSearchSavedObject | null;
-  indexPattern: IIndexPattern | null;
+  indexPattern: DataView | null;
 }
 export async function getIndexPatternAndSavedSearch(savedSearchId: string) {
   const resp: IndexPatternAndSavedSearch = {
@@ -106,7 +88,7 @@ export function getQueryFromSavedSearch(savedSearch: SavedSearchSavedObject) {
   };
 }
 
-export function getIndexPatternById(id: string): Promise<IndexPattern> {
+export function getIndexPatternById(id: string): Promise<DataView> {
   if (indexPatternsContract !== null) {
     if (id) {
       return indexPatternsContract.get(id);
@@ -127,7 +109,7 @@ export function getSavedSearchById(id: string): SavedSearchSavedObject | undefin
  * an optional flag will trigger the display a notification at the top of the page
  * warning that the index is not time based
  */
-export function timeBasedIndexCheck(indexPattern: IndexPattern, showNotification = false) {
+export function timeBasedIndexCheck(indexPattern: DataView, showNotification = false) {
   if (!indexPattern.isTimeBased()) {
     if (showNotification) {
       const toastNotifications = getToastNotifications();
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx
index 65d26b844e960..47be6065aa99b 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx
@@ -21,7 +21,7 @@ import {
   AnomalyChartsEmbeddableOutput,
   AnomalyChartsServices,
 } from '..';
-import type { IndexPattern } from '../../../../../../src/plugins/data/common';
+import type { DataView } from '../../../../../../src/plugins/data_views/common';
 import { EmbeddableLoading } from '../common/components/embeddable_loading_fallback';
 export const getDefaultExplorerChartsPanelTitle = (jobIds: JobId[]) =>
   i18n.translate('xpack.ml.anomalyChartsEmbeddable.title', {
@@ -66,7 +66,7 @@ export class AnomalyChartsEmbeddable extends Embeddable<
       const indices = new Set(jobs.map((j) => j.datafeed_config.indices).flat());
 
       // Then find the index patterns assuming the index pattern title matches the index name
-      const indexPatterns: Record<string, IndexPattern> = {};
+      const indexPatterns: Record<string, DataView> = {};
       for (const indexName of indices) {
         const response = await indexPatternsService.find(`"${indexName}"`);
 
diff --git a/x-pack/plugins/ml/public/embeddables/types.ts b/x-pack/plugins/ml/public/embeddables/types.ts
index 7c93fb31e9a6c..bf23f397fe08c 100644
--- a/x-pack/plugins/ml/public/embeddables/types.ts
+++ b/x-pack/plugins/ml/public/embeddables/types.ts
@@ -27,7 +27,7 @@ import {
   ANOMALY_SWIMLANE_EMBEDDABLE_TYPE,
 } from './constants';
 import { MlResultsService } from '../application/services/results_service';
-import { IndexPattern } from '../../../../../src/plugins/data/common';
+import type { DataView } from '../../../../../src/plugins/data_views/common';
 
 export interface AnomalySwimlaneEmbeddableCustomInput {
   jobIds: JobId[];
@@ -110,7 +110,7 @@ export type AnomalyChartsEmbeddableServices = [CoreStart, MlDependencies, Anomal
 export interface AnomalyChartsCustomOutput {
   entityFields?: EntityField[];
   severity?: number;
-  indexPatterns?: IndexPattern[];
+  indexPatterns?: DataView[];
 }
 export type AnomalyChartsEmbeddableOutput = EmbeddableOutput & AnomalyChartsCustomOutput;
 export interface EditAnomalyChartsPanelContext {
diff --git a/x-pack/plugins/ml/server/lib/data_views_utils.ts b/x-pack/plugins/ml/server/lib/data_views_utils.ts
new file mode 100644
index 0000000000000..497404425eff8
--- /dev/null
+++ b/x-pack/plugins/ml/server/lib/data_views_utils.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 type { IScopedClusterClient, SavedObjectsClientContract } from 'kibana/server';
+
+import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
+import type { PluginStart as DataViewsPluginStart } from '../../../../../src/plugins/data_views/server';
+
+export type GetDataViewsService = () => Promise<DataViewsService>;
+
+export function getDataViewsServiceFactory(
+  getDataViews: () => DataViewsPluginStart | null,
+  savedObjectClient: SavedObjectsClientContract,
+  scopedClient: IScopedClusterClient
+): GetDataViewsService {
+  const dataViews = getDataViews();
+  if (dataViews === null) {
+    throw Error('data views service has not been initialized');
+  }
+
+  return () => dataViews.dataViewsServiceFactory(savedObjectClient, scopedClient.asInternalUser);
+}
diff --git a/x-pack/plugins/ml/server/lib/route_guard.ts b/x-pack/plugins/ml/server/lib/route_guard.ts
index 1a066660d4ee0..b7b0568c10a31 100644
--- a/x-pack/plugins/ml/server/lib/route_guard.ts
+++ b/x-pack/plugins/ml/server/lib/route_guard.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import {
+import type {
   KibanaRequest,
   KibanaResponseFactory,
   RequestHandlerContext,
@@ -13,14 +13,17 @@ import {
   RequestHandler,
   SavedObjectsClientContract,
 } from 'kibana/server';
-import { SpacesPluginSetup } from '../../../spaces/server';
+import type { SpacesPluginSetup } from '../../../spaces/server';
 import type { SecurityPluginSetup } from '../../../security/server';
 
 import { jobSavedObjectServiceFactory, JobSavedObjectService } from '../saved_objects';
-import { MlLicense } from '../../common/license';
+import type { MlLicense } from '../../common/license';
 
 import { MlClient, getMlClient } from '../lib/ml_client';
 import type { AlertingApiRequestHandlerContext } from '../../../alerting/server';
+import type { PluginStart as DataViewsPluginStart } from '../../../../../src/plugins/data_views/server';
+import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
+import { getDataViewsServiceFactory } from './data_views_utils';
 
 type MLRequestHandlerContext = RequestHandlerContext & {
   alerting?: AlertingApiRequestHandlerContext;
@@ -33,10 +36,12 @@ type Handler<P = unknown, Q = unknown, B = unknown> = (handlerParams: {
   context: MLRequestHandlerContext;
   jobSavedObjectService: JobSavedObjectService;
   mlClient: MlClient;
+  getDataViewsService(): Promise<DataViewsService>;
 }) => ReturnType<RequestHandler<P, Q, B>>;
 
 type GetMlSavedObjectClient = (request: KibanaRequest) => SavedObjectsClientContract | null;
 type GetInternalSavedObjectClient = () => SavedObjectsClientContract | null;
+type GetDataViews = () => DataViewsPluginStart | null;
 
 export class RouteGuard {
   private _mlLicense: MlLicense;
@@ -45,6 +50,7 @@ export class RouteGuard {
   private _spacesPlugin: SpacesPluginSetup | undefined;
   private _authorization: SecurityPluginSetup['authz'] | undefined;
   private _isMlReady: () => Promise<void>;
+  private _getDataViews: GetDataViews;
 
   constructor(
     mlLicense: MlLicense,
@@ -52,7 +58,8 @@ export class RouteGuard {
     getInternalSavedObject: GetInternalSavedObjectClient,
     spacesPlugin: SpacesPluginSetup | undefined,
     authorization: SecurityPluginSetup['authz'] | undefined,
-    isMlReady: () => Promise<void>
+    isMlReady: () => Promise<void>,
+    getDataViews: GetDataViews
   ) {
     this._mlLicense = mlLicense;
     this._getMlSavedObjectClient = getSavedObject;
@@ -60,6 +67,7 @@ export class RouteGuard {
     this._spacesPlugin = spacesPlugin;
     this._authorization = authorization;
     this._isMlReady = isMlReady;
+    this._getDataViews = getDataViews;
   }
 
   public fullLicenseAPIGuard<P, Q, B>(handler: Handler<P, Q, B>) {
@@ -79,6 +87,7 @@ export class RouteGuard {
         return response.forbidden();
       }
 
+      const client = context.core.elasticsearch.client;
       const mlSavedObjectClient = this._getMlSavedObjectClient(request);
       const internalSavedObjectsClient = this._getInternalSavedObjectClient();
       if (mlSavedObjectClient === null || internalSavedObjectsClient === null) {
@@ -94,7 +103,6 @@ export class RouteGuard {
         this._authorization,
         this._isMlReady
       );
-      const client = context.core.elasticsearch.client;
 
       return handler({
         client,
@@ -103,6 +111,11 @@ export class RouteGuard {
         context,
         jobSavedObjectService,
         mlClient: getMlClient(client, jobSavedObjectService),
+        getDataViewsService: getDataViewsServiceFactory(
+          this._getDataViews,
+          context.core.savedObjects.client,
+          client
+        ),
       });
     };
   }
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts
index 15b4cfa5be8b1..568be4197baf8 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts
@@ -5,29 +5,19 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
-import { IndexPatternAttributes } from 'src/plugins/data/server';
+import { DataViewsService } from '../../../../../../src/plugins/data_views/common';
 
 export class IndexPatternHandler {
-  constructor(private savedObjectsClient: SavedObjectsClientContract) {}
+  constructor(private dataViewService: DataViewsService) {}
   // returns a id based on an index pattern name
   async getIndexPatternId(indexName: string) {
-    const response = await this.savedObjectsClient.find<IndexPatternAttributes>({
-      type: 'index-pattern',
-      perPage: 10,
-      search: `"${indexName}"`,
-      searchFields: ['title'],
-      fields: ['title'],
-    });
-
-    const ip = response.saved_objects.find(
-      (obj) => obj.attributes.title.toLowerCase() === indexName.toLowerCase()
+    const dv = (await this.dataViewService.find(indexName)).find(
+      ({ title }) => title === indexName
     );
-
-    return ip?.id;
+    return dv?.id;
   }
 
   async deleteIndexPatternById(indexId: string) {
-    return await this.savedObjectsClient.delete('index-pattern', indexId);
+    return await this.dataViewService.delete(indexId);
   }
 }
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
index 8ddb805af2033..e853d5de5899d 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
@@ -5,11 +5,16 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract, KibanaRequest, IScopedClusterClient } from 'kibana/server';
-import { Module } from '../../../common/types/modules';
+import type {
+  SavedObjectsClientContract,
+  KibanaRequest,
+  IScopedClusterClient,
+} from 'kibana/server';
+import type { DataViewsService } from '../../../../../../src/plugins/data_views/common';
+import type { Module } from '../../../common/types/modules';
 import { DataRecognizer } from '../data_recognizer';
 import type { MlClient } from '../../lib/ml_client';
-import { JobSavedObjectService } from '../../saved_objects';
+import type { JobSavedObjectService } from '../../saved_objects';
 
 const callAs = () => Promise.resolve({ body: {} });
 
@@ -28,6 +33,7 @@ describe('ML - data recognizer', () => {
       find: jest.fn(),
       bulkCreate: jest.fn(),
     } as unknown as SavedObjectsClientContract,
+    { find: jest.fn() } as unknown as DataViewsService,
     {} as JobSavedObjectService,
     { headers: { authorization: '' } } as KibanaRequest
   );
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
index f9c609803217e..711ec0d458f27 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
@@ -8,17 +8,21 @@
 import fs from 'fs';
 import Boom from '@hapi/boom';
 import numeral from '@elastic/numeral';
-import { KibanaRequest, IScopedClusterClient, SavedObjectsClientContract } from 'kibana/server';
+import type {
+  KibanaRequest,
+  IScopedClusterClient,
+  SavedObjectsClientContract,
+} from 'kibana/server';
 
 import moment from 'moment';
-import { IndexPatternAttributes } from 'src/plugins/data/server';
 import { merge } from 'lodash';
-import { AnalysisLimits } from '../../../common/types/anomaly_detection_jobs';
+import type { DataViewsService } from '../../../../../../src/plugins/data_views/common';
+import type { AnalysisLimits } from '../../../common/types/anomaly_detection_jobs';
 import { getAuthorizationHeader } from '../../lib/request_authorization';
-import { MlInfoResponse } from '../../../common/types/ml_server_info';
+import type { MlInfoResponse } from '../../../common/types/ml_server_info';
 import type { MlClient } from '../../lib/ml_client';
 import { ML_MODULE_SAVED_OBJECT_TYPE } from '../../../common/types/saved_objects';
-import {
+import type {
   KibanaObjects,
   KibanaObjectConfig,
   ModuleDatafeed,
@@ -35,8 +39,8 @@ import {
   DataRecognizerConfigResponse,
   GeneralDatafeedsOverride,
   JobSpecificOverride,
-  isGeneralJobOverride,
 } from '../../../common/types/modules';
+import { isGeneralJobOverride } from '../../../common/types/modules';
 import {
   getLatestDataOrBucketTimestamp,
   prefixDatafeedId,
@@ -47,10 +51,10 @@ import { calculateModelMemoryLimitProvider } from '../calculate_model_memory_lim
 import { fieldsServiceProvider } from '../fields_service';
 import { jobServiceProvider } from '../job_service';
 import { resultsServiceProvider } from '../results_service';
-import { JobExistResult, JobStat } from '../../../common/types/data_recognizer';
-import { MlJobsStatsResponse } from '../../../common/types/job_service';
-import { Datafeed } from '../../../common/types/anomaly_detection_jobs';
-import { JobSavedObjectService } from '../../saved_objects';
+import type { JobExistResult, JobStat } from '../../../common/types/data_recognizer';
+import type { MlJobsStatsResponse } from '../../../common/types/job_service';
+import type { Datafeed } from '../../../common/types/anomaly_detection_jobs';
+import type { JobSavedObjectService } from '../../saved_objects';
 import { isDefined } from '../../../common/types/guards';
 import { isPopulatedObject } from '../../../common/util/object_utils';
 
@@ -110,6 +114,7 @@ export class DataRecognizer {
   private _mlClient: MlClient;
   private _savedObjectsClient: SavedObjectsClientContract;
   private _jobSavedObjectService: JobSavedObjectService;
+  private _dataViewsService: DataViewsService;
   private _request: KibanaRequest;
 
   private _authorizationHeader: object;
@@ -130,12 +135,14 @@ export class DataRecognizer {
     mlClusterClient: IScopedClusterClient,
     mlClient: MlClient,
     savedObjectsClient: SavedObjectsClientContract,
+    dataViewsService: DataViewsService,
     jobSavedObjectService: JobSavedObjectService,
     request: KibanaRequest
   ) {
     this._client = mlClusterClient;
     this._mlClient = mlClient;
     this._savedObjectsClient = savedObjectsClient;
+    this._dataViewsService = dataViewsService;
     this._jobSavedObjectService = jobSavedObjectService;
     this._request = request;
     this._authorizationHeader = getAuthorizationHeader(request);
@@ -615,22 +622,11 @@ export class DataRecognizer {
     return results;
   }
 
-  private async _loadIndexPatterns() {
-    return await this._savedObjectsClient.find<IndexPatternAttributes>({
-      type: 'index-pattern',
-      perPage: 1000,
-    });
-  }
-
   // returns a id based on an index pattern name
-  private async _getIndexPatternId(name: string) {
+  private async _getIndexPatternId(name: string): Promise<string | undefined> {
     try {
-      const indexPatterns = await this._loadIndexPatterns();
-      if (indexPatterns === undefined || indexPatterns.saved_objects === undefined) {
-        return;
-      }
-      const ip = indexPatterns.saved_objects.find((i) => i.attributes.title === name);
-      return ip !== undefined ? ip.id : undefined;
+      const dataViews = await this._dataViewsService.find(name);
+      return dataViews.find((d) => d.title === name)?.id;
     } catch (error) {
       mlLog.warn(`Error loading index patterns, ${error}`);
       return;
@@ -1387,3 +1383,21 @@ export class DataRecognizer {
     }
   }
 }
+
+export function dataRecognizerFactory(
+  client: IScopedClusterClient,
+  mlClient: MlClient,
+  savedObjectsClient: SavedObjectsClientContract,
+  dataViewsService: DataViewsService,
+  jobSavedObjectService: JobSavedObjectService,
+  request: KibanaRequest
+) {
+  return new DataRecognizer(
+    client,
+    mlClient,
+    savedObjectsClient,
+    dataViewsService,
+    jobSavedObjectService,
+    request
+  );
+}
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/index.ts b/x-pack/plugins/ml/server/models/data_recognizer/index.ts
index 27c45726ae249..fbddf17a50ede 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/index.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { DataRecognizer, RecognizeResult } from './data_recognizer';
+export { DataRecognizer, RecognizeResult, dataRecognizerFactory } from './data_recognizer';
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/__mocks__/responses/data_view_rollup_cloudwatch.json b/x-pack/plugins/ml/server/models/job_service/new_job_caps/__mocks__/responses/data_view_rollup_cloudwatch.json
new file mode 100644
index 0000000000000..a6aeb81431532
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/__mocks__/responses/data_view_rollup_cloudwatch.json
@@ -0,0 +1,151 @@
+[
+  {
+    "id": "d6ac99b0-2777-11ec-8e1c-aba6d0767aaa",
+    "title": "cloud_roll_index",
+    "fieldFormatMap": {},
+    "typeMeta": {
+      "params": {
+        "rollup_index": "cloud_roll_index"
+      },
+      "aggs": {
+        "date_histogram": {
+          "@timestamp": {
+            "agg": "date_histogram",
+            "fixed_interval": "5m",
+            "time_zone": "UTC"
+          }
+        }
+      }
+    },
+    "fields": [
+      {
+        "count": 0,
+        "name": "_source",
+        "type": "_source",
+        "esTypes": [
+          "_source"
+        ],
+        "scripted": false,
+        "searchable": false,
+        "aggregatable": false,
+        "readFromDocValues": false
+      },
+      {
+        "count": 0,
+        "name": "_id",
+        "type": "string",
+        "esTypes": [
+          "_id"
+        ],
+        "scripted": false,
+        "searchable": true,
+        "aggregatable": false,
+        "readFromDocValues": false
+      },
+      {
+        "count": 0,
+        "name": "_type",
+        "type": "string",
+        "scripted": false,
+        "searchable": false,
+        "aggregatable": false,
+        "readFromDocValues": false
+      },
+      {
+        "count": 0,
+        "name": "_index",
+        "type": "string",
+        "esTypes": [
+          "_index"
+        ],
+        "scripted": false,
+        "searchable": true,
+        "aggregatable": true,
+        "readFromDocValues": false
+      },
+      {
+        "count": 0,
+        "name": "_score",
+        "type": "number",
+        "scripted": false,
+        "searchable": false,
+        "aggregatable": false,
+        "readFromDocValues": false
+      },
+      {
+        "count": 0,
+        "name": "@timestamp",
+        "type": "date",
+        "esTypes": [
+          "date"
+        ],
+        "scripted": false,
+        "searchable": true,
+        "aggregatable": true,
+        "readFromDocValues": true
+      }
+    ],
+    "timeFieldName": "@timestamp",
+    "type": "rollup",
+    "metaFields": [
+      "_source",
+      "_id",
+      "_type",
+      "_index",
+      "_score"
+    ],
+    "version": "WzY5NjEsNF0=",
+    "originalSavedObjectBody": {
+      "fieldAttrs": "{}",
+      "title": "cloud_roll_index",
+      "timeFieldName": "@timestamp",
+      "fields": "[]",
+      "type": "rollup",
+      "typeMeta": "{\"params\":{\"rollup_index\":\"cloud_roll_index\"},\"aggs\":{\"date_histogram\":{\"@timestamp\":{\"agg\":\"date_histogram\",\"fixed_interval\":\"5m\",\"time_zone\":\"UTC\"}}}}",
+      "runtimeFieldMap": "{}"
+    },
+    "shortDotsEnable": false,
+    "fieldFormats": {
+      "fieldFormats": {},
+      "defaultMap": {
+        "ip": {
+          "id": "ip",
+          "params": {}
+        },
+        "date": {
+          "id": "date",
+          "params": {}
+        },
+        "date_nanos": {
+          "id": "date_nanos",
+          "params": {},
+          "es": true
+        },
+        "number": {
+          "id": "number",
+          "params": {}
+        },
+        "boolean": {
+          "id": "boolean",
+          "params": {}
+        },
+        "histogram": {
+          "id": "histogram",
+          "params": {}
+        },
+        "_source": {
+          "id": "_source",
+          "params": {}
+        },
+        "_default_": {
+          "id": "string",
+          "params": {}
+        }
+      },
+      "metaParamsOptions": {}
+    },
+    "fieldAttrs": {},
+    "runtimeFieldMap": {},
+    "allowNoIndex": false
+  }
+]
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/__mocks__/responses/kibana_saved_objects.json b/x-pack/plugins/ml/server/models/job_service/new_job_caps/__mocks__/responses/kibana_saved_objects.json
deleted file mode 100644
index 9e2af76264231..0000000000000
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/__mocks__/responses/kibana_saved_objects.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "page": 1,
-  "per_page": 1000,
-  "total": 4,
-  "saved_objects": [
-    {
-      "type": "index-pattern",
-      "id": "be0eebe0-65ac-11e9-aa86-0793be5f3670",
-      "attributes": {
-        "title": "farequote-*"
-      },
-      "references": [],
-      "migrationVersion": {
-        "index-pattern": "6.5.0"
-      },
-      "updated_at": "2019-04-23T09:47:02.203Z",
-      "version": "WzcsMV0="
-    },
-    {
-      "type": "index-pattern",
-      "id": "be14ceb0-66b1-11e9-91c9-ffa52374d341",
-      "attributes": {
-        "typeMeta": "{\"params\":{\"rollup_index\":\"cloud_roll_index\"},\"aggs\":{\"histogram\":{\"NetworkOut\":{\"agg\":\"histogram\",\"interval\":5},\"CPUUtilization\":{\"agg\":\"histogram\",\"interval\":5},\"NetworkIn\":{\"agg\":\"histogram\",\"interval\":5}},\"avg\":{\"NetworkOut\":{\"agg\":\"avg\"},\"CPUUtilization\":{\"agg\":\"avg\"},\"NetworkIn\":{\"agg\":\"avg\"},\"DiskReadBytes\":{\"agg\":\"avg\"}},\"min\":{\"NetworkOut\":{\"agg\":\"min\"},\"NetworkIn\":{\"agg\":\"min\"}},\"value_count\":{\"NetworkOut\":{\"agg\":\"value_count\"},\"DiskReadBytes\":{\"agg\":\"value_count\"},\"CPUUtilization\":{\"agg\":\"value_count\"},\"NetworkIn\":{\"agg\":\"value_count\"}},\"max\":{\"CPUUtilization\":{\"agg\":\"max\"},\"DiskReadBytes\":{\"agg\":\"max\"}},\"date_histogram\":{\"@timestamp\":{\"agg\":\"date_histogram\",\"delay\":\"1d\",\"fixed_interval\":\"5m\",\"time_zone\":\"UTC\"}},\"terms\":{\"instance\":{\"agg\":\"terms\"},\"sourcetype.keyword\":{\"agg\":\"terms\"},\"region\":{\"agg\":\"terms\"}},\"sum\":{\"DiskReadBytes\":{\"agg\":\"sum\"},\"NetworkOut\":{\"agg\":\"sum\"}}}}",
-        "title": "cloud_roll_index",
-        "type": "rollup"
-      },
-      "references": [],
-      "migrationVersion": {
-        "index-pattern": "6.5.0"
-      },
-      "updated_at": "2019-04-24T16:55:20.550Z",
-      "version": "Wzc0LDJd"
-    }
-  ]
-}
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
index b838165826da1..a25b3183362b3 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { estypes } from '@elastic/elasticsearch';
-import { IScopedClusterClient } from 'kibana/server';
 import { cloneDeep } from 'lodash';
-import { SavedObjectsClientContract } from 'kibana/server';
-import { Field, FieldId, NewJobCaps, RollupFields } from '../../../../common/types/fields';
+import { estypes } from '@elastic/elasticsearch';
+import type { IScopedClusterClient } from 'kibana/server';
+import type { Field, FieldId, NewJobCaps, RollupFields } from '../../../../common/types/fields';
 import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/common';
+import type { DataViewsService } from '../../../../../../../src/plugins/data_views/common';
 import { combineFieldsAndAggs } from '../../../../common/util/fields_utils';
 import { rollupServiceProvider } from './rollup';
 import { aggregations, mlOnlyAggregations } from '../../../../common/constants/aggregation_types';
@@ -38,27 +38,27 @@ export function fieldServiceProvider(
   indexPattern: string,
   isRollup: boolean,
   client: IScopedClusterClient,
-  savedObjectsClient: SavedObjectsClientContract
+  dataViewsService: DataViewsService
 ) {
-  return new FieldsService(indexPattern, isRollup, client, savedObjectsClient);
+  return new FieldsService(indexPattern, isRollup, client, dataViewsService);
 }
 
 class FieldsService {
   private _indexPattern: string;
   private _isRollup: boolean;
   private _mlClusterClient: IScopedClusterClient;
-  private _savedObjectsClient: SavedObjectsClientContract;
+  private _dataViewsService: DataViewsService;
 
   constructor(
     indexPattern: string,
     isRollup: boolean,
     client: IScopedClusterClient,
-    savedObjectsClient: SavedObjectsClientContract
+    dataViewsService: DataViewsService
   ) {
     this._indexPattern = indexPattern;
     this._isRollup = isRollup;
     this._mlClusterClient = client;
-    this._savedObjectsClient = savedObjectsClient;
+    this._dataViewsService = dataViewsService;
   }
 
   private async loadFieldCaps(): Promise<any> {
@@ -111,7 +111,7 @@ class FieldsService {
       const rollupService = await rollupServiceProvider(
         this._indexPattern,
         this._mlClusterClient,
-        this._savedObjectsClient
+        this._dataViewsService
       );
       const rollupConfigs: estypes.RollupGetRollupCapabilitiesRollupCapabilitySummary[] | null =
         await rollupService.getRollupJobs();
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
index 3eb2ba5bbaced..c0f270f1df96c 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
@@ -10,7 +10,7 @@ import { newJobCapsProvider } from './index';
 import farequoteFieldCaps from './__mocks__/responses/farequote_field_caps.json';
 import cloudwatchFieldCaps from './__mocks__/responses/cloudwatch_field_caps.json';
 import rollupCaps from './__mocks__/responses/rollup_caps.json';
-import kibanaSavedObjects from './__mocks__/responses/kibana_saved_objects.json';
+import dataView from './__mocks__/responses/data_view_rollup_cloudwatch.json';
 
 import farequoteJobCaps from './__mocks__/results/farequote_job_caps.json';
 import farequoteJobCapsEmpty from './__mocks__/results/farequote_job_caps_empty.json';
@@ -19,7 +19,7 @@ import cloudwatchJobCaps from './__mocks__/results/cloudwatch_rollup_job_caps.js
 describe('job_service - job_caps', () => {
   let mlClusterClientNonRollupMock: any;
   let mlClusterClientRollupMock: any;
-  let savedObjectsClientMock: any;
+  let dataViews: any;
 
   beforeEach(() => {
     const asNonRollupMock = {
@@ -41,9 +41,9 @@ describe('job_service - job_caps', () => {
       asInternalUser: callAsRollupMock,
     };
 
-    savedObjectsClientMock = {
+    dataViews = {
       async find() {
-        return Promise.resolve(kibanaSavedObjects);
+        return Promise.resolve(dataView);
       },
     };
   });
@@ -53,7 +53,7 @@ describe('job_service - job_caps', () => {
       const indexPattern = 'farequote-*';
       const isRollup = false;
       const { newJobCaps } = newJobCapsProvider(mlClusterClientNonRollupMock);
-      const response = await newJobCaps(indexPattern, isRollup, savedObjectsClientMock);
+      const response = await newJobCaps(indexPattern, isRollup, dataViews);
       expect(response).toEqual(farequoteJobCaps);
     });
 
@@ -61,7 +61,7 @@ describe('job_service - job_caps', () => {
       const indexPattern = 'farequote-*';
       const isRollup = true;
       const { newJobCaps } = newJobCapsProvider(mlClusterClientNonRollupMock);
-      const response = await newJobCaps(indexPattern, isRollup, savedObjectsClientMock);
+      const response = await newJobCaps(indexPattern, isRollup, dataViews);
       expect(response).toEqual(farequoteJobCapsEmpty);
     });
   });
@@ -71,7 +71,7 @@ describe('job_service - job_caps', () => {
       const indexPattern = 'cloud_roll_index';
       const isRollup = true;
       const { newJobCaps } = newJobCapsProvider(mlClusterClientRollupMock);
-      const response = await newJobCaps(indexPattern, isRollup, savedObjectsClientMock);
+      const response = await newJobCaps(indexPattern, isRollup, dataViews);
       expect(response).toEqual(cloudwatchJobCaps);
     });
 
@@ -79,7 +79,7 @@ describe('job_service - job_caps', () => {
       const indexPattern = 'cloud_roll_index';
       const isRollup = false;
       const { newJobCaps } = newJobCapsProvider(mlClusterClientRollupMock);
-      const response = await newJobCaps(indexPattern, isRollup, savedObjectsClientMock);
+      const response = await newJobCaps(indexPattern, isRollup, dataViews);
       expect(response).not.toEqual(cloudwatchJobCaps);
     });
   });
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
index 6444f9ae3f61a..bab4fb31aa1a9 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
@@ -5,18 +5,19 @@
  * 2.0.
  */
 
-import { IScopedClusterClient, SavedObjectsClientContract } from 'kibana/server';
+import type { IScopedClusterClient } from 'kibana/server';
+import type { DataViewsService } from '../../../../../../../src/plugins/data_views/common';
+import type { Aggregation, Field, NewJobCapsResponse } from '../../../../common/types/fields';
 import { _DOC_COUNT } from '../../../../common/constants/field_types';
-import { Aggregation, Field, NewJobCapsResponse } from '../../../../common/types/fields';
 import { fieldServiceProvider } from './field_service';
 
 export function newJobCapsProvider(client: IScopedClusterClient) {
   async function newJobCaps(
     indexPattern: string,
     isRollup: boolean = false,
-    savedObjectsClient: SavedObjectsClientContract
+    dataViewsService: DataViewsService
   ): Promise<NewJobCapsResponse> {
-    const fieldService = fieldServiceProvider(indexPattern, isRollup, client, savedObjectsClient);
+    const fieldService = fieldServiceProvider(indexPattern, isRollup, client, dataViewsService);
     const { aggs, fields } = await fieldService.getData();
     convertForStringify(aggs, fields);
 
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
index 72408b7f9c534..87504a1bc0e10 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
@@ -6,11 +6,12 @@
  */
 
 import { estypes } from '@elastic/elasticsearch';
-import { IScopedClusterClient } from 'kibana/server';
-import { SavedObject } from 'kibana/server';
-import { IndexPatternAttributes } from 'src/plugins/data/server';
-import { SavedObjectsClientContract } from 'kibana/server';
-import { RollupFields } from '../../../../common/types/fields';
+import type { IScopedClusterClient } from 'kibana/server';
+import type {
+  DataViewsService,
+  DataView,
+} from '../../../../../../../src/plugins/data_views/common';
+import type { RollupFields } from '../../../../common/types/fields';
 
 export interface RollupJob {
   job_id: string;
@@ -22,17 +23,19 @@ export interface RollupJob {
 export async function rollupServiceProvider(
   indexPattern: string,
   { asCurrentUser }: IScopedClusterClient,
-  savedObjectsClient: SavedObjectsClientContract
+  dataViewsService: DataViewsService
 ) {
-  const rollupIndexPatternObject = await loadRollupIndexPattern(indexPattern, savedObjectsClient);
+  const rollupIndexPatternObject = await loadRollupIndexPattern(indexPattern, dataViewsService);
   let jobIndexPatterns: string[] = [indexPattern];
 
   async function getRollupJobs(): Promise<
     estypes.RollupGetRollupCapabilitiesRollupCapabilitySummary[] | null
   > {
-    if (rollupIndexPatternObject !== null) {
-      const parsedTypeMetaData = JSON.parse(rollupIndexPatternObject.attributes.typeMeta!);
-      const rollUpIndex: string = parsedTypeMetaData.params.rollup_index;
+    if (
+      rollupIndexPatternObject !== null &&
+      rollupIndexPatternObject.typeMeta?.params !== undefined
+    ) {
+      const rollUpIndex: string = rollupIndexPatternObject.typeMeta.params.rollup_index;
       const { body: rollupCaps } = await asCurrentUser.rollup.getRollupIndexCaps({
         index: rollUpIndex,
       });
@@ -60,21 +63,12 @@ export async function rollupServiceProvider(
 
 async function loadRollupIndexPattern(
   indexPattern: string,
-  savedObjectsClient: SavedObjectsClientContract
-): Promise<SavedObject<IndexPatternAttributes> | null> {
-  const resp = await savedObjectsClient.find<IndexPatternAttributes>({
-    type: 'index-pattern',
-    fields: ['title', 'type', 'typeMeta'],
-    perPage: 1000,
-  });
-
-  const obj = resp.saved_objects.find(
-    (r) =>
-      r.attributes &&
-      r.attributes.type === 'rollup' &&
-      r.attributes.title === indexPattern &&
-      r.attributes.typeMeta !== undefined
+  dataViewsService: DataViewsService
+): Promise<DataView | null> {
+  const resp = await dataViewsService.find('*', 10000);
+  const obj = resp.find(
+    (dv) => dv.type === 'rollup' && dv.title === indexPattern && dv.typeMeta !== undefined
   );
 
-  return obj || null;
+  return obj ?? null;
 }
diff --git a/x-pack/plugins/ml/server/plugin.ts b/x-pack/plugins/ml/server/plugin.ts
index 3876193cfbe39..efa61593655ac 100644
--- a/x-pack/plugins/ml/server/plugin.ts
+++ b/x-pack/plugins/ml/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
+import type {
   CoreSetup,
   CoreStart,
   Plugin,
@@ -21,10 +21,11 @@ import {
 } from 'kibana/server';
 import type { SecurityPluginSetup } from '../../security/server';
 import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
-import { PluginsSetup, PluginsStart, RouteInitialization } from './types';
-import { SpacesPluginSetup } from '../../spaces/server';
+import type { PluginStart as DataViewsPluginStart } from '../../../../src/plugins/data_views/server';
+import type { PluginsSetup, PluginsStart, RouteInitialization } from './types';
+import type { SpacesPluginSetup } from '../../spaces/server';
 import { PLUGIN_ID } from '../common/constants/app';
-import { MlCapabilities } from '../common/types/capabilities';
+import type { MlCapabilities } from '../common/types/capabilities';
 
 import { initMlServerLog } from './lib/log';
 import { initSampleDataSets } from './lib/sample_data_sets';
@@ -78,6 +79,7 @@ export class MlServerPlugin
   private savedObjectsStart: SavedObjectsServiceStart | null = null;
   private spacesPlugin: SpacesPluginSetup | undefined;
   private security: SecurityPluginSetup | undefined;
+  private dataViews: DataViewsPluginStart | null = null;
   private isMlReady: Promise<void>;
   private setMlReady: () => void = () => {};
   private readonly kibanaIndexConfig: SharedGlobalConfig;
@@ -156,7 +158,8 @@ export class MlServerPlugin
         getInternalSavedObjectsClient,
         plugins.spaces,
         plugins.security?.authz,
-        () => this.isMlReady
+        () => this.isMlReady,
+        () => this.dataViews
       ),
       mlLicense: this.mlLicense,
     };
@@ -173,6 +176,13 @@ export class MlServerPlugin
       ? () => coreSetup.getStartServices().then(([, { spaces }]) => spaces!)
       : undefined;
 
+    const getDataViews = () => {
+      if (this.dataViews === null) {
+        throw Error('Data views plugin not initialized');
+      }
+      return this.dataViews;
+    };
+
     annotationRoutes(routeInit, plugins.security);
     calendars(routeInit);
     dataFeedRoutes(routeInit);
@@ -211,6 +221,7 @@ export class MlServerPlugin
       () => getInternalSavedObjectsClient(),
       () => this.uiSettings,
       () => this.fieldsFormat,
+      getDataViews,
       () => this.isMlReady
     );
 
@@ -236,6 +247,7 @@ export class MlServerPlugin
     this.capabilities = coreStart.capabilities;
     this.clusterClient = coreStart.elasticsearch.client;
     this.savedObjectsStart = coreStart.savedObjects;
+    this.dataViews = plugins.dataViews;
 
     // check whether the job saved objects exist
     // and create them if needed.
diff --git a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
index bedc70566a62f..bbfcc0fd5e500 100644
--- a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { RequestHandlerContext, IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from 'kibana/server';
 import { wrapError } from '../client/error_wrapper';
 import { analyticsAuditMessagesProvider } from '../models/data_frame_analytics/analytics_audit_messages';
-import { RouteInitialization } from '../types';
+import type { RouteInitialization } from '../types';
 import { JOB_MAP_NODE_TYPES } from '../../common/constants/data_frame_analytics';
-import { Field, Aggregation } from '../../common/types/fields';
+import type { Field, Aggregation } from '../../common/types/fields';
 import {
   dataAnalyticsJobConfigSchema,
   dataAnalyticsJobUpdateSchema,
@@ -25,22 +25,26 @@ import {
   analyticsNewJobCapsParamsSchema,
   analyticsNewJobCapsQuerySchema,
 } from './schemas/data_analytics_schema';
-import { GetAnalyticsMapArgs, ExtendAnalyticsMapArgs } from '../models/data_frame_analytics/types';
+import type {
+  GetAnalyticsMapArgs,
+  ExtendAnalyticsMapArgs,
+} from '../models/data_frame_analytics/types';
 import { IndexPatternHandler } from '../models/data_frame_analytics/index_patterns';
 import { AnalyticsManager } from '../models/data_frame_analytics/analytics_manager';
 import { validateAnalyticsJob } from '../models/data_frame_analytics/validation';
 import { fieldServiceProvider } from '../models/job_service/new_job_caps/field_service';
-import { DeleteDataFrameAnalyticsWithIndexStatus } from '../../common/types/data_frame_analytics';
+import type { DeleteDataFrameAnalyticsWithIndexStatus } from '../../common/types/data_frame_analytics';
 import { getAuthorizationHeader } from '../lib/request_authorization';
 import type { MlClient } from '../lib/ml_client';
+import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
 
-function getIndexPatternId(context: RequestHandlerContext, patternName: string) {
-  const iph = new IndexPatternHandler(context.core.savedObjects.client);
+function getIndexPatternId(dataViewsService: DataViewsService, patternName: string) {
+  const iph = new IndexPatternHandler(dataViewsService);
   return iph.getIndexPatternId(patternName);
 }
 
-function deleteDestIndexPatternById(context: RequestHandlerContext, indexPatternId: string) {
-  const iph = new IndexPatternHandler(context.core.savedObjects.client);
+function deleteDestIndexPatternById(dataViewsService: DataViewsService, indexPatternId: string) {
+  const iph = new IndexPatternHandler(dataViewsService);
   return iph.deleteIndexPatternById(indexPatternId);
 }
 
@@ -374,86 +378,89 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout
         tags: ['access:ml:canDeleteDataFrameAnalytics'],
       },
     },
-    routeGuard.fullLicenseAPIGuard(async ({ mlClient, client, request, response, context }) => {
-      try {
-        const { analyticsId } = request.params;
-        const { deleteDestIndex, deleteDestIndexPattern } = request.query;
-        let destinationIndex: string | undefined;
-        const analyticsJobDeleted: DeleteDataFrameAnalyticsWithIndexStatus = { success: false };
-        const destIndexDeleted: DeleteDataFrameAnalyticsWithIndexStatus = { success: false };
-        const destIndexPatternDeleted: DeleteDataFrameAnalyticsWithIndexStatus = {
-          success: false,
-        };
-
+    routeGuard.fullLicenseAPIGuard(
+      async ({ mlClient, client, request, response, getDataViewsService }) => {
         try {
-          // Check if analyticsId is valid and get destination index
-          const { body } = await mlClient.getDataFrameAnalytics({
-            id: analyticsId,
-          });
-          if (Array.isArray(body.data_frame_analytics) && body.data_frame_analytics.length > 0) {
-            destinationIndex = body.data_frame_analytics[0].dest.index;
+          const { analyticsId } = request.params;
+          const { deleteDestIndex, deleteDestIndexPattern } = request.query;
+          let destinationIndex: string | undefined;
+          const analyticsJobDeleted: DeleteDataFrameAnalyticsWithIndexStatus = { success: false };
+          const destIndexDeleted: DeleteDataFrameAnalyticsWithIndexStatus = { success: false };
+          const destIndexPatternDeleted: DeleteDataFrameAnalyticsWithIndexStatus = {
+            success: false,
+          };
+
+          try {
+            // Check if analyticsId is valid and get destination index
+            const { body } = await mlClient.getDataFrameAnalytics({
+              id: analyticsId,
+            });
+            if (Array.isArray(body.data_frame_analytics) && body.data_frame_analytics.length > 0) {
+              destinationIndex = body.data_frame_analytics[0].dest.index;
+            }
+          } catch (e) {
+            // exist early if the job doesn't exist
+            return response.customError(wrapError(e));
           }
-        } catch (e) {
-          // exist early if the job doesn't exist
-          return response.customError(wrapError(e));
-        }
 
-        if (deleteDestIndex || deleteDestIndexPattern) {
-          // If user checks box to delete the destinationIndex associated with the job
-          if (destinationIndex && deleteDestIndex) {
-            // Verify if user has privilege to delete the destination index
-            const userCanDeleteDestIndex = await userCanDeleteIndex(client, destinationIndex);
-            // If user does have privilege to delete the index, then delete the index
-            if (userCanDeleteDestIndex) {
-              try {
-                await client.asCurrentUser.indices.delete({
-                  index: destinationIndex,
-                });
-                destIndexDeleted.success = true;
-              } catch ({ body }) {
-                destIndexDeleted.error = body;
+          if (deleteDestIndex || deleteDestIndexPattern) {
+            // If user checks box to delete the destinationIndex associated with the job
+            if (destinationIndex && deleteDestIndex) {
+              // Verify if user has privilege to delete the destination index
+              const userCanDeleteDestIndex = await userCanDeleteIndex(client, destinationIndex);
+              // If user does have privilege to delete the index, then delete the index
+              if (userCanDeleteDestIndex) {
+                try {
+                  await client.asCurrentUser.indices.delete({
+                    index: destinationIndex,
+                  });
+                  destIndexDeleted.success = true;
+                } catch ({ body }) {
+                  destIndexDeleted.error = body;
+                }
+              } else {
+                return response.forbidden();
               }
-            } else {
-              return response.forbidden();
             }
-          }
 
-          // Delete the index pattern if there's an index pattern that matches the name of dest index
-          if (destinationIndex && deleteDestIndexPattern) {
-            try {
-              const indexPatternId = await getIndexPatternId(context, destinationIndex);
-              if (indexPatternId) {
-                await deleteDestIndexPatternById(context, indexPatternId);
+            // Delete the index pattern if there's an index pattern that matches the name of dest index
+            if (destinationIndex && deleteDestIndexPattern) {
+              try {
+                const dataViewsService = await getDataViewsService();
+                const indexPatternId = await getIndexPatternId(dataViewsService, destinationIndex);
+                if (indexPatternId) {
+                  await deleteDestIndexPatternById(dataViewsService, indexPatternId);
+                }
+                destIndexPatternDeleted.success = true;
+              } catch (deleteDestIndexPatternError) {
+                destIndexPatternDeleted.error = deleteDestIndexPatternError;
               }
-              destIndexPatternDeleted.success = true;
-            } catch (deleteDestIndexPatternError) {
-              destIndexPatternDeleted.error = deleteDestIndexPatternError;
             }
           }
-        }
-        // Grab the target index from the data frame analytics job id
-        // Delete the data frame analytics
+          // Grab the target index from the data frame analytics job id
+          // Delete the data frame analytics
 
-        try {
-          await mlClient.deleteDataFrameAnalytics({
-            id: analyticsId,
+          try {
+            await mlClient.deleteDataFrameAnalytics({
+              id: analyticsId,
+            });
+            analyticsJobDeleted.success = true;
+          } catch ({ body }) {
+            analyticsJobDeleted.error = body;
+          }
+          const results = {
+            analyticsJobDeleted,
+            destIndexDeleted,
+            destIndexPatternDeleted,
+          };
+          return response.ok({
+            body: results,
           });
-          analyticsJobDeleted.success = true;
-        } catch ({ body }) {
-          analyticsJobDeleted.error = body;
+        } catch (e) {
+          return response.customError(wrapError(e));
         }
-        const results = {
-          analyticsJobDeleted,
-          destIndexDeleted,
-          destIndexPatternDeleted,
-        };
-        return response.ok({
-          body: results,
-        });
-      } catch (e) {
-        return response.customError(wrapError(e));
       }
-    })
+    )
   );
 
   /**
@@ -716,17 +723,12 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout
         tags: ['access:ml:canGetJobs'],
       },
     },
-    routeGuard.fullLicenseAPIGuard(async ({ client, request, response, context }) => {
+    routeGuard.fullLicenseAPIGuard(async ({ client, request, response, getDataViewsService }) => {
       try {
         const { indexPattern } = request.params;
         const isRollup = request.query?.rollup === 'true';
-        const savedObjectsClient = context.core.savedObjects.client;
-        const fieldService = fieldServiceProvider(
-          indexPattern,
-          isRollup,
-          client,
-          savedObjectsClient
-        );
+        const dataViewsService = await getDataViewsService();
+        const fieldService = fieldServiceProvider(indexPattern, isRollup, client, dataViewsService);
         const { fields, aggs } = await fieldService.getData(true);
         convertForStringify(aggs, fields);
 
diff --git a/x-pack/plugins/ml/server/routes/job_service.ts b/x-pack/plugins/ml/server/routes/job_service.ts
index da115a224d19e..15b0b4449590c 100644
--- a/x-pack/plugins/ml/server/routes/job_service.ts
+++ b/x-pack/plugins/ml/server/routes/job_service.ts
@@ -8,7 +8,7 @@
 import { estypes } from '@elastic/elasticsearch';
 import { schema } from '@kbn/config-schema';
 import { wrapError } from '../client/error_wrapper';
-import { RouteInitialization } from '../types';
+import type { RouteInitialization } from '../types';
 import {
   categorizationFieldExamplesSchema,
   basicChartSchema,
@@ -32,7 +32,7 @@ import { jobIdSchema } from './schemas/anomaly_detectors_schema';
 import { jobServiceProvider } from '../models/job_service';
 import { categorizationExamplesProvider } from '../models/job_service/new_job';
 import { getAuthorizationHeader } from '../lib/request_authorization';
-import { Datafeed, Job } from '../../common/types/anomaly_detection_jobs';
+import type { Datafeed, Job } from '../../common/types/anomaly_detection_jobs';
 
 /**
  * Routes for job service
@@ -535,21 +535,24 @@ export function jobServiceRoutes({ router, routeGuard }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    routeGuard.fullLicenseAPIGuard(async ({ client, mlClient, request, response, context }) => {
-      try {
-        const { indexPattern } = request.params;
-        const isRollup = request.query?.rollup === 'true';
-        const savedObjectsClient = context.core.savedObjects.client;
-        const { newJobCaps } = jobServiceProvider(client, mlClient);
-        const resp = await newJobCaps(indexPattern, isRollup, savedObjectsClient);
-
-        return response.ok({
-          body: resp,
-        });
-      } catch (e) {
-        return response.customError(wrapError(e));
+    routeGuard.fullLicenseAPIGuard(
+      async ({ client, mlClient, request, response, getDataViewsService }) => {
+        try {
+          const { indexPattern } = request.params;
+          const isRollup = request.query?.rollup === 'true';
+          const { newJobCaps } = jobServiceProvider(client, mlClient);
+
+          const dataViewsService = await getDataViewsService();
+          const resp = await newJobCaps(indexPattern, isRollup, dataViewsService);
+
+          return response.ok({
+            body: resp,
+          });
+        } catch (e) {
+          return response.customError(wrapError(e));
+        }
       }
-    })
+    )
   );
 
   /**
diff --git a/x-pack/plugins/ml/server/routes/modules.ts b/x-pack/plugins/ml/server/routes/modules.ts
index 097f3f8d67652..d814e91f70ca0 100644
--- a/x-pack/plugins/ml/server/routes/modules.ts
+++ b/x-pack/plugins/ml/server/routes/modules.ts
@@ -5,19 +5,24 @@
  * 2.0.
  */
 
-import { TypeOf } from '@kbn/config-schema';
+import type { TypeOf } from '@kbn/config-schema';
 
-import { IScopedClusterClient, KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
-import { DatafeedOverride, JobOverride } from '../../common/types/modules';
+import type {
+  IScopedClusterClient,
+  KibanaRequest,
+  SavedObjectsClientContract,
+} from 'kibana/server';
+import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
+import type { DatafeedOverride, JobOverride } from '../../common/types/modules';
 import { wrapError } from '../client/error_wrapper';
-import { DataRecognizer } from '../models/data_recognizer';
+import { dataRecognizerFactory } from '../models/data_recognizer';
 import {
   moduleIdParamSchema,
   optionalModuleIdParamSchema,
   modulesIndexPatternTitleSchema,
   setupModuleBodySchema,
 } from './schemas/modules';
-import { RouteInitialization } from '../types';
+import type { RouteInitialization } from '../types';
 import type { MlClient } from '../lib/ml_client';
 import type { JobSavedObjectService } from '../saved_objects';
 
@@ -25,14 +30,16 @@ function recognize(
   client: IScopedClusterClient,
   mlClient: MlClient,
   savedObjectsClient: SavedObjectsClientContract,
+  dataViewsService: DataViewsService,
   jobSavedObjectService: JobSavedObjectService,
   request: KibanaRequest,
   indexPatternTitle: string
 ) {
-  const dr = new DataRecognizer(
+  const dr = dataRecognizerFactory(
     client,
     mlClient,
     savedObjectsClient,
+    dataViewsService,
     jobSavedObjectService,
     request
   );
@@ -43,14 +50,16 @@ function getModule(
   client: IScopedClusterClient,
   mlClient: MlClient,
   savedObjectsClient: SavedObjectsClientContract,
+  dataViewsService: DataViewsService,
   jobSavedObjectService: JobSavedObjectService,
   request: KibanaRequest,
   moduleId?: string
 ) {
-  const dr = new DataRecognizer(
+  const dr = dataRecognizerFactory(
     client,
     mlClient,
     savedObjectsClient,
+    dataViewsService,
     jobSavedObjectService,
     request
   );
@@ -65,6 +74,7 @@ function setup(
   client: IScopedClusterClient,
   mlClient: MlClient,
   savedObjectsClient: SavedObjectsClientContract,
+  dataViewsService: DataViewsService,
   jobSavedObjectService: JobSavedObjectService,
   request: KibanaRequest,
   moduleId: string,
@@ -81,10 +91,11 @@ function setup(
   estimateModelMemory?: boolean,
   applyToAllSpaces?: boolean
 ) {
-  const dr = new DataRecognizer(
+  const dr = dataRecognizerFactory(
     client,
     mlClient,
     savedObjectsClient,
+    dataViewsService,
     jobSavedObjectService,
     request
   );
@@ -109,14 +120,16 @@ function dataRecognizerJobsExist(
   client: IScopedClusterClient,
   mlClient: MlClient,
   savedObjectsClient: SavedObjectsClientContract,
+  dataViewsService: DataViewsService,
   jobSavedObjectService: JobSavedObjectService,
   request: KibanaRequest,
   moduleId: string
 ) {
-  const dr = new DataRecognizer(
+  const dr = dataRecognizerFactory(
     client,
     mlClient,
     savedObjectsClient,
+    dataViewsService,
     jobSavedObjectService,
     request
   );
@@ -166,13 +179,23 @@ export function dataRecognizer({ router, routeGuard }: RouteInitialization) {
       },
     },
     routeGuard.fullLicenseAPIGuard(
-      async ({ client, mlClient, request, response, context, jobSavedObjectService }) => {
+      async ({
+        client,
+        mlClient,
+        request,
+        response,
+        context,
+        jobSavedObjectService,
+        getDataViewsService,
+      }) => {
         try {
           const { indexPatternTitle } = request.params;
+          const dataViewService = await getDataViewsService();
           const results = await recognize(
             client,
             mlClient,
             context.core.savedObjects.client,
+            dataViewService,
             jobSavedObjectService,
             request,
             indexPatternTitle
@@ -305,7 +328,15 @@ export function dataRecognizer({ router, routeGuard }: RouteInitialization) {
       },
     },
     routeGuard.fullLicenseAPIGuard(
-      async ({ client, mlClient, request, response, context, jobSavedObjectService }) => {
+      async ({
+        client,
+        mlClient,
+        request,
+        response,
+        context,
+        jobSavedObjectService,
+        getDataViewsService,
+      }) => {
         try {
           let { moduleId } = request.params;
           if (moduleId === '') {
@@ -313,10 +344,12 @@ export function dataRecognizer({ router, routeGuard }: RouteInitialization) {
             // the moduleId will be an empty string.
             moduleId = undefined;
           }
+          const dataViewService = await getDataViewsService();
           const results = await getModule(
             client,
             mlClient,
             context.core.savedObjects.client,
+            dataViewService,
             jobSavedObjectService,
             request,
             moduleId
@@ -482,7 +515,15 @@ export function dataRecognizer({ router, routeGuard }: RouteInitialization) {
       },
     },
     routeGuard.fullLicenseAPIGuard(
-      async ({ client, mlClient, request, response, context, jobSavedObjectService }) => {
+      async ({
+        client,
+        mlClient,
+        request,
+        response,
+        context,
+        jobSavedObjectService,
+        getDataViewsService,
+      }) => {
         try {
           const { moduleId } = request.params;
 
@@ -501,10 +542,13 @@ export function dataRecognizer({ router, routeGuard }: RouteInitialization) {
             applyToAllSpaces,
           } = request.body as TypeOf<typeof setupModuleBodySchema>;
 
+          const dataViewService = await getDataViewsService();
+
           const result = await setup(
             client,
             mlClient,
             context.core.savedObjects.client,
+            dataViewService,
             jobSavedObjectService,
             request,
             moduleId,
@@ -593,13 +637,23 @@ export function dataRecognizer({ router, routeGuard }: RouteInitialization) {
       },
     },
     routeGuard.fullLicenseAPIGuard(
-      async ({ client, mlClient, request, response, context, jobSavedObjectService }) => {
+      async ({
+        client,
+        mlClient,
+        request,
+        response,
+        context,
+        jobSavedObjectService,
+        getDataViewsService,
+      }) => {
         try {
           const { moduleId } = request.params;
+          const dataViewService = await getDataViewsService();
           const result = await dataRecognizerJobsExist(
             client,
             mlClient,
             context.core.savedObjects.client,
+            dataViewService,
             jobSavedObjectService,
             request,
             moduleId
diff --git a/x-pack/plugins/ml/server/shared_services/providers/modules.ts b/x-pack/plugins/ml/server/shared_services/providers/modules.ts
index c86a40e4224ce..f6a6c58fadb4e 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/modules.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/modules.ts
@@ -5,13 +5,12 @@
  * 2.0.
  */
 
-import { IScopedClusterClient, KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
-import { TypeOf } from '@kbn/config-schema';
-import { DataRecognizer } from '../../models/data_recognizer';
-import { GetGuards } from '../shared_services';
+import type { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import type { TypeOf } from '@kbn/config-schema';
+import type { PluginStart as DataViewsPluginStart } from '../../../../../../src/plugins/data_views/server';
+import type { GetGuards } from '../shared_services';
+import { DataRecognizer, dataRecognizerFactory } from '../../models/data_recognizer';
 import { moduleIdParamSchema, setupModuleBodySchema } from '../../routes/schemas/modules';
-import { MlClient } from '../../lib/ml_client';
-import { JobSavedObjectService } from '../../saved_objects';
 
 export type ModuleSetupPayload = TypeOf<typeof moduleIdParamSchema> &
   TypeOf<typeof setupModuleBodySchema>;
@@ -28,7 +27,10 @@ export interface ModulesProvider {
   };
 }
 
-export function getModulesProvider(getGuards: GetGuards): ModulesProvider {
+export function getModulesProvider(
+  getGuards: GetGuards,
+  getDataViews: () => DataViewsPluginStart
+): ModulesProvider {
   return {
     modulesProvider(request: KibanaRequest, savedObjectsClient: SavedObjectsClientContract) {
       return {
@@ -36,11 +38,13 @@ export function getModulesProvider(getGuards: GetGuards): ModulesProvider {
           return await getGuards(request, savedObjectsClient)
             .isFullLicense()
             .hasMlCapabilities(['canGetJobs'])
-            .ok(async ({ scopedClient, mlClient, jobSavedObjectService }) => {
+            .ok(async ({ scopedClient, mlClient, jobSavedObjectService, getDataViewsService }) => {
+              const dataViewsService = await getDataViewsService();
               const dr = dataRecognizerFactory(
                 scopedClient,
                 mlClient,
                 savedObjectsClient,
+                dataViewsService,
                 jobSavedObjectService,
                 request
               );
@@ -51,11 +55,13 @@ export function getModulesProvider(getGuards: GetGuards): ModulesProvider {
           return await getGuards(request, savedObjectsClient)
             .isFullLicense()
             .hasMlCapabilities(['canGetJobs'])
-            .ok(async ({ scopedClient, mlClient, jobSavedObjectService }) => {
+            .ok(async ({ scopedClient, mlClient, jobSavedObjectService, getDataViewsService }) => {
+              const dataViewsService = await getDataViewsService();
               const dr = dataRecognizerFactory(
                 scopedClient,
                 mlClient,
                 savedObjectsClient,
+                dataViewsService,
                 jobSavedObjectService,
                 request
               );
@@ -66,11 +72,13 @@ export function getModulesProvider(getGuards: GetGuards): ModulesProvider {
           return await getGuards(request, savedObjectsClient)
             .isFullLicense()
             .hasMlCapabilities(['canGetJobs'])
-            .ok(async ({ scopedClient, mlClient, jobSavedObjectService }) => {
+            .ok(async ({ scopedClient, mlClient, jobSavedObjectService, getDataViewsService }) => {
+              const dataViewsService = await getDataViewsService();
               const dr = dataRecognizerFactory(
                 scopedClient,
                 mlClient,
                 savedObjectsClient,
+                dataViewsService,
                 jobSavedObjectService,
                 request
               );
@@ -81,11 +89,13 @@ export function getModulesProvider(getGuards: GetGuards): ModulesProvider {
           return await getGuards(request, savedObjectsClient)
             .isFullLicense()
             .hasMlCapabilities(['canCreateJob'])
-            .ok(async ({ scopedClient, mlClient, jobSavedObjectService }) => {
+            .ok(async ({ scopedClient, mlClient, jobSavedObjectService, getDataViewsService }) => {
+              const dataViewsService = await getDataViewsService();
               const dr = dataRecognizerFactory(
                 scopedClient,
                 mlClient,
                 savedObjectsClient,
+                dataViewsService,
                 jobSavedObjectService,
                 request
               );
@@ -109,13 +119,3 @@ export function getModulesProvider(getGuards: GetGuards): ModulesProvider {
     },
   };
 }
-
-function dataRecognizerFactory(
-  client: IScopedClusterClient,
-  mlClient: MlClient,
-  savedObjectsClient: SavedObjectsClientContract,
-  jobSavedObjectService: JobSavedObjectService,
-  request: KibanaRequest
-) {
-  return new DataRecognizer(client, mlClient, savedObjectsClient, jobSavedObjectService, request);
-}
diff --git a/x-pack/plugins/ml/server/shared_services/shared_services.ts b/x-pack/plugins/ml/server/shared_services/shared_services.ts
index 5c8bbffe10aed..9c8ab1e069258 100644
--- a/x-pack/plugins/ml/server/shared_services/shared_services.ts
+++ b/x-pack/plugins/ml/server/shared_services/shared_services.ts
@@ -5,17 +5,18 @@
  * 2.0.
  */
 
-import {
+import type {
   IClusterClient,
   IScopedClusterClient,
   SavedObjectsClientContract,
   UiSettingsServiceStart,
 } from 'kibana/server';
-import { SpacesPluginStart } from '../../../spaces/server';
+import type { SpacesPluginStart } from '../../../spaces/server';
 import { KibanaRequest } from '../../.././../../src/core/server';
 import { MlLicense } from '../../common/license';
 
 import type { CloudSetup } from '../../../cloud/server';
+import type { PluginStart as DataViewsPluginStart } from '../../../../../src/plugins/data_views/server';
 import type { SecurityPluginSetup } from '../../../security/server';
 import { licenseChecks } from './license_checks';
 import { MlSystemProvider, getMlSystemProvider } from './providers/system';
@@ -26,7 +27,7 @@ import {
   AnomalyDetectorsProvider,
   getAnomalyDetectorsProvider,
 } from './providers/anomaly_detectors';
-import { ResolveMlCapabilities, MlCapabilitiesKey } from '../../common/types/capabilities';
+import type { ResolveMlCapabilities, MlCapabilitiesKey } from '../../common/types/capabilities';
 import { hasMlCapabilitiesProvider, HasMlCapabilities } from '../lib/capabilities';
 import {
   MLClusterClientUninitialized,
@@ -45,6 +46,7 @@ import {
 } from '../lib/alerts/jobs_health_service';
 import type { FieldFormatsStart } from '../../../../../src/plugins/field_formats/server';
 import type { FieldFormatsRegistryProvider } from '../../common/types/kibana';
+import { getDataViewsServiceFactory, GetDataViewsService } from '../lib/data_views_utils';
 
 export type SharedServices = JobServiceProvider &
   AnomalyDetectorsProvider &
@@ -76,6 +78,7 @@ interface OkParams {
   mlClient: MlClient;
   jobSavedObjectService: JobSavedObjectService;
   getFieldsFormatRegistry: FieldFormatsRegistryProvider;
+  getDataViewsService: GetDataViewsService;
 }
 
 type OkCallback = (okParams: OkParams) => any;
@@ -90,6 +93,7 @@ export function createSharedServices(
   getInternalSavedObjectsClient: () => SavedObjectsClientContract | null,
   getUiSettings: () => UiSettingsServiceStart | null,
   getFieldsFormat: () => FieldFormatsStart | null,
+  getDataViews: () => DataViewsPluginStart,
   isMlReady: () => Promise<void>
 ): {
   sharedServicesProviders: SharedServices;
@@ -101,6 +105,7 @@ export function createSharedServices(
     savedObjectsClient: SavedObjectsClientContract
   ): Guards {
     const internalSavedObjectsClient = getInternalSavedObjectsClient();
+
     if (internalSavedObjectsClient === null) {
       throw new Error('Internal saved object client not initialized');
     }
@@ -113,7 +118,8 @@ export function createSharedServices(
       getSpaces !== undefined,
       isMlReady,
       getUiSettings,
-      getFieldsFormat
+      getFieldsFormat,
+      getDataViews
     );
 
     const {
@@ -122,6 +128,7 @@ export function createSharedServices(
       mlClient,
       jobSavedObjectService,
       getFieldsFormatRegistry,
+      getDataViewsService,
     } = getRequestItems(request);
     const asyncGuards: Array<Promise<void>> = [];
 
@@ -140,7 +147,13 @@ export function createSharedServices(
       },
       async ok(callback: OkCallback) {
         await Promise.all(asyncGuards);
-        return callback({ scopedClient, mlClient, jobSavedObjectService, getFieldsFormatRegistry });
+        return callback({
+          scopedClient,
+          mlClient,
+          jobSavedObjectService,
+          getFieldsFormatRegistry,
+          getDataViewsService,
+        });
       },
     };
     return guards;
@@ -153,7 +166,7 @@ export function createSharedServices(
     sharedServicesProviders: {
       ...getJobServiceProvider(getGuards),
       ...getAnomalyDetectorsProvider(getGuards),
-      ...getModulesProvider(getGuards),
+      ...getModulesProvider(getGuards, getDataViews),
       ...getResultsServiceProvider(getGuards),
       ...getMlSystemProvider(getGuards, mlLicense, getSpaces, cloud, resolveMlCapabilities),
       ...getAlertingServiceProvider(getGuards),
@@ -176,7 +189,8 @@ function getRequestItemsProvider(
   spaceEnabled: boolean,
   isMlReady: () => Promise<void>,
   getUiSettings: () => UiSettingsServiceStart | null,
-  getFieldsFormat: () => FieldFormatsStart | null
+  getFieldsFormat: () => FieldFormatsStart | null,
+  getDataViews: () => DataViewsPluginStart
 ) {
   return (request: KibanaRequest) => {
     const getHasMlCapabilities = hasMlCapabilitiesProvider(resolveMlCapabilities);
@@ -234,12 +248,20 @@ function getRequestItemsProvider(
       };
       mlClient = getMlClient(scopedClient, jobSavedObjectService);
     }
+
+    const getDataViewsService = getDataViewsServiceFactory(
+      getDataViews,
+      savedObjectsClient,
+      scopedClient
+    );
+
     return {
       hasMlCapabilities,
       scopedClient,
       mlClient,
       jobSavedObjectService,
       getFieldsFormatRegistry,
+      getDataViewsService,
     };
   };
 }
diff --git a/x-pack/plugins/ml/server/types.ts b/x-pack/plugins/ml/server/types.ts
index da83b03766af4..d5c67bf99a7a0 100644
--- a/x-pack/plugins/ml/server/types.ts
+++ b/x-pack/plugins/ml/server/types.ts
@@ -23,6 +23,7 @@ import type {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
 } from '../../../../src/plugins/data/server';
+import type { PluginStart as DataViewsPluginStart } from '../../../../src/plugins/data_views/server';
 import type {
   FieldFormatsSetup,
   FieldFormatsStart,
@@ -64,6 +65,7 @@ export interface PluginsSetup {
 
 export interface PluginsStart {
   data: DataPluginStart;
+  dataViews: DataViewsPluginStart;
   fieldFormats: FieldFormatsStart;
   spaces?: SpacesPluginStart;
 }
diff --git a/x-pack/plugins/ml/tsconfig.json b/x-pack/plugins/ml/tsconfig.json
index db8fc463b0550..0c108f8b3b8a5 100644
--- a/x-pack/plugins/ml/tsconfig.json
+++ b/x-pack/plugins/ml/tsconfig.json
@@ -21,6 +21,7 @@
     { "path": "../../../src/core/tsconfig.json" },
     { "path": "../../../src/plugins/embeddable/tsconfig.json" },
     { "path": "../../../src/plugins/index_pattern_management/tsconfig.json" },
+    { "path": "../../../src/plugins/data_views/tsconfig.json" },
     { "path": "../cloud/tsconfig.json" },
     { "path": "../features/tsconfig.json" },
     { "path": "../data_visualizer/tsconfig.json"},

From 877e00786d5458db746371db7442aec0bd5617cd Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Wed, 13 Oct 2021 13:37:21 -0500
Subject: [PATCH 038/117] [DOCS] Removes capitalized attributes (#114849)

---
 docs/index.asciidoc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/index.asciidoc b/docs/index.asciidoc
index e286e42f2c421..f9ed2abc4b8cf 100644
--- a/docs/index.asciidoc
+++ b/docs/index.asciidoc
@@ -13,12 +13,8 @@ include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 :es-docker-image: {es-docker-repo}:{version}
 :blob:            {kib-repo}blob/{branch}/
 :security-ref:    https://www.elastic.co/community/security/
-:Data-Sources:    Data Views
-:Data-source:     Data view
 :data-source:     data view
-:Data-sources:    Data views
 :data-sources:    data views
-:A-data-source:   A data view
 :a-data-source:   a data view
 
 include::{docs-root}/shared/attributes.asciidoc[]

From b96f5443d60fe802b0a0f0e6cc680a9288724ed8 Mon Sep 17 00:00:00 2001
From: Kerry Gallagher <471693+Kerry350@users.noreply.github.com>
Date: Wed, 13 Oct 2021 19:39:52 +0100
Subject: [PATCH 039/117] [RAC] Change index bootstrapping strategy (#113389)

* Change index bootstrapping to cater for non-additive changes only
---
 x-pack/plugins/rule_registry/server/config.ts |   5 +-
 x-pack/plugins/rule_registry/server/plugin.ts |   1 -
 .../rule_data_client/rule_data_client.ts      | 147 ++++++++++++------
 .../server/rule_data_client/types.ts          |   2 +-
 .../server/rule_data_plugin_service/errors.ts |  14 ++
 .../resource_installer.ts                     |  71 +++------
 .../rule_data_plugin_service.ts               |   3 +-
 7 files changed, 138 insertions(+), 105 deletions(-)

diff --git a/x-pack/plugins/rule_registry/server/config.ts b/x-pack/plugins/rule_registry/server/config.ts
index 62f29a9e06294..f112a99e59eaa 100644
--- a/x-pack/plugins/rule_registry/server/config.ts
+++ b/x-pack/plugins/rule_registry/server/config.ts
@@ -9,7 +9,10 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import { PluginConfigDescriptor } from 'src/core/server';
 
 export const config: PluginConfigDescriptor = {
-  deprecations: ({ deprecate }) => [deprecate('enabled', '8.0.0')],
+  deprecations: ({ deprecate, unused }) => [
+    deprecate('enabled', '8.0.0'),
+    unused('unsafe.indexUpgrade.enabled'),
+  ],
   schema: schema.object({
     enabled: schema.boolean({ defaultValue: true }),
     write: schema.object({
diff --git a/x-pack/plugins/rule_registry/server/plugin.ts b/x-pack/plugins/rule_registry/server/plugin.ts
index 5d1994cfd3e6d..b68f3eeb10669 100644
--- a/x-pack/plugins/rule_registry/server/plugin.ts
+++ b/x-pack/plugins/rule_registry/server/plugin.ts
@@ -104,7 +104,6 @@ export class RuleRegistryPlugin
       logger,
       kibanaVersion,
       isWriteEnabled: isWriteEnabled(this.config, this.legacyConfig),
-      isIndexUpgradeEnabled: this.config.unsafe.indexUpgrade.enabled,
       getClusterClient: async () => {
         const deps = await startDependencies;
         return deps.core.elasticsearch.client.asInternalUser;
diff --git a/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.ts b/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.ts
index 89ae479132de5..2755021e235a8 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.ts
@@ -5,13 +5,18 @@
  * 2.0.
  */
 
+import { BulkRequest } from '@elastic/elasticsearch/api/types';
 import { ResponseError } from '@elastic/elasticsearch/lib/errors';
 import { Either, isLeft } from 'fp-ts/lib/Either';
 
 import { ElasticsearchClient } from 'kibana/server';
+import { Logger } from 'kibana/server';
 import { IndexPatternsFetcher } from '../../../../../src/plugins/data/server';
 
-import { RuleDataWriteDisabledError } from '../rule_data_plugin_service/errors';
+import {
+  RuleDataWriteDisabledError,
+  RuleDataWriterInitializationError,
+} from '../rule_data_plugin_service/errors';
 import { IndexInfo } from '../rule_data_plugin_service/index_info';
 import { ResourceInstaller } from '../rule_data_plugin_service/resource_installer';
 import { IRuleDataClient, IRuleDataReader, IRuleDataWriter } from './types';
@@ -22,12 +27,21 @@ interface ConstructorOptions {
   isWriteEnabled: boolean;
   waitUntilReadyForReading: Promise<WaitResult>;
   waitUntilReadyForWriting: Promise<WaitResult>;
+  logger: Logger;
 }
 
 export type WaitResult = Either<Error, ElasticsearchClient>;
 
 export class RuleDataClient implements IRuleDataClient {
-  constructor(private readonly options: ConstructorOptions) {}
+  private _isWriteEnabled: boolean = false;
+
+  // Writers cached by namespace
+  private writerCache: Map<string, IRuleDataWriter>;
+
+  constructor(private readonly options: ConstructorOptions) {
+    this.writeEnabled = this.options.isWriteEnabled;
+    this.writerCache = new Map();
+  }
 
   public get indexName(): string {
     return this.options.indexInfo.baseName;
@@ -37,8 +51,16 @@ export class RuleDataClient implements IRuleDataClient {
     return this.options.indexInfo.kibanaVersion;
   }
 
+  private get writeEnabled(): boolean {
+    return this._isWriteEnabled;
+  }
+
+  private set writeEnabled(isEnabled: boolean) {
+    this._isWriteEnabled = isEnabled;
+  }
+
   public isWriteEnabled(): boolean {
-    return this.options.isWriteEnabled;
+    return this.writeEnabled;
   }
 
   public getReader(options: { namespace?: string } = {}): IRuleDataReader {
@@ -95,62 +117,89 @@ export class RuleDataClient implements IRuleDataClient {
   }
 
   public getWriter(options: { namespace?: string } = {}): IRuleDataWriter {
-    const { indexInfo, resourceInstaller } = this.options;
-
     const namespace = options.namespace || 'default';
+    const cachedWriter = this.writerCache.get(namespace);
+
+    // There is no cached writer, so we'll install / update the namespace specific resources now.
+    if (!cachedWriter) {
+      const writerForNamespace = this.initializeWriter(namespace);
+      this.writerCache.set(namespace, writerForNamespace);
+      return writerForNamespace;
+    } else {
+      return cachedWriter;
+    }
+  }
+
+  private initializeWriter(namespace: string): IRuleDataWriter {
+    const isWriteEnabled = () => this.writeEnabled;
+    const turnOffWrite = () => (this.writeEnabled = false);
+
+    const { indexInfo, resourceInstaller } = this.options;
     const alias = indexInfo.getPrimaryAlias(namespace);
-    const isWriteEnabled = this.isWriteEnabled();
 
-    const waitUntilReady = async () => {
-      const result = await this.options.waitUntilReadyForWriting;
-      if (isLeft(result)) {
-        throw result.left;
+    // Wait until both index and namespace level resources have been installed / updated.
+    const prepareForWriting = async () => {
+      if (!isWriteEnabled()) {
+        throw new RuleDataWriteDisabledError();
+      }
+
+      const indexLevelResourcesResult = await this.options.waitUntilReadyForWriting;
+
+      if (isLeft(indexLevelResourcesResult)) {
+        throw new RuleDataWriterInitializationError(
+          'index',
+          indexInfo.indexOptions.registrationContext,
+          indexLevelResourcesResult.left
+        );
       } else {
-        return result.right;
+        try {
+          await resourceInstaller.installAndUpdateNamespaceLevelResources(indexInfo, namespace);
+          return indexLevelResourcesResult.right;
+        } catch (e) {
+          throw new RuleDataWriterInitializationError(
+            'namespace',
+            indexInfo.indexOptions.registrationContext,
+            e
+          );
+        }
       }
     };
 
-    return {
-      bulk: async (request) => {
-        if (!isWriteEnabled) {
-          throw new RuleDataWriteDisabledError();
-        }
+    const prepareForWritingResult = prepareForWriting();
 
-        const clusterClient = await waitUntilReady();
+    return {
+      bulk: async (request: BulkRequest) => {
+        return prepareForWritingResult
+          .then((clusterClient) => {
+            const requestWithDefaultParameters = {
+              ...request,
+              require_alias: true,
+              index: alias,
+            };
 
-        const requestWithDefaultParameters = {
-          ...request,
-          require_alias: true,
-          index: alias,
-        };
-
-        return clusterClient.bulk(requestWithDefaultParameters).then((response) => {
-          if (response.body.errors) {
-            if (
-              response.body.items.length > 0 &&
-              (response.body.items.every(
-                (item) => item.index?.error?.type === 'index_not_found_exception'
-              ) ||
-                response.body.items.every(
-                  (item) => item.index?.error?.type === 'illegal_argument_exception'
-                ))
-            ) {
-              return resourceInstaller
-                .installNamespaceLevelResources(indexInfo, namespace)
-                .then(() => {
-                  return clusterClient.bulk(requestWithDefaultParameters).then((retryResponse) => {
-                    if (retryResponse.body.errors) {
-                      throw new ResponseError(retryResponse);
-                    }
-                    return retryResponse;
-                  });
-                });
+            return clusterClient.bulk(requestWithDefaultParameters).then((response) => {
+              if (response.body.errors) {
+                const error = new ResponseError(response);
+                throw error;
+              }
+              return response;
+            });
+          })
+          .catch((error) => {
+            if (error instanceof RuleDataWriterInitializationError) {
+              this.options.logger.error(error);
+              this.options.logger.error(
+                `The writer for the Rule Data Client for the ${indexInfo.indexOptions.registrationContext} registration context was not initialized properly, bulk() cannot continue, and writing will be disabled.`
+              );
+              turnOffWrite();
+            } else if (error instanceof RuleDataWriteDisabledError) {
+              this.options.logger.debug(`Writing is disabled, bulk() will not write any data.`);
+            } else {
+              this.options.logger.error(error);
             }
-            const error = new ResponseError(response);
-            throw error;
-          }
-          return response;
-        });
+
+            return undefined;
+          });
       },
     };
   }
diff --git a/x-pack/plugins/rule_registry/server/rule_data_client/types.ts b/x-pack/plugins/rule_registry/server/rule_data_client/types.ts
index 0595dbeea6dc6..7c05945a98b10 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_client/types.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_client/types.ts
@@ -35,5 +35,5 @@ export interface IRuleDataReader {
 }
 
 export interface IRuleDataWriter {
-  bulk(request: BulkRequest): Promise<ApiResponse<BulkResponse>>;
+  bulk(request: BulkRequest): Promise<ApiResponse<BulkResponse> | undefined>;
 }
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/errors.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/errors.ts
index cb5dcf8e8ae76..fe8d3b3b18d9d 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/errors.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/errors.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+/* eslint-disable max-classes-per-file */
 export class RuleDataWriteDisabledError extends Error {
   constructor(message?: string) {
     super(message);
@@ -12,3 +13,16 @@ export class RuleDataWriteDisabledError extends Error {
     this.name = 'RuleDataWriteDisabledError';
   }
 }
+
+export class RuleDataWriterInitializationError extends Error {
+  constructor(
+    resourceType: 'index' | 'namespace',
+    registrationContext: string,
+    error: string | Error
+  ) {
+    super(`There has been a catastrophic error trying to install ${resourceType} level resources for the following registration context: ${registrationContext}. 
+    This may have been due to a non-additive change to the mappings, removal and type changes are not permitted. Full error: ${error.toString()}`);
+    Object.setPrototypeOf(this, new.target.prototype);
+    this.name = 'RuleDataWriterInitializationError';
+  }
+}
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.ts
index e10bb6382ab24..160261642ff25 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.ts
@@ -20,7 +20,6 @@ import { ecsComponentTemplate } from '../../common/assets/component_templates/ec
 import { defaultLifecyclePolicy } from '../../common/assets/lifecycle_policies/default_lifecycle_policy';
 
 import { IndexInfo } from './index_info';
-import { incrementIndexName } from './utils';
 
 const INSTALLATION_TIMEOUT = 20 * 60 * 1000; // 20 minutes
 
@@ -29,7 +28,6 @@ interface ConstructorOptions {
   getClusterClient: () => Promise<ElasticsearchClient>;
   logger: Logger;
   isWriteEnabled: boolean;
-  isIndexUpgradeEnabled: boolean;
 }
 
 export class ResourceInstaller {
@@ -111,12 +109,10 @@ export class ResourceInstaller {
    * Installs index-level resources shared between all namespaces of this index:
    *   - custom ILM policy if it was provided
    *   - component templates
-   *   - attempts to update mappings of existing concrete indices
    */
   public async installIndexLevelResources(indexInfo: IndexInfo): Promise<void> {
     await this.installWithTimeout(`resources for index ${indexInfo.baseName}`, async () => {
       const { componentTemplates, ilmPolicy } = indexInfo.indexOptions;
-      const { isIndexUpgradeEnabled } = this.options;
 
       if (ilmPolicy != null) {
         await this.createOrUpdateLifecyclePolicy({
@@ -139,35 +135,30 @@ export class ResourceInstaller {
           });
         })
       );
-
-      if (isIndexUpgradeEnabled) {
-        // TODO: Update all existing namespaced index templates matching this index' base name
-
-        await this.updateIndexMappings(indexInfo);
-      }
     });
   }
 
-  private async updateIndexMappings(indexInfo: IndexInfo) {
+  private async updateIndexMappings(indexInfo: IndexInfo, namespace: string) {
     const { logger } = this.options;
 
     const aliases = indexInfo.basePattern;
-    const backingIndices = indexInfo.getPatternForBackingIndices();
+    const backingIndices = indexInfo.getPatternForBackingIndices(namespace);
 
     logger.debug(`Updating mappings of existing concrete indices for ${indexInfo.baseName}`);
 
     // Find all concrete indices for all namespaces of the index.
     const concreteIndices = await this.fetchConcreteIndices(aliases, backingIndices);
-    const concreteWriteIndices = concreteIndices.filter((item) => item.isWriteIndex);
-
-    // Update mappings of the found write indices.
-    await Promise.all(concreteWriteIndices.map((item) => this.updateAliasWriteIndexMapping(item)));
+    // Update mappings of the found indices.
+    await Promise.all(concreteIndices.map((item) => this.updateAliasWriteIndexMapping(item)));
   }
 
+  // NOTE / IMPORTANT: Please note this will update the mappings of backing indices but
+  // *not* the settings. This is due to the fact settings can be classed as dynamic and static,
+  // and static updates will fail on an index that isn't closed. New settings *will* be applied as part
+  // of the ILM policy rollovers. More info: https://github.com/elastic/kibana/pull/113389#issuecomment-940152654
   private async updateAliasWriteIndexMapping({ index, alias }: ConcreteIndexInfo) {
     const { logger, getClusterClient } = this.options;
     const clusterClient = await getClusterClient();
-
     const simulatedIndexMapping = await clusterClient.indices.simulateIndexTemplate({
       name: index,
     });
@@ -180,35 +171,8 @@ export class ResourceInstaller {
       });
       return;
     } catch (err) {
-      if (err.meta?.body?.error?.type !== 'illegal_argument_exception') {
-        /**
-         * We skip the rollover if we catch anything except for illegal_argument_exception - that's the error
-         * returned by ES when the mapping update contains a conflicting field definition (e.g., a field changes types).
-         * We expect to get that error for some mapping changes we might make, and in those cases,
-         * we want to continue to rollover the index. Other errors are unexpected.
-         */
-        logger.error(`Failed to PUT mapping for alias ${alias}: ${err.message}`);
-        return;
-      }
-      const newIndexName = incrementIndexName(index);
-      if (newIndexName == null) {
-        logger.error(`Failed to increment write index name for alias: ${alias}`);
-        return;
-      }
-      try {
-        await clusterClient.indices.rollover({
-          alias,
-          new_index: newIndexName,
-        });
-      } catch (e) {
-        /**
-         * If we catch resource_already_exists_exception, that means that the index has been
-         * rolled over already — nothing to do for us in this case.
-         */
-        if (e?.meta?.body?.error?.type !== 'resource_already_exists_exception') {
-          logger.error(`Failed to rollover index for alias ${alias}: ${e.message}`);
-        }
-      }
+      logger.error(`Failed to PUT mapping for alias ${alias}: ${err.message}`);
+      throw err;
     }
   }
 
@@ -216,11 +180,12 @@ export class ResourceInstaller {
   // Namespace-level resources
 
   /**
-   * Installs resources tied to concrete namespace of an index:
+   * Installs and updates resources tied to concrete namespace of an index:
    *   - namespaced index template
+   *   - Index mappings for existing concrete indices
    *   - concrete index (write target) if it doesn't exist
    */
-  public async installNamespaceLevelResources(
+  public async installAndUpdateNamespaceLevelResources(
     indexInfo: IndexInfo,
     namespace: string
   ): Promise<void> {
@@ -230,15 +195,19 @@ export class ResourceInstaller {
 
     logger.info(`Installing namespace-level resources and creating concrete index for ${alias}`);
 
+    // Install / update the index template
+    await this.installNamespacedIndexTemplate(indexInfo, namespace);
+    // Update index mappings for indices matching this namespace.
+    await this.updateIndexMappings(indexInfo, namespace);
+
     // If we find a concrete backing index which is the write index for the alias here, we shouldn't
     // be making a new concrete index. We return early because we don't need a new write target.
     const indexExists = await this.checkIfConcreteWriteIndexExists(indexInfo, namespace);
     if (indexExists) {
       return;
+    } else {
+      await this.createConcreteWriteIndex(indexInfo, namespace);
     }
-
-    await this.installNamespacedIndexTemplate(indexInfo, namespace);
-    await this.createConcreteWriteIndex(indexInfo, namespace);
   }
 
   private async checkIfConcreteWriteIndexExists(
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.ts
index c69677b091c9c..0617bc0a820ac 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.ts
@@ -22,7 +22,6 @@ interface ConstructorOptions {
   logger: Logger;
   kibanaVersion: string;
   isWriteEnabled: boolean;
-  isIndexUpgradeEnabled: boolean;
 }
 
 /**
@@ -44,7 +43,6 @@ export class RuleDataPluginService {
       getClusterClient: options.getClusterClient,
       logger: options.logger,
       isWriteEnabled: options.isWriteEnabled,
-      isIndexUpgradeEnabled: options.isIndexUpgradeEnabled,
     });
 
     this.installCommonResources = Promise.resolve(right('ok'));
@@ -154,6 +152,7 @@ export class RuleDataPluginService {
       isWriteEnabled: this.isWriteEnabled(),
       waitUntilReadyForReading,
       waitUntilReadyForWriting,
+      logger: this.options.logger,
     });
   }
 

From 8d1c96cd7efcdfa732413b88c65e8132b6e7682e Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Wed, 13 Oct 2021 13:44:50 -0500
Subject: [PATCH 040/117] [Workplace Search] Add Synchronize button to Source
 Overview page (#114842)

* Add sync route

* Add logic for triggering sync on server

* Add button with confirm modal and description w/links
---
 .../applications/shared/constants/actions.ts  |  5 ++
 .../components/overview.test.tsx              | 16 +++-
 .../content_sources/components/overview.tsx   | 80 ++++++++++++++++++-
 .../views/content_sources/constants.ts        | 43 ++++++++++
 .../content_sources/source_logic.test.ts      | 28 +++++++
 .../views/content_sources/source_logic.ts     | 11 +++
 .../routes/workplace_search/sources.test.ts   | 24 ++++++
 .../server/routes/workplace_search/sources.ts | 20 +++++
 8 files changed, 222 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/constants/actions.ts b/x-pack/plugins/enterprise_search/public/applications/shared/constants/actions.ts
index cb05311e11998..d43217fba1443 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/constants/actions.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/constants/actions.ts
@@ -35,6 +35,11 @@ export const CANCEL_BUTTON_LABEL = i18n.translate(
   { defaultMessage: 'Cancel' }
 );
 
+export const START_BUTTON_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.actions.startButtonLabel',
+  { defaultMessage: 'Start' }
+);
+
 export const CONTINUE_BUTTON_LABEL = i18n.translate(
   'xpack.enterpriseSearch.actions.continueButtonLabel',
   { defaultMessage: 'Continue' }
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.test.tsx
index d99eac5de74e5..c9eb2e0afdf5e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.test.tsx
@@ -5,20 +5,21 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__/kea_logic';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 import { fullContentSources } from '../../../__mocks__/content_sources.mock';
 
 import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { EuiEmptyPrompt, EuiPanel, EuiTable } from '@elastic/eui';
+import { EuiConfirmModal, EuiEmptyPrompt, EuiPanel, EuiTable } from '@elastic/eui';
 
 import { ComponentLoader } from '../../../components/shared/component_loader';
 
 import { Overview } from './overview';
 
 describe('Overview', () => {
+  const initializeSourceSynchronization = jest.fn();
   const contentSource = fullContentSources[0];
   const dataLoading = false;
   const isOrganization = true;
@@ -31,6 +32,7 @@ describe('Overview', () => {
 
   beforeEach(() => {
     setMockValues({ ...mockValues });
+    setMockActions({ initializeSourceSynchronization });
   });
 
   it('renders', () => {
@@ -118,4 +120,14 @@ describe('Overview', () => {
 
     expect(wrapper.find('[data-test-subj="DocumentPermissionsDisabled"]')).toHaveLength(1);
   });
+
+  it('handles confirmModal submission', () => {
+    const wrapper = shallow(<Overview />);
+    const button = wrapper.find('[data-test-subj="SyncButton"]');
+    button.prop('onClick')!({} as any);
+    const modal = wrapper.find(EuiConfirmModal);
+    modal.prop('onConfirm')!({} as any);
+
+    expect(initializeSourceSynchronization).toHaveBeenCalled();
+  });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.tsx
index a4fe0329e6c42..899d9dceebe3e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.tsx
@@ -5,11 +5,13 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { useState } from 'react';
 
-import { useValues } from 'kea';
+import { useValues, useActions } from 'kea';
 
 import {
+  EuiButton,
+  EuiConfirmModal,
   EuiEmptyPrompt,
   EuiFlexGroup,
   EuiFlexItem,
@@ -30,7 +32,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { EuiListGroupItemTo } from '../../../../shared/react_router_helpers';
+import { CANCEL_BUTTON_LABEL, START_BUTTON_LABEL } from '../../../../shared/constants';
+import { EuiListGroupItemTo, EuiLinkTo } from '../../../../shared/react_router_helpers';
 import { AppLogic } from '../../../app_logic';
 import aclImage from '../../../assets/supports_acl.svg';
 import { ComponentLoader } from '../../../components/shared/component_loader';
@@ -48,7 +51,10 @@ import {
   DOCUMENT_PERMISSIONS_DOCS_URL,
   ENT_SEARCH_LICENSE_MANAGEMENT,
   EXTERNAL_IDENTITIES_DOCS_URL,
+  SYNC_FREQUENCY_PATH,
+  BLOCKED_TIME_WINDOWS_PATH,
   getGroupPath,
+  getContentSourcePath,
 } from '../../../routes';
 import {
   SOURCES_NO_CONTENT_TITLE,
@@ -77,6 +83,12 @@ import {
   LEARN_CUSTOM_FEATURES_BUTTON,
   DOC_PERMISSIONS_DESCRIPTION,
   CUSTOM_CALLOUT_TITLE,
+  SOURCE_SYNCHRONIZATION_TITLE,
+  SOURCE_SYNC_FREQUENCY_LINK_LABEL,
+  SOURCE_BLOCKED_TIME_WINDOWS_LINK_LABEL,
+  SOURCE_SYNCHRONIZATION_BUTTON_LABEL,
+  SOURCE_SYNC_CONFIRM_TITLE,
+  SOURCE_SYNC_CONFIRM_MESSAGE,
 } from '../constants';
 import { SourceLogic } from '../source_logic';
 
@@ -84,6 +96,7 @@ import { SourceLayout } from './source_layout';
 
 export const Overview: React.FC = () => {
   const { contentSource } = useValues(SourceLogic);
+  const { initializeSourceSynchronization } = useActions(SourceLogic);
   const { isOrganization } = useValues(AppLogic);
 
   const {
@@ -99,8 +112,20 @@ export const Overview: React.FC = () => {
     indexPermissions,
     hasPermissions,
     isFederatedSource,
+    isIndexedSource,
   } = contentSource;
 
+  const [isSyncing, setIsSyncing] = useState(false);
+  const [isModalVisible, setIsModalVisible] = useState(false);
+  const closeModal = () => setIsModalVisible(false);
+  const handleSyncClick = () => setIsModalVisible(true);
+
+  const onSyncConfirm = () => {
+    initializeSourceSynchronization(id);
+    setIsSyncing(true);
+    closeModal();
+  };
+
   const DocumentSummary = () => {
     let totalDocuments = 0;
     const tableContent = summary?.map((item, index) => {
@@ -451,9 +476,57 @@ export const Overview: React.FC = () => {
     </EuiPanel>
   );
 
+  const syncTriggerCallout = (
+    <EuiFlexItem>
+      <EuiSpacer />
+      <EuiTitle size="xs">
+        <h5>{SOURCE_SYNCHRONIZATION_TITLE}</h5>
+      </EuiTitle>
+      <EuiSpacer size="s" />
+      <EuiPanel color="subdued">
+        <EuiButton fill isLoading={isSyncing} onClick={handleSyncClick} data-test-subj="SyncButton">
+          {SOURCE_SYNCHRONIZATION_BUTTON_LABEL}
+        </EuiButton>
+        <EuiSpacer size="m" />
+        <EuiText size="s">
+          <FormattedMessage
+            id="xpack.enterpriseSearch.workplaceSearch.sources.synchronizationCallout"
+            defaultMessage="Configure {syncFrequencyLink} or permissions {blockTimeWindowsLink}."
+            values={{
+              syncFrequencyLink: (
+                <EuiLinkTo to={getContentSourcePath(SYNC_FREQUENCY_PATH, id, isOrganization)}>
+                  {SOURCE_SYNC_FREQUENCY_LINK_LABEL}
+                </EuiLinkTo>
+              ),
+              blockTimeWindowsLink: (
+                <EuiLinkTo to={getContentSourcePath(BLOCKED_TIME_WINDOWS_PATH, id, isOrganization)}>
+                  {SOURCE_BLOCKED_TIME_WINDOWS_LINK_LABEL}
+                </EuiLinkTo>
+              ),
+            }}
+          />
+        </EuiText>
+      </EuiPanel>
+    </EuiFlexItem>
+  );
+
+  const syncConfirmModal = (
+    <EuiConfirmModal
+      title={SOURCE_SYNC_CONFIRM_TITLE}
+      onCancel={closeModal}
+      onConfirm={onSyncConfirm}
+      cancelButtonText={CANCEL_BUTTON_LABEL}
+      confirmButtonText={START_BUTTON_LABEL}
+      defaultFocusedButton="confirm"
+    >
+      <p>{SOURCE_SYNC_CONFIRM_MESSAGE}</p>
+    </EuiConfirmModal>
+  );
+
   return (
     <SourceLayout pageViewTelemetry="source_overview">
       <ViewContentHeader title={SOURCE_OVERVIEW_TITLE} />
+      {isModalVisible && syncConfirmModal}
 
       <EuiFlexGroup gutterSize="xl" alignItems="flexStart">
         <EuiFlexItem grow={8}>
@@ -513,6 +586,7 @@ export const Overview: React.FC = () => {
                 )}
               </>
             )}
+            {isIndexedSource && isOrganization && syncTriggerCallout}
           </EuiFlexGroup>
         </EuiFlexItem>
       </EuiFlexGroup>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts
index 14d0a7f196ae8..f44dbae0608ea 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts
@@ -579,6 +579,49 @@ export const SOURCE_SYNCHRONIZATION_FREQUENCY_TITLE = i18n.translate(
   }
 );
 
+export const SOURCE_SYNCHRONIZATION_TITLE = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.sources.sourceSynchronizationTitle',
+  {
+    defaultMessage: 'Synchronization',
+  }
+);
+
+export const SOURCE_SYNCHRONIZATION_BUTTON_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.sources.sourceSynchronizationButtonLabel',
+  {
+    defaultMessage: 'Synchronize content',
+  }
+);
+
+export const SOURCE_SYNC_FREQUENCY_LINK_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.sources.sourceSyncFrequencyLinkLabel',
+  {
+    defaultMessage: 'sync frequency',
+  }
+);
+
+export const SOURCE_BLOCKED_TIME_WINDOWS_LINK_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.sources.sourceBlockedTimeWindowsLinkLabel',
+  {
+    defaultMessage: 'blocked time windows',
+  }
+);
+
+export const SOURCE_SYNC_CONFIRM_TITLE = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.sources.sourceSyncConfirmTitle',
+  {
+    defaultMessage: 'Start new content sync?',
+  }
+);
+
+export const SOURCE_SYNC_CONFIRM_MESSAGE = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.sources.sourceSyncConfirmMessage',
+  {
+    defaultMessage:
+      'Are you sure you would like to continue with this request and stop all other syncs?',
+  }
+);
+
 export const SOURCE_SYNC_FREQUENCY_TITLE = i18n.translate(
   'xpack.enterpriseSearch.workplaceSearch.sources.sourceSyncFrequencyTitle',
   {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts
index 1fb4477cea5c0..fb88360de5df0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts
@@ -429,6 +429,34 @@ describe('SourceLogic', () => {
       });
     });
 
+    describe('initializeSourceSynchronization', () => {
+      it('calls API and fetches fresh source state', async () => {
+        const initializeSourceSpy = jest.spyOn(SourceLogic.actions, 'initializeSource');
+        const promise = Promise.resolve(contentSource);
+        http.post.mockReturnValue(promise);
+        SourceLogic.actions.initializeSourceSynchronization(contentSource.id);
+
+        expect(http.post).toHaveBeenCalledWith('/internal/workplace_search/org/sources/123/sync');
+        await promise;
+        expect(initializeSourceSpy).toHaveBeenCalledWith(contentSource.id);
+      });
+
+      it('handles error', async () => {
+        const error = {
+          response: {
+            error: 'this is an error',
+            status: 400,
+          },
+        };
+        const promise = Promise.reject(error);
+        http.post.mockReturnValue(promise);
+        SourceLogic.actions.initializeSourceSynchronization(contentSource.id);
+        await expectedAsyncError(promise);
+
+        expect(flashAPIErrors).toHaveBeenCalledWith(error);
+      });
+    });
+
     it('resetSourceState', () => {
       SourceLogic.actions.resetSourceState();
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
index d10400bc5ba2d..9dcd0824cad11 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
@@ -27,6 +27,7 @@ export interface SourceActions {
   onUpdateSourceName(name: string): string;
   setSearchResults(searchResultsResponse: SearchResultsResponse): SearchResultsResponse;
   initializeFederatedSummary(sourceId: string): { sourceId: string };
+  initializeSourceSynchronization(sourceId: string): { sourceId: string };
   onUpdateSummary(summary: DocumentSummaryItem[]): DocumentSummaryItem[];
   setContentFilterValue(contentFilterValue: string): string;
   setActivePage(activePage: number): number;
@@ -81,6 +82,7 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
     setActivePage: (activePage: number) => activePage,
     initializeSource: (sourceId: string) => ({ sourceId }),
     initializeFederatedSummary: (sourceId: string) => ({ sourceId }),
+    initializeSourceSynchronization: (sourceId: string) => ({ sourceId }),
     searchContentSourceDocuments: (sourceId: string) => ({ sourceId }),
     updateContentSource: (sourceId: string, source: SourceUpdatePayload) => ({ sourceId, source }),
     removeContentSource: (sourceId: string) => ({
@@ -254,6 +256,15 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
         actions.setButtonNotLoading();
       }
     },
+    initializeSourceSynchronization: async ({ sourceId }) => {
+      const route = `/internal/workplace_search/org/sources/${sourceId}/sync`;
+      try {
+        await HttpLogic.values.http.post(route);
+        actions.initializeSource(sourceId);
+      } catch (e) {
+        flashAPIErrors(e);
+      }
+    },
     onUpdateSourceName: (name: string) => {
       flashSuccessToast(
         i18n.translate(
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.test.ts
index 706bc8a4853a7..961635c3f9001 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.test.ts
@@ -42,6 +42,7 @@ import {
   registerOrgSourceDownloadDiagnosticsRoute,
   registerOrgSourceOauthConfigurationsRoute,
   registerOrgSourceOauthConfigurationRoute,
+  registerOrgSourceSynchronizeRoute,
   registerOauthConnectorParamsRoute,
 } from './sources';
 
@@ -1252,6 +1253,29 @@ describe('sources routes', () => {
     });
   });
 
+  describe('POST /internal/workplace_search/org/sources/{id}/sync', () => {
+    let mockRouter: MockRouter;
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+      mockRouter = new MockRouter({
+        method: 'post',
+        path: '/internal/workplace_search/org/sources/{id}/sync',
+      });
+
+      registerOrgSourceSynchronizeRoute({
+        ...mockDependencies,
+        router: mockRouter.router,
+      });
+    });
+
+    it('creates a request handler', () => {
+      expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+        path: '/ws/org/sources/:id/sync',
+      });
+    });
+  });
+
   describe('GET /internal/workplace_search/sources/create', () => {
     const tokenPackage = 'some_encrypted_secrets';
 
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.ts
index 660294a5e1ddd..011fe341d6edf 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.ts
@@ -891,6 +891,25 @@ export function registerOrgSourceOauthConfigurationRoute({
   );
 }
 
+export function registerOrgSourceSynchronizeRoute({
+  router,
+  enterpriseSearchRequestHandler,
+}: RouteDependencies) {
+  router.post(
+    {
+      path: '/internal/workplace_search/org/sources/{id}/sync',
+      validate: {
+        params: schema.object({
+          id: schema.string(),
+        }),
+      },
+    },
+    enterpriseSearchRequestHandler.createRequest({
+      path: '/ws/org/sources/:id/sync',
+    })
+  );
+}
+
 // Same route is used for org and account. `state` passes the context.
 export function registerOauthConnectorParamsRoute({
   router,
@@ -956,5 +975,6 @@ export const registerSourcesRoutes = (dependencies: RouteDependencies) => {
   registerOrgSourceDownloadDiagnosticsRoute(dependencies);
   registerOrgSourceOauthConfigurationsRoute(dependencies);
   registerOrgSourceOauthConfigurationRoute(dependencies);
+  registerOrgSourceSynchronizeRoute(dependencies);
   registerOauthConnectorParamsRoute(dependencies);
 };

From a532ea5c05d41e2d0fd3a8dee66316e594c8d698 Mon Sep 17 00:00:00 2001
From: Davey Holler <daveyholler@gmail.com>
Date: Wed, 13 Oct 2021 12:21:46 -0700
Subject: [PATCH 041/117] [App Search] Static Curations History Tab (#113481)

---
 .../components/curations/curations_logic.ts   |  2 +-
 .../curations/views/curations.test.tsx        | 18 ++++++-
 .../components/curations/views/curations.tsx  | 12 +++++
 .../curation_changes_panel.test.tsx           | 22 ++++++++
 .../components/curation_changes_panel.tsx     | 23 ++++++++
 .../ignored_suggestions_panel.test.tsx        | 25 +++++++++
 .../components/ignored_suggestions_panel.tsx  | 53 +++++++++++++++++++
 .../curations_history/components/index.ts     | 10 ++++
 .../rejected_curations_panel.test.tsx         | 22 ++++++++
 .../components/rejected_curations_panel.tsx   | 23 ++++++++
 .../curations_history.test.tsx                | 27 ++++++++++
 .../curations_history/curations_history.tsx   | 36 +++++++++++++
 .../views/curations_history/index.ts          |  8 +++
 13 files changed, 278 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/curation_changes_panel.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/curation_changes_panel.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/ignored_suggestions_panel.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/ignored_suggestions_panel.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/rejected_curations_panel.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/rejected_curations_panel.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/curations_history.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/curations_history.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/index.ts

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_logic.ts
index e623379e58d3f..04d04b297050a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_logic.ts
@@ -23,7 +23,7 @@ import { EngineLogic, generateEnginePath } from '../engine';
 import { DELETE_CONFIRMATION_MESSAGE, DELETE_SUCCESS_MESSAGE } from './constants';
 import { Curation, CurationsAPIResponse } from './types';
 
-type CurationsPageTabs = 'overview' | 'settings';
+type CurationsPageTabs = 'overview' | 'settings' | 'history';
 
 interface CurationsValues {
   dataLoading: boolean;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx
index 7e357cae4343c..f7e9f5437fc3f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx
@@ -19,6 +19,7 @@ import { EuiTab } from '@elastic/eui';
 import { getPageHeaderTabs, getPageTitle } from '../../../../test_helpers';
 
 import { Curations } from './curations';
+import { CurationsHistory } from './curations_history/curations_history';
 import { CurationsOverview } from './curations_overview';
 import { CurationsSettings } from './curations_settings';
 
@@ -70,7 +71,10 @@ describe('Curations', () => {
     expect(actions.onSelectPageTab).toHaveBeenNthCalledWith(1, 'overview');
 
     tabs.at(1).simulate('click');
-    expect(actions.onSelectPageTab).toHaveBeenNthCalledWith(2, 'settings');
+    expect(actions.onSelectPageTab).toHaveBeenNthCalledWith(2, 'history');
+
+    tabs.at(2).simulate('click');
+    expect(actions.onSelectPageTab).toHaveBeenNthCalledWith(3, 'settings');
   });
 
   it('renders an overview view', () => {
@@ -83,12 +87,22 @@ describe('Curations', () => {
     expect(wrapper.find(CurationsOverview)).toHaveLength(1);
   });
 
+  it('renders a history view', () => {
+    setMockValues({ ...values, selectedPageTab: 'history' });
+    const wrapper = shallow(<Curations />);
+    const tabs = getPageHeaderTabs(wrapper).find(EuiTab);
+
+    expect(tabs.at(1).prop('isSelected')).toEqual(true);
+
+    expect(wrapper.find(CurationsHistory)).toHaveLength(1);
+  });
+
   it('renders a settings view', () => {
     setMockValues({ ...values, selectedPageTab: 'settings' });
     const wrapper = shallow(<Curations />);
     const tabs = getPageHeaderTabs(wrapper).find(EuiTab);
 
-    expect(tabs.at(1).prop('isSelected')).toEqual(true);
+    expect(tabs.at(2).prop('isSelected')).toEqual(true);
 
     expect(wrapper.find(CurationsSettings)).toHaveLength(1);
   });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
index 9584b21424fe3..c55fde7626488 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
@@ -21,6 +21,7 @@ import { CURATIONS_OVERVIEW_TITLE, CREATE_NEW_CURATION_TITLE } from '../constant
 import { CurationsLogic } from '../curations_logic';
 import { getCurationsBreadcrumbs } from '../utils';
 
+import { CurationsHistory } from './curations_history/curations_history';
 import { CurationsOverview } from './curations_overview';
 import { CurationsSettings } from './curations_settings';
 
@@ -39,6 +40,16 @@ export const Curations: React.FC = () => {
       isSelected: selectedPageTab === 'overview',
       onClick: () => onSelectPageTab('overview'),
     },
+    {
+      label: i18n.translate(
+        'xpack.enterpriseSearch.appSearch.engine.curations.historyPageTabLabel',
+        {
+          defaultMessage: 'History',
+        }
+      ),
+      isSelected: selectedPageTab === 'history',
+      onClick: () => onSelectPageTab('history'),
+    },
     {
       label: i18n.translate(
         'xpack.enterpriseSearch.appSearch.engine.curations.settingsPageTabLabel',
@@ -74,6 +85,7 @@ export const Curations: React.FC = () => {
       isLoading={dataLoading && !curations.length}
     >
       {selectedPageTab === 'overview' && <CurationsOverview />}
+      {selectedPageTab === 'history' && <CurationsHistory />}
       {selectedPageTab === 'settings' && <CurationsSettings />}
     </AppSearchPageTemplate>
   );
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/curation_changes_panel.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/curation_changes_panel.test.tsx
new file mode 100644
index 0000000000000..7fc06beaa86a9
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/curation_changes_panel.test.tsx
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { DataPanel } from '../../../../data_panel';
+
+import { CurationChangesPanel } from './curation_changes_panel';
+
+describe('CurationChangesPanel', () => {
+  it('renders', () => {
+    const wrapper = shallow(<CurationChangesPanel />);
+
+    expect(wrapper.is(DataPanel)).toBe(true);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/curation_changes_panel.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/curation_changes_panel.tsx
new file mode 100644
index 0000000000000..0aaf20485966e
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/curation_changes_panel.tsx
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { DataPanel } from '../../../../data_panel';
+
+export const CurationChangesPanel: React.FC = () => {
+  return (
+    <DataPanel
+      title={<h2>Automated curation changes</h2>}
+      subtitle={<span>A detailed log of recent changes to your automated curations</span>}
+      iconType="visTable"
+      hasBorder
+    >
+      Embedded logs view goes here...
+    </DataPanel>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/ignored_suggestions_panel.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/ignored_suggestions_panel.test.tsx
new file mode 100644
index 0000000000000..b09981748f19c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/ignored_suggestions_panel.test.tsx
@@ -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 React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiBasicTable } from '@elastic/eui';
+
+import { DataPanel } from '../../../../data_panel';
+
+import { IgnoredSuggestionsPanel } from './ignored_suggestions_panel';
+
+describe('IgnoredSuggestionsPanel', () => {
+  it('renders', () => {
+    const wrapper = shallow(<IgnoredSuggestionsPanel />);
+
+    expect(wrapper.is(DataPanel)).toBe(true);
+    expect(wrapper.find(EuiBasicTable)).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/ignored_suggestions_panel.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/ignored_suggestions_panel.tsx
new file mode 100644
index 0000000000000..f2fdfd55a7e5a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/ignored_suggestions_panel.tsx
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { CustomItemAction, EuiBasicTable, EuiBasicTableColumn, EuiLink } from '@elastic/eui';
+
+import { DataPanel } from '../../../../data_panel';
+import { CurationSuggestion } from '../../../types';
+
+export const IgnoredSuggestionsPanel: React.FC = () => {
+  const ignoredSuggestions: CurationSuggestion[] = [];
+
+  const allowSuggestion = (query: string) => alert(query);
+
+  const actions: Array<CustomItemAction<CurationSuggestion>> = [
+    {
+      render: (item: CurationSuggestion) => {
+        return (
+          <EuiLink onClick={() => allowSuggestion(item.query)} color="primary">
+            Allow
+          </EuiLink>
+        );
+      },
+    },
+  ];
+
+  const columns: Array<EuiBasicTableColumn<CurationSuggestion>> = [
+    {
+      field: 'query',
+      name: 'Query',
+      sortable: true,
+    },
+    {
+      actions,
+    },
+  ];
+
+  return (
+    <DataPanel
+      title={<h2>Ignored queries</h2>}
+      subtitle={<span>You won’t be notified about suggestions for these queries</span>}
+      iconType="eyeClosed"
+      hasBorder
+    >
+      <EuiBasicTable items={ignoredSuggestions} itemId="query" columns={columns} />
+    </DataPanel>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/index.ts
new file mode 100644
index 0000000000000..2e16d9bde8550
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/index.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { CurationChangesPanel } from './curation_changes_panel';
+export { IgnoredSuggestionsPanel } from './ignored_suggestions_panel';
+export { RejectedCurationsPanel } from './rejected_curations_panel';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/rejected_curations_panel.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/rejected_curations_panel.test.tsx
new file mode 100644
index 0000000000000..a40eb8895ad69
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/rejected_curations_panel.test.tsx
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { DataPanel } from '../../../../data_panel';
+
+import { RejectedCurationsPanel } from './rejected_curations_panel';
+
+describe('RejectedCurationsPanel', () => {
+  it('renders', () => {
+    const wrapper = shallow(<RejectedCurationsPanel />);
+
+    expect(wrapper.is(DataPanel)).toBe(true);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/rejected_curations_panel.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/rejected_curations_panel.tsx
new file mode 100644
index 0000000000000..51719b4eebbd7
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/components/rejected_curations_panel.tsx
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { DataPanel } from '../../../../data_panel';
+
+export const RejectedCurationsPanel: React.FC = () => {
+  return (
+    <DataPanel
+      title={<h2>Rececntly rejected sugggestions</h2>}
+      subtitle={<span>Recent suggestions that are still valid can be re-enabled from here</span>}
+      iconType="crossInACircleFilled"
+      hasBorder
+    >
+      Embedded logs view goes here...
+    </DataPanel>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/curations_history.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/curations_history.test.tsx
new file mode 100644
index 0000000000000..1ebd4da694d54
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/curations_history.test.tsx
@@ -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 React from 'react';
+
+import { shallow } from 'enzyme';
+
+import {
+  CurationChangesPanel,
+  IgnoredSuggestionsPanel,
+  RejectedCurationsPanel,
+} from './components';
+import { CurationsHistory } from './curations_history';
+
+describe('CurationsHistory', () => {
+  it('renders', () => {
+    const wrapper = shallow(<CurationsHistory />);
+
+    expect(wrapper.find(CurationChangesPanel)).toHaveLength(1);
+    expect(wrapper.find(RejectedCurationsPanel)).toHaveLength(1);
+    expect(wrapper.find(IgnoredSuggestionsPanel)).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/curations_history.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/curations_history.tsx
new file mode 100644
index 0000000000000..6db62820b1cdb
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/curations_history.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+import {
+  CurationChangesPanel,
+  IgnoredSuggestionsPanel,
+  RejectedCurationsPanel,
+} from './components';
+
+export const CurationsHistory: React.FC = () => {
+  return (
+    <EuiFlexGroup>
+      <EuiFlexItem grow={2}>
+        <EuiFlexGroup direction="column">
+          <EuiFlexItem>
+            <CurationChangesPanel />
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <RejectedCurationsPanel />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+      <EuiFlexItem grow={1}>
+        <IgnoredSuggestionsPanel />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/index.ts
new file mode 100644
index 0000000000000..bddc156f7920e
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_history/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { CurationsHistory } from './curations_history';

From fdd72a9e80621d31f562ddae4413967ca375031f Mon Sep 17 00:00:00 2001
From: Orhan Toy <toyorhan@gmail.com>
Date: Wed, 13 Oct 2021 21:36:03 +0200
Subject: [PATCH 042/117] [App Search] [Crawler] Add tooltip to explain path
 pattern (#114779)

7.13.0 adds a wildcard character to (non-regex) path patterns. This change updates the UI help text to explain this.
---
 .../crawler/components/crawl_rules_table.tsx  | 37 +++++++++++++++----
 .../components/crawler/utils.test.ts          | 26 +++++++++++++
 .../app_search/components/crawler/utils.ts    | 22 +++++++++++
 3 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/crawl_rules_table.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/crawl_rules_table.tsx
index d8d5d9d10b3b7..df7ea80779acf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/crawl_rules_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/crawl_rules_table.tsx
@@ -9,7 +9,16 @@ import React from 'react';
 
 import { useActions } from 'kea';
 
-import { EuiCode, EuiFieldText, EuiLink, EuiSelect, EuiText } from '@elastic/eui';
+import {
+  EuiCode,
+  EuiFieldText,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIconTip,
+  EuiLink,
+  EuiSelect,
+  EuiText,
+} from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -27,6 +36,7 @@ import {
   getReadableCrawlerPolicy,
   getReadableCrawlerRule,
 } from '../types';
+import { getCrawlRulePathPatternTooltip } from '../utils';
 
 interface CrawlRulesTableProps {
   description?: React.ReactNode;
@@ -130,13 +140,24 @@ export const CrawlRulesTable: React.FC<CrawlRulesTableProps> = ({
     },
     {
       editingRender: (crawlRule, onChange, { isInvalid, isLoading }) => (
-        <EuiFieldText
-          fullWidth
-          value={(crawlRule as CrawlRule).pattern}
-          onChange={(e) => onChange(e.target.value)}
-          disabled={isLoading}
-          isInvalid={isInvalid}
-        />
+        <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+          <EuiFlexItem>
+            <EuiFieldText
+              fullWidth
+              value={(crawlRule as CrawlRule).pattern}
+              onChange={(e) => onChange(e.target.value)}
+              disabled={isLoading}
+              isInvalid={isInvalid}
+            />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiIconTip
+              content={getCrawlRulePathPatternTooltip(crawlRule as CrawlRule)}
+              type="iInCircle"
+              position="top"
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
       ),
       render: (crawlRule) => <EuiCode>{(crawlRule as CrawlRule).pattern}</EuiCode>,
       name: i18n.translate(
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.test.ts
index fc810ba8fd7cb..0fc608ac6f5e4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.test.ts
@@ -26,6 +26,7 @@ import {
   crawlRequestServerToClient,
   getDeleteDomainConfirmationMessage,
   getDeleteDomainSuccessMessage,
+  getCrawlRulePathPatternTooltip,
 } from './utils';
 
 const DEFAULT_CRAWL_RULE: CrawlRule = {
@@ -292,3 +293,28 @@ describe('getDeleteDomainSuccessMessage', () => {
     expect(getDeleteDomainSuccessMessage('https://elastic.co/')).toContain('https://elastic.co');
   });
 });
+
+describe('getCrawlRulePathPatternTooltip', () => {
+  it('includes regular expression', () => {
+    const crawlRule: CrawlRule = {
+      id: '-',
+      policy: CrawlerPolicies.allow,
+      rule: CrawlerRules.regex,
+      pattern: '.*',
+    };
+
+    expect(getCrawlRulePathPatternTooltip(crawlRule)).toContain('regular expression');
+  });
+
+  it('includes meta', () => {
+    const crawlRule: CrawlRule = {
+      id: '-',
+      policy: CrawlerPolicies.allow,
+      rule: CrawlerRules.beginsWith,
+      pattern: '/elastic',
+    };
+
+    expect(getCrawlRulePathPatternTooltip(crawlRule)).not.toContain('regular expression');
+    expect(getCrawlRulePathPatternTooltip(crawlRule)).toContain('meta');
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.ts
index 9c94040355d47..817f10b70dca5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.ts
@@ -16,6 +16,8 @@ import {
   CrawlerDomainValidationStep,
   CrawlRequestFromServer,
   CrawlRequest,
+  CrawlRule,
+  CrawlerRules,
   CrawlEventFromServer,
   CrawlEvent,
 } from './types';
@@ -159,3 +161,23 @@ export const getDeleteDomainSuccessMessage = (domainUrl: string) => {
     }
   );
 };
+
+export const getCrawlRulePathPatternTooltip = (crawlRule: CrawlRule) => {
+  if (crawlRule.rule === CrawlerRules.regex) {
+    return i18n.translate(
+      'xpack.enterpriseSearch.appSearch.crawler.crawlRulesTable.regexPathPatternTooltip',
+      {
+        defaultMessage:
+          'The path pattern is a regular expression compatible with the Ruby language regular expression engine.',
+      }
+    );
+  }
+
+  return i18n.translate(
+    'xpack.enterpriseSearch.appSearch.crawler.crawlRulesTable.pathPatternTooltip',
+    {
+      defaultMessage:
+        'The path pattern is a literal string except for the asterisk (*) character, which is a meta character that will match anything.',
+    }
+  );
+};

From 491fcd5c36af3304cc4023e889dc150137acb1a9 Mon Sep 17 00:00:00 2001
From: Kevin Lacabane <kevin.lacabane@elastic.co>
Date: Wed, 13 Oct 2021 21:45:49 +0200
Subject: [PATCH 043/117] [Stack Monitoring] fix beats pages test-subj
 attributes (#114835)

* fix beats pages test-subj attributes

* fix eslint errors
---
 .../public/application/pages/beats/beats_template.tsx    | 2 ++
 .../public/application/pages/beats/instances.tsx         | 7 +------
 .../public/application/pages/beats/overview.tsx          | 9 ++-------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/x-pack/plugins/monitoring/public/application/pages/beats/beats_template.tsx b/x-pack/plugins/monitoring/public/application/pages/beats/beats_template.tsx
index 3bab01af8ceb7..7a070c735bbea 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/beats_template.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/beats_template.tsx
@@ -23,6 +23,7 @@ export const BeatsTemplate: React.FC<BeatsTemplateProps> = ({ instance, ...props
         defaultMessage: 'Overview',
       }),
       route: '/beats',
+      testSubj: 'beatsOverviewPage',
     });
     tabs.push({
       id: 'instances',
@@ -30,6 +31,7 @@ export const BeatsTemplate: React.FC<BeatsTemplateProps> = ({ instance, ...props
         defaultMessage: 'Instances',
       }),
       route: '/beats/beats',
+      testSubj: 'beatsListingPage',
     });
   } else {
     tabs.push({
diff --git a/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx b/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
index 489ad110c40fd..4611f17159621 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
@@ -71,12 +71,7 @@ export const BeatsInstancesPage: React.FC<ComponentProps> = ({ clusters }) => {
   ]);
 
   return (
-    <BeatsTemplate
-      title={title}
-      pageTitle={pageTitle}
-      getPageData={getPageData}
-      data-test-subj="beatsListingPage"
-    >
+    <BeatsTemplate title={title} pageTitle={pageTitle} getPageData={getPageData}>
       <div data-test-subj="monitoringBeatsInstancesApp">
         <SetupModeRenderer
           productName={BEATS_SYSTEM_ID}
diff --git a/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
index 1fa37a2c7b3e6..aec89c92055c4 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
@@ -72,13 +72,8 @@ export const BeatsOverviewPage: React.FC<ComponentProps> = ({ clusters }) => {
   };
 
   return (
-    <BeatsTemplate
-      title={title}
-      pageTitle={pageTitle}
-      getPageData={getPageData}
-      data-test-subj="beatsOverviewPage"
-    >
-      <div data-test-subj="beatsOverviewPage">{renderOverview(data)}</div>
+    <BeatsTemplate title={title} pageTitle={pageTitle} getPageData={getPageData}>
+      <div>{renderOverview(data)}</div>
     </BeatsTemplate>
   );
 };

From e1e1830f15f96ced2deacd614663c17ab4327890 Mon Sep 17 00:00:00 2001
From: Luke Elmers <luke.elmers@elastic.co>
Date: Wed, 13 Oct 2021 14:20:56 -0600
Subject: [PATCH 044/117] [Breaking] Remove `/api/settings` & the
 `xpack_legacy` plugin. (#114730)

---
 .github/CODEOWNERS                            |   1 -
 api_docs/plugin_directory.mdx                 |   1 -
 docs/developer/plugin-list.asciidoc           |   4 -
 x-pack/plugins/xpack_legacy/README.md         |   3 -
 x-pack/plugins/xpack_legacy/jest.config.js    |  15 ---
 x-pack/plugins/xpack_legacy/kibana.json       |  12 --
 x-pack/plugins/xpack_legacy/server/index.ts   |  12 --
 x-pack/plugins/xpack_legacy/server/plugin.ts  |  45 -------
 .../server/routes/settings.test.ts            | 115 ------------------
 .../xpack_legacy/server/routes/settings.ts    |  96 ---------------
 x-pack/plugins/xpack_legacy/tsconfig.json     |  17 ---
 x-pack/test/api_integration/apis/index.ts     |   1 -
 .../apis/xpack_legacy/index.js                |  12 --
 .../apis/xpack_legacy/settings/index.js       |  12 --
 .../apis/xpack_legacy/settings/settings.js    |  40 ------
 x-pack/test/tsconfig.json                     |   3 +-
 16 files changed, 1 insertion(+), 388 deletions(-)
 delete mode 100644 x-pack/plugins/xpack_legacy/README.md
 delete mode 100644 x-pack/plugins/xpack_legacy/jest.config.js
 delete mode 100644 x-pack/plugins/xpack_legacy/kibana.json
 delete mode 100644 x-pack/plugins/xpack_legacy/server/index.ts
 delete mode 100644 x-pack/plugins/xpack_legacy/server/plugin.ts
 delete mode 100644 x-pack/plugins/xpack_legacy/server/routes/settings.test.ts
 delete mode 100644 x-pack/plugins/xpack_legacy/server/routes/settings.ts
 delete mode 100644 x-pack/plugins/xpack_legacy/tsconfig.json
 delete mode 100644 x-pack/test/api_integration/apis/xpack_legacy/index.js
 delete mode 100644 x-pack/test/api_integration/apis/xpack_legacy/settings/index.js
 delete mode 100644 x-pack/test/api_integration/apis/xpack_legacy/settings/settings.js

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 91a8f8c2d5998..1e0a8b187c778 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -254,7 +254,6 @@
 /src/plugins/kibana_overview/ @elastic/kibana-core
 /x-pack/plugins/global_search_bar/ @elastic/kibana-core
 #CC# /src/core/server/csp/ @elastic/kibana-core
-#CC# /src/plugins/xpack_legacy/ @elastic/kibana-core
 #CC# /src/plugins/saved_objects/ @elastic/kibana-core
 #CC# /x-pack/plugins/cloud/ @elastic/kibana-core
 #CC# /x-pack/plugins/features/ @elastic/kibana-core
diff --git a/api_docs/plugin_directory.mdx b/api_docs/plugin_directory.mdx
index 533a86b9e806f..6380831a8c6c3 100644
--- a/api_docs/plugin_directory.mdx
+++ b/api_docs/plugin_directory.mdx
@@ -153,7 +153,6 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibVisualizationsPluginApi" text="visualizations"/> | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | Contains the shared architecture among all the legacy visualizations, e.g. the visualization type registry or the visualization embeddable. | 304 | 13 | 286 | 16 |
 | <DocLink id="kibVisualizePluginApi" text="visualize"/> | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | Contains the visualize application which includes the listing page and the app frame, which will load the visualization's editor. | 24 | 0 | 23 | 1 |
 | watcher | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 0 | 0 | 0 | 0 |
-| xpackLegacy | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 |
 
 ## Package Directory
 
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index 9581848be9e53..3d1fcd51837a3 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -617,10 +617,6 @@ in their infrastructure.
 |This plugins adopts some conventions in addition to or in place of conventions in Kibana (at the time of the plugin's creation):
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/xpack_legacy/README.md[xpackLegacy]
-|Contains HTTP endpoints and UiSettings that are slated for removal.
-
-
 |===
 
 include::{kibana-root}/src/plugins/dashboard/README.asciidoc[leveloffset=+1]
diff --git a/x-pack/plugins/xpack_legacy/README.md b/x-pack/plugins/xpack_legacy/README.md
deleted file mode 100644
index be43825347959..0000000000000
--- a/x-pack/plugins/xpack_legacy/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Xpack Leagcy
-
-Contains HTTP endpoints and UiSettings that are slated for removal.
diff --git a/x-pack/plugins/xpack_legacy/jest.config.js b/x-pack/plugins/xpack_legacy/jest.config.js
deleted file mode 100644
index 5ad0fa36264d1..0000000000000
--- a/x-pack/plugins/xpack_legacy/jest.config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-module.exports = {
-  preset: '@kbn/test',
-  rootDir: '../../..',
-  roots: ['<rootDir>/x-pack/plugins/xpack_legacy'],
-  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/x-pack/plugins/xpack_legacy',
-  coverageReporters: ['text', 'html'],
-  collectCoverageFrom: ['<rootDir>/x-pack/plugins/xpack_legacy/server/**/*.{ts,tsx}'],
-};
diff --git a/x-pack/plugins/xpack_legacy/kibana.json b/x-pack/plugins/xpack_legacy/kibana.json
deleted file mode 100644
index 9dd0ac8340183..0000000000000
--- a/x-pack/plugins/xpack_legacy/kibana.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id": "xpackLegacy",
-  "owner": {
-    "name": "Kibana Core",
-    "githubTeam": "kibana-core"
-  },
-  "version": "8.0.0",
-  "kibanaVersion": "kibana",
-  "server": true,
-  "ui": false,
-  "requiredPlugins": ["usageCollection"]
-}
diff --git a/x-pack/plugins/xpack_legacy/server/index.ts b/x-pack/plugins/xpack_legacy/server/index.ts
deleted file mode 100644
index ee51afcca429f..0000000000000
--- a/x-pack/plugins/xpack_legacy/server/index.ts
+++ /dev/null
@@ -1,12 +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 { PluginInitializerContext } from '../../../../src/core/server';
-import { XpackLegacyPlugin } from './plugin';
-
-export const plugin = (initializerContext: PluginInitializerContext) =>
-  new XpackLegacyPlugin(initializerContext);
diff --git a/x-pack/plugins/xpack_legacy/server/plugin.ts b/x-pack/plugins/xpack_legacy/server/plugin.ts
deleted file mode 100644
index ffef7117bbbd8..0000000000000
--- a/x-pack/plugins/xpack_legacy/server/plugin.ts
+++ /dev/null
@@ -1,45 +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 {
-  CoreStart,
-  CoreSetup,
-  Plugin,
-  PluginInitializerContext,
-} from '../../../../src/core/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import { registerSettingsRoute } from './routes/settings';
-
-interface SetupPluginDeps {
-  usageCollection: UsageCollectionSetup;
-}
-
-export class XpackLegacyPlugin implements Plugin {
-  constructor(private readonly initContext: PluginInitializerContext) {}
-
-  public setup(core: CoreSetup, { usageCollection }: SetupPluginDeps) {
-    const router = core.http.createRouter();
-    const globalConfig = this.initContext.config.legacy.get();
-    const serverInfo = core.http.getServerInfo();
-
-    registerSettingsRoute({
-      router,
-      usageCollection,
-      overallStatus$: core.status.overall$,
-      config: {
-        kibanaIndex: globalConfig.kibana.index,
-        kibanaVersion: this.initContext.env.packageInfo.version,
-        uuid: this.initContext.env.instanceUuid,
-        server: serverInfo,
-      },
-    });
-  }
-
-  public start(core: CoreStart) {}
-
-  public stop() {}
-}
diff --git a/x-pack/plugins/xpack_legacy/server/routes/settings.test.ts b/x-pack/plugins/xpack_legacy/server/routes/settings.test.ts
deleted file mode 100644
index f265ea6ab125a..0000000000000
--- a/x-pack/plugins/xpack_legacy/server/routes/settings.test.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { BehaviorSubject } from 'rxjs';
-import { UnwrapPromise } from '@kbn/utility-types';
-import supertest from 'supertest';
-
-import { ServiceStatus, ServiceStatusLevels } from '../../../../../src/core/server';
-import {
-  contextServiceMock,
-  elasticsearchServiceMock,
-  savedObjectsServiceMock,
-  executionContextServiceMock,
-} from '../../../../../src/core/server/mocks';
-import { createHttpServer } from '../../../../../src/core/server/test_utils';
-import { registerSettingsRoute } from './settings';
-
-type HttpService = ReturnType<typeof createHttpServer>;
-type HttpSetup = UnwrapPromise<ReturnType<HttpService['setup']>>;
-
-export function mockGetClusterInfo(clusterInfo: any) {
-  const esClient = elasticsearchServiceMock.createScopedClusterClient().asCurrentUser;
-  // @ts-ignore we only care about the response body
-  esClient.info.mockResolvedValue({ body: { ...clusterInfo } });
-  return esClient;
-}
-
-describe('/api/settings', () => {
-  let server: HttpService;
-  let httpSetup: HttpSetup;
-  let overallStatus$: BehaviorSubject<ServiceStatus>;
-
-  beforeEach(async () => {
-    server = createHttpServer();
-    await server.preboot({ context: contextServiceMock.createPrebootContract() });
-    httpSetup = await server.setup({
-      context: contextServiceMock.createSetupContract({
-        core: {
-          elasticsearch: {
-            client: {
-              asCurrentUser: mockGetClusterInfo({ cluster_uuid: 'yyy-yyyyy' }),
-            },
-          },
-          savedObjects: {
-            client: savedObjectsServiceMock.create(),
-          },
-        },
-      }),
-      executionContext: executionContextServiceMock.createInternalSetupContract(),
-    });
-
-    overallStatus$ = new BehaviorSubject<ServiceStatus>({
-      level: ServiceStatusLevels.available,
-      summary: 'everything is working',
-    });
-
-    const usageCollection = {
-      getCollectorByType: jest.fn().mockReturnValue({
-        fetch: jest
-          .fn()
-          .mockReturnValue({ xpack: { default_admin_email: 'kibana-machine@elastic.co' } }),
-      }),
-    } as any;
-
-    const router = httpSetup.createRouter('');
-    registerSettingsRoute({
-      router,
-      overallStatus$,
-      usageCollection,
-      config: {
-        kibanaIndex: '.kibana-test',
-        kibanaVersion: '8.8.8-SNAPSHOT',
-        server: {
-          name: 'mykibana',
-          hostname: 'mykibana.com',
-          port: 1234,
-        },
-        uuid: 'xxx-xxxxx',
-      },
-    });
-
-    await server.start();
-  });
-
-  afterEach(async () => {
-    await server.stop();
-  });
-
-  it('successfully returns data', async () => {
-    const response = await supertest(httpSetup.server.listener).get('/api/settings').expect(200);
-    expect(response.body).toMatchObject({
-      cluster_uuid: 'yyy-yyyyy',
-      settings: {
-        xpack: {
-          default_admin_email: 'kibana-machine@elastic.co',
-        },
-        kibana: {
-          uuid: 'xxx-xxxxx',
-          name: 'mykibana',
-          index: '.kibana-test',
-          host: 'mykibana.com',
-          locale: 'en',
-          transport_address: `mykibana.com:1234`,
-          version: '8.8.8',
-          snapshot: true,
-          status: 'green',
-        },
-      },
-    });
-  });
-});
diff --git a/x-pack/plugins/xpack_legacy/server/routes/settings.ts b/x-pack/plugins/xpack_legacy/server/routes/settings.ts
deleted file mode 100644
index b9052ca0c84e3..0000000000000
--- a/x-pack/plugins/xpack_legacy/server/routes/settings.ts
+++ /dev/null
@@ -1,96 +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 { i18n } from '@kbn/i18n';
-import { Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
-
-import { IRouter, ServiceStatus, ServiceStatusLevels } from '../../../../../src/core/server';
-import { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
-import { KIBANA_SETTINGS_TYPE } from '../../../monitoring/common/constants';
-import { KibanaSettingsCollector } from '../../../monitoring/server';
-
-const SNAPSHOT_REGEX = /-snapshot/i;
-
-export function registerSettingsRoute({
-  router,
-  usageCollection,
-  overallStatus$,
-  config,
-}: {
-  router: IRouter;
-  usageCollection: UsageCollectionSetup;
-  overallStatus$: Observable<ServiceStatus>;
-  config: {
-    kibanaIndex: string;
-    kibanaVersion: string;
-    uuid: string;
-    server: {
-      name: string;
-      hostname: string;
-      port: number;
-    };
-  };
-}) {
-  router.get(
-    {
-      path: '/api/settings',
-      validate: false,
-    },
-    async (context, req, res) => {
-      const collectorFetchContext = {
-        esClient: context.core.elasticsearch.client.asCurrentUser,
-        soClient: context.core.savedObjects.client,
-      };
-
-      const settingsCollector = usageCollection.getCollectorByType(KIBANA_SETTINGS_TYPE) as
-        | KibanaSettingsCollector
-        | undefined;
-      if (!settingsCollector) {
-        throw new Error('The settings collector is not registered');
-      }
-
-      const settings =
-        (await settingsCollector.fetch(collectorFetchContext)) ??
-        settingsCollector.getEmailValueStructure(null);
-
-      const { body } = await collectorFetchContext.esClient.info({ filter_path: 'cluster_uuid' });
-      const uuid: string = body.cluster_uuid;
-
-      const overallStatus = await overallStatus$.pipe(first()).toPromise();
-
-      const kibana = {
-        uuid: config.uuid,
-        name: config.server.name,
-        index: config.kibanaIndex,
-        host: config.server.hostname,
-        port: config.server.port,
-        locale: i18n.getLocale(),
-        transport_address: `${config.server.hostname}:${config.server.port}`,
-        version: config.kibanaVersion.replace(SNAPSHOT_REGEX, ''),
-        snapshot: SNAPSHOT_REGEX.test(config.kibanaVersion),
-        status: ServiceStatusToLegacyState[overallStatus.level.toString()],
-      };
-      return res.ok({
-        body: {
-          cluster_uuid: uuid,
-          settings: {
-            ...settings,
-            kibana,
-          },
-        },
-      });
-    }
-  );
-}
-
-const ServiceStatusToLegacyState: Record<string, string> = {
-  [ServiceStatusLevels.critical.toString()]: 'red',
-  [ServiceStatusLevels.unavailable.toString()]: 'red',
-  [ServiceStatusLevels.degraded.toString()]: 'yellow',
-  [ServiceStatusLevels.available.toString()]: 'green',
-};
diff --git a/x-pack/plugins/xpack_legacy/tsconfig.json b/x-pack/plugins/xpack_legacy/tsconfig.json
deleted file mode 100644
index 57fccc031a0cf..0000000000000
--- a/x-pack/plugins/xpack_legacy/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./target/types",
-    "emitDeclarationOnly": true,
-    "declaration": true,
-    "declarationMap": true
-  },
-  "include": [
-    "server/**/*",
-  ],
-  "references": [
-    { "path": "../../../src/core/tsconfig.json" },
-    { "path": "../../../src/plugins/usage_collection/tsconfig.json" },
-    { "path": "../monitoring/tsconfig.json" },
-  ]
-}
diff --git a/x-pack/test/api_integration/apis/index.ts b/x-pack/test/api_integration/apis/index.ts
index eed39fd6dc6dc..c3d08ba306692 100644
--- a/x-pack/test/api_integration/apis/index.ts
+++ b/x-pack/test/api_integration/apis/index.ts
@@ -16,7 +16,6 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./security'));
     loadTestFile(require.resolve('./spaces'));
     loadTestFile(require.resolve('./monitoring'));
-    loadTestFile(require.resolve('./xpack_legacy'));
     loadTestFile(require.resolve('./features'));
     loadTestFile(require.resolve('./telemetry'));
     loadTestFile(require.resolve('./logstash'));
diff --git a/x-pack/test/api_integration/apis/xpack_legacy/index.js b/x-pack/test/api_integration/apis/xpack_legacy/index.js
deleted file mode 100644
index 4d3046286fb9d..0000000000000
--- a/x-pack/test/api_integration/apis/xpack_legacy/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export default function ({ loadTestFile }) {
-  describe('xpack_legacy', () => {
-    loadTestFile(require.resolve('./settings'));
-  });
-}
diff --git a/x-pack/test/api_integration/apis/xpack_legacy/settings/index.js b/x-pack/test/api_integration/apis/xpack_legacy/settings/index.js
deleted file mode 100644
index 3d8ce8d33b3d4..0000000000000
--- a/x-pack/test/api_integration/apis/xpack_legacy/settings/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export default function ({ loadTestFile }) {
-  describe('Settings', () => {
-    loadTestFile(require.resolve('./settings'));
-  });
-}
diff --git a/x-pack/test/api_integration/apis/xpack_legacy/settings/settings.js b/x-pack/test/api_integration/apis/xpack_legacy/settings/settings.js
deleted file mode 100644
index 6a82c5468a2c4..0000000000000
--- a/x-pack/test/api_integration/apis/xpack_legacy/settings/settings.js
+++ /dev/null
@@ -1,40 +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';
-
-export default function ({ getService }) {
-  const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-
-  describe('/api/settings', () => {
-    describe('with trial license clusters', () => {
-      const archive = 'x-pack/test/functional/es_archives/monitoring/multicluster';
-
-      before('load clusters archive', () => {
-        return esArchiver.load(archive);
-      });
-
-      after('unload clusters archive', () => {
-        return esArchiver.unload(archive);
-      });
-
-      it('should load multiple clusters', async () => {
-        const { body } = await supertest.get('/api/settings').set('kbn-xsrf', 'xxx').expect(200);
-        expect(body.cluster_uuid.length > 1).to.eql(true);
-        expect(body.settings.kibana.uuid.length > 0).to.eql(true);
-        expect(body.settings.kibana.name.length > 0).to.eql(true);
-        expect(body.settings.kibana.index.length > 0).to.eql(true);
-        expect(body.settings.kibana.host.length > 0).to.eql(true);
-        expect(body.settings.kibana.transport_address.length > 0).to.eql(true);
-        expect(body.settings.kibana.version.length > 0).to.eql(true);
-        expect(body.settings.kibana.status.length > 0).to.eql(true);
-        expect(body.settings.xpack.default_admin_email).to.eql(null);
-      });
-    });
-  });
-}
diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json
index 173403743235b..1ffe3834d782d 100644
--- a/x-pack/test/tsconfig.json
+++ b/x-pack/test/tsconfig.json
@@ -102,7 +102,6 @@
     { "path": "../plugins/remote_clusters/tsconfig.json" },
     { "path": "../plugins/cross_cluster_replication/tsconfig.json" },
     { "path": "../plugins/index_lifecycle_management/tsconfig.json"},
-    { "path": "../plugins/uptime/tsconfig.json" },
-    { "path": "../plugins/xpack_legacy/tsconfig.json" }
+    { "path": "../plugins/uptime/tsconfig.json" }
   ]
 }

From fda421fab61bba5799ddcff1d70c8f4cc291a695 Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Wed, 13 Oct 2021 16:34:31 -0400
Subject: [PATCH 045/117] Always call resolve (#114670)

---
 .../components/alert_details_route.test.tsx   | 118 +++---------------
 .../components/alert_details_route.tsx        |  24 +---
 2 files changed, 26 insertions(+), 116 deletions(-)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details_route.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details_route.test.tsx
index c07138990f88d..847c6c65464b2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details_route.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details_route.test.tsx
@@ -19,20 +19,6 @@ import { spacesPluginMock } from '../../../../../../spaces/public/mocks';
 import { useKibana } from '../../../../common/lib/kibana';
 jest.mock('../../../../common/lib/kibana');
 
-class NotFoundError extends Error {
-  public readonly body: {
-    statusCode: number;
-    name: string;
-  } = {
-    statusCode: 404,
-    name: 'Not found',
-  };
-
-  constructor(message: string | undefined) {
-    super(message);
-  }
-}
-
 describe('alert_details_route', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -58,11 +44,8 @@ describe('alert_details_route', () => {
   it('redirects to another page if fetched rule is an aliasMatch', async () => {
     await setup();
     const rule = mockRule();
-    const { loadAlert, resolveRule } = mockApis();
+    const { resolveRule } = mockApis();
 
-    loadAlert.mockImplementationOnce(async () => {
-      throw new NotFoundError('OMG');
-    });
     resolveRule.mockImplementationOnce(async () => ({
       ...rule,
       id: 'new_id',
@@ -70,17 +53,13 @@ describe('alert_details_route', () => {
       alias_target_id: rule.id,
     }));
     const wrapper = mountWithIntl(
-      <AlertDetailsRoute
-        {...mockRouterProps(rule)}
-        {...{ ...mockApis(), loadAlert, resolveRule }}
-      />
+      <AlertDetailsRoute {...mockRouterProps(rule)} {...{ ...mockApis(), resolveRule }} />
     );
     await act(async () => {
       await nextTick();
       wrapper.update();
     });
 
-    expect(loadAlert).toHaveBeenCalledWith(rule.id);
     expect(resolveRule).toHaveBeenCalledWith(rule.id);
     expect((spacesMock as any).ui.redirectLegacyUrl).toHaveBeenCalledWith(
       `insightsAndAlerting/triggersActions/rule/new_id`,
@@ -96,11 +75,8 @@ describe('alert_details_route', () => {
       name: 'type name',
       authorizedConsumers: ['consumer'],
     };
-    const { loadAlert, loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
+    const { loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
 
-    loadAlert.mockImplementationOnce(async () => {
-      throw new NotFoundError('OMG');
-    });
     loadAlertTypes.mockImplementationOnce(async () => [ruleType]);
     loadActionTypes.mockImplementation(async () => []);
     resolveRule.mockImplementationOnce(async () => ({
@@ -112,7 +88,7 @@ describe('alert_details_route', () => {
     const wrapper = mountWithIntl(
       <AlertDetailsRoute
         {...mockRouterProps(rule)}
-        {...{ ...mockApis(), loadAlert, loadAlertTypes, loadActionTypes, resolveRule }}
+        {...{ ...mockApis(), loadAlertTypes, loadActionTypes, resolveRule }}
       />
     );
     await act(async () => {
@@ -120,7 +96,6 @@ describe('alert_details_route', () => {
       wrapper.update();
     });
 
-    expect(loadAlert).toHaveBeenCalledWith(rule.id);
     expect(resolveRule).toHaveBeenCalledWith(rule.id);
     expect((spacesMock as any).ui.components.getLegacyUrlConflict).toHaveBeenCalledWith({
       currentObjectId: 'new_id',
@@ -138,10 +113,10 @@ describe('getRuleData useEffect handler', () => {
 
   it('fetches rule', async () => {
     const rule = mockRule();
-    const { loadAlert, loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
+    const { loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
     const { setAlert, setAlertType, setActionTypes } = mockStateSetter();
 
-    loadAlert.mockImplementationOnce(async () => rule);
+    resolveRule.mockImplementationOnce(async () => rule);
 
     const toastNotifications = {
       addDanger: jest.fn(),
@@ -149,7 +124,6 @@ describe('getRuleData useEffect handler', () => {
 
     await getRuleData(
       rule.id,
-      loadAlert,
       loadAlertTypes,
       resolveRule,
       loadActionTypes,
@@ -159,8 +133,7 @@ describe('getRuleData useEffect handler', () => {
       toastNotifications
     );
 
-    expect(loadAlert).toHaveBeenCalledWith(rule.id);
-    expect(resolveRule).not.toHaveBeenCalled();
+    expect(resolveRule).toHaveBeenCalledWith(rule.id);
     expect(setAlert).toHaveBeenCalledWith(rule);
   });
 
@@ -184,10 +157,10 @@ describe('getRuleData useEffect handler', () => {
       id: rule.alertTypeId,
       name: 'type name',
     };
-    const { loadAlert, loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
+    const { loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
     const { setAlert, setAlertType, setActionTypes } = mockStateSetter();
 
-    loadAlert.mockImplementation(async () => rule);
+    resolveRule.mockImplementation(async () => rule);
     loadAlertTypes.mockImplementation(async () => [ruleType]);
     loadActionTypes.mockImplementation(async () => [connectorType]);
 
@@ -197,7 +170,6 @@ describe('getRuleData useEffect handler', () => {
 
     await getRuleData(
       rule.id,
-      loadAlert,
       loadAlertTypes,
       resolveRule,
       loadActionTypes,
@@ -209,58 +181,13 @@ describe('getRuleData useEffect handler', () => {
 
     expect(loadAlertTypes).toHaveBeenCalledTimes(1);
     expect(loadActionTypes).toHaveBeenCalledTimes(1);
-    expect(resolveRule).not.toHaveBeenCalled();
+    expect(resolveRule).toHaveBeenCalled();
 
     expect(setAlert).toHaveBeenCalledWith(rule);
     expect(setAlertType).toHaveBeenCalledWith(ruleType);
     expect(setActionTypes).toHaveBeenCalledWith([connectorType]);
   });
 
-  it('fetches rule using resolve if initial GET results in a 404 error', async () => {
-    const connectorType = {
-      id: '.server-log',
-      name: 'Server log',
-      enabled: true,
-    };
-    const rule = mockRule({
-      actions: [
-        {
-          group: '',
-          id: uuid.v4(),
-          actionTypeId: connectorType.id,
-          params: {},
-        },
-      ],
-    });
-
-    const { loadAlert, loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
-    const { setAlert, setAlertType, setActionTypes } = mockStateSetter();
-
-    loadAlert.mockImplementationOnce(async () => {
-      throw new NotFoundError('OMG');
-    });
-    resolveRule.mockImplementationOnce(async () => rule);
-
-    const toastNotifications = {
-      addDanger: jest.fn(),
-    } as unknown as ToastsApi;
-    await getRuleData(
-      rule.id,
-      loadAlert,
-      loadAlertTypes,
-      resolveRule,
-      loadActionTypes,
-      setAlert,
-      setAlertType,
-      setActionTypes,
-      toastNotifications
-    );
-
-    expect(loadAlert).toHaveBeenCalledWith(rule.id);
-    expect(resolveRule).toHaveBeenCalledWith(rule.id);
-    expect(setAlert).toHaveBeenCalledWith(rule);
-  });
-
   it('displays an error if fetching the rule results in a non-404 error', async () => {
     const connectorType = {
       id: '.server-log',
@@ -278,10 +205,10 @@ describe('getRuleData useEffect handler', () => {
       ],
     });
 
-    const { loadAlert, loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
+    const { loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
     const { setAlert, setAlertType, setActionTypes } = mockStateSetter();
 
-    loadAlert.mockImplementation(async () => {
+    resolveRule.mockImplementation(async () => {
       throw new Error('OMG');
     });
 
@@ -290,7 +217,6 @@ describe('getRuleData useEffect handler', () => {
     } as unknown as ToastsApi;
     await getRuleData(
       rule.id,
-      loadAlert,
       loadAlertTypes,
       resolveRule,
       loadActionTypes,
@@ -322,10 +248,10 @@ describe('getRuleData useEffect handler', () => {
       ],
     });
 
-    const { loadAlert, loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
+    const { loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
     const { setAlert, setAlertType, setActionTypes } = mockStateSetter();
 
-    loadAlert.mockImplementation(async () => rule);
+    resolveRule.mockImplementation(async () => rule);
 
     loadAlertTypes.mockImplementation(async () => {
       throw new Error('OMG no rule type');
@@ -337,7 +263,6 @@ describe('getRuleData useEffect handler', () => {
     } as unknown as ToastsApi;
     await getRuleData(
       rule.id,
-      loadAlert,
       loadAlertTypes,
       resolveRule,
       loadActionTypes,
@@ -373,10 +298,10 @@ describe('getRuleData useEffect handler', () => {
       name: 'type name',
     };
 
-    const { loadAlert, loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
+    const { loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
     const { setAlert, setAlertType, setActionTypes } = mockStateSetter();
 
-    loadAlert.mockImplementation(async () => rule);
+    resolveRule.mockImplementation(async () => rule);
 
     loadAlertTypes.mockImplementation(async () => [ruleType]);
     loadActionTypes.mockImplementation(async () => {
@@ -388,7 +313,6 @@ describe('getRuleData useEffect handler', () => {
     } as unknown as ToastsApi;
     await getRuleData(
       rule.id,
-      loadAlert,
       loadAlertTypes,
       resolveRule,
       loadActionTypes,
@@ -425,10 +349,10 @@ describe('getRuleData useEffect handler', () => {
       name: 'type name',
     };
 
-    const { loadAlert, loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
+    const { loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
     const { setAlert, setAlertType, setActionTypes } = mockStateSetter();
 
-    loadAlert.mockImplementation(async () => rule);
+    resolveRule.mockImplementation(async () => rule);
     loadAlertTypes.mockImplementation(async () => [ruleType]);
     loadActionTypes.mockImplementation(async () => [connectorType]);
 
@@ -437,7 +361,6 @@ describe('getRuleData useEffect handler', () => {
     } as unknown as ToastsApi;
     await getRuleData(
       rule.id,
-      loadAlert,
       loadAlertTypes,
       resolveRule,
       loadActionTypes,
@@ -485,10 +408,10 @@ describe('getRuleData useEffect handler', () => {
       name: 'type name',
     };
 
-    const { loadAlert, loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
+    const { loadAlertTypes, loadActionTypes, resolveRule } = mockApis();
     const { setAlert, setAlertType, setActionTypes } = mockStateSetter();
 
-    loadAlert.mockImplementation(async () => rule);
+    resolveRule.mockImplementation(async () => rule);
     loadAlertTypes.mockImplementation(async () => [ruleType]);
     loadActionTypes.mockImplementation(async () => [availableConnectorType]);
 
@@ -497,7 +420,6 @@ describe('getRuleData useEffect handler', () => {
     } as unknown as ToastsApi;
     await getRuleData(
       rule.id,
-      loadAlert,
       loadAlertTypes,
       resolveRule,
       loadActionTypes,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details_route.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details_route.tsx
index 123d60bb9fea3..b530df986c277 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details_route.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details_route.tsx
@@ -10,7 +10,7 @@ import React, { useState, useEffect } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { ToastsApi } from 'kibana/public';
 import { EuiSpacer } from '@elastic/eui';
-import { Alert, AlertType, ActionType, ResolvedRule } from '../../../../types';
+import { AlertType, ActionType, ResolvedRule } from '../../../../types';
 import { AlertDetailsWithApi as AlertDetails } from './alert_details';
 import { throwIfAbsent, throwIfIsntContained } from '../../../lib/value_validators';
 import {
@@ -28,13 +28,12 @@ type AlertDetailsRouteProps = RouteComponentProps<{
   ruleId: string;
 }> &
   Pick<ActionApis, 'loadActionTypes'> &
-  Pick<AlertApis, 'loadAlert' | 'loadAlertTypes' | 'resolveRule'>;
+  Pick<AlertApis, 'loadAlertTypes' | 'resolveRule'>;
 
 export const AlertDetailsRoute: React.FunctionComponent<AlertDetailsRouteProps> = ({
   match: {
     params: { ruleId },
   },
-  loadAlert,
   loadAlertTypes,
   loadActionTypes,
   resolveRule,
@@ -47,14 +46,13 @@ export const AlertDetailsRoute: React.FunctionComponent<AlertDetailsRouteProps>
 
   const { basePath } = http;
 
-  const [alert, setAlert] = useState<Alert | ResolvedRule | null>(null);
+  const [alert, setAlert] = useState<ResolvedRule | null>(null);
   const [alertType, setAlertType] = useState<AlertType | null>(null);
   const [actionTypes, setActionTypes] = useState<ActionType[] | null>(null);
   const [refreshToken, requestRefresh] = React.useState<number>();
   useEffect(() => {
     getRuleData(
       ruleId,
-      loadAlert,
       loadAlertTypes,
       resolveRule,
       loadActionTypes,
@@ -63,7 +61,7 @@ export const AlertDetailsRoute: React.FunctionComponent<AlertDetailsRouteProps>
       setActionTypes,
       toasts
     );
-  }, [ruleId, http, loadActionTypes, loadAlert, loadAlertTypes, resolveRule, toasts, refreshToken]);
+  }, [ruleId, http, loadActionTypes, loadAlertTypes, resolveRule, toasts, refreshToken]);
 
   useEffect(() => {
     if (alert) {
@@ -128,26 +126,16 @@ export const AlertDetailsRoute: React.FunctionComponent<AlertDetailsRouteProps>
 
 export async function getRuleData(
   ruleId: string,
-  loadAlert: AlertApis['loadAlert'],
   loadAlertTypes: AlertApis['loadAlertTypes'],
   resolveRule: AlertApis['resolveRule'],
   loadActionTypes: ActionApis['loadActionTypes'],
-  setAlert: React.Dispatch<React.SetStateAction<Alert | ResolvedRule | null>>,
+  setAlert: React.Dispatch<React.SetStateAction<ResolvedRule | null>>,
   setAlertType: React.Dispatch<React.SetStateAction<AlertType | null>>,
   setActionTypes: React.Dispatch<React.SetStateAction<ActionType[] | null>>,
   toasts: Pick<ToastsApi, 'addDanger'>
 ) {
   try {
-    let loadedRule: Alert | ResolvedRule;
-    try {
-      loadedRule = await loadAlert(ruleId);
-    } catch (err) {
-      // Try resolving this rule id if the error is a 404, otherwise re-throw
-      if (err?.body?.statusCode !== 404) {
-        throw err;
-      }
-      loadedRule = await resolveRule(ruleId);
-    }
+    const loadedRule: ResolvedRule = await resolveRule(ruleId);
     setAlert(loadedRule);
 
     const [loadedAlertType, loadedActionTypes] = await Promise.all<AlertType, ActionType[]>([

From d822d6dc3229c45195fc2eea588e475b24c89dd7 Mon Sep 17 00:00:00 2001
From: Nick Peihl <nick.peihl@elastic.co>
Date: Wed, 13 Oct 2021 13:45:53 -0700
Subject: [PATCH 046/117] Update kibana to EMS 7.16 (#114865)

* Update kibana to EMS 7.16

* Update license override
---
 package.json                         |  2 +-
 src/dev/license_checker/config.ts    |  2 +-
 src/plugins/maps_ems/common/index.ts |  2 +-
 yarn.lock                            | 20 ++++++++++----------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index e9aea2d2adda3..f526f357ff347 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "@elastic/charts": "37.0.0",
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.21",
-    "@elastic/ems-client": "7.15.0",
+    "@elastic/ems-client": "7.16.0",
     "@elastic/eui": "39.0.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/maki": "6.3.0",
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index 818ea3675194e..a4ae39848735e 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -74,7 +74,7 @@ export const DEV_ONLY_LICENSE_ALLOWED = ['MPL-2.0'];
 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@7.15.0': ['Elastic License 2.0'],
+  '@elastic/ems-client@7.16.0': ['Elastic License 2.0'],
   '@elastic/eui@39.0.0': ['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/plugins/maps_ems/common/index.ts b/src/plugins/maps_ems/common/index.ts
index f7d7ff1102e59..26fdb4fa795fe 100644
--- a/src/plugins/maps_ems/common/index.ts
+++ b/src/plugins/maps_ems/common/index.ts
@@ -10,7 +10,7 @@ export const TMS_IN_YML_ID = 'TMS in config/kibana.yml';
 
 export const DEFAULT_EMS_FILE_API_URL = 'https://vector.maps.elastic.co';
 export const DEFAULT_EMS_TILE_API_URL = 'https://tiles.maps.elastic.co';
-export const DEFAULT_EMS_LANDING_PAGE_URL = 'https://maps.elastic.co/v7.15';
+export const DEFAULT_EMS_LANDING_PAGE_URL = 'https://maps.elastic.co/v7.16';
 export const DEFAULT_EMS_FONT_LIBRARY_URL =
   'https://tiles.maps.elastic.co/fonts/{fontstack}/{range}.pbf';
 
diff --git a/yarn.lock b/yarn.lock
index 05d03a637eaee..70e2a452e87dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2389,10 +2389,10 @@
     ms "^2.1.3"
     secure-json-parse "^2.4.0"
 
-"@elastic/ems-client@7.15.0":
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/@elastic/ems-client/-/ems-client-7.15.0.tgz#c101d7f83aa56463bcc385fd4eb883c6ea3ae9fc"
-  integrity sha512-BAAAVPhoaH6SGrfuO6U0MVRg4lvblhJ9VqYlMf3dZN9uDBB+12CUtb6t6Kavn5Tr3nS6X3tU/KKsuomo5RrEeQ==
+"@elastic/ems-client@7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@elastic/ems-client/-/ems-client-7.16.0.tgz#92db94126bac0b95fbf156fe609f68979e7af4b6"
+  integrity sha512-NgMB5vqj6I7lxVsysrz6eB1EW6gsZj7SWWs79WSiiKQeNuRg82tJhvbHQnWezjIS4UKOtoGxZsg475EHVZB46g==
   dependencies:
     "@types/geojson" "^7946.0.7"
     "@types/lru-cache" "^5.1.0"
@@ -2400,7 +2400,7 @@
     "@types/topojson-specification" "^1.0.1"
     lodash "^4.17.15"
     lru-cache "^6.0.0"
-    semver "7.3.2"
+    semver "^7.3.2"
     topojson-client "^3.1.0"
 
 "@elastic/eslint-config-kibana@link:bazel-bin/packages/elastic-eslint-config-kibana":
@@ -25810,16 +25810,16 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.2, semver@^7.2.1, semver@^7.3.2, semver@~7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
-
 semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.2.1, semver@^7.3.2, semver@~7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
 semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"

From 77ad8fe9912cd65fd6cd0ef1de23900fcccfe4e2 Mon Sep 17 00:00:00 2001
From: Brandon Morelli <brandon.morelli@elastic.co>
Date: Wed, 13 Oct 2021 14:21:50 -0700
Subject: [PATCH 047/117] docs: fix config names (#114903)

---
 docs/apm/api.asciidoc             | 3 +--
 docs/apm/troubleshooting.asciidoc | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/apm/api.asciidoc b/docs/apm/api.asciidoc
index fe4c8a9280158..5f81a41e93df8 100644
--- a/docs/apm/api.asciidoc
+++ b/docs/apm/api.asciidoc
@@ -484,8 +484,7 @@ An example is below.
 [[api-create-apm-index-pattern]]
 ==== Customize the APM index pattern
 
-As an alternative to updating <<apm-settings-in-kibana,`apm_oss.indexPattern`>> in your `kibana.yml` configuration file,
-you can use Kibana's <<saved-objects-api-update,update object API>> to update the default APM index pattern on the fly.
+Use Kibana's <<saved-objects-api-update,update object API>> to update the default APM index pattern on the fly.
 
 The following example sets the default APM app index pattern to `some-other-pattern-*`:
 
diff --git a/docs/apm/troubleshooting.asciidoc b/docs/apm/troubleshooting.asciidoc
index 3736d21f44a5b..84cdb9876dc63 100644
--- a/docs/apm/troubleshooting.asciidoc
+++ b/docs/apm/troubleshooting.asciidoc
@@ -76,7 +76,7 @@ If you change the default, you must also configure the `setup.template.name` and
 See {apm-server-ref}/configuration-template.html[Load the Elasticsearch index template].
 If the Elasticsearch index template has already been successfully loaded to the index,
 you can customize the indices that the APM app uses to display data.
-Navigate to *APM* > *Settings* > *Indices*, and change all `xpack.apm.*Pattern` values to
+Navigate to *APM* > *Settings* > *Indices*, and change all `xpack.apm.indices.*` values to
 include the new index pattern. For example: `customIndexName-*`.
 
 [float]

From c737c393cf55518cc1bdda31b7a7da7e51403f36 Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Wed, 13 Oct 2021 14:22:40 -0700
Subject: [PATCH 048/117] [Actions] Fixed actions telemetry for multiple
 namespaces usage (#114748)

* [Actions] Fixed actions telemetry for multiple namespaces usage

* fixed tests
---
 .../server/usage/actions_telemetry.test.ts    | 159 ++++++++++--------
 .../actions/server/usage/actions_telemetry.ts |  46 +++--
 x-pack/plugins/actions/server/usage/task.ts   |  21 +--
 3 files changed, 121 insertions(+), 105 deletions(-)

diff --git a/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts b/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
index 4049d8fc3b594..0e6b7fff04451 100644
--- a/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
+++ b/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
@@ -116,7 +116,7 @@ Object {
 
   test('getInUseTotalCount', async () => {
     const mockEsClient = elasticsearchClientMock.createClusterClient().asScoped().asInternalUser;
-    mockEsClient.search.mockReturnValue(
+    mockEsClient.search.mockReturnValueOnce(
       // @ts-expect-error not full search response
       elasticsearchClientMock.createSuccessTransportRequestPromise({
         aggregations: {
@@ -134,28 +134,35 @@ Object {
         },
       })
     );
-    const actionsBulkGet = jest.fn();
-    actionsBulkGet.mockReturnValue({
-      saved_objects: [
-        {
-          id: '1',
-          attributes: {
-            actionTypeId: '.server-log',
-          },
-        },
-        {
-          id: '123',
-          attributes: {
-            actionTypeId: '.slack',
-          },
-        },
-      ],
-    });
-    const telemetry = await getInUseTotalCount(mockEsClient, actionsBulkGet, 'test');
 
-    expect(mockEsClient.search).toHaveBeenCalledTimes(1);
-    expect(actionsBulkGet).toHaveBeenCalledTimes(1);
+    mockEsClient.search.mockReturnValueOnce(
+      // @ts-expect-error not full search response
+      elasticsearchClientMock.createSuccessTransportRequestPromise({
+        hits: {
+          hits: [
+            {
+              _source: {
+                action: {
+                  id: '1',
+                  actionTypeId: '.server-log',
+                },
+              },
+            },
+            {
+              _source: {
+                action: {
+                  id: '2',
+                  actionTypeId: '.slack',
+                },
+              },
+            },
+          ],
+        },
+      })
+    );
+    const telemetry = await getInUseTotalCount(mockEsClient, 'test');
 
+    expect(mockEsClient.search).toHaveBeenCalledTimes(2);
     expect(telemetry).toMatchInlineSnapshot(`
 Object {
   "countByAlertHistoryConnectorType": 0,
@@ -170,7 +177,7 @@ Object {
 
   test('getInUseTotalCount should count preconfigured alert history connector usage', async () => {
     const mockEsClient = elasticsearchClientMock.createClusterClient().asScoped().asInternalUser;
-    mockEsClient.search.mockReturnValue(
+    mockEsClient.search.mockReturnValueOnce(
       // @ts-expect-error not full search response
       elasticsearchClientMock.createSuccessTransportRequestPromise({
         aggregations: {
@@ -202,28 +209,34 @@ Object {
         },
       })
     );
-    const actionsBulkGet = jest.fn();
-    actionsBulkGet.mockReturnValue({
-      saved_objects: [
-        {
-          id: '1',
-          attributes: {
-            actionTypeId: '.server-log',
-          },
-        },
-        {
-          id: '123',
-          attributes: {
-            actionTypeId: '.slack',
-          },
+    mockEsClient.search.mockReturnValueOnce(
+      // @ts-expect-error not full search response
+      elasticsearchClientMock.createSuccessTransportRequestPromise({
+        hits: {
+          hits: [
+            {
+              _source: {
+                action: {
+                  id: '1',
+                  actionTypeId: '.server-log',
+                },
+              },
+            },
+            {
+              _source: {
+                action: {
+                  id: '2',
+                  actionTypeId: '.slack',
+                },
+              },
+            },
+          ],
         },
-      ],
-    });
-    const telemetry = await getInUseTotalCount(mockEsClient, actionsBulkGet, 'test');
-
-    expect(mockEsClient.search).toHaveBeenCalledTimes(1);
-    expect(actionsBulkGet).toHaveBeenCalledTimes(1);
+      })
+    );
+    const telemetry = await getInUseTotalCount(mockEsClient, 'test');
 
+    expect(mockEsClient.search).toHaveBeenCalledTimes(2);
     expect(telemetry).toMatchInlineSnapshot(`
 Object {
   "countByAlertHistoryConnectorType": 1,
@@ -359,7 +372,7 @@ Object {
 
   test('getInUseTotalCount() accounts for preconfigured connectors', async () => {
     const mockEsClient = elasticsearchClientMock.createClusterClient().asScoped().asInternalUser;
-    mockEsClient.search.mockReturnValue(
+    mockEsClient.search.mockReturnValueOnce(
       // @ts-expect-error not full search response
       elasticsearchClientMock.createSuccessTransportRequestPromise({
         aggregations: {
@@ -399,34 +412,42 @@ Object {
         },
       })
     );
-    const actionsBulkGet = jest.fn();
-    actionsBulkGet.mockReturnValue({
-      saved_objects: [
-        {
-          id: '1',
-          attributes: {
-            actionTypeId: '.server-log',
-          },
-        },
-        {
-          id: '123',
-          attributes: {
-            actionTypeId: '.slack',
-          },
-        },
-        {
-          id: '456',
-          attributes: {
-            actionTypeId: '.email',
-          },
+    mockEsClient.search.mockReturnValueOnce(
+      // @ts-expect-error not full search response
+      elasticsearchClientMock.createSuccessTransportRequestPromise({
+        hits: {
+          hits: [
+            {
+              _source: {
+                action: {
+                  id: '1',
+                  actionTypeId: '.server-log',
+                },
+              },
+            },
+            {
+              _source: {
+                action: {
+                  id: '2',
+                  actionTypeId: '.slack',
+                },
+              },
+            },
+            {
+              _source: {
+                action: {
+                  id: '3',
+                  actionTypeId: '.email',
+                },
+              },
+            },
+          ],
         },
-      ],
-    });
-    const telemetry = await getInUseTotalCount(mockEsClient, actionsBulkGet, 'test');
-
-    expect(mockEsClient.search).toHaveBeenCalledTimes(1);
-    expect(actionsBulkGet).toHaveBeenCalledTimes(1);
+      })
+    );
+    const telemetry = await getInUseTotalCount(mockEsClient, 'test');
 
+    expect(mockEsClient.search).toHaveBeenCalledTimes(2);
     expect(telemetry).toMatchInlineSnapshot(`
 Object {
   "countByAlertHistoryConnectorType": 1,
diff --git a/x-pack/plugins/actions/server/usage/actions_telemetry.ts b/x-pack/plugins/actions/server/usage/actions_telemetry.ts
index 544d6a411ccdc..4a3d0c70e535a 100644
--- a/x-pack/plugins/actions/server/usage/actions_telemetry.ts
+++ b/x-pack/plugins/actions/server/usage/actions_telemetry.ts
@@ -5,12 +5,7 @@
  * 2.0.
  */
 
-import {
-  ElasticsearchClient,
-  SavedObjectsBaseOptions,
-  SavedObjectsBulkGetObject,
-  SavedObjectsBulkResponse,
-} from 'kibana/server';
+import { ElasticsearchClient } from 'kibana/server';
 import { AlertHistoryEsIndexConnectorId } from '../../common';
 import { ActionResult, PreConfiguredAction } from '../types';
 
@@ -86,10 +81,6 @@ export async function getTotalCount(
 
 export async function getInUseTotalCount(
   esClient: ElasticsearchClient,
-  actionsBulkGet: (
-    objects?: SavedObjectsBulkGetObject[] | undefined,
-    options?: SavedObjectsBaseOptions | undefined
-  ) => Promise<SavedObjectsBulkResponse<ActionResult<Record<string, unknown>>>>,
   kibanaIndex: string
 ): Promise<{
   countTotal: number;
@@ -259,15 +250,34 @@ export async function getInUseTotalCount(
   const preconfiguredActionsAggs =
     // @ts-expect-error aggegation type is not specified
     actionResults.aggregations.preconfigured_actions?.preconfiguredActionRefIds.value;
-  const bulkFilter = Object.entries(aggs.connectorIds).map(([key]) => ({
-    id: key,
-    type: 'action',
-    fields: ['id', 'actionTypeId'],
-  }));
-  const actions = await actionsBulkGet(bulkFilter);
-  const countByActionTypeId = actions.saved_objects.reduce(
+  const {
+    body: { hits: actions },
+  } = await esClient.search<{
+    action: ActionResult;
+  }>({
+    index: kibanaIndex,
+    _source_includes: ['action'],
+    body: {
+      query: {
+        bool: {
+          must: [
+            {
+              term: { type: 'action' },
+            },
+            {
+              terms: {
+                _id: Object.entries(aggs.connectorIds).map(([key]) => `action:${key}`),
+              },
+            },
+          ],
+        },
+      },
+    },
+  });
+  const countByActionTypeId = actions.hits.reduce(
     (actionTypeCount: Record<string, number>, action) => {
-      const alertTypeId = replaceFirstAndLastDotSymbols(action.attributes.actionTypeId);
+      const actionSource = action._source!;
+      const alertTypeId = replaceFirstAndLastDotSymbols(actionSource.action.actionTypeId);
       const currentCount =
         actionTypeCount[alertTypeId] !== undefined ? actionTypeCount[alertTypeId] : 0;
       actionTypeCount[alertTypeId] = currentCount + 1;
diff --git a/x-pack/plugins/actions/server/usage/task.ts b/x-pack/plugins/actions/server/usage/task.ts
index f37f830697eb5..7cbfb87dedda6 100644
--- a/x-pack/plugins/actions/server/usage/task.ts
+++ b/x-pack/plugins/actions/server/usage/task.ts
@@ -5,19 +5,14 @@
  * 2.0.
  */
 
-import {
-  Logger,
-  CoreSetup,
-  SavedObjectsBulkGetObject,
-  SavedObjectsBaseOptions,
-} from 'kibana/server';
+import { Logger, CoreSetup } from 'kibana/server';
 import moment from 'moment';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
 } from '../../../task_manager/server';
-import { ActionResult, PreConfiguredAction } from '../types';
+import { PreConfiguredAction } from '../types';
 import { getTotalCount, getInUseTotalCount } from './actions_telemetry';
 
 export const TELEMETRY_TASK_TYPE = 'actions_telemetry';
@@ -83,22 +78,12 @@ export function telemetryTaskRunner(
           },
         ]) => client.asInternalUser
       );
-    const actionsBulkGet = (
-      objects?: SavedObjectsBulkGetObject[],
-      options?: SavedObjectsBaseOptions
-    ) => {
-      return core
-        .getStartServices()
-        .then(([{ savedObjects }]) =>
-          savedObjects.createInternalRepository(['action']).bulkGet<ActionResult>(objects, options)
-        );
-    };
     return {
       async run() {
         const esClient = await getEsClient();
         return Promise.all([
           getTotalCount(esClient, kibanaIndex, preconfiguredActions),
-          getInUseTotalCount(esClient, actionsBulkGet, kibanaIndex),
+          getInUseTotalCount(esClient, kibanaIndex),
         ])
           .then(([totalAggegations, totalInUse]) => {
             return {

From 493b408673f708f7c58eb676194ac0cc90024dda Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Wed, 13 Oct 2021 17:14:14 -0500
Subject: [PATCH 049/117] [Workplace Search] Fix button order and remove extra
 source name label (#114899)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove extra source title from Personal dashboard

* Change button order to match other views

We typically have the right-most button the Save button and the reset button to the left

* Fix typo

* Fix failing test

EUI requires the name but we don’t want to dispaly it, so sending an empty string

* Remove Synchronization nav items from Custom Source

* Hide syncTriggerCallout for custom sources
---
 .../personal_dashboard_sidebar/private_sources_sidebar.tsx  | 4 ++--
 .../views/content_sources/components/overview.tsx           | 5 +++--
 .../views/content_sources/components/source_sub_nav.tsx     | 2 +-
 .../workplace_search/views/security/security.tsx            | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_sidebar/private_sources_sidebar.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_sidebar/private_sources_sidebar.tsx
index 6cd7a10fc7ade..c8eaffbfbec10 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_sidebar/private_sources_sidebar.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_sidebar/private_sources_sidebar.tsx
@@ -35,10 +35,10 @@ export const PrivateSourcesSidebar = () => {
     : PRIVATE_VIEW_ONLY_PAGE_DESCRIPTION;
 
   const {
-    contentSource: { id = '', name = '' },
+    contentSource: { id = '' },
   } = useValues(SourceLogic);
 
-  const navItems = [{ id, name, items: useSourceSubNav() }];
+  const navItems = [{ id, name: '', items: useSourceSubNav() }];
 
   return (
     <>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.tsx
index 899d9dceebe3e..9441f43dc253f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.tsx
@@ -119,6 +119,7 @@ export const Overview: React.FC = () => {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const closeModal = () => setIsModalVisible(false);
   const handleSyncClick = () => setIsModalVisible(true);
+  const showSyncTriggerCallout = !custom && isIndexedSource && isOrganization;
 
   const onSyncConfirm = () => {
     initializeSourceSynchronization(id);
@@ -491,7 +492,7 @@ export const Overview: React.FC = () => {
         <EuiText size="s">
           <FormattedMessage
             id="xpack.enterpriseSearch.workplaceSearch.sources.synchronizationCallout"
-            defaultMessage="Configure {syncFrequencyLink} or permissions {blockTimeWindowsLink}."
+            defaultMessage="Configure {syncFrequencyLink} or {blockTimeWindowsLink}."
             values={{
               syncFrequencyLink: (
                 <EuiLinkTo to={getContentSourcePath(SYNC_FREQUENCY_PATH, id, isOrganization)}>
@@ -586,7 +587,7 @@ export const Overview: React.FC = () => {
                 )}
               </>
             )}
-            {isIndexedSource && isOrganization && syncTriggerCallout}
+            {showSyncTriggerCallout && syncTriggerCallout}
           </EuiFlexGroup>
         </EuiFlexItem>
       </EuiFlexGroup>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_sub_nav.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_sub_nav.tsx
index cae1e8834cdd2..99597023303ff 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_sub_nav.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_sub_nav.tsx
@@ -37,7 +37,7 @@ export const useSourceSubNav = () => {
   if (!id) return undefined;
 
   const isCustom = serviceType === CUSTOM_SERVICE_TYPE;
-  const showSynchronization = isIndexedSource && isOrganization;
+  const showSynchronization = isIndexedSource && isOrganization && !isCustom;
 
   const navItems: Array<EuiSideNavItemType<unknown>> = [
     {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.tsx
index a971df8f89914..997d79f67cb13 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.tsx
@@ -75,9 +75,6 @@ export const Security: React.FC = () => {
   };
 
   const headerActions = [
-    <EuiButtonEmpty disabled={!unsavedChanges || dataLoading} onClick={resetState}>
-      {RESET_BUTTON}
-    </EuiButtonEmpty>,
     <EuiButton
       disabled={!hasPlatinumLicense || !unsavedChanges || dataLoading}
       onClick={showConfirmModal}
@@ -86,6 +83,9 @@ export const Security: React.FC = () => {
     >
       {SAVE_SETTINGS_BUTTON}
     </EuiButton>,
+    <EuiButtonEmpty disabled={!unsavedChanges || dataLoading} onClick={resetState}>
+      {RESET_BUTTON}
+    </EuiButtonEmpty>,
   ];
 
   const allSourcesToggle = (

From e5576d688d843e895201d6993bdebe6d131ba15d Mon Sep 17 00:00:00 2001
From: Oliver Gupte <ogupte@users.noreply.github.com>
Date: Wed, 13 Oct 2021 18:46:04 -0400
Subject: [PATCH 050/117] [APM] Fixes incorrect index config names (#114901)
 (#114904)

---
 .../resources/base/bin/kibana-docker          | 10 +++++-----
 .../integration/power_user/no_data_screen.ts  | 20 +++++++++----------
 .../plugins/apm/public/utils/testHelpers.tsx  | 20 +++++++++----------
 .../encrypted_saved_objects/mappings.json     | 10 +++++-----
 .../mappings.json                             | 10 +++++-----
 .../es_archiver/key_rotation/mappings.json    | 10 +++++-----
 .../action_task_params/mappings.json          | 10 +++++-----
 .../es_archives/actions/mappings.json         | 10 +++++-----
 .../es_archives/alerts_legacy/mappings.json   | 10 +++++-----
 .../es_archives/canvas/reports/mappings.json  | 10 +++++-----
 .../cases/migrations/7.10.0/mappings.json     | 10 +++++-----
 .../cases/migrations/7.11.1/mappings.json     | 10 +++++-----
 .../cases/migrations/7.13.2/mappings.json     | 10 +++++-----
 .../7.13_user_actions/mappings.json           | 10 +++++-----
 .../migrations/7.16.0_space/mappings.json     | 10 +++++-----
 .../data/search_sessions/mappings.json        | 10 +++++-----
 .../telemetry/agent_only/mappings.json        | 10 +++++-----
 .../mappings.json                             | 10 +++++-----
 .../cloned_endpoint_installed/mappings.json   | 10 +++++-----
 .../cloned_endpoint_uninstalled/mappings.json | 10 +++++-----
 .../endpoint_malware_disabled/mappings.json   | 10 +++++-----
 .../endpoint_malware_enabled/mappings.json    | 10 +++++-----
 .../endpoint_uninstalled/mappings.json        | 10 +++++-----
 .../es_archives/fleet/agents/mappings.json    | 10 +++++-----
 .../mappings.json                             | 10 +++++-----
 .../es_archives/lists/mappings.json           | 10 +++++-----
 .../canvas_disallowed_url/mappings.json       | 10 +++++-----
 .../ecommerce_kibana_spaces/mappings.json     | 10 +++++-----
 .../reporting/hugedata/mappings.json          | 10 +++++-----
 .../multi_index_kibana/mappings.json          | 10 +++++-----
 .../migrations/mappings.json                  | 10 +++++-----
 .../timelines/7.15.0/mappings.json            | 10 +++++-----
 .../timelines/7.15.0_space/mappings.json      | 10 +++++-----
 .../visualize/default/mappings.json           | 10 +++++-----
 34 files changed, 180 insertions(+), 180 deletions(-)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index 9e7766ce16c9b..4a8f9df4c4044 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
@@ -211,12 +211,12 @@ kibana_vars=(
     xpack.alerts.invalidateApiKeysTask.interval
     xpack.alerts.invalidateApiKeysTask.removalDelay
     xpack.apm.enabled
-    xpack.apm.indices.errors
-    xpack.apm.indices.metrics
+    xpack.apm.indices.error
+    xpack.apm.indices.metric
     xpack.apm.indices.onboarding
-    xpack.apm.indices.sourcemaps
-    xpack.apm.indices.spans
-    xpack.apm.indices.transactions
+    xpack.apm.indices.sourcemap
+    xpack.apm.indices.span
+    xpack.apm.indices.transaction
     xpack.apm.maxServiceEnvironments
     xpack.apm.searchAggregatedTransactions
     xpack.apm.serviceMapEnabled
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts
index 47eba11e6f6fb..56704d63a42f1 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts
@@ -19,12 +19,12 @@ describe('No data screen', () => {
         url: apmIndicesSaveURL,
         method: 'POST',
         body: {
-          sourcemaps: 'foo-*',
-          errors: 'foo-*',
+          sourcemap: 'foo-*',
+          error: 'foo-*',
           onboarding: 'foo-*',
-          spans: 'foo-*',
-          transactions: 'foo-*',
-          metrics: 'foo-*',
+          span: 'foo-*',
+          transaction: 'foo-*',
+          metric: 'foo-*',
         },
         headers: {
           'kbn-xsrf': true,
@@ -49,12 +49,12 @@ describe('No data screen', () => {
         url: apmIndicesSaveURL,
         method: 'POST',
         body: {
-          sourcemaps: '',
-          errors: '',
+          sourcemap: '',
+          error: '',
           onboarding: '',
-          spans: '',
-          transactions: '',
-          metrics: '',
+          span: '',
+          transaction: '',
+          metric: '',
         },
         headers: { 'kbn-xsrf': true },
         auth: { user: 'apm_power_user', pass: 'changeme' },
diff --git a/x-pack/plugins/apm/public/utils/testHelpers.tsx b/x-pack/plugins/apm/public/utils/testHelpers.tsx
index 2203bc63f68cd..9ce7d2e4a52d9 100644
--- a/x-pack/plugins/apm/public/utils/testHelpers.tsx
+++ b/x-pack/plugins/apm/public/utils/testHelpers.tsx
@@ -119,12 +119,12 @@ interface MockSetup {
   config: APMConfig;
   uiFilters: UxUIFilters;
   indices: {
-    sourcemaps: string;
-    errors: string;
+    sourcemap: string;
+    error: string;
     onboarding: string;
-    spans: string;
-    transactions: string;
-    metrics: string;
+    span: string;
+    transaction: string;
+    metric: string;
     apmAgentConfigurationIndex: string;
     apmCustomLinkIndex: string;
   };
@@ -176,12 +176,12 @@ export async function inspectSearchParams(
     ) as APMConfig,
     uiFilters: {},
     indices: {
-      sourcemaps: 'myIndex',
-      errors: 'myIndex',
+      sourcemap: 'myIndex',
+      error: 'myIndex',
       onboarding: 'myIndex',
-      spans: 'myIndex',
-      transactions: 'myIndex',
-      metrics: 'myIndex',
+      span: 'myIndex',
+      transaction: 'myIndex',
+      metric: 'myIndex',
       apmAgentConfigurationIndex: 'myIndex',
       apmCustomLinkIndex: 'myIndex',
     },
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json
index daa99c4d71967..be99452707814 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json
+++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json
@@ -189,22 +189,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json
index 4e41d8cb72fb5..dfcf3155b67ca 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json
+++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json
@@ -216,22 +216,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json
index 9164430730216..72f66db35cec6 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json
+++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json
@@ -214,22 +214,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/action_task_params/mappings.json b/x-pack/test/functional/es_archives/action_task_params/mappings.json
index 874886647e6d6..d28c1504d3eed 100644
--- a/x-pack/test/functional/es_archives/action_task_params/mappings.json
+++ b/x-pack/test/functional/es_archives/action_task_params/mappings.json
@@ -206,22 +206,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/actions/mappings.json b/x-pack/test/functional/es_archives/actions/mappings.json
index 786005d1ab6a6..a0da38c85f724 100644
--- a/x-pack/test/functional/es_archives/actions/mappings.json
+++ b/x-pack/test/functional/es_archives/actions/mappings.json
@@ -202,22 +202,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/alerts_legacy/mappings.json b/x-pack/test/functional/es_archives/alerts_legacy/mappings.json
index 9c856a829a343..6e40f811e1af4 100644
--- a/x-pack/test/functional/es_archives/alerts_legacy/mappings.json
+++ b/x-pack/test/functional/es_archives/alerts_legacy/mappings.json
@@ -198,22 +198,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/canvas/reports/mappings.json b/x-pack/test/functional/es_archives/canvas/reports/mappings.json
index 51c48857d2481..d6c3f1b26a430 100644
--- a/x-pack/test/functional/es_archives/canvas/reports/mappings.json
+++ b/x-pack/test/functional/es_archives/canvas/reports/mappings.json
@@ -229,22 +229,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/cases/migrations/7.10.0/mappings.json b/x-pack/test/functional/es_archives/cases/migrations/7.10.0/mappings.json
index bd0b2c4e9ad27..b1b6c468c3945 100644
--- a/x-pack/test/functional/es_archives/cases/migrations/7.10.0/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.10.0/mappings.json
@@ -199,22 +199,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/cases/migrations/7.11.1/mappings.json b/x-pack/test/functional/es_archives/cases/migrations/7.11.1/mappings.json
index 2da75330be93a..94648d407a89b 100644
--- a/x-pack/test/functional/es_archives/cases/migrations/7.11.1/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.11.1/mappings.json
@@ -254,22 +254,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/cases/migrations/7.13.2/mappings.json b/x-pack/test/functional/es_archives/cases/migrations/7.13.2/mappings.json
index 62fec329aa40f..6f4a2df3a7543 100644
--- a/x-pack/test/functional/es_archives/cases/migrations/7.13.2/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.13.2/mappings.json
@@ -260,22 +260,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/cases/migrations/7.13_user_actions/mappings.json b/x-pack/test/functional/es_archives/cases/migrations/7.13_user_actions/mappings.json
index 8a9c1a626e652..7026e50cdb658 100644
--- a/x-pack/test/functional/es_archives/cases/migrations/7.13_user_actions/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.13_user_actions/mappings.json
@@ -261,22 +261,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/cases/migrations/7.16.0_space/mappings.json b/x-pack/test/functional/es_archives/cases/migrations/7.16.0_space/mappings.json
index 4b8f2c7103b20..d7422d4236598 100644
--- a/x-pack/test/functional/es_archives/cases/migrations/7.16.0_space/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.16.0_space/mappings.json
@@ -275,22 +275,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/data/search_sessions/mappings.json b/x-pack/test/functional/es_archives/data/search_sessions/mappings.json
index 1203e1d892d56..07c2c88b9f38f 100644
--- a/x-pack/test/functional/es_archives/data/search_sessions/mappings.json
+++ b/x-pack/test/functional/es_archives/data/search_sessions/mappings.json
@@ -169,22 +169,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/mappings.json
index daab89b69483e..dd65c3977e1b7 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/mappings.json
@@ -198,22 +198,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json
index c133c3fec76e2..eecc8ee5d8870 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json
@@ -199,22 +199,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json
index c133c3fec76e2..eecc8ee5d8870 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json
@@ -199,22 +199,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json
index c133c3fec76e2..eecc8ee5d8870 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json
@@ -199,22 +199,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json
index daab89b69483e..dd65c3977e1b7 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json
@@ -198,22 +198,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json
index daab89b69483e..dd65c3977e1b7 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json
@@ -198,22 +198,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json
index daab89b69483e..dd65c3977e1b7 100644
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json
@@ -198,22 +198,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/fleet/agents/mappings.json b/x-pack/test/functional/es_archives/fleet/agents/mappings.json
index b2f5392ebd23a..24b4a66624305 100644
--- a/x-pack/test/functional/es_archives/fleet/agents/mappings.json
+++ b/x-pack/test/functional/es_archives/fleet/agents/mappings.json
@@ -189,22 +189,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json b/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json
index 7853368bc37d5..e0dd6d90eacb4 100644
--- a/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json
+++ b/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json
@@ -181,22 +181,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/lists/mappings.json b/x-pack/test/functional/es_archives/lists/mappings.json
index e23c5ad224506..e687285f91b29 100644
--- a/x-pack/test/functional/es_archives/lists/mappings.json
+++ b/x-pack/test/functional/es_archives/lists/mappings.json
@@ -196,22 +196,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
index a35e4c8e07e97..e67abaf2032c7 100644
--- a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
@@ -193,22 +193,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json
index 9d11349819d68..0fe9a18ce2201 100644
--- a/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json
@@ -214,22 +214,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json b/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json
index 02a212d65cc1a..d1cb75c1f5150 100644
--- a/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json
@@ -170,22 +170,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json b/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json
index f6b5df41938fb..69c6cbc3b46b5 100644
--- a/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json
@@ -172,22 +172,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/security_solution/migrations/mappings.json b/x-pack/test/functional/es_archives/security_solution/migrations/mappings.json
index fa49916066a1a..8728ec4ad74a1 100644
--- a/x-pack/test/functional/es_archives/security_solution/migrations/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/migrations/mappings.json
@@ -272,22 +272,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/mappings.json b/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/mappings.json
index 2e6a9bcee3d8c..7292878908cab 100644
--- a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/mappings.json
@@ -276,22 +276,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json b/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json
index 682b241c126f4..45206c84b69de 100644
--- a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json
@@ -273,22 +273,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }
diff --git a/x-pack/test/functional/es_archives/visualize/default/mappings.json b/x-pack/test/functional/es_archives/visualize/default/mappings.json
index 2d761064d0a46..abf6bcfa04c80 100644
--- a/x-pack/test/functional/es_archives/visualize/default/mappings.json
+++ b/x-pack/test/functional/es_archives/visualize/default/mappings.json
@@ -254,22 +254,22 @@
         },
         "apm-indices": {
           "properties": {
-            "errors": {
+            "error": {
               "type": "keyword"
             },
-            "metrics": {
+            "metric": {
               "type": "keyword"
             },
             "onboarding": {
               "type": "keyword"
             },
-            "sourcemaps": {
+            "sourcemap": {
               "type": "keyword"
             },
-            "spans": {
+            "span": {
               "type": "keyword"
             },
-            "transactions": {
+            "transaction": {
               "type": "keyword"
             }
           }

From f8cbbbb99fbed1a6dfcacbe13aee7e922030fb36 Mon Sep 17 00:00:00 2001
From: Devon Thomson <devon.thomson@hotmail.com>
Date: Wed, 13 Oct 2021 20:11:53 -0400
Subject: [PATCH 051/117] [Controls] Redux Toolkit and Embeddable Redux Wrapper
 (#114371)

Use new redux wrapper for control group management and upgrade all control group methods to use redux wrapper. Get order of controls from embeddable input, set up preconfigured story.

Co-authored-by: andreadelrio <delrio.andre@gmail.com>
---
 package.json                                  |   3 +
 .../__stories__/controls_service_stub.ts      |   2 +-
 .../__stories__/input_controls.stories.tsx    |  68 +++++-
 .../storybook_control_factories.ts            |  27 +++
 .../control_frame/control_frame_strings.ts    |  22 --
 .../component}/control_frame_component.tsx    |  47 ++--
 .../component/control_group_component.tsx     | 121 +++++-----
 .../component/control_group_sortable_item.tsx | 114 ++++-----
 .../control_group/control_group_container.tsx | 224 ------------------
 .../control_group/control_group_strings.ts    |  63 +++--
 ...{manage_control.tsx => control_editor.tsx} |   2 +-
 .../control_group/editor/create_control.tsx   | 158 ++++++++++++
 .../control_group/editor/edit_control.tsx     | 127 ++++++++++
 .../editor/edit_control_group.tsx             | 124 ++++++++++
 .../editor/forward_all_context.tsx            |  36 +++
 .../editor/manage_control_group_component.tsx | 113 ---------
 .../embeddable/control_group_container.tsx    |  77 ++++++
 .../control_group_container_factory.ts        |  19 +-
 .../state/control_group_reducers.ts           |  48 ++++
 .../controls/control_group/types.ts           |   4 +-
 .../options_list/options_list_embeddable.tsx  |   2 +-
 .../components/controls/controls_service.ts   |   6 +-
 .../controls/hooks/use_child_embeddable.ts    |  11 +-
 .../public/components/controls/types.ts       |  38 +--
 .../generic_embeddable_store.ts               |  40 ++++
 .../redux_embeddable_context.ts               |  73 ++++++
 .../redux_embeddable_wrapper.tsx              | 162 +++++++++++++
 .../components/redux_embeddables/types.ts     |  62 +++++
 src/plugins/presentation_util/public/mocks.ts |   1 +
 .../presentation_util/public/plugin.ts        |   1 +
 .../public/services/controls.ts               |  85 +++++++
 .../public/services/index.ts                  |   3 +
 .../index.ts => services/kibana/controls.ts}  |   6 +
 .../public/services/kibana/index.ts           |   2 +
 .../public/services/storybook/controls.ts     |  13 +
 .../public/services/storybook/index.ts        |  11 +-
 .../public/services/stub/controls.ts          |  13 +
 .../public/services/stub/index.ts             |   3 +-
 src/plugins/presentation_util/public/types.ts |   2 +
 39 files changed, 1308 insertions(+), 625 deletions(-)
 create mode 100644 src/plugins/presentation_util/public/components/controls/__stories__/storybook_control_factories.ts
 delete mode 100644 src/plugins/presentation_util/public/components/controls/control_frame/control_frame_strings.ts
 rename src/plugins/presentation_util/public/components/controls/{control_frame => control_group/component}/control_frame_component.tsx (71%)
 delete mode 100644 src/plugins/presentation_util/public/components/controls/control_group/control_group_container.tsx
 rename src/plugins/presentation_util/public/components/controls/control_group/editor/{manage_control.tsx => control_editor.tsx} (99%)
 create mode 100644 src/plugins/presentation_util/public/components/controls/control_group/editor/create_control.tsx
 create mode 100644 src/plugins/presentation_util/public/components/controls/control_group/editor/edit_control.tsx
 create mode 100644 src/plugins/presentation_util/public/components/controls/control_group/editor/edit_control_group.tsx
 create mode 100644 src/plugins/presentation_util/public/components/controls/control_group/editor/forward_all_context.tsx
 delete mode 100644 src/plugins/presentation_util/public/components/controls/control_group/editor/manage_control_group_component.tsx
 create mode 100644 src/plugins/presentation_util/public/components/controls/control_group/embeddable/control_group_container.tsx
 rename src/plugins/presentation_util/public/components/controls/control_group/{ => embeddable}/control_group_container_factory.ts (71%)
 create mode 100644 src/plugins/presentation_util/public/components/controls/control_group/state/control_group_reducers.ts
 create mode 100644 src/plugins/presentation_util/public/components/redux_embeddables/generic_embeddable_store.ts
 create mode 100644 src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_context.ts
 create mode 100644 src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_wrapper.tsx
 create mode 100644 src/plugins/presentation_util/public/components/redux_embeddables/types.ts
 create mode 100644 src/plugins/presentation_util/public/services/controls.ts
 rename src/plugins/presentation_util/public/{components/controls/index.ts => services/kibana/controls.ts} (54%)
 create mode 100644 src/plugins/presentation_util/public/services/storybook/controls.ts
 create mode 100644 src/plugins/presentation_util/public/services/stub/controls.ts

diff --git a/package.json b/package.json
index f526f357ff347..6e4a37863bc82 100644
--- a/package.json
+++ b/package.json
@@ -91,6 +91,9 @@
     "yarn": "^1.21.1"
   },
   "dependencies": {
+    "@dnd-kit/core": "^3.1.1",
+    "@dnd-kit/sortable": "^4.0.0",
+    "@dnd-kit/utilities": "^2.0.0",
     "@babel/runtime": "^7.15.4",
     "@dnd-kit/core": "^3.1.1",
     "@dnd-kit/sortable": "^4.0.0",
diff --git a/src/plugins/presentation_util/public/components/controls/__stories__/controls_service_stub.ts b/src/plugins/presentation_util/public/components/controls/__stories__/controls_service_stub.ts
index 59e7a44a83a17..faaa155249949 100644
--- a/src/plugins/presentation_util/public/components/controls/__stories__/controls_service_stub.ts
+++ b/src/plugins/presentation_util/public/components/controls/__stories__/controls_service_stub.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { InputControlFactory } from '../types';
 import { ControlsService } from '../controls_service';
+import { InputControlFactory } from '../../../services/controls';
 import { flightFields, getEuiSelectableOptions } from './flights';
 import { OptionsListEmbeddableFactory } from '../control_types/options_list';
 
diff --git a/src/plugins/presentation_util/public/components/controls/__stories__/input_controls.stories.tsx b/src/plugins/presentation_util/public/components/controls/__stories__/input_controls.stories.tsx
index 2a463fece18da..66f1d8b36399e 100644
--- a/src/plugins/presentation_util/public/components/controls/__stories__/input_controls.stories.tsx
+++ b/src/plugins/presentation_util/public/components/controls/__stories__/input_controls.stories.tsx
@@ -10,9 +10,14 @@ import React, { useEffect, useMemo } from 'react';
 import uuid from 'uuid';
 
 import { decorators } from './decorators';
-import { providers } from '../../../services/storybook';
-import { getControlsServiceStub } from './controls_service_stub';
-import { ControlGroupContainerFactory } from '../control_group/control_group_container_factory';
+import { pluginServices, registry } from '../../../services/storybook';
+import { populateStorybookControlFactories } from './storybook_control_factories';
+import { ControlGroupContainerFactory } from '../control_group/embeddable/control_group_container_factory';
+import { ControlsPanels } from '../control_group/types';
+import {
+  OptionsListEmbeddableInput,
+  OPTIONS_LIST_CONTROL,
+} from '../control_types/options_list/options_list_embeddable';
 
 export default {
   title: 'Controls',
@@ -20,17 +25,15 @@ export default {
   decorators,
 };
 
-const ControlGroupStoryComponent = () => {
+const EmptyControlGroupStoryComponent = ({ panels }: { panels?: ControlsPanels }) => {
   const embeddableRoot: React.RefObject<HTMLDivElement> = useMemo(() => React.createRef(), []);
 
-  providers.overlays.start({});
-  const overlays = providers.overlays.getService();
-
-  const controlsServiceStub = getControlsServiceStub();
+  pluginServices.setRegistry(registry.start({}));
+  populateStorybookControlFactories(pluginServices.getServices().controls);
 
   useEffect(() => {
     (async () => {
-      const factory = new ControlGroupContainerFactory(controlsServiceStub, overlays);
+      const factory = new ControlGroupContainerFactory();
       const controlGroupContainerEmbeddable = await factory.create({
         inheritParentState: {
           useQuery: false,
@@ -38,16 +41,57 @@ const ControlGroupStoryComponent = () => {
           useTimerange: false,
         },
         controlStyle: 'oneLine',
+        panels: panels ?? {},
         id: uuid.v4(),
-        panels: {},
       });
       if (controlGroupContainerEmbeddable && embeddableRoot.current) {
         controlGroupContainerEmbeddable.render(embeddableRoot.current);
       }
     })();
-  }, [embeddableRoot, controlsServiceStub, overlays]);
+  }, [embeddableRoot, panels]);
 
   return <div ref={embeddableRoot} />;
 };
 
-export const ControlGroupStory = () => <ControlGroupStoryComponent />;
+export const EmptyControlGroupStory = () => <EmptyControlGroupStoryComponent />;
+export const ConfiguredControlGroupStory = () => (
+  <EmptyControlGroupStoryComponent
+    panels={{
+      optionsList1: {
+        type: OPTIONS_LIST_CONTROL,
+        order: 1,
+        width: 'auto',
+        explicitInput: {
+          title: 'Origin City',
+          id: 'optionsList1',
+          indexPattern: 'demo data flights',
+          field: 'OriginCityName',
+          defaultSelections: ['Toronto'],
+        } as OptionsListEmbeddableInput,
+      },
+      optionsList2: {
+        type: OPTIONS_LIST_CONTROL,
+        order: 2,
+        width: 'auto',
+        explicitInput: {
+          title: 'Destination City',
+          id: 'optionsList2',
+          indexPattern: 'demo data flights',
+          field: 'DestCityName',
+          defaultSelections: ['London'],
+        } as OptionsListEmbeddableInput,
+      },
+      optionsList3: {
+        type: OPTIONS_LIST_CONTROL,
+        order: 3,
+        width: 'auto',
+        explicitInput: {
+          title: 'Carrier',
+          id: 'optionsList3',
+          indexPattern: 'demo data flights',
+          field: 'Carrier',
+        } as OptionsListEmbeddableInput,
+      },
+    }}
+  />
+);
diff --git a/src/plugins/presentation_util/public/components/controls/__stories__/storybook_control_factories.ts b/src/plugins/presentation_util/public/components/controls/__stories__/storybook_control_factories.ts
new file mode 100644
index 0000000000000..3048adc74d8c7
--- /dev/null
+++ b/src/plugins/presentation_util/public/components/controls/__stories__/storybook_control_factories.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { flightFields, getEuiSelectableOptions } from './flights';
+import { OptionsListEmbeddableFactory } from '../control_types/options_list';
+import { InputControlFactory, PresentationControlsService } from '../../../services/controls';
+
+export const populateStorybookControlFactories = (
+  controlsServiceStub: PresentationControlsService
+) => {
+  const optionsListFactoryStub = new OptionsListEmbeddableFactory(
+    ({ field, search }) =>
+      new Promise((r) => setTimeout(() => r(getEuiSelectableOptions(field, search)), 500)),
+    () => Promise.resolve(['demo data flights']),
+    () => Promise.resolve(flightFields)
+  );
+
+  // cast to unknown because the stub cannot use the embeddable start contract to transform the EmbeddableFactoryDefinition into an EmbeddableFactory
+  const optionsListControlFactory = optionsListFactoryStub as unknown as InputControlFactory;
+  optionsListControlFactory.getDefaultInput = () => ({});
+  controlsServiceStub.registerInputControlType(optionsListControlFactory);
+};
diff --git a/src/plugins/presentation_util/public/components/controls/control_frame/control_frame_strings.ts b/src/plugins/presentation_util/public/components/controls/control_frame/control_frame_strings.ts
deleted file mode 100644
index 5f9e89aa797cb..0000000000000
--- a/src/plugins/presentation_util/public/components/controls/control_frame/control_frame_strings.ts
+++ /dev/null
@@ -1,22 +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 { i18n } from '@kbn/i18n';
-
-export const ControlFrameStrings = {
-  floatingActions: {
-    getEditButtonTitle: () =>
-      i18n.translate('presentationUtil.inputControls.controlGroup.floatingActions.editTitle', {
-        defaultMessage: 'Manage control',
-      }),
-    getRemoveButtonTitle: () =>
-      i18n.translate('presentationUtil.inputControls.controlGroup.floatingActions.removeTitle', {
-        defaultMessage: 'Remove control',
-      }),
-  },
-};
diff --git a/src/plugins/presentation_util/public/components/controls/control_frame/control_frame_component.tsx b/src/plugins/presentation_util/public/components/controls/control_group/component/control_frame_component.tsx
similarity index 71%
rename from src/plugins/presentation_util/public/components/controls/control_frame/control_frame_component.tsx
rename to src/plugins/presentation_util/public/components/controls/control_group/component/control_frame_component.tsx
index 240beea13b0e2..103ce6dd0e27c 100644
--- a/src/plugins/presentation_util/public/components/controls/control_frame/control_frame_component.tsx
+++ b/src/plugins/presentation_util/public/components/controls/control_group/component/control_frame_component.tsx
@@ -15,32 +15,28 @@ import {
   EuiFormRow,
   EuiToolTip,
 } from '@elastic/eui';
-import { ControlGroupContainer } from '../control_group/control_group_container';
-import { useChildEmbeddable } from '../hooks/use_child_embeddable';
-import { ControlStyle } from '../types';
-import { ControlFrameStrings } from './control_frame_strings';
+
+import { ControlGroupInput } from '../types';
+import { EditControlButton } from '../editor/edit_control';
+import { useChildEmbeddable } from '../../hooks/use_child_embeddable';
+import { useReduxContainerContext } from '../../../redux_embeddables/redux_embeddable_context';
+import { ControlGroupStrings } from '../control_group_strings';
 
 export interface ControlFrameProps {
-  container: ControlGroupContainer;
   customPrepend?: JSX.Element;
-  controlStyle: ControlStyle;
   enableActions?: boolean;
-  onRemove?: () => void;
   embeddableId: string;
-  onEdit?: () => void;
 }
 
-export const ControlFrame = ({
-  customPrepend,
-  enableActions,
-  embeddableId,
-  controlStyle,
-  container,
-  onRemove,
-  onEdit,
-}: ControlFrameProps) => {
+export const ControlFrame = ({ customPrepend, enableActions, embeddableId }: ControlFrameProps) => {
   const embeddableRoot: React.RefObject<HTMLDivElement> = useMemo(() => React.createRef(), []);
-  const embeddable = useChildEmbeddable({ container, embeddableId });
+  const {
+    useEmbeddableSelector,
+    containerActions: { untilEmbeddableLoaded, removeEmbeddable },
+  } = useReduxContainerContext<ControlGroupInput>();
+  const { controlStyle } = useEmbeddableSelector((state) => state);
+
+  const embeddable = useChildEmbeddable({ untilEmbeddableLoaded, embeddableId });
 
   const [title, setTitle] = useState<string>();
 
@@ -61,18 +57,13 @@ export const ControlFrame = ({
         'controlFrame--floatingActions-oneLine': !usingTwoLineLayout,
       })}
     >
-      <EuiToolTip content={ControlFrameStrings.floatingActions.getEditButtonTitle()}>
-        <EuiButtonIcon
-          aria-label={ControlFrameStrings.floatingActions.getEditButtonTitle()}
-          iconType="pencil"
-          onClick={onEdit}
-          color="text"
-        />
+      <EuiToolTip content={ControlGroupStrings.floatingActions.getEditButtonTitle()}>
+        <EditControlButton embeddableId={embeddableId} />
       </EuiToolTip>
-      <EuiToolTip content={ControlFrameStrings.floatingActions.getRemoveButtonTitle()}>
+      <EuiToolTip content={ControlGroupStrings.floatingActions.getRemoveButtonTitle()}>
         <EuiButtonIcon
-          aria-label={ControlFrameStrings.floatingActions.getRemoveButtonTitle()}
-          onClick={onRemove}
+          aria-label={ControlGroupStrings.floatingActions.getRemoveButtonTitle()}
+          onClick={() => removeEmbeddable(embeddableId)}
           iconType="cross"
           color="danger"
         />
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_component.tsx b/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_component.tsx
index d683c0749d98d..4d5e8bc270e23 100644
--- a/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_component.tsx
+++ b/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_component.tsx
@@ -9,7 +9,7 @@
 import '../control_group.scss';
 
 import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import classNames from 'classnames';
 import {
   arrayMove,
@@ -29,46 +29,51 @@ import {
   LayoutMeasuringStrategy,
 } from '@dnd-kit/core';
 
+import { ControlGroupInput } from '../types';
+import { pluginServices } from '../../../../services';
 import { ControlGroupStrings } from '../control_group_strings';
-import { ControlGroupContainer } from '../control_group_container';
+import { CreateControlButton } from '../editor/create_control';
+import { EditControlGroup } from '../editor/edit_control_group';
+import { forwardAllContext } from '../editor/forward_all_context';
 import { ControlClone, SortableControl } from './control_group_sortable_item';
-import { OPTIONS_LIST_CONTROL } from '../../control_types/options_list/options_list_embeddable';
+import { useReduxContainerContext } from '../../../redux_embeddables/redux_embeddable_context';
+import { controlGroupReducers } from '../state/control_group_reducers';
 
-interface ControlGroupProps {
-  controlGroupContainer: ControlGroupContainer;
-}
+export const ControlGroup = () => {
+  // Presentation Services Context
+  const { overlays } = pluginServices.getHooks();
+  const { openFlyout } = overlays.useService();
 
-export const ControlGroup = ({ controlGroupContainer }: ControlGroupProps) => {
-  const [controlIds, setControlIds] = useState<string[]>([]);
+  // Redux embeddable container Context
+  const reduxContainerContext = useReduxContainerContext<
+    ControlGroupInput,
+    typeof controlGroupReducers
+  >();
+  const {
+    useEmbeddableSelector,
+    useEmbeddableDispatch,
+    actions: { setControlOrders },
+  } = reduxContainerContext;
+  const dispatch = useEmbeddableDispatch();
 
-  // sync controlIds every time input panels change
-  useEffect(() => {
-    const subscription = controlGroupContainer.getInput$().subscribe(() => {
-      setControlIds((currentIds) => {
-        // sync control Ids with panels from container input.
-        const { panels } = controlGroupContainer.getInput();
-        const newIds: string[] = [];
-        const allIds = [...currentIds, ...Object.keys(panels)];
-        allIds.forEach((id) => {
-          const currentIndex = currentIds.indexOf(id);
-          if (!panels[id] && currentIndex !== -1) {
-            currentIds.splice(currentIndex, 1);
-          }
-          if (currentIndex === -1 && Boolean(panels[id])) {
-            newIds.push(id);
-          }
-        });
-        return [...currentIds, ...newIds];
-      });
-    });
-    return () => subscription.unsubscribe();
-  }, [controlGroupContainer]);
+  // current state
+  const { panels } = useEmbeddableSelector((state) => state);
 
-  const [draggingId, setDraggingId] = useState<string | null>(null);
+  const idsInOrder = useMemo(
+    () =>
+      Object.values(panels)
+        .sort((a, b) => (a.order > b.order ? 1 : -1))
+        .reduce((acc, panel) => {
+          acc.push(panel.explicitInput.id);
+          return acc;
+        }, [] as string[]),
+    [panels]
+  );
 
+  const [draggingId, setDraggingId] = useState<string | null>(null);
   const draggingIndex = useMemo(
-    () => (draggingId ? controlIds.indexOf(draggingId) : -1),
-    [controlIds, draggingId]
+    () => (draggingId ? idsInOrder.indexOf(draggingId) : -1),
+    [idsInOrder, draggingId]
   );
 
   const sensors = useSensors(
@@ -78,10 +83,10 @@ export const ControlGroup = ({ controlGroupContainer }: ControlGroupProps) => {
 
   const onDragEnd = ({ over }: DragEndEvent) => {
     if (over) {
-      const overIndex = controlIds.indexOf(over.id);
+      const overIndex = idsInOrder.indexOf(over.id);
       if (draggingIndex !== overIndex) {
         const newIndex = overIndex;
-        setControlIds((currentControlIds) => arrayMove(currentControlIds, draggingIndex, newIndex));
+        dispatch(setControlOrders({ ids: arrayMove([...idsInOrder], draggingIndex, newIndex) }));
       }
     }
     setDraggingId(null);
@@ -100,36 +105,26 @@ export const ControlGroup = ({ controlGroupContainer }: ControlGroupProps) => {
             strategy: LayoutMeasuringStrategy.Always,
           }}
         >
-          <SortableContext items={controlIds} strategy={rectSortingStrategy}>
+          <SortableContext items={idsInOrder} strategy={rectSortingStrategy}>
             <EuiFlexGroup
               className={classNames('controlGroup', { 'controlGroup-isDragging': draggingId })}
               alignItems="center"
               gutterSize={'m'}
               wrap={true}
             >
-              {controlIds.map((controlId, index) => (
-                <SortableControl
-                  onEdit={() => controlGroupContainer.editControl(controlId)}
-                  onRemove={() => controlGroupContainer.removeEmbeddable(controlId)}
-                  dragInfo={{ index, draggingIndex }}
-                  container={controlGroupContainer}
-                  controlStyle={controlGroupContainer.getInput().controlStyle}
-                  embeddableId={controlId}
-                  width={controlGroupContainer.getInput().panels[controlId].width}
-                  key={controlId}
-                />
-              ))}
+              {idsInOrder.map(
+                (controlId, index) =>
+                  panels[controlId] && (
+                    <SortableControl
+                      dragInfo={{ index, draggingIndex }}
+                      embeddableId={controlId}
+                      key={controlId}
+                    />
+                  )
+              )}
             </EuiFlexGroup>
           </SortableContext>
-          <DragOverlay>
-            {draggingId ? (
-              <ControlClone
-                width={controlGroupContainer.getInput().panels[draggingId].width}
-                embeddableId={draggingId}
-                container={controlGroupContainer}
-              />
-            ) : null}
-          </DragOverlay>
+          <DragOverlay>{draggingId ? <ControlClone draggingId={draggingId} /> : null}</DragOverlay>
         </DndContext>
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
@@ -141,19 +136,15 @@ export const ControlGroup = ({ controlGroupContainer }: ControlGroupProps) => {
                 iconType="gear"
                 color="text"
                 data-test-subj="inputControlsSortingButton"
-                onClick={controlGroupContainer.editControlGroup}
+                onClick={() =>
+                  openFlyout(forwardAllContext(<EditControlGroup />, reduxContainerContext))
+                }
               />
             </EuiToolTip>
           </EuiFlexItem>
           <EuiFlexItem>
             <EuiToolTip content={ControlGroupStrings.management.getAddControlTitle()}>
-              <EuiButtonIcon
-                aria-label={ControlGroupStrings.management.getManageButtonTitle()}
-                iconType="plus"
-                color="text"
-                data-test-subj="inputControlsSortingButton"
-                onClick={() => controlGroupContainer.createNewControl(OPTIONS_LIST_CONTROL)} // use popover when there are multiple types of control
-              />
+              <CreateControlButton />
             </EuiToolTip>
           </EuiFlexItem>
         </EuiFlexGroup>
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_sortable_item.tsx b/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_sortable_item.tsx
index 3ae171a588da4..5c222e3c130b5 100644
--- a/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_sortable_item.tsx
+++ b/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_sortable_item.tsx
@@ -12,10 +12,9 @@ import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import classNames from 'classnames';
 
-import { ControlWidth } from '../../types';
-import { ControlGroupContainer } from '../control_group_container';
-import { useChildEmbeddable } from '../../hooks/use_child_embeddable';
-import { ControlFrame, ControlFrameProps } from '../../control_frame/control_frame_component';
+import { ControlGroupInput } from '../types';
+import { ControlFrame, ControlFrameProps } from './control_frame_component';
+import { useReduxContainerContext } from '../../../redux_embeddables/redux_embeddable_context';
 
 interface DragInfo {
   isOver?: boolean;
@@ -26,7 +25,6 @@ interface DragInfo {
 
 export type SortableControlProps = ControlFrameProps & {
   dragInfo: DragInfo;
-  width: ControlWidth;
 };
 
 /**
@@ -60,91 +58,67 @@ export const SortableControl = (frameProps: SortableControlProps) => {
 const SortableControlInner = forwardRef<
   HTMLButtonElement,
   SortableControlProps & { style: HTMLAttributes<HTMLButtonElement>['style'] }
->(
-  (
-    {
-      embeddableId,
-      controlStyle,
-      container,
-      dragInfo,
-      onRemove,
-      onEdit,
-      style,
-      width,
-      ...dragHandleProps
-    },
-    dragHandleRef
-  ) => {
-    const { isOver, isDragging, draggingIndex, index } = dragInfo;
+>(({ embeddableId, dragInfo, style, ...dragHandleProps }, dragHandleRef) => {
+  const { isOver, isDragging, draggingIndex, index } = dragInfo;
+  const { useEmbeddableSelector } = useReduxContainerContext<ControlGroupInput>();
+  const { panels } = useEmbeddableSelector((state) => state);
 
-    const dragHandle = (
-      <button ref={dragHandleRef} {...dragHandleProps} className="controlFrame--dragHandle">
-        <EuiIcon type="grabHorizontal" />
-      </button>
-    );
+  const width = panels[embeddableId].width;
 
-    return (
-      <EuiFlexItem
-        grow={width === 'auto'}
-        className={classNames('controlFrame--wrapper', {
-          'controlFrame--wrapper-isDragging': isDragging,
-          'controlFrame--wrapper-small': width === 'small',
-          'controlFrame--wrapper-medium': width === 'medium',
-          'controlFrame--wrapper-large': width === 'large',
-          'controlFrame--wrapper-insertBefore': isOver && (index ?? -1) < (draggingIndex ?? -1),
-          'controlFrame--wrapper-insertAfter': isOver && (index ?? -1) > (draggingIndex ?? -1),
-        })}
-        style={style}
-      >
-        <ControlFrame
-          enableActions={draggingIndex === -1}
-          controlStyle={controlStyle}
-          embeddableId={embeddableId}
-          customPrepend={dragHandle}
-          container={container}
-          onRemove={onRemove}
-          onEdit={onEdit}
-        />
-      </EuiFlexItem>
-    );
-  }
-);
+  const dragHandle = (
+    <button ref={dragHandleRef} {...dragHandleProps} className="controlFrame--dragHandle">
+      <EuiIcon type="grabHorizontal" />
+    </button>
+  );
+
+  return (
+    <EuiFlexItem
+      grow={width === 'auto'}
+      className={classNames('controlFrame--wrapper', {
+        'controlFrame--wrapper-isDragging': isDragging,
+        'controlFrame--wrapper-small': width === 'small',
+        'controlFrame--wrapper-medium': width === 'medium',
+        'controlFrame--wrapper-large': width === 'large',
+        'controlFrame--wrapper-insertBefore': isOver && (index ?? -1) < (draggingIndex ?? -1),
+        'controlFrame--wrapper-insertAfter': isOver && (index ?? -1) > (draggingIndex ?? -1),
+      })}
+      style={style}
+    >
+      <ControlFrame
+        enableActions={draggingIndex === -1}
+        embeddableId={embeddableId}
+        customPrepend={dragHandle}
+      />
+    </EuiFlexItem>
+  );
+});
 
 /**
  * A simplified clone version of the control which is dragged. This version only shows
  * the title, because individual controls can be any size, and dragging a wide item
  * can be quite cumbersome.
  */
-export const ControlClone = ({
-  embeddableId,
-  container,
-  width,
-}: {
-  embeddableId: string;
-  container: ControlGroupContainer;
-  width: ControlWidth;
-}) => {
-  const embeddable = useChildEmbeddable({ embeddableId, container });
-  const layout = container.getInput().controlStyle;
+export const ControlClone = ({ draggingId }: { draggingId: string }) => {
+  const { useEmbeddableSelector } = useReduxContainerContext<ControlGroupInput>();
+  const { panels, controlStyle } = useEmbeddableSelector((state) => state);
+
+  const width = panels[draggingId].width;
+  const title = panels[draggingId].explicitInput.title;
   return (
     <EuiFlexItem
       className={classNames('controlFrame--cloneWrapper', {
         'controlFrame--cloneWrapper-small': width === 'small',
         'controlFrame--cloneWrapper-medium': width === 'medium',
         'controlFrame--cloneWrapper-large': width === 'large',
-        'controlFrame--cloneWrapper-twoLine': layout === 'twoLine',
+        'controlFrame--cloneWrapper-twoLine': controlStyle === 'twoLine',
       })}
     >
-      {layout === 'twoLine' ? (
-        <EuiFormLabel>{embeddable?.getInput().title}</EuiFormLabel>
-      ) : undefined}
+      {controlStyle === 'twoLine' ? <EuiFormLabel>{title}</EuiFormLabel> : undefined}
       <EuiFlexGroup gutterSize="none" className={'controlFrame--draggable'}>
         <EuiFlexItem grow={false}>
           <EuiIcon type="grabHorizontal" className="controlFrame--dragHandle" />
         </EuiFlexItem>
-        {container.getInput().controlStyle === 'oneLine' ? (
-          <EuiFlexItem>{embeddable?.getInput().title}</EuiFlexItem>
-        ) : undefined}
+        {controlStyle === 'oneLine' ? <EuiFlexItem>{title}</EuiFlexItem> : undefined}
       </EuiFlexGroup>
     </EuiFlexItem>
   );
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/control_group_container.tsx b/src/plugins/presentation_util/public/components/controls/control_group/control_group_container.tsx
deleted file mode 100644
index 03249889dfdea..0000000000000
--- a/src/plugins/presentation_util/public/components/controls/control_group/control_group_container.tsx
+++ /dev/null
@@ -1,224 +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 ReactDOM from 'react-dom';
-import { cloneDeep } from 'lodash';
-
-import {
-  Container,
-  EmbeddableFactory,
-  EmbeddableFactoryNotFoundError,
-} from '../../../../../embeddable/public';
-import {
-  InputControlEmbeddable,
-  InputControlInput,
-  InputControlOutput,
-  IEditableControlFactory,
-  ControlWidth,
-} from '../types';
-import { ControlsService } from '../controls_service';
-import { ControlGroupInput, ControlPanelState } from './types';
-import { ManageControlComponent } from './editor/manage_control';
-import { toMountPoint } from '../../../../../kibana_react/public';
-import { ControlGroup } from './component/control_group_component';
-import { PresentationOverlaysService } from '../../../services/overlays';
-import { CONTROL_GROUP_TYPE, DEFAULT_CONTROL_WIDTH } from './control_group_constants';
-import { ManageControlGroup } from './editor/manage_control_group_component';
-import { OverlayRef } from '../../../../../../core/public';
-import { ControlGroupStrings } from './control_group_strings';
-
-export class ControlGroupContainer extends Container<InputControlInput, ControlGroupInput> {
-  public readonly type = CONTROL_GROUP_TYPE;
-
-  private nextControlWidth: ControlWidth = DEFAULT_CONTROL_WIDTH;
-
-  constructor(
-    initialInput: ControlGroupInput,
-    private readonly controlsService: ControlsService,
-    private readonly overlays: PresentationOverlaysService,
-    parent?: Container
-  ) {
-    super(initialInput, { embeddableLoaded: {} }, controlsService.getControlFactory, parent);
-    this.overlays = overlays;
-    this.controlsService = controlsService;
-  }
-
-  protected createNewPanelState<TEmbeddableInput extends InputControlInput = InputControlInput>(
-    factory: EmbeddableFactory<InputControlInput, InputControlOutput, InputControlEmbeddable>,
-    partial: Partial<TEmbeddableInput> = {}
-  ): ControlPanelState<TEmbeddableInput> {
-    const panelState = super.createNewPanelState(factory, partial);
-    return {
-      order: 1,
-      width: this.nextControlWidth,
-      ...panelState,
-    } as ControlPanelState<TEmbeddableInput>;
-  }
-
-  protected getInheritedInput(id: string): InputControlInput {
-    const { filters, query, timeRange, inheritParentState } = this.getInput();
-    return {
-      filters: inheritParentState.useFilters ? filters : undefined,
-      query: inheritParentState.useQuery ? query : undefined,
-      timeRange: inheritParentState.useTimerange ? timeRange : undefined,
-      id,
-    };
-  }
-
-  public createNewControl = async (type: string) => {
-    const factory = this.controlsService.getControlFactory(type);
-    if (!factory) throw new EmbeddableFactoryNotFoundError(type);
-
-    const initialInputPromise = new Promise<Omit<InputControlInput, 'id'>>((resolve, reject) => {
-      let inputToReturn: Partial<InputControlInput> = {};
-
-      const onCancel = (ref: OverlayRef) => {
-        this.overlays
-          .openConfirm(ControlGroupStrings.management.discardNewControl.getSubtitle(), {
-            confirmButtonText: ControlGroupStrings.management.discardNewControl.getConfirm(),
-            cancelButtonText: ControlGroupStrings.management.discardNewControl.getCancel(),
-            title: ControlGroupStrings.management.discardNewControl.getTitle(),
-            buttonColor: 'danger',
-          })
-          .then((confirmed) => {
-            if (confirmed) {
-              reject();
-              ref.close();
-            }
-          });
-      };
-
-      const flyoutInstance = this.overlays.openFlyout(
-        toMountPoint(
-          <ManageControlComponent
-            width={this.nextControlWidth}
-            updateTitle={(newTitle) => (inputToReturn.title = newTitle)}
-            updateWidth={(newWidth) => (this.nextControlWidth = newWidth)}
-            controlEditorComponent={(factory as IEditableControlFactory).getControlEditor?.({
-              onChange: (partialInput) => {
-                inputToReturn = { ...inputToReturn, ...partialInput };
-              },
-            })}
-            onSave={() => {
-              resolve(inputToReturn);
-              flyoutInstance.close();
-            }}
-            onCancel={() => onCancel(flyoutInstance)}
-          />
-        ),
-        {
-          onClose: (flyout) => onCancel(flyout),
-        }
-      );
-    });
-    initialInputPromise.then(
-      async (explicitInput) => {
-        await this.addNewEmbeddable(type, explicitInput);
-      },
-      () => {} // swallow promise rejection because it can be part of normal flow
-    );
-  };
-
-  public editControl = async (embeddableId: string) => {
-    const panel = this.getInput().panels[embeddableId];
-    const factory = this.getFactory(panel.type);
-    const embeddable = await this.untilEmbeddableLoaded(embeddableId);
-
-    if (!factory) throw new EmbeddableFactoryNotFoundError(panel.type);
-
-    const initialExplicitInput = cloneDeep(panel.explicitInput);
-    const initialWidth = panel.width;
-
-    const onCancel = (ref: OverlayRef) => {
-      this.overlays
-        .openConfirm(ControlGroupStrings.management.discardChanges.getSubtitle(), {
-          confirmButtonText: ControlGroupStrings.management.discardChanges.getConfirm(),
-          cancelButtonText: ControlGroupStrings.management.discardChanges.getCancel(),
-          title: ControlGroupStrings.management.discardChanges.getTitle(),
-          buttonColor: 'danger',
-        })
-        .then((confirmed) => {
-          if (confirmed) {
-            embeddable.updateInput(initialExplicitInput);
-            this.updateInput({
-              panels: {
-                ...this.getInput().panels,
-                [embeddableId]: { ...this.getInput().panels[embeddableId], width: initialWidth },
-              },
-            });
-            ref.close();
-          }
-        });
-    };
-
-    const flyoutInstance = this.overlays.openFlyout(
-      toMountPoint(
-        <ManageControlComponent
-          width={panel.width}
-          title={embeddable.getTitle()}
-          removeControl={() => this.removeEmbeddable(embeddableId)}
-          updateTitle={(newTitle) => embeddable.updateInput({ title: newTitle })}
-          controlEditorComponent={(factory as IEditableControlFactory).getControlEditor?.({
-            onChange: (partialInput) => embeddable.updateInput(partialInput),
-            initialInput: embeddable.getInput(),
-          })}
-          onCancel={() => onCancel(flyoutInstance)}
-          onSave={() => flyoutInstance.close()}
-          updateWidth={(newWidth) =>
-            this.updateInput({
-              panels: {
-                ...this.getInput().panels,
-                [embeddableId]: { ...this.getInput().panels[embeddableId], width: newWidth },
-              },
-            })
-          }
-        />
-      ),
-      {
-        onClose: (flyout) => onCancel(flyout),
-      }
-    );
-  };
-
-  public editControlGroup = () => {
-    const flyoutInstance = this.overlays.openFlyout(
-      toMountPoint(
-        <ManageControlGroup
-          controlStyle={this.getInput().controlStyle}
-          setControlStyle={(newStyle) => this.updateInput({ controlStyle: newStyle })}
-          deleteAllEmbeddables={() => {
-            this.overlays
-              .openConfirm(ControlGroupStrings.management.deleteAllControls.getSubtitle(), {
-                confirmButtonText: ControlGroupStrings.management.deleteAllControls.getConfirm(),
-                cancelButtonText: ControlGroupStrings.management.deleteAllControls.getCancel(),
-                title: ControlGroupStrings.management.deleteAllControls.getTitle(),
-                buttonColor: 'danger',
-              })
-              .then((confirmed) => {
-                if (confirmed) {
-                  Object.keys(this.getInput().panels).forEach((id) => this.removeEmbeddable(id));
-                  flyoutInstance.close();
-                }
-              });
-          }}
-          setAllPanelWidths={(newWidth) => {
-            const newPanels = cloneDeep(this.getInput().panels);
-            Object.values(newPanels).forEach((panel) => (panel.width = newWidth));
-            this.updateInput({ panels: { ...newPanels, ...newPanels } });
-          }}
-          panels={this.getInput().panels}
-        />
-      )
-    );
-  };
-
-  public render(dom: HTMLElement) {
-    ReactDOM.render(<ControlGroup controlGroupContainer={this} />, dom);
-  }
-}
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/control_group_strings.ts b/src/plugins/presentation_util/public/components/controls/control_group/control_group_strings.ts
index 78e50d8651931..35e490b0ea530 100644
--- a/src/plugins/presentation_util/public/components/controls/control_group/control_group_strings.ts
+++ b/src/plugins/presentation_util/public/components/controls/control_group/control_group_strings.ts
@@ -48,13 +48,9 @@ export const ControlGroupStrings = {
       i18n.translate('presentationUtil.inputControls.controlGroup.management.flyoutTitle', {
         defaultMessage: 'Manage controls',
       }),
-    getDesignTitle: () =>
-      i18n.translate('presentationUtil.inputControls.controlGroup.management.designTitle', {
-        defaultMessage: 'Design',
-      }),
-    getWidthTitle: () =>
-      i18n.translate('presentationUtil.inputControls.controlGroup.management.widthTitle', {
-        defaultMessage: 'Width',
+    getDefaultWidthTitle: () =>
+      i18n.translate('presentationUtil.inputControls.controlGroup.management.defaultWidthTitle', {
+        defaultMessage: 'Default width',
       }),
     getLayoutTitle: () =>
       i18n.translate('presentationUtil.inputControls.controlGroup.management.layoutTitle', {
@@ -64,23 +60,20 @@ export const ControlGroupStrings = {
       i18n.translate('presentationUtil.inputControls.controlGroup.management.delete', {
         defaultMessage: 'Delete control',
       }),
+    getSetAllWidthsToDefaultTitle: () =>
+      i18n.translate('presentationUtil.inputControls.controlGroup.management.setAllWidths', {
+        defaultMessage: 'Set all widths to default',
+      }),
     getDeleteAllButtonTitle: () =>
       i18n.translate('presentationUtil.inputControls.controlGroup.management.deleteAll', {
         defaultMessage: 'Delete all',
       }),
     controlWidth: {
-      getChangeAllControlWidthsTitle: () =>
-        i18n.translate(
-          'presentationUtil.inputControls.controlGroup.management.layout.changeAllControlWidths',
-          {
-            defaultMessage: 'Set width for all controls',
-          }
-        ),
       getWidthSwitchLegend: () =>
         i18n.translate(
           'presentationUtil.inputControls.controlGroup.management.layout.controlWidthLegend',
           {
-            defaultMessage: 'Change individual control width',
+            defaultMessage: 'Change control width',
           }
         ),
       getAutoWidthTitle: () =>
@@ -117,21 +110,31 @@ export const ControlGroupStrings = {
           defaultMessage: 'Two line layout',
         }),
     },
-    deleteAllControls: {
-      getTitle: () =>
-        i18n.translate('presentationUtil.inputControls.controlGroup.management.deleteAll.title', {
-          defaultMessage: 'Delete all?',
-        }),
+    deleteControls: {
+      getDeleteAllTitle: () =>
+        i18n.translate(
+          'presentationUtil.inputControls.controlGroup.management.delete.deleteAllTitle',
+          {
+            defaultMessage: 'Delete all controls?',
+          }
+        ),
+      getDeleteTitle: () =>
+        i18n.translate(
+          'presentationUtil.inputControls.controlGroup.management.delete.deleteTitle',
+          {
+            defaultMessage: 'Delete control?',
+          }
+        ),
       getSubtitle: () =>
-        i18n.translate('presentationUtil.inputControls.controlGroup.management.deleteAll.sub', {
+        i18n.translate('presentationUtil.inputControls.controlGroup.management.delete.sub', {
           defaultMessage: 'Controls are not recoverable once removed.',
         }),
       getConfirm: () =>
-        i18n.translate('presentationUtil.inputControls.controlGroup.management.deleteAll.confirm', {
+        i18n.translate('presentationUtil.inputControls.controlGroup.management.delete.confirm', {
           defaultMessage: 'Delete',
         }),
       getCancel: () =>
-        i18n.translate('presentationUtil.inputControls.controlGroup.management.deleteAll.cancel', {
+        i18n.translate('presentationUtil.inputControls.controlGroup.management.delete.cancel', {
           defaultMessage: 'Cancel',
         }),
     },
@@ -143,7 +146,7 @@ export const ControlGroupStrings = {
       getSubtitle: () =>
         i18n.translate('presentationUtil.inputControls.controlGroup.management.discard.sub', {
           defaultMessage:
-            'Discard changes to this control? Controls are not recoverable once removed.',
+            'Discard changes to this control? Changes are not recoverable once discardsd.',
         }),
       getConfirm: () =>
         i18n.translate('presentationUtil.inputControls.controlGroup.management.discard.confirm', {
@@ -161,7 +164,7 @@ export const ControlGroupStrings = {
         }),
       getSubtitle: () =>
         i18n.translate('presentationUtil.inputControls.controlGroup.management.deleteNew.sub', {
-          defaultMessage: 'Discard new control? Controls are not recoverable once removed.',
+          defaultMessage: 'Discard new control? Controls are not recoverable once discarded.',
         }),
       getConfirm: () =>
         i18n.translate('presentationUtil.inputControls.controlGroup.management.deleteNew.confirm', {
@@ -173,4 +176,14 @@ export const ControlGroupStrings = {
         }),
     },
   },
+  floatingActions: {
+    getEditButtonTitle: () =>
+      i18n.translate('presentationUtil.inputControls.controlGroup.floatingActions.editTitle', {
+        defaultMessage: 'Manage control',
+      }),
+    getRemoveButtonTitle: () =>
+      i18n.translate('presentationUtil.inputControls.controlGroup.floatingActions.removeTitle', {
+        defaultMessage: 'Remove control',
+      }),
+  },
 };
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/editor/manage_control.tsx b/src/plugins/presentation_util/public/components/controls/control_group/editor/control_editor.tsx
similarity index 99%
rename from src/plugins/presentation_util/public/components/controls/control_group/editor/manage_control.tsx
rename to src/plugins/presentation_util/public/components/controls/control_group/editor/control_editor.tsx
index 6d80a6e0b31f6..38d8faf37397a 100644
--- a/src/plugins/presentation_util/public/components/controls/control_group/editor/manage_control.tsx
+++ b/src/plugins/presentation_util/public/components/controls/control_group/editor/control_editor.tsx
@@ -46,7 +46,7 @@ interface ManageControlProps {
   updateWidth: (newWidth: ControlWidth) => void;
 }
 
-export const ManageControlComponent = ({
+export const ControlEditor = ({
   controlEditorComponent,
   removeControl,
   updateTitle,
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/editor/create_control.tsx b/src/plugins/presentation_util/public/components/controls/control_group/editor/create_control.tsx
new file mode 100644
index 0000000000000..9f59fe98cc0c1
--- /dev/null
+++ b/src/plugins/presentation_util/public/components/controls/control_group/editor/create_control.tsx
@@ -0,0 +1,158 @@
+/*
+ * Copyright 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 {
+  EuiButtonIcon,
+  EuiButtonIconColor,
+  EuiContextMenuItem,
+  EuiContextMenuPanel,
+  EuiPopover,
+} from '@elastic/eui';
+import React, { useState, ReactElement } from 'react';
+
+import { ControlGroupInput } from '../types';
+import { ControlEditor } from './control_editor';
+import { pluginServices } from '../../../../services';
+import { forwardAllContext } from './forward_all_context';
+import { OverlayRef } from '../../../../../../../core/public';
+import { ControlGroupStrings } from '../control_group_strings';
+import { InputControlInput } from '../../../../services/controls';
+import { DEFAULT_CONTROL_WIDTH } from '../control_group_constants';
+import { ControlWidth, IEditableControlFactory } from '../../types';
+import { controlGroupReducers } from '../state/control_group_reducers';
+import { EmbeddableFactoryNotFoundError } from '../../../../../../embeddable/public';
+import { useReduxContainerContext } from '../../../redux_embeddables/redux_embeddable_context';
+
+export const CreateControlButton = () => {
+  // Presentation Services Context
+  const { overlays, controls } = pluginServices.getHooks();
+  const { getInputControlTypes, getControlFactory } = controls.useService();
+  const { openFlyout, openConfirm } = overlays.useService();
+
+  // Redux embeddable container Context
+  const reduxContainerContext = useReduxContainerContext<
+    ControlGroupInput,
+    typeof controlGroupReducers
+  >();
+  const {
+    containerActions: { addNewEmbeddable },
+    actions: { setDefaultControlWidth },
+    useEmbeddableSelector,
+    useEmbeddableDispatch,
+  } = reduxContainerContext;
+  const dispatch = useEmbeddableDispatch();
+
+  // current state
+  const { defaultControlWidth } = useEmbeddableSelector((state) => state);
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+
+  const createNewControl = async (type: string) => {
+    const factory = getControlFactory(type);
+    if (!factory) throw new EmbeddableFactoryNotFoundError(type);
+
+    const initialInputPromise = new Promise<Omit<InputControlInput, 'id'>>((resolve, reject) => {
+      let inputToReturn: Partial<InputControlInput> = {};
+
+      const onCancel = (ref: OverlayRef) => {
+        if (Object.keys(inputToReturn).length === 0) {
+          reject();
+          ref.close();
+          return;
+        }
+        openConfirm(ControlGroupStrings.management.discardNewControl.getSubtitle(), {
+          confirmButtonText: ControlGroupStrings.management.discardNewControl.getConfirm(),
+          cancelButtonText: ControlGroupStrings.management.discardNewControl.getCancel(),
+          title: ControlGroupStrings.management.discardNewControl.getTitle(),
+          buttonColor: 'danger',
+        }).then((confirmed) => {
+          if (confirmed) {
+            reject();
+            ref.close();
+          }
+        });
+      };
+
+      const flyoutInstance = openFlyout(
+        forwardAllContext(
+          <ControlEditor
+            width={defaultControlWidth ?? DEFAULT_CONTROL_WIDTH}
+            updateTitle={(newTitle) => (inputToReturn.title = newTitle)}
+            updateWidth={(newWidth) => dispatch(setDefaultControlWidth(newWidth as ControlWidth))}
+            controlEditorComponent={(factory as IEditableControlFactory).getControlEditor?.({
+              onChange: (partialInput) => {
+                inputToReturn = { ...inputToReturn, ...partialInput };
+              },
+            })}
+            onSave={() => {
+              resolve(inputToReturn);
+              flyoutInstance.close();
+            }}
+            onCancel={() => onCancel(flyoutInstance)}
+          />,
+          reduxContainerContext
+        ),
+        {
+          onClose: (flyout) => onCancel(flyout),
+        }
+      );
+    });
+    initialInputPromise.then(
+      async (explicitInput) => {
+        await addNewEmbeddable(type, explicitInput);
+      },
+      () => {} // swallow promise rejection because it can be part of normal flow
+    );
+  };
+
+  if (getInputControlTypes().length === 0) return null;
+
+  const commonButtonProps = {
+    iconType: 'plus',
+    color: 'text' as EuiButtonIconColor,
+    'data-test-subj': 'inputControlsSortingButton',
+    'aria-label': ControlGroupStrings.management.getManageButtonTitle(),
+  };
+
+  if (getInputControlTypes().length > 1) {
+    const items: ReactElement[] = [];
+    getInputControlTypes().forEach((type) => {
+      const factory = getControlFactory(type);
+      items.push(
+        <EuiContextMenuItem
+          key={type}
+          icon={factory.getIconType?.()}
+          onClick={() => {
+            setIsPopoverOpen(false);
+            createNewControl(type);
+          }}
+        >
+          {factory.getDisplayName()}
+        </EuiContextMenuItem>
+      );
+    });
+    const button = <EuiButtonIcon {...commonButtonProps} onClick={() => setIsPopoverOpen(true)} />;
+
+    return (
+      <EuiPopover
+        button={button}
+        isOpen={isPopoverOpen}
+        panelPaddingSize="none"
+        anchorPosition="downLeft"
+        closePopover={() => setIsPopoverOpen(false)}
+      >
+        <EuiContextMenuPanel size="s" items={items} />
+      </EuiPopover>
+    );
+  }
+  return (
+    <EuiButtonIcon
+      {...commonButtonProps}
+      onClick={() => createNewControl(getInputControlTypes()[0])}
+    />
+  );
+};
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/editor/edit_control.tsx b/src/plugins/presentation_util/public/components/controls/control_group/editor/edit_control.tsx
new file mode 100644
index 0000000000000..58c59c8f84fe0
--- /dev/null
+++ b/src/plugins/presentation_util/public/components/controls/control_group/editor/edit_control.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 { isEqual } from 'lodash';
+import { EuiButtonIcon } from '@elastic/eui';
+import React, { useEffect, useRef } from 'react';
+
+import { ControlGroupInput } from '../types';
+import { ControlEditor } from './control_editor';
+import { IEditableControlFactory } from '../../types';
+import { pluginServices } from '../../../../services';
+import { forwardAllContext } from './forward_all_context';
+import { OverlayRef } from '../../../../../../../core/public';
+import { ControlGroupStrings } from '../control_group_strings';
+import { controlGroupReducers } from '../state/control_group_reducers';
+import { EmbeddableFactoryNotFoundError } from '../../../../../../embeddable/public';
+import { useReduxContainerContext } from '../../../redux_embeddables/redux_embeddable_context';
+
+export const EditControlButton = ({ embeddableId }: { embeddableId: string }) => {
+  // Presentation Services Context
+  const { overlays, controls } = pluginServices.getHooks();
+  const { getControlFactory } = controls.useService();
+  const { openFlyout, openConfirm } = overlays.useService();
+
+  // Redux embeddable container Context
+  const reduxContainerContext = useReduxContainerContext<
+    ControlGroupInput,
+    typeof controlGroupReducers
+  >();
+  const {
+    containerActions: { untilEmbeddableLoaded, removeEmbeddable, updateInputForChild },
+    actions: { setControlWidth },
+    useEmbeddableSelector,
+    useEmbeddableDispatch,
+  } = reduxContainerContext;
+  const dispatch = useEmbeddableDispatch();
+
+  // current state
+  const { panels } = useEmbeddableSelector((state) => state);
+
+  // keep up to date ref of latest panel state for comparison when closing editor.
+  const latestPanelState = useRef(panels[embeddableId]);
+  useEffect(() => {
+    latestPanelState.current = panels[embeddableId];
+  }, [panels, embeddableId]);
+
+  const editControl = async () => {
+    const panel = panels[embeddableId];
+    const factory = getControlFactory(panel.type);
+    const embeddable = await untilEmbeddableLoaded(embeddableId);
+
+    if (!factory) throw new EmbeddableFactoryNotFoundError(panel.type);
+
+    let removed = false;
+    const onCancel = (ref: OverlayRef) => {
+      if (
+        removed ||
+        (isEqual(latestPanelState.current.explicitInput, panel.explicitInput) &&
+          isEqual(latestPanelState.current.width, panel.width))
+      ) {
+        ref.close();
+        return;
+      }
+      openConfirm(ControlGroupStrings.management.discardChanges.getSubtitle(), {
+        confirmButtonText: ControlGroupStrings.management.discardChanges.getConfirm(),
+        cancelButtonText: ControlGroupStrings.management.discardChanges.getCancel(),
+        title: ControlGroupStrings.management.discardChanges.getTitle(),
+        buttonColor: 'danger',
+      }).then((confirmed) => {
+        if (confirmed) {
+          updateInputForChild(embeddableId, panel.explicitInput);
+          dispatch(setControlWidth({ width: panel.width, embeddableId }));
+          ref.close();
+        }
+      });
+    };
+
+    const flyoutInstance = openFlyout(
+      forwardAllContext(
+        <ControlEditor
+          width={panel.width}
+          title={embeddable.getTitle()}
+          removeControl={() => {
+            openConfirm(ControlGroupStrings.management.deleteControls.getSubtitle(), {
+              confirmButtonText: ControlGroupStrings.management.deleteControls.getConfirm(),
+              cancelButtonText: ControlGroupStrings.management.deleteControls.getCancel(),
+              title: ControlGroupStrings.management.deleteControls.getDeleteTitle(),
+              buttonColor: 'danger',
+            }).then((confirmed) => {
+              if (confirmed) {
+                removeEmbeddable(embeddableId);
+                removed = true;
+                flyoutInstance.close();
+              }
+            });
+          }}
+          updateTitle={(newTitle) => updateInputForChild(embeddableId, { title: newTitle })}
+          controlEditorComponent={(factory as IEditableControlFactory).getControlEditor?.({
+            onChange: (partialInput) => updateInputForChild(embeddableId, partialInput),
+            initialInput: embeddable.getInput(),
+          })}
+          onCancel={() => onCancel(flyoutInstance)}
+          onSave={() => flyoutInstance.close()}
+          updateWidth={(newWidth) => dispatch(setControlWidth({ width: newWidth, embeddableId }))}
+        />,
+        reduxContainerContext
+      ),
+      {
+        onClose: (flyout) => onCancel(flyout),
+      }
+    );
+  };
+
+  return (
+    <EuiButtonIcon
+      aria-label={ControlGroupStrings.floatingActions.getEditButtonTitle()}
+      iconType="pencil"
+      onClick={() => editControl()}
+      color="text"
+    />
+  );
+};
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/editor/edit_control_group.tsx b/src/plugins/presentation_util/public/components/controls/control_group/editor/edit_control_group.tsx
new file mode 100644
index 0000000000000..9438091e2fb1d
--- /dev/null
+++ b/src/plugins/presentation_util/public/components/controls/control_group/editor/edit_control_group.tsx
@@ -0,0 +1,124 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import {
+  EuiTitle,
+  EuiSpacer,
+  EuiFormRow,
+  EuiFlexItem,
+  EuiFlexGroup,
+  EuiFlyoutBody,
+  EuiButtonGroup,
+  EuiButtonEmpty,
+  EuiFlyoutHeader,
+} from '@elastic/eui';
+
+import {
+  CONTROL_LAYOUT_OPTIONS,
+  CONTROL_WIDTH_OPTIONS,
+  DEFAULT_CONTROL_WIDTH,
+} from '../control_group_constants';
+import { ControlGroupInput } from '../types';
+import { pluginServices } from '../../../../services';
+import { ControlStyle, ControlWidth } from '../../types';
+import { ControlGroupStrings } from '../control_group_strings';
+import { controlGroupReducers } from '../state/control_group_reducers';
+import { useReduxContainerContext } from '../../../redux_embeddables/redux_embeddable_context';
+
+export const EditControlGroup = () => {
+  const { overlays } = pluginServices.getHooks();
+  const { openConfirm } = overlays.useService();
+
+  const {
+    containerActions,
+    useEmbeddableSelector,
+    useEmbeddableDispatch,
+    actions: { setControlStyle, setAllControlWidths, setDefaultControlWidth },
+  } = useReduxContainerContext<ControlGroupInput, typeof controlGroupReducers>();
+
+  const dispatch = useEmbeddableDispatch();
+  const { panels, controlStyle, defaultControlWidth } = useEmbeddableSelector((state) => state);
+
+  return (
+    <>
+      <EuiFlyoutHeader hasBorder>
+        <EuiTitle size="m">
+          <h2>{ControlGroupStrings.management.getFlyoutTitle()}</h2>
+        </EuiTitle>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        <EuiFormRow label={ControlGroupStrings.management.getLayoutTitle()}>
+          <EuiButtonGroup
+            color="primary"
+            legend={ControlGroupStrings.management.controlStyle.getDesignSwitchLegend()}
+            options={CONTROL_LAYOUT_OPTIONS}
+            idSelected={controlStyle}
+            onChange={(newControlStyle) =>
+              dispatch(setControlStyle(newControlStyle as ControlStyle))
+            }
+          />
+        </EuiFormRow>
+        <EuiSpacer size="m" />
+        <EuiFormRow label={ControlGroupStrings.management.getDefaultWidthTitle()}>
+          <EuiFlexGroup direction={'row'}>
+            <EuiFlexItem>
+              <EuiButtonGroup
+                color="primary"
+                idSelected={defaultControlWidth ?? DEFAULT_CONTROL_WIDTH}
+                legend={ControlGroupStrings.management.controlWidth.getWidthSwitchLegend()}
+                options={CONTROL_WIDTH_OPTIONS}
+                onChange={(newWidth: string) =>
+                  dispatch(setDefaultControlWidth(newWidth as ControlWidth))
+                }
+              />
+            </EuiFlexItem>
+            <EuiFlexItem>
+              <EuiButtonEmpty
+                onClick={() =>
+                  dispatch(setAllControlWidths(defaultControlWidth ?? DEFAULT_CONTROL_WIDTH))
+                }
+                aria-label={'delete-all'}
+                iconType="returnKey"
+                size="s"
+              >
+                {ControlGroupStrings.management.getSetAllWidthsToDefaultTitle()}
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFormRow>
+
+        <EuiSpacer size="xl" />
+
+        <EuiButtonEmpty
+          onClick={() => {
+            if (!containerActions?.removeEmbeddable) return;
+            openConfirm(ControlGroupStrings.management.deleteControls.getSubtitle(), {
+              confirmButtonText: ControlGroupStrings.management.deleteControls.getConfirm(),
+              cancelButtonText: ControlGroupStrings.management.deleteControls.getCancel(),
+              title: ControlGroupStrings.management.deleteControls.getDeleteAllTitle(),
+              buttonColor: 'danger',
+            }).then((confirmed) => {
+              if (confirmed)
+                Object.keys(panels).forEach((panelId) =>
+                  containerActions.removeEmbeddable(panelId)
+                );
+            });
+          }}
+          aria-label={'delete-all'}
+          iconType="trash"
+          color="danger"
+          flush="left"
+          size="s"
+        >
+          {ControlGroupStrings.management.getDeleteAllButtonTitle()}
+        </EuiButtonEmpty>
+      </EuiFlyoutBody>
+    </>
+  );
+};
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/editor/forward_all_context.tsx b/src/plugins/presentation_util/public/components/controls/control_group/editor/forward_all_context.tsx
new file mode 100644
index 0000000000000..bb7356c240648
--- /dev/null
+++ b/src/plugins/presentation_util/public/components/controls/control_group/editor/forward_all_context.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { Provider } from 'react-redux';
+import { ReactElement } from 'react';
+import React from 'react';
+
+import { ControlGroupInput } from '../types';
+import { pluginServices } from '../../../../services';
+import { toMountPoint } from '../../../../../../kibana_react/public';
+import { ReduxContainerContextServices } from '../../../redux_embeddables/types';
+import { ReduxEmbeddableContext } from '../../../redux_embeddables/redux_embeddable_context';
+import { getManagedEmbeddablesStore } from '../../../redux_embeddables/generic_embeddable_store';
+
+/**
+ * The overlays service creates its divs outside the flow of the component. This necessitates
+ * passing all context from the component to the flyout.
+ */
+export const forwardAllContext = (
+  component: ReactElement,
+  reduxContainerContext: ReduxContainerContextServices<ControlGroupInput>
+) => {
+  const PresentationUtilProvider = pluginServices.getContextProvider();
+  return toMountPoint(
+    <Provider store={getManagedEmbeddablesStore()}>
+      <ReduxEmbeddableContext.Provider value={reduxContainerContext}>
+        <PresentationUtilProvider>{component}</PresentationUtilProvider>
+      </ReduxEmbeddableContext.Provider>
+    </Provider>
+  );
+};
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/editor/manage_control_group_component.tsx b/src/plugins/presentation_util/public/components/controls/control_group/editor/manage_control_group_component.tsx
deleted file mode 100644
index e766b16ade13a..0000000000000
--- a/src/plugins/presentation_util/public/components/controls/control_group/editor/manage_control_group_component.tsx
+++ /dev/null
@@ -1,113 +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 useMount from 'react-use/lib/useMount';
-import React, { useState } from 'react';
-import {
-  EuiFlyoutHeader,
-  EuiButtonEmpty,
-  EuiButtonGroup,
-  EuiFlyoutBody,
-  EuiFormRow,
-  EuiSpacer,
-  EuiSwitch,
-  EuiTitle,
-} from '@elastic/eui';
-
-import { ControlsPanels } from '../types';
-import { ControlStyle, ControlWidth } from '../../types';
-import { ControlGroupStrings } from '../control_group_strings';
-import { CONTROL_LAYOUT_OPTIONS, CONTROL_WIDTH_OPTIONS } from '../control_group_constants';
-
-interface ManageControlGroupProps {
-  panels: ControlsPanels;
-  controlStyle: ControlStyle;
-  deleteAllEmbeddables: () => void;
-  setControlStyle: (style: ControlStyle) => void;
-  setAllPanelWidths: (newWidth: ControlWidth) => void;
-}
-
-export const ManageControlGroup = ({
-  panels,
-  controlStyle,
-  setControlStyle,
-  setAllPanelWidths,
-  deleteAllEmbeddables,
-}: ManageControlGroupProps) => {
-  const [currentControlStyle, setCurrentControlStyle] = useState<ControlStyle>(controlStyle);
-  const [selectedWidth, setSelectedWidth] = useState<ControlWidth>();
-  const [selectionDisplay, setSelectionDisplay] = useState(false);
-
-  useMount(() => {
-    if (!panels || Object.keys(panels).length === 0) return;
-    const firstWidth = panels[Object.keys(panels)[0]].width;
-    if (Object.values(panels).every((panel) => panel.width === firstWidth)) {
-      setSelectedWidth(firstWidth);
-    }
-  });
-
-  return (
-    <>
-      <EuiFlyoutHeader hasBorder>
-        <EuiTitle size="m">
-          <h2>{ControlGroupStrings.management.getFlyoutTitle()}</h2>
-        </EuiTitle>
-      </EuiFlyoutHeader>
-      <EuiFlyoutBody>
-        <EuiFormRow label={ControlGroupStrings.management.getLayoutTitle()}>
-          <EuiButtonGroup
-            color="primary"
-            legend={ControlGroupStrings.management.controlStyle.getDesignSwitchLegend()}
-            options={CONTROL_LAYOUT_OPTIONS}
-            idSelected={currentControlStyle}
-            onChange={(newControlStyle) => {
-              setControlStyle(newControlStyle as ControlStyle);
-              setCurrentControlStyle(newControlStyle as ControlStyle);
-            }}
-          />
-        </EuiFormRow>
-        <EuiSpacer size="m" />
-        <EuiFormRow label={ControlGroupStrings.management.getWidthTitle()}>
-          <EuiSwitch
-            label={ControlGroupStrings.management.controlWidth.getChangeAllControlWidthsTitle()}
-            checked={selectionDisplay}
-            onChange={() => setSelectionDisplay(!selectionDisplay)}
-          />
-        </EuiFormRow>
-        {selectionDisplay ? (
-          <>
-            <EuiSpacer size="s" />
-            <EuiButtonGroup
-              color="primary"
-              idSelected={selectedWidth ?? ''}
-              legend={ControlGroupStrings.management.controlWidth.getWidthSwitchLegend()}
-              options={CONTROL_WIDTH_OPTIONS}
-              onChange={(newWidth: string) => {
-                setAllPanelWidths(newWidth as ControlWidth);
-                setSelectedWidth(newWidth as ControlWidth);
-              }}
-            />
-          </>
-        ) : undefined}
-
-        <EuiSpacer size="xl" />
-
-        <EuiButtonEmpty
-          onClick={deleteAllEmbeddables}
-          aria-label={'delete-all'}
-          iconType="trash"
-          color="danger"
-          flush="left"
-          size="s"
-        >
-          {ControlGroupStrings.management.getDeleteAllButtonTitle()}
-        </EuiButtonEmpty>
-      </EuiFlyoutBody>
-    </>
-  );
-};
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/embeddable/control_group_container.tsx b/src/plugins/presentation_util/public/components/controls/control_group/embeddable/control_group_container.tsx
new file mode 100644
index 0000000000000..a722bed6c07d2
--- /dev/null
+++ b/src/plugins/presentation_util/public/components/controls/control_group/embeddable/control_group_container.tsx
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 ReactDOM from 'react-dom';
+
+import {
+  InputControlEmbeddable,
+  InputControlInput,
+  InputControlOutput,
+} from '../../../../services/controls';
+import { pluginServices } from '../../../../services';
+import { ControlGroupInput, ControlPanelState } from '../types';
+import { ControlGroup } from '../component/control_group_component';
+import { controlGroupReducers } from '../state/control_group_reducers';
+import { Container, EmbeddableFactory } from '../../../../../../embeddable/public';
+import { CONTROL_GROUP_TYPE, DEFAULT_CONTROL_WIDTH } from '../control_group_constants';
+import { ReduxEmbeddableWrapper } from '../../../redux_embeddables/redux_embeddable_wrapper';
+
+export class ControlGroupContainer extends Container<InputControlInput, ControlGroupInput> {
+  public readonly type = CONTROL_GROUP_TYPE;
+
+  constructor(initialInput: ControlGroupInput, parent?: Container) {
+    super(
+      initialInput,
+      { embeddableLoaded: {} },
+      pluginServices.getServices().controls.getControlFactory,
+      parent
+    );
+  }
+
+  protected createNewPanelState<TEmbeddableInput extends InputControlInput = InputControlInput>(
+    factory: EmbeddableFactory<InputControlInput, InputControlOutput, InputControlEmbeddable>,
+    partial: Partial<TEmbeddableInput> = {}
+  ): ControlPanelState<TEmbeddableInput> {
+    const panelState = super.createNewPanelState(factory, partial);
+    const highestOrder = Object.values(this.getInput().panels).reduce((highestSoFar, panel) => {
+      if (panel.order > highestSoFar) highestSoFar = panel.order;
+      return highestSoFar;
+    }, 0);
+    return {
+      order: highestOrder + 1,
+      width: this.getInput().defaultControlWidth ?? DEFAULT_CONTROL_WIDTH,
+      ...panelState,
+    } as ControlPanelState<TEmbeddableInput>;
+  }
+
+  protected getInheritedInput(id: string): InputControlInput {
+    const { filters, query, timeRange, inheritParentState } = this.getInput();
+    return {
+      filters: inheritParentState.useFilters ? filters : undefined,
+      query: inheritParentState.useQuery ? query : undefined,
+      timeRange: inheritParentState.useTimerange ? timeRange : undefined,
+      id,
+    };
+  }
+
+  public render(dom: HTMLElement) {
+    const PresentationUtilProvider = pluginServices.getContextProvider();
+    ReactDOM.render(
+      <PresentationUtilProvider>
+        <ReduxEmbeddableWrapper<ControlGroupInput>
+          embeddable={this}
+          reducers={controlGroupReducers}
+        >
+          <ControlGroup />
+        </ReduxEmbeddableWrapper>
+      </PresentationUtilProvider>,
+      dom
+    );
+  }
+}
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/control_group_container_factory.ts b/src/plugins/presentation_util/public/components/controls/control_group/embeddable/control_group_container_factory.ts
similarity index 71%
rename from src/plugins/presentation_util/public/components/controls/control_group/control_group_container_factory.ts
rename to src/plugins/presentation_util/public/components/controls/control_group/embeddable/control_group_container_factory.ts
index 97ef48e6b240c..e50b1c5d734e4 100644
--- a/src/plugins/presentation_util/public/components/controls/control_group/control_group_container_factory.ts
+++ b/src/plugins/presentation_util/public/components/controls/control_group/embeddable/control_group_container_factory.ts
@@ -20,13 +20,11 @@ import {
   EmbeddableFactory,
   EmbeddableFactoryDefinition,
   ErrorEmbeddable,
-} from '../../../../../embeddable/public';
-import { ControlGroupInput } from './types';
-import { ControlsService } from '../controls_service';
-import { ControlGroupStrings } from './control_group_strings';
-import { CONTROL_GROUP_TYPE } from './control_group_constants';
+} from '../../../../../../embeddable/public';
+import { ControlGroupInput } from '../types';
+import { ControlGroupStrings } from '../control_group_strings';
+import { CONTROL_GROUP_TYPE } from '../control_group_constants';
 import { ControlGroupContainer } from './control_group_container';
-import { PresentationOverlaysService } from '../../../services/overlays';
 
 export type DashboardContainerFactory = EmbeddableFactory<
   ControlGroupInput,
@@ -38,13 +36,6 @@ export class ControlGroupContainerFactory
 {
   public readonly isContainerType = true;
   public readonly type = CONTROL_GROUP_TYPE;
-  public readonly controlsService: ControlsService;
-  private readonly overlays: PresentationOverlaysService;
-
-  constructor(controlsService: ControlsService, overlays: PresentationOverlaysService) {
-    this.overlays = overlays;
-    this.controlsService = controlsService;
-  }
 
   public isEditable = async () => false;
 
@@ -67,6 +58,6 @@ export class ControlGroupContainerFactory
     initialInput: ControlGroupInput,
     parent?: Container
   ): Promise<ControlGroupContainer | ErrorEmbeddable> => {
-    return new ControlGroupContainer(initialInput, this.controlsService, this.overlays, parent);
+    return new ControlGroupContainer(initialInput, parent);
   };
 }
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/state/control_group_reducers.ts b/src/plugins/presentation_util/public/components/controls/control_group/state/control_group_reducers.ts
new file mode 100644
index 0000000000000..b7c0c62535d4c
--- /dev/null
+++ b/src/plugins/presentation_util/public/components/controls/control_group/state/control_group_reducers.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 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 { PayloadAction } from '@reduxjs/toolkit';
+import { WritableDraft } from 'immer/dist/types/types-external';
+
+import { ControlWidth } from '../../types';
+import { ControlGroupInput } from '../types';
+
+export const controlGroupReducers = {
+  setControlStyle: (
+    state: WritableDraft<ControlGroupInput>,
+    action: PayloadAction<ControlGroupInput['controlStyle']>
+  ) => {
+    state.controlStyle = action.payload;
+  },
+  setDefaultControlWidth: (
+    state: WritableDraft<ControlGroupInput>,
+    action: PayloadAction<ControlGroupInput['defaultControlWidth']>
+  ) => {
+    state.defaultControlWidth = action.payload;
+  },
+  setAllControlWidths: (
+    state: WritableDraft<ControlGroupInput>,
+    action: PayloadAction<ControlWidth>
+  ) => {
+    Object.keys(state.panels).forEach((panelId) => (state.panels[panelId].width = action.payload));
+  },
+  setControlWidth: (
+    state: WritableDraft<ControlGroupInput>,
+    action: PayloadAction<{ width: ControlWidth; embeddableId: string }>
+  ) => {
+    state.panels[action.payload.embeddableId].width = action.payload.width;
+  },
+  setControlOrders: (
+    state: WritableDraft<ControlGroupInput>,
+    action: PayloadAction<{ ids: string[] }>
+  ) => {
+    action.payload.ids.forEach((id, index) => {
+      state.panels[id].order = index;
+    });
+  },
+};
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/types.ts b/src/plugins/presentation_util/public/components/controls/control_group/types.ts
index fb381610711e5..438eee1c461dd 100644
--- a/src/plugins/presentation_util/public/components/controls/control_group/types.ts
+++ b/src/plugins/presentation_util/public/components/controls/control_group/types.ts
@@ -7,7 +7,8 @@
  */
 
 import { PanelState, EmbeddableInput } from '../../../../../embeddable/public';
-import { ControlStyle, ControlWidth, InputControlInput } from '../types';
+import { InputControlInput } from '../../../services/controls';
+import { ControlStyle, ControlWidth } from '../types';
 
 export interface ControlGroupInput
   extends EmbeddableInput,
@@ -17,6 +18,7 @@ export interface ControlGroupInput
     useQuery: boolean;
     useTimerange: boolean;
   };
+  defaultControlWidth?: ControlWidth;
   controlStyle: ControlStyle;
   panels: ControlsPanels;
 }
diff --git a/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_embeddable.tsx b/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_embeddable.tsx
index 93a7b3e353bdf..97a128c3e84eb 100644
--- a/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_embeddable.tsx
+++ b/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_embeddable.tsx
@@ -16,7 +16,7 @@ import { tap, debounceTime, map, distinctUntilChanged } from 'rxjs/operators';
 import { esFilters } from '../../../../../../data/public';
 import { OptionsListStrings } from './options_list_strings';
 import { Embeddable, IContainer } from '../../../../../../embeddable/public';
-import { InputControlInput, InputControlOutput } from '../../types';
+import { InputControlInput, InputControlOutput } from '../../../../services/controls';
 import { OptionsListComponent, OptionsListComponentState } from './options_list_component';
 
 const toggleAvailableOptions = (
diff --git a/src/plugins/presentation_util/public/components/controls/controls_service.ts b/src/plugins/presentation_util/public/components/controls/controls_service.ts
index 4e01f3cf9ab6a..82242946e4563 100644
--- a/src/plugins/presentation_util/public/components/controls/controls_service.ts
+++ b/src/plugins/presentation_util/public/components/controls/controls_service.ts
@@ -8,12 +8,12 @@
 
 import { EmbeddableFactory } from '../../../../embeddable/public';
 import {
-  ControlTypeRegistry,
   InputControlEmbeddable,
+  ControlTypeRegistry,
   InputControlFactory,
-  InputControlInput,
   InputControlOutput,
-} from './types';
+  InputControlInput,
+} from '../../services/controls';
 
 export class ControlsService {
   private controlsFactoriesMap: ControlTypeRegistry = {};
diff --git a/src/plugins/presentation_util/public/components/controls/hooks/use_child_embeddable.ts b/src/plugins/presentation_util/public/components/controls/hooks/use_child_embeddable.ts
index 82b9aa528bf35..c4f700ec059d9 100644
--- a/src/plugins/presentation_util/public/components/controls/hooks/use_child_embeddable.ts
+++ b/src/plugins/presentation_util/public/components/controls/hooks/use_child_embeddable.ts
@@ -6,14 +6,13 @@
  * Side Public License, v 1.
  */
 import { useEffect, useState } from 'react';
-import { InputControlEmbeddable } from '../types';
-import { IContainer } from '../../../../../embeddable/public';
+import { InputControlEmbeddable } from '../../../services/controls';
 
 export const useChildEmbeddable = ({
-  container,
+  untilEmbeddableLoaded,
   embeddableId,
 }: {
-  container: IContainer;
+  untilEmbeddableLoaded: (embeddableId: string) => Promise<InputControlEmbeddable>;
   embeddableId: string;
 }) => {
   const [embeddable, setEmbeddable] = useState<InputControlEmbeddable>();
@@ -21,14 +20,14 @@ export const useChildEmbeddable = ({
   useEffect(() => {
     let mounted = true;
     (async () => {
-      const newEmbeddable = await container.untilEmbeddableLoaded(embeddableId);
+      const newEmbeddable = await untilEmbeddableLoaded(embeddableId);
       if (!mounted) return;
       setEmbeddable(newEmbeddable);
     })();
     return () => {
       mounted = false;
     };
-  }, [container, embeddableId]);
+  }, [untilEmbeddableLoaded, embeddableId]);
 
   return embeddable;
 };
diff --git a/src/plugins/presentation_util/public/components/controls/types.ts b/src/plugins/presentation_util/public/components/controls/types.ts
index c94e2957e34ea..0704a601640e6 100644
--- a/src/plugins/presentation_util/public/components/controls/types.ts
+++ b/src/plugins/presentation_util/public/components/controls/types.ts
@@ -6,47 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { Filter } from '@kbn/es-query';
-import { Query, TimeRange } from '../../../../data/public';
-import {
-  EmbeddableFactory,
-  EmbeddableInput,
-  EmbeddableOutput,
-  IEmbeddable,
-} from '../../../../embeddable/public';
+import { InputControlInput } from '../../services/controls';
 
 export type ControlWidth = 'auto' | 'small' | 'medium' | 'large';
 export type ControlStyle = 'twoLine' | 'oneLine';
 
-/**
- * Control embeddable types
- */
-export type InputControlFactory = EmbeddableFactory<
-  InputControlInput,
-  InputControlOutput,
-  InputControlEmbeddable
->;
-
-export interface ControlTypeRegistry {
-  [key: string]: InputControlFactory;
-}
-
-export type InputControlInput = EmbeddableInput & {
-  query?: Query;
-  filters?: Filter[];
-  timeRange?: TimeRange;
-  twoLineLayout?: boolean;
-};
-
-export type InputControlOutput = EmbeddableOutput & {
-  filters?: Filter[];
-};
-
-export type InputControlEmbeddable<
-  TInputControlEmbeddableInput extends InputControlInput = InputControlInput,
-  TInputControlEmbeddableOutput extends InputControlOutput = InputControlOutput
-> = IEmbeddable<TInputControlEmbeddableInput, TInputControlEmbeddableOutput>;
-
 /**
  * Control embeddable editor types
  */
diff --git a/src/plugins/presentation_util/public/components/redux_embeddables/generic_embeddable_store.ts b/src/plugins/presentation_util/public/components/redux_embeddables/generic_embeddable_store.ts
new file mode 100644
index 0000000000000..36ba1fcaa49b9
--- /dev/null
+++ b/src/plugins/presentation_util/public/components/redux_embeddables/generic_embeddable_store.ts
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { configureStore, EnhancedStore } from '@reduxjs/toolkit';
+import { combineReducers, Reducer } from 'redux';
+
+export interface InjectReducerProps<StateShape> {
+  key: string;
+  asyncReducer: Reducer<StateShape>;
+}
+
+type ManagedEmbeddableReduxStore = EnhancedStore & {
+  asyncReducers: { [key: string]: Reducer<unknown> };
+  injectReducer: <StateShape>(props: InjectReducerProps<StateShape>) => void;
+};
+const embeddablesStore = configureStore({ reducer: {} as { [key: string]: Reducer } });
+
+const managedEmbeddablesStore = embeddablesStore as ManagedEmbeddableReduxStore;
+managedEmbeddablesStore.asyncReducers = {};
+
+managedEmbeddablesStore.injectReducer = <StateShape>({
+  key,
+  asyncReducer,
+}: InjectReducerProps<StateShape>) => {
+  managedEmbeddablesStore.asyncReducers[key] = asyncReducer as Reducer<unknown>;
+  managedEmbeddablesStore.replaceReducer(
+    combineReducers({ ...managedEmbeddablesStore.asyncReducers })
+  );
+};
+
+/**
+ * A managed Redux store which can be used with multiple embeddables at once. When a new embeddable is created at runtime,
+ * all passed in reducers will be made into a slice, then combined into the store using combineReducers.
+ */
+export const getManagedEmbeddablesStore = () => managedEmbeddablesStore;
diff --git a/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_context.ts b/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_context.ts
new file mode 100644
index 0000000000000..159230e4de024
--- /dev/null
+++ b/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_context.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 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 { createContext, useContext } from 'react';
+
+import {
+  GenericEmbeddableReducers,
+  ReduxContainerContextServices,
+  ReduxEmbeddableContextServices,
+} from './types';
+import { ContainerInput, EmbeddableInput } from '../../../../embeddable/public';
+
+/**
+ * When creating the context, a generic EmbeddableInput as placeholder is used. This will later be cast to
+ * the generic type passed in by the useReduxEmbeddableContext or useReduxContainerContext hooks
+ **/
+export const ReduxEmbeddableContext = createContext<
+  | ReduxEmbeddableContextServices<EmbeddableInput>
+  | ReduxContainerContextServices<EmbeddableInput>
+  | null
+>(null);
+
+/**
+ * A typed use context hook for embeddables that are not containers. it @returns an
+ * ReduxEmbeddableContextServices object typed to the generic inputTypes and ReducerTypes you pass in.
+ * Note that the reducer type is optional, but will be required to correctly infer the keys and payload
+ * types of your reducers. use `typeof MyReducers` here to retain them.
+ */
+export const useReduxEmbeddableContext = <
+  InputType extends EmbeddableInput = EmbeddableInput,
+  ReducerType extends GenericEmbeddableReducers<InputType> = GenericEmbeddableReducers<InputType>
+>(): ReduxEmbeddableContextServices<InputType, ReducerType> => {
+  const context = useContext<ReduxEmbeddableContextServices<InputType, ReducerType>>(
+    ReduxEmbeddableContext as unknown as React.Context<
+      ReduxEmbeddableContextServices<InputType, ReducerType>
+    >
+  );
+  if (context == null) {
+    throw new Error(
+      'useReduxEmbeddableContext must be used inside the useReduxEmbeddableContextProvider.'
+    );
+  }
+
+  return context!;
+};
+
+/**
+ * A typed use context hook for embeddable containers. it @returns an
+ * ReduxContainerContextServices object typed to the generic inputTypes and ReducerTypes you pass in.
+ * Note that the reducer type is optional, but will be required to correctly infer the keys and payload
+ * types of your reducers. use `typeof MyReducers` here to retain them. It also includes a containerActions
+ * key which contains most of the commonly used container operations
+ */
+export const useReduxContainerContext = <
+  InputType extends ContainerInput = ContainerInput,
+  ReducerType extends GenericEmbeddableReducers<InputType> = GenericEmbeddableReducers<InputType>
+>(): ReduxContainerContextServices<InputType, ReducerType> => {
+  const context = useContext<ReduxContainerContextServices<InputType, ReducerType>>(
+    ReduxEmbeddableContext as unknown as React.Context<
+      ReduxContainerContextServices<InputType, ReducerType>
+    >
+  );
+  if (context == null) {
+    throw new Error(
+      'useReduxEmbeddableContext must be used inside the useReduxEmbeddableContextProvider.'
+    );
+  }
+  return context!;
+};
diff --git a/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_wrapper.tsx b/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_wrapper.tsx
new file mode 100644
index 0000000000000..a4912b5b5f2fc
--- /dev/null
+++ b/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_wrapper.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 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, { PropsWithChildren, useEffect, useMemo, useRef } from 'react';
+import { Provider, TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
+import { Draft } from 'immer/dist/types/types-external';
+import { isEqual } from 'lodash';
+import { SliceCaseReducers, PayloadAction, createSlice } from '@reduxjs/toolkit';
+
+import {
+  IEmbeddable,
+  EmbeddableInput,
+  EmbeddableOutput,
+  IContainer,
+} from '../../../../embeddable/public';
+import { getManagedEmbeddablesStore } from './generic_embeddable_store';
+import {
+  ReduxContainerContextServices,
+  ReduxEmbeddableContextServices,
+  ReduxEmbeddableWrapperProps,
+} from './types';
+import { ReduxEmbeddableContext, useReduxEmbeddableContext } from './redux_embeddable_context';
+
+const getDefaultProps = <InputType extends EmbeddableInput = EmbeddableInput>(): Required<
+  Pick<ReduxEmbeddableWrapperProps<InputType>, 'diffInput'>
+> => ({
+  diffInput: (a, b) => {
+    const differences: Partial<InputType> = {};
+    const allKeys = [...Object.keys(a), ...Object.keys(b)] as Array<keyof InputType>;
+    allKeys.forEach((key) => {
+      if (!isEqual(a[key], b[key])) differences[key] = a[key];
+    });
+    return differences;
+  },
+});
+
+const embeddableIsContainer = (
+  embeddable: IEmbeddable<EmbeddableInput, EmbeddableOutput>
+): embeddable is IContainer => embeddable.isContainer;
+
+/**
+ * Place this wrapper around the react component when rendering an embeddable to automatically set up
+ * redux for use with the embeddable via the supplied reducers. Any child components can then use ReduxEmbeddableContext
+ * or ReduxContainerContext to interface with the state of the embeddable.
+ */
+export const ReduxEmbeddableWrapper = <InputType extends EmbeddableInput = EmbeddableInput>(
+  props: PropsWithChildren<ReduxEmbeddableWrapperProps<InputType>>
+) => {
+  const { embeddable, reducers, diffInput } = useMemo(
+    () => ({ ...getDefaultProps<InputType>(), ...props }),
+    [props]
+  );
+
+  const containerActions: ReduxContainerContextServices['containerActions'] | undefined =
+    useMemo(() => {
+      if (embeddableIsContainer(embeddable)) {
+        return {
+          untilEmbeddableLoaded: embeddable.untilEmbeddableLoaded.bind(embeddable),
+          updateInputForChild: embeddable.updateInputForChild.bind(embeddable),
+          removeEmbeddable: embeddable.removeEmbeddable.bind(embeddable),
+          addNewEmbeddable: embeddable.addNewEmbeddable.bind(embeddable),
+        };
+      }
+      return;
+    }, [embeddable]);
+
+  const reduxEmbeddableContext: ReduxEmbeddableContextServices | ReduxContainerContextServices =
+    useMemo(() => {
+      const key = `${embeddable.type}_${embeddable.id}`;
+
+      // A generic reducer used to update redux state when the embeddable input changes
+      const updateEmbeddableReduxState = (
+        state: Draft<InputType>,
+        action: PayloadAction<Partial<InputType>>
+      ) => {
+        return { ...state, ...action.payload };
+      };
+
+      const slice = createSlice<InputType, SliceCaseReducers<InputType>>({
+        initialState: embeddable.getInput(),
+        name: key,
+        reducers: { ...reducers, updateEmbeddableReduxState },
+      });
+      const store = getManagedEmbeddablesStore();
+
+      store.injectReducer({
+        key,
+        asyncReducer: slice.reducer,
+      });
+
+      const useEmbeddableSelector: TypedUseSelectorHook<InputType> = () =>
+        useSelector((state: ReturnType<typeof store.getState>) => state[key]);
+
+      return {
+        useEmbeddableDispatch: () => useDispatch<typeof store.dispatch>(),
+        useEmbeddableSelector,
+        actions: slice.actions as ReduxEmbeddableContextServices['actions'],
+        containerActions,
+      };
+    }, [reducers, embeddable, containerActions]);
+
+  return (
+    <Provider store={getManagedEmbeddablesStore()}>
+      <ReduxEmbeddableContext.Provider value={reduxEmbeddableContext}>
+        <ReduxEmbeddableSync diffInput={diffInput} embeddable={embeddable}>
+          {props.children}
+        </ReduxEmbeddableSync>
+      </ReduxEmbeddableContext.Provider>
+    </Provider>
+  );
+};
+
+interface ReduxEmbeddableSyncProps<InputType extends EmbeddableInput = EmbeddableInput> {
+  diffInput: (a: InputType, b: InputType) => Partial<InputType>;
+  embeddable: IEmbeddable<InputType, EmbeddableOutput>;
+}
+
+/**
+ * This component uses the context from the embeddable wrapper to set up a generic two-way binding between the embeddable input and
+ * the redux store. a custom diffInput function can be provided, this function should always prioritize input A over input B.
+ */
+const ReduxEmbeddableSync = <InputType extends EmbeddableInput = EmbeddableInput>({
+  embeddable,
+  diffInput,
+  children,
+}: PropsWithChildren<ReduxEmbeddableSyncProps<InputType>>) => {
+  const {
+    useEmbeddableSelector,
+    useEmbeddableDispatch,
+    actions: { updateEmbeddableReduxState },
+  } = useReduxEmbeddableContext<InputType>();
+
+  const dispatch = useEmbeddableDispatch();
+  const currentState = useEmbeddableSelector((state) => state);
+  const stateRef = useRef(currentState);
+
+  // When Embeddable Input changes, push differences to redux.
+  useEffect(() => {
+    embeddable.getInput$().subscribe(() => {
+      const differences = diffInput(embeddable.getInput(), stateRef.current);
+      if (differences && Object.keys(differences).length > 0) {
+        dispatch(updateEmbeddableReduxState(differences));
+      }
+    });
+  }, [diffInput, dispatch, embeddable, updateEmbeddableReduxState]);
+
+  // When redux state changes, push differences to Embeddable Input.
+  useEffect(() => {
+    stateRef.current = currentState;
+    const differences = diffInput(currentState, embeddable.getInput());
+    if (differences && Object.keys(differences).length > 0) {
+      embeddable.updateInput(differences);
+    }
+  }, [currentState, diffInput, embeddable]);
+
+  return <>{children}</>;
+};
diff --git a/src/plugins/presentation_util/public/components/redux_embeddables/types.ts b/src/plugins/presentation_util/public/components/redux_embeddables/types.ts
new file mode 100644
index 0000000000000..118b5d340528e
--- /dev/null
+++ b/src/plugins/presentation_util/public/components/redux_embeddables/types.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 {
+  ActionCreatorWithPayload,
+  AnyAction,
+  CaseReducer,
+  Dispatch,
+  PayloadAction,
+} from '@reduxjs/toolkit';
+import { TypedUseSelectorHook } from 'react-redux';
+import {
+  EmbeddableInput,
+  EmbeddableOutput,
+  IContainer,
+  IEmbeddable,
+} from '../../../../embeddable/public';
+
+export interface GenericEmbeddableReducers<InputType> {
+  /**
+   * PayloadAction of type any is strategic here because we want to allow payloads of any shape in generic reducers.
+   * This type will be overridden to remove any and be type safe when returned by ReduxEmbeddableContextServices.
+   */
+  [key: string]: CaseReducer<InputType, PayloadAction<any>>;
+}
+
+export interface ReduxEmbeddableWrapperProps<InputType extends EmbeddableInput = EmbeddableInput> {
+  embeddable: IEmbeddable<InputType, EmbeddableOutput>;
+  reducers: GenericEmbeddableReducers<InputType>;
+  diffInput?: (a: InputType, b: InputType) => Partial<InputType>;
+}
+
+/**
+ * This context allows components underneath the redux embeddable wrapper to get access to the actions, selector, dispatch, and containerActions.
+ */
+export interface ReduxEmbeddableContextServices<
+  InputType extends EmbeddableInput = EmbeddableInput,
+  ReducerType extends GenericEmbeddableReducers<InputType> = GenericEmbeddableReducers<InputType>
+> {
+  actions: {
+    [Property in keyof ReducerType]: ActionCreatorWithPayload<
+      Parameters<ReducerType[Property]>[1]['payload']
+    >;
+  } & { updateEmbeddableReduxState: ActionCreatorWithPayload<Partial<InputType>> };
+  useEmbeddableSelector: TypedUseSelectorHook<InputType>;
+  useEmbeddableDispatch: () => Dispatch<AnyAction>;
+}
+
+export type ReduxContainerContextServices<
+  InputType extends EmbeddableInput = EmbeddableInput,
+  ReducerType extends GenericEmbeddableReducers<InputType> = GenericEmbeddableReducers<InputType>
+> = ReduxEmbeddableContextServices<InputType, ReducerType> & {
+  containerActions: Pick<
+    IContainer,
+    'untilEmbeddableLoaded' | 'removeEmbeddable' | 'addNewEmbeddable' | 'updateInputForChild'
+  >;
+};
diff --git a/src/plugins/presentation_util/public/mocks.ts b/src/plugins/presentation_util/public/mocks.ts
index 91c461646c280..ddb02ce464e22 100644
--- a/src/plugins/presentation_util/public/mocks.ts
+++ b/src/plugins/presentation_util/public/mocks.ts
@@ -17,6 +17,7 @@ const createStartContract = (coreStart: CoreStart): PresentationUtilPluginStart
   const startContract: PresentationUtilPluginStart = {
     ContextProvider: pluginServices.getContextProvider(),
     labsService: pluginServices.getServices().labs,
+    controlsService: pluginServices.getServices().controls,
   };
   return startContract;
 };
diff --git a/src/plugins/presentation_util/public/plugin.ts b/src/plugins/presentation_util/public/plugin.ts
index f34bd2f1f8afe..f697f1a29eb82 100644
--- a/src/plugins/presentation_util/public/plugin.ts
+++ b/src/plugins/presentation_util/public/plugin.ts
@@ -39,6 +39,7 @@ export class PresentationUtilPlugin
     pluginServices.setRegistry(registry.start({ coreStart, startPlugins }));
     return {
       ContextProvider: pluginServices.getContextProvider(),
+      controlsService: pluginServices.getServices().controls,
       labsService: pluginServices.getServices().labs,
     };
   }
diff --git a/src/plugins/presentation_util/public/services/controls.ts b/src/plugins/presentation_util/public/services/controls.ts
new file mode 100644
index 0000000000000..197e986381b10
--- /dev/null
+++ b/src/plugins/presentation_util/public/services/controls.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 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 { Filter } from '@kbn/es-query';
+import { Query, TimeRange } from '../../../data/public';
+import {
+  EmbeddableFactory,
+  EmbeddableInput,
+  EmbeddableOutput,
+  IEmbeddable,
+} from '../../../embeddable/public';
+
+/**
+ * Control embeddable types
+ */
+export type InputControlFactory = EmbeddableFactory<
+  InputControlInput,
+  InputControlOutput,
+  InputControlEmbeddable
+>;
+
+export type InputControlInput = EmbeddableInput & {
+  query?: Query;
+  filters?: Filter[];
+  timeRange?: TimeRange;
+  twoLineLayout?: boolean;
+};
+
+export type InputControlOutput = EmbeddableOutput & {
+  filters?: Filter[];
+};
+
+export type InputControlEmbeddable<
+  TInputControlEmbeddableInput extends InputControlInput = InputControlInput,
+  TInputControlEmbeddableOutput extends InputControlOutput = InputControlOutput
+> = IEmbeddable<TInputControlEmbeddableInput, TInputControlEmbeddableOutput>;
+
+export interface ControlTypeRegistry {
+  [key: string]: InputControlFactory;
+}
+
+export interface PresentationControlsService {
+  registerInputControlType: (factory: InputControlFactory) => void;
+
+  getControlFactory: <
+    I extends InputControlInput = InputControlInput,
+    O extends InputControlOutput = InputControlOutput,
+    E extends InputControlEmbeddable<I, O> = InputControlEmbeddable<I, O>
+  >(
+    type: string
+  ) => EmbeddableFactory<I, O, E>;
+
+  getInputControlTypes: () => string[];
+}
+
+export const getCommonControlsService = () => {
+  const controlsFactoriesMap: ControlTypeRegistry = {};
+
+  const registerInputControlType = (factory: InputControlFactory) => {
+    controlsFactoriesMap[factory.type] = factory;
+  };
+
+  const getControlFactory = <
+    I extends InputControlInput = InputControlInput,
+    O extends InputControlOutput = InputControlOutput,
+    E extends InputControlEmbeddable<I, O> = InputControlEmbeddable<I, O>
+  >(
+    type: string
+  ) => {
+    return controlsFactoriesMap[type] as EmbeddableFactory<I, O, E>;
+  };
+
+  const getInputControlTypes = () => Object.keys(controlsFactoriesMap);
+
+  return {
+    registerInputControlType,
+    getControlFactory,
+    getInputControlTypes,
+  };
+};
diff --git a/src/plugins/presentation_util/public/services/index.ts b/src/plugins/presentation_util/public/services/index.ts
index c622ad82bb888..21012971ca86d 100644
--- a/src/plugins/presentation_util/public/services/index.ts
+++ b/src/plugins/presentation_util/public/services/index.ts
@@ -13,6 +13,7 @@ import { PresentationDashboardsService } from './dashboards';
 import { PresentationLabsService } from './labs';
 import { registry as stubRegistry } from './stub';
 import { PresentationOverlaysService } from './overlays';
+import { PresentationControlsService } from './controls';
 
 export { PresentationCapabilitiesService } from './capabilities';
 export { PresentationDashboardsService } from './dashboards';
@@ -21,6 +22,7 @@ export interface PresentationUtilServices {
   dashboards: PresentationDashboardsService;
   capabilities: PresentationCapabilitiesService;
   overlays: PresentationOverlaysService;
+  controls: PresentationControlsService;
   labs: PresentationLabsService;
 }
 
@@ -31,5 +33,6 @@ export const getStubPluginServices = (): PresentationUtilPluginStart => {
   return {
     ContextProvider: pluginServices.getContextProvider(),
     labsService: pluginServices.getServices().labs,
+    controlsService: pluginServices.getServices().controls,
   };
 };
diff --git a/src/plugins/presentation_util/public/components/controls/index.ts b/src/plugins/presentation_util/public/services/kibana/controls.ts
similarity index 54%
rename from src/plugins/presentation_util/public/components/controls/index.ts
rename to src/plugins/presentation_util/public/services/kibana/controls.ts
index 5c2d5b68ae2e0..e5dc84a3dd645 100644
--- a/src/plugins/presentation_util/public/components/controls/index.ts
+++ b/src/plugins/presentation_util/public/services/kibana/controls.ts
@@ -5,3 +5,9 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+
+import { PluginServiceFactory } from '../create';
+import { getCommonControlsService, PresentationControlsService } from '../controls';
+
+export type ControlsServiceFactory = PluginServiceFactory<PresentationControlsService>;
+export const controlsServiceFactory = () => getCommonControlsService();
diff --git a/src/plugins/presentation_util/public/services/kibana/index.ts b/src/plugins/presentation_util/public/services/kibana/index.ts
index 8a9a28606f24b..48c921bff1efd 100644
--- a/src/plugins/presentation_util/public/services/kibana/index.ts
+++ b/src/plugins/presentation_util/public/services/kibana/index.ts
@@ -18,6 +18,7 @@ import {
 } from '../create';
 import { PresentationUtilPluginStartDeps } from '../../types';
 import { PresentationUtilServices } from '..';
+import { controlsServiceFactory } from './controls';
 
 export { capabilitiesServiceFactory } from './capabilities';
 export { dashboardsServiceFactory } from './dashboards';
@@ -32,6 +33,7 @@ export const providers: PluginServiceProviders<
   labs: new PluginServiceProvider(labsServiceFactory),
   dashboards: new PluginServiceProvider(dashboardsServiceFactory),
   overlays: new PluginServiceProvider(overlaysServiceFactory),
+  controls: new PluginServiceProvider(controlsServiceFactory),
 };
 
 export const registry = new PluginServiceRegistry<
diff --git a/src/plugins/presentation_util/public/services/storybook/controls.ts b/src/plugins/presentation_util/public/services/storybook/controls.ts
new file mode 100644
index 0000000000000..e5dc84a3dd645
--- /dev/null
+++ b/src/plugins/presentation_util/public/services/storybook/controls.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { PluginServiceFactory } from '../create';
+import { getCommonControlsService, PresentationControlsService } from '../controls';
+
+export type ControlsServiceFactory = PluginServiceFactory<PresentationControlsService>;
+export const controlsServiceFactory = () => getCommonControlsService();
diff --git a/src/plugins/presentation_util/public/services/storybook/index.ts b/src/plugins/presentation_util/public/services/storybook/index.ts
index 1ce1eb72848c9..9de4934d51300 100644
--- a/src/plugins/presentation_util/public/services/storybook/index.ts
+++ b/src/plugins/presentation_util/public/services/storybook/index.ts
@@ -6,12 +6,18 @@
  * Side Public License, v 1.
  */
 
-import { PluginServices, PluginServiceProviders, PluginServiceProvider } from '../create';
+import {
+  PluginServices,
+  PluginServiceProviders,
+  PluginServiceProvider,
+  PluginServiceRegistry,
+} from '../create';
 import { dashboardsServiceFactory } from '../stub/dashboards';
 import { labsServiceFactory } from './labs';
 import { capabilitiesServiceFactory } from './capabilities';
 import { PresentationUtilServices } from '..';
 import { overlaysServiceFactory } from './overlays';
+import { controlsServiceFactory } from './controls';
 
 export { PluginServiceProviders, PluginServiceProvider, PluginServiceRegistry } from '../create';
 export { PresentationUtilServices } from '..';
@@ -27,7 +33,10 @@ export const providers: PluginServiceProviders<PresentationUtilServices, Storybo
   capabilities: new PluginServiceProvider(capabilitiesServiceFactory),
   dashboards: new PluginServiceProvider(dashboardsServiceFactory),
   overlays: new PluginServiceProvider(overlaysServiceFactory),
+  controls: new PluginServiceProvider(controlsServiceFactory),
   labs: new PluginServiceProvider(labsServiceFactory),
 };
 
 export const pluginServices = new PluginServices<PresentationUtilServices>();
+
+export const registry = new PluginServiceRegistry<PresentationUtilServices>(providers);
diff --git a/src/plugins/presentation_util/public/services/stub/controls.ts b/src/plugins/presentation_util/public/services/stub/controls.ts
new file mode 100644
index 0000000000000..e5dc84a3dd645
--- /dev/null
+++ b/src/plugins/presentation_util/public/services/stub/controls.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { PluginServiceFactory } from '../create';
+import { getCommonControlsService, PresentationControlsService } from '../controls';
+
+export type ControlsServiceFactory = PluginServiceFactory<PresentationControlsService>;
+export const controlsServiceFactory = () => getCommonControlsService();
diff --git a/src/plugins/presentation_util/public/services/stub/index.ts b/src/plugins/presentation_util/public/services/stub/index.ts
index 61dca47427531..35aabdb465b14 100644
--- a/src/plugins/presentation_util/public/services/stub/index.ts
+++ b/src/plugins/presentation_util/public/services/stub/index.ts
@@ -12,7 +12,7 @@ import { labsServiceFactory } from './labs';
 import { PluginServiceProviders, PluginServiceProvider, PluginServiceRegistry } from '../create';
 import { PresentationUtilServices } from '..';
 import { overlaysServiceFactory } from './overlays';
-
+import { controlsServiceFactory } from './controls';
 export { dashboardsServiceFactory } from './dashboards';
 export { capabilitiesServiceFactory } from './capabilities';
 
@@ -20,6 +20,7 @@ export const providers: PluginServiceProviders<PresentationUtilServices> = {
   dashboards: new PluginServiceProvider(dashboardsServiceFactory),
   capabilities: new PluginServiceProvider(capabilitiesServiceFactory),
   overlays: new PluginServiceProvider(overlaysServiceFactory),
+  controls: new PluginServiceProvider(controlsServiceFactory),
   labs: new PluginServiceProvider(labsServiceFactory),
 };
 
diff --git a/src/plugins/presentation_util/public/types.ts b/src/plugins/presentation_util/public/types.ts
index 05779ffb206c4..3903d1bc2786e 100644
--- a/src/plugins/presentation_util/public/types.ts
+++ b/src/plugins/presentation_util/public/types.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { PresentationControlsService } from './services/controls';
 import { PresentationLabsService } from './services/labs';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
@@ -14,6 +15,7 @@ export interface PresentationUtilPluginSetup {}
 export interface PresentationUtilPluginStart {
   ContextProvider: React.FC;
   labsService: PresentationLabsService;
+  controlsService: PresentationControlsService;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface

From 461f9f65ccb5e3e9444d2ce69013fd9856f49b30 Mon Sep 17 00:00:00 2001
From: Devon Thomson <devon.thomson@hotmail.com>
Date: Wed, 13 Oct 2021 21:12:21 -0400
Subject: [PATCH 052/117] fix package.json: (#114936)

---
 package.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package.json b/package.json
index 6e4a37863bc82..f526f357ff347 100644
--- a/package.json
+++ b/package.json
@@ -91,9 +91,6 @@
     "yarn": "^1.21.1"
   },
   "dependencies": {
-    "@dnd-kit/core": "^3.1.1",
-    "@dnd-kit/sortable": "^4.0.0",
-    "@dnd-kit/utilities": "^2.0.0",
     "@babel/runtime": "^7.15.4",
     "@dnd-kit/core": "^3.1.1",
     "@dnd-kit/sortable": "^4.0.0",

From 5647de3b4a32815a5c8c4df1a35072bb3d1db7db Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 13 Oct 2021 18:18:06 -0700
Subject: [PATCH 053/117] [ci] Fixes Bazel cache writes (#114915)

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 .../scripts/common/persist_bazel_cache.sh     | 14 +++++++++++
 .buildkite/scripts/common/setup_bazel.sh      | 24 -------------------
 .../steps/on_merge_build_and_metrics.sh       |  2 +-
 src/dev/ci_setup/.bazelrc-ci                  | 13 +++++-----
 src/dev/ci_setup/.bazelrc-ci.common           | 11 ---------
 5 files changed, 21 insertions(+), 43 deletions(-)
 create mode 100755 .buildkite/scripts/common/persist_bazel_cache.sh
 delete mode 100755 .buildkite/scripts/common/setup_bazel.sh
 delete mode 100644 src/dev/ci_setup/.bazelrc-ci.common

diff --git a/.buildkite/scripts/common/persist_bazel_cache.sh b/.buildkite/scripts/common/persist_bazel_cache.sh
new file mode 100755
index 0000000000000..597ab0947c267
--- /dev/null
+++ b/.buildkite/scripts/common/persist_bazel_cache.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+source .buildkite/scripts/common/util.sh
+
+KIBANA_BUILDBUDDY_CI_API_KEY=$(retry 5 5 vault read -field=value secret/kibana-issues/dev/kibana-buildbuddy-ci-api-key)
+export KIBANA_BUILDBUDDY_CI_API_KEY
+
+cp "$KIBANA_DIR/src/dev/ci_setup/.bazelrc-ci" "$KIBANA_DIR/.bazelrc"
+
+###
+### append auth token to buildbuddy into "$HOME/.bazelrc";
+###
+echo "# Appended by .buildkite/scripts/persist_bazel_cache.sh" >> "$KIBANA_DIR/.bazelrc"
+echo "build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY" >> "$KIBANA_DIR/.bazelrc"
diff --git a/.buildkite/scripts/common/setup_bazel.sh b/.buildkite/scripts/common/setup_bazel.sh
deleted file mode 100755
index bbd1c58497172..0000000000000
--- a/.buildkite/scripts/common/setup_bazel.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-source .buildkite/scripts/common/util.sh
-
-KIBANA_BUILDBUDDY_CI_API_KEY=$(retry 5 5 vault read -field=value secret/kibana-issues/dev/kibana-buildbuddy-ci-api-key)
-export KIBANA_BUILDBUDDY_CI_API_KEY
-
-cp "$KIBANA_DIR/src/dev/ci_setup/.bazelrc-ci" "$HOME/.bazelrc"
-
-###
-### append auth token to buildbuddy into "$HOME/.bazelrc";
-###
-echo "# Appended by .buildkite/scripts/setup_bazel.sh" >> "$HOME/.bazelrc"
-echo "build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY" >> "$HOME/.bazelrc"
-
-###
-### remove write permissions on buildbuddy remote cache for prs
-###
-if [[ "${BUILDKITE_PULL_REQUEST:-}" && "$BUILDKITE_PULL_REQUEST" != "false" ]] ; then
-  {
-    echo "# Uploads logs & artifacts without writing to cache"
-    echo "build --noremote_upload_local_results"
-  } >> "$HOME/.bazelrc"
-fi
diff --git a/.buildkite/scripts/steps/on_merge_build_and_metrics.sh b/.buildkite/scripts/steps/on_merge_build_and_metrics.sh
index b24e585e70735..315ba08f8719b 100755
--- a/.buildkite/scripts/steps/on_merge_build_and_metrics.sh
+++ b/.buildkite/scripts/steps/on_merge_build_and_metrics.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 # Write Bazel cache for Linux
-.buildkite/scripts/common/setup_bazel.sh
+.buildkite/scripts/common/persist_bazel_cache.sh
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/build_kibana.sh
diff --git a/src/dev/ci_setup/.bazelrc-ci b/src/dev/ci_setup/.bazelrc-ci
index ef6fab3a30590..9aee657f37bcb 100644
--- a/src/dev/ci_setup/.bazelrc-ci
+++ b/src/dev/ci_setup/.bazelrc-ci
@@ -1,16 +1,15 @@
-# Inspired on https://github.com/angular/angular/blob/master/.circleci/bazel.linux.rc
-# These options are only enabled when running on CI
-# That is done by copying this file into "$HOME/.bazelrc" which loads after the .bazelrc into the workspace
+# Used in the on-merge job to persist the Bazel cache to BuildBuddy
+# from: .buildkite/scripts/common/persist_bazel_cache.sh
 
-# Import and load bazelrc common settings for ci env
-try-import %workspace%/src/dev/ci_setup/.bazelrc-ci.common
+import %workspace%/.bazelrc.common
 
 # BuildBuddy settings
-## Remote settings including cache
 build --bes_results_url=https://app.buildbuddy.io/invocation/
 build --bes_backend=grpcs://cloud.buildbuddy.io
 build --remote_cache=grpcs://cloud.buildbuddy.io
 build --remote_timeout=3600
+# --remote_header=x-buildbuddy-api-key= # appended in CI script
 
-## Metadata settings
+# Metadata settings
 build --build_metadata=ROLE=CI
+build --workspace_status_command="node ./src/dev/bazel_workspace_status.js"
diff --git a/src/dev/ci_setup/.bazelrc-ci.common b/src/dev/ci_setup/.bazelrc-ci.common
deleted file mode 100644
index 56a5ee8d30cd6..0000000000000
--- a/src/dev/ci_setup/.bazelrc-ci.common
+++ /dev/null
@@ -1,11 +0,0 @@
-# Inspired on https://github.com/angular/angular/blob/master/.circleci/bazel.common.rc
-# Settings in this file should be OS agnostic
-
-# Don't be spammy in the logs
-build --noshow_progress
-
-# More details on failures
-build --verbose_failures=true
-
-## Avoid to keep connections to build event backend connections alive across builds
-build --keep_backend_build_event_connections_alive=false

From 423b0e801fb29dcf02f6588fa8f888b9aebe2f15 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Thu, 14 Oct 2021 03:35:17 +0100
Subject: [PATCH 054/117] chore(NA): fixes a typo on persist_bazel_cache.sh
 comment (#114943)

---
 .buildkite/scripts/common/persist_bazel_cache.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.buildkite/scripts/common/persist_bazel_cache.sh b/.buildkite/scripts/common/persist_bazel_cache.sh
index 597ab0947c267..357805c11acec 100755
--- a/.buildkite/scripts/common/persist_bazel_cache.sh
+++ b/.buildkite/scripts/common/persist_bazel_cache.sh
@@ -5,10 +5,11 @@ source .buildkite/scripts/common/util.sh
 KIBANA_BUILDBUDDY_CI_API_KEY=$(retry 5 5 vault read -field=value secret/kibana-issues/dev/kibana-buildbuddy-ci-api-key)
 export KIBANA_BUILDBUDDY_CI_API_KEY
 
+# overwrites the file checkout .bazelrc file with the one intended for CI env
 cp "$KIBANA_DIR/src/dev/ci_setup/.bazelrc-ci" "$KIBANA_DIR/.bazelrc"
 
 ###
-### append auth token to buildbuddy into "$HOME/.bazelrc";
+### append auth token to buildbuddy into "$KIBANA_DIR/.bazelrc";
 ###
 echo "# Appended by .buildkite/scripts/persist_bazel_cache.sh" >> "$KIBANA_DIR/.bazelrc"
 echo "build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY" >> "$KIBANA_DIR/.bazelrc"

From 86f0733e5642a10b77025f36199d895282c1e601 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Wed, 13 Oct 2021 19:49:16 -0700
Subject: [PATCH 055/117] Clean up inaccurate comments (#114935)

---
 .../create_package_policy_page/step_configure_package.tsx        | 1 -
 x-pack/plugins/fleet/server/services/epm/packages/get.ts         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_configure_package.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_configure_package.tsx
index 1ff5d20baec06..390e540f1b10f 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_configure_package.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_configure_package.tsx
@@ -49,7 +49,6 @@ export const StepConfigurePackagePolicy: React.FunctionComponent<{
   );
 
   // Configure inputs (and their streams)
-  // Assume packages only export one config template for now
   const renderConfigureInputs = () =>
     packagePolicyTemplates.length ? (
       <>
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get.ts b/x-pack/plugins/fleet/server/services/epm/packages/get.ts
index cf847cdf62bc2..8d3c1fbe0daa4 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/get.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/get.ts
@@ -69,7 +69,6 @@ export async function getPackages(
 }
 
 // Get package names for packages which cannot have more than one package policy on an agent policy
-// Assume packages only export one policy template for now
 export async function getLimitedPackages(options: {
   savedObjectsClient: SavedObjectsClientContract;
 }): Promise<string[]> {

From 69a6cf329ce8be83b48a102e28983b7d0ca11ab8 Mon Sep 17 00:00:00 2001
From: Yara Tercero <yctercero@users.noreply.github.com>
Date: Wed, 13 Oct 2021 20:32:43 -0700
Subject: [PATCH 056/117] Fixing exceptions export format (#114920)

### Summary

Fixing exceptions export format and adding integration tests for it.
---
 .../src/api/index.ts                          |   2 +-
 .../kbn-securitysolution-utils/src/index.ts   |   1 +
 .../transform_data_to_ndjson/index.test.ts    |  88 ++++++++++
 .../src/transform_data_to_ndjson/index.ts     |  16 ++
 .../lists/public/exceptions/api.test.ts       |   2 +-
 .../routes/export_exception_list_route.ts     |  42 +++--
 .../downloads/test_exception_list.ndjson      |   2 +
 .../exceptions/exceptions_table.spec.ts       |   2 +-
 .../cypress/objects/exception.ts              |   3 +-
 .../detection_engine/rules/get_export_all.ts  |   3 +-
 .../rules/get_export_by_object_ids.ts         |   2 +-
 .../server/lib/telemetry/sender.ts            |   3 +-
 .../timelines/export_timelines/helpers.ts     |   3 +-
 .../create_stream_from_ndjson.test.ts         |  71 --------
 .../read_stream/create_stream_from_ndjson.ts  |   9 -
 .../tests/export_exception_list.ts            | 155 ++++++++++++++++++
 .../security_and_spaces/tests/index.ts        |   1 +
 17 files changed, 292 insertions(+), 113 deletions(-)
 create mode 100644 packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.test.ts
 create mode 100644 packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.ts
 create mode 100644 x-pack/plugins/security_solution/cypress/downloads/test_exception_list.ndjson
 delete mode 100644 x-pack/plugins/security_solution/server/utils/read_stream/create_stream_from_ndjson.test.ts
 create mode 100644 x-pack/test/lists_api_integration/security_and_spaces/tests/export_exception_list.ts

diff --git a/packages/kbn-securitysolution-list-api/src/api/index.ts b/packages/kbn-securitysolution-list-api/src/api/index.ts
index d70417a29971f..77c50fb32c299 100644
--- a/packages/kbn-securitysolution-list-api/src/api/index.ts
+++ b/packages/kbn-securitysolution-list-api/src/api/index.ts
@@ -558,7 +558,7 @@ export const exportExceptionList = async ({
   signal,
 }: ExportExceptionListProps): Promise<Blob> =>
   http.fetch<Blob>(`${EXCEPTION_LIST_URL}/_export`, {
-    method: 'GET',
+    method: 'POST',
     query: { id, list_id: listId, namespace_type: namespaceType },
     signal,
   });
diff --git a/packages/kbn-securitysolution-utils/src/index.ts b/packages/kbn-securitysolution-utils/src/index.ts
index 0bb36c590ffdf..755bbd2203dff 100644
--- a/packages/kbn-securitysolution-utils/src/index.ts
+++ b/packages/kbn-securitysolution-utils/src/index.ts
@@ -7,3 +7,4 @@
  */
 
 export * from './add_remove_id_to_item';
+export * from './transform_data_to_ndjson';
diff --git a/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.test.ts b/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.test.ts
new file mode 100644
index 0000000000000..b10626357f5b1
--- /dev/null
+++ b/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.test.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 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 { transformDataToNdjson } from './';
+
+export const ANCHOR_DATE = '2020-02-20T03:57:54.037Z';
+
+const getRulesSchemaMock = (anchorDate: string = ANCHOR_DATE) => ({
+  author: [],
+  id: '7a7065d7-6e8b-4aae-8d20-c93613dec9f9',
+  created_at: new Date(anchorDate).toISOString(),
+  updated_at: new Date(anchorDate).toISOString(),
+  created_by: 'elastic',
+  description: 'some description',
+  enabled: true,
+  false_positives: ['false positive 1', 'false positive 2'],
+  from: 'now-6m',
+  immutable: false,
+  name: 'Query with a rule id',
+  query: 'user.name: root or user.name: admin',
+  references: ['test 1', 'test 2'],
+  severity: 'high',
+  severity_mapping: [],
+  updated_by: 'elastic_kibana',
+  tags: ['some fake tag 1', 'some fake tag 2'],
+  to: 'now',
+  type: 'query',
+  threat: [],
+  version: 1,
+  status: 'succeeded',
+  status_date: '2020-02-22T16:47:50.047Z',
+  last_success_at: '2020-02-22T16:47:50.047Z',
+  last_success_message: 'succeeded',
+  output_index: '.siem-signals-default',
+  max_signals: 100,
+  risk_score: 55,
+  risk_score_mapping: [],
+  language: 'kuery',
+  rule_id: 'query-rule-id',
+  interval: '5m',
+  exceptions_list: [],
+});
+
+describe('transformDataToNdjson', () => {
+  test('if rules are empty it returns an empty string', () => {
+    const ruleNdjson = transformDataToNdjson([]);
+    expect(ruleNdjson).toEqual('');
+  });
+
+  test('single rule will transform with new line ending character for ndjson', () => {
+    const rule = getRulesSchemaMock();
+    const ruleNdjson = transformDataToNdjson([rule]);
+    expect(ruleNdjson.endsWith('\n')).toBe(true);
+  });
+
+  test('multiple rules will transform with two new line ending characters for ndjson', () => {
+    const result1 = getRulesSchemaMock();
+    const result2 = getRulesSchemaMock();
+    result2.id = 'some other id';
+    result2.rule_id = 'some other id';
+    result2.name = 'Some other rule';
+
+    const ruleNdjson = transformDataToNdjson([result1, result2]);
+    // this is how we count characters in JavaScript :-)
+    const count = ruleNdjson.split('\n').length - 1;
+    expect(count).toBe(2);
+  });
+
+  test('you can parse two rules back out without errors', () => {
+    const result1 = getRulesSchemaMock();
+    const result2 = getRulesSchemaMock();
+    result2.id = 'some other id';
+    result2.rule_id = 'some other id';
+    result2.name = 'Some other rule';
+
+    const ruleNdjson = transformDataToNdjson([result1, result2]);
+    const ruleStrings = ruleNdjson.split('\n');
+    const reParsed1 = JSON.parse(ruleStrings[0]);
+    const reParsed2 = JSON.parse(ruleStrings[1]);
+    expect(reParsed1).toEqual(result1);
+    expect(reParsed2).toEqual(result2);
+  });
+});
diff --git a/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.ts b/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.ts
new file mode 100644
index 0000000000000..66a500731f497
--- /dev/null
+++ b/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export const transformDataToNdjson = (data: unknown[]): string => {
+  if (data.length !== 0) {
+    const dataString = data.map((item) => JSON.stringify(item)).join('\n');
+    return `${dataString}\n`;
+  } else {
+    return '';
+  }
+};
diff --git a/x-pack/plugins/lists/public/exceptions/api.test.ts b/x-pack/plugins/lists/public/exceptions/api.test.ts
index a196999d14943..65c11bfc1dfd0 100644
--- a/x-pack/plugins/lists/public/exceptions/api.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/api.test.ts
@@ -759,7 +759,7 @@ describe('Exceptions Lists API', () => {
       });
 
       expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists/_export', {
-        method: 'GET',
+        method: 'POST',
         query: {
           id: 'some-id',
           list_id: 'list-id',
diff --git a/x-pack/plugins/lists/server/routes/export_exception_list_route.ts b/x-pack/plugins/lists/server/routes/export_exception_list_route.ts
index a238d0e6529ff..aa30c8a7d435d 100644
--- a/x-pack/plugins/lists/server/routes/export_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/export_exception_list_route.ts
@@ -6,6 +6,7 @@
  */
 
 import { transformError } from '@kbn/securitysolution-es-utils';
+import { transformDataToNdjson } from '@kbn/securitysolution-utils';
 import { exportExceptionListQuerySchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 
@@ -14,7 +15,7 @@ import type { ListsPluginRouter } from '../types';
 import { buildRouteValidation, buildSiemResponse, getExceptionListClient } from './utils';
 
 export const exportExceptionListRoute = (router: ListsPluginRouter): void => {
-  router.get(
+  router.post(
     {
       options: {
         tags: ['access:lists-read'],
@@ -26,6 +27,7 @@ export const exportExceptionListRoute = (router: ListsPluginRouter): void => {
     },
     async (context, request, response) => {
       const siemResponse = buildSiemResponse(response);
+
       try {
         const { id, list_id: listId, namespace_type: namespaceType } = request.query;
         const exceptionLists = getExceptionListClient(context);
@@ -37,11 +39,10 @@ export const exportExceptionListRoute = (router: ListsPluginRouter): void => {
 
         if (exceptionList == null) {
           return siemResponse.error({
-            body: `list_id: ${listId} does not exist`,
+            body: `exception list with list_id: ${listId} does not exist`,
             statusCode: 400,
           });
         } else {
-          const { exportData: exportList } = getExport([exceptionList]);
           const listItems = await exceptionLists.findExceptionListItem({
             filter: undefined,
             listId,
@@ -51,19 +52,15 @@ export const exportExceptionListRoute = (router: ListsPluginRouter): void => {
             sortField: 'exception-list.created_at',
             sortOrder: 'desc',
           });
+          const exceptionItems = listItems?.data ?? [];
 
-          const { exportData: exportListItems, exportDetails } = getExport(listItems?.data ?? []);
-
-          const responseBody = [
-            exportList,
-            exportListItems,
-            { exception_list_items_details: exportDetails },
-          ];
+          const { exportData } = getExport([exceptionList, ...exceptionItems]);
+          const { exportDetails } = getExportDetails(exceptionItems);
 
           // TODO: Allow the API to override the name of the file to export
           const fileName = exceptionList.list_id;
           return response.ok({
-            body: transformDataToNdjson(responseBody),
+            body: `${exportData}${exportDetails}`,
             headers: {
               'Content-Disposition': `attachment; filename="${fileName}"`,
               'Content-Type': 'application/ndjson',
@@ -81,24 +78,23 @@ export const exportExceptionListRoute = (router: ListsPluginRouter): void => {
   );
 };
 
-const transformDataToNdjson = (data: unknown[]): string => {
-  if (data.length !== 0) {
-    const dataString = data.map((dataItem) => JSON.stringify(dataItem)).join('\n');
-    return `${dataString}\n`;
-  } else {
-    return '';
-  }
-};
-
 export const getExport = (
   data: unknown[]
 ): {
   exportData: string;
-  exportDetails: string;
 } => {
   const ndjson = transformDataToNdjson(data);
+
+  return { exportData: ndjson };
+};
+
+export const getExportDetails = (
+  items: unknown[]
+): {
+  exportDetails: string;
+} => {
   const exportDetails = JSON.stringify({
-    exported_count: data.length,
+    exported_list_items_count: items.length,
   });
-  return { exportData: ndjson, exportDetails: `${exportDetails}\n` };
+  return { exportDetails: `${exportDetails}\n` };
 };
diff --git a/x-pack/plugins/security_solution/cypress/downloads/test_exception_list.ndjson b/x-pack/plugins/security_solution/cypress/downloads/test_exception_list.ndjson
new file mode 100644
index 0000000000000..54420eff29e0d
--- /dev/null
+++ b/x-pack/plugins/security_solution/cypress/downloads/test_exception_list.ndjson
@@ -0,0 +1,2 @@
+{"_version":"WzQyNjA0LDFd","created_at":"2021-10-14T01:30:22.034Z","created_by":"elastic","description":"Test exception list description","id":"4c65a230-2c8e-11ec-be1c-2bbdec602f88","immutable":false,"list_id":"test_exception_list","name":"Test exception list","namespace_type":"single","os_types":[],"tags":[],"tie_breaker_id":"b04983b4-1617-441c-bb6c-c729281fa2e9","type":"detection","updated_at":"2021-10-14T01:30:22.036Z","updated_by":"elastic","version":1}
+{"exported_list_items_count":0}
diff --git a/x-pack/plugins/security_solution/cypress/integration/exceptions/exceptions_table.spec.ts b/x-pack/plugins/security_solution/cypress/integration/exceptions/exceptions_table.spec.ts
index 8530f949664b8..c8b6f73912acf 100644
--- a/x-pack/plugins/security_solution/cypress/integration/exceptions/exceptions_table.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/exceptions/exceptions_table.spec.ts
@@ -81,7 +81,7 @@ describe('Exceptions Table', () => {
 
     cy.wait('@export').then(({ response }) =>
       cy
-        .wrap(response?.body!)
+        .wrap(response?.body)
         .should('eql', expectedExportedExceptionList(this.exceptionListResponse))
     );
   });
diff --git a/x-pack/plugins/security_solution/cypress/objects/exception.ts b/x-pack/plugins/security_solution/cypress/objects/exception.ts
index 81c3b885ab94d..b772924697148 100644
--- a/x-pack/plugins/security_solution/cypress/objects/exception.ts
+++ b/x-pack/plugins/security_solution/cypress/objects/exception.ts
@@ -41,6 +41,5 @@ export const expectedExportedExceptionList = (
   exceptionListResponse: Cypress.Response<ExceptionListItemSchema>
 ): string => {
   const jsonrule = exceptionListResponse.body;
-
-  return `"{\\"_version\\":\\"${jsonrule._version}\\",\\"created_at\\":\\"${jsonrule.created_at}\\",\\"created_by\\":\\"elastic\\",\\"description\\":\\"${jsonrule.description}\\",\\"id\\":\\"${jsonrule.id}\\",\\"immutable\\":false,\\"list_id\\":\\"test_exception_list\\",\\"name\\":\\"Test exception list\\",\\"namespace_type\\":\\"single\\",\\"os_types\\":[],\\"tags\\":[],\\"tie_breaker_id\\":\\"${jsonrule.tie_breaker_id}\\",\\"type\\":\\"detection\\",\\"updated_at\\":\\"${jsonrule.updated_at}\\",\\"updated_by\\":\\"elastic\\",\\"version\\":1}\\n"\n""\n{"exception_list_items_details":"{\\"exported_count\\":0}\\n"}\n`;
+  return `{"_version":"${jsonrule._version}","created_at":"${jsonrule.created_at}","created_by":"elastic","description":"${jsonrule.description}","id":"${jsonrule.id}","immutable":false,"list_id":"test_exception_list","name":"Test exception list","namespace_type":"single","os_types":[],"tags":[],"tie_breaker_id":"${jsonrule.tie_breaker_id}","type":"detection","updated_at":"${jsonrule.updated_at}","updated_by":"elastic","version":1}\n{"exported_list_items_count":0}\n`;
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.ts
index f44471e6e26f9..71079ccefc97a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.ts
@@ -5,11 +5,12 @@
  * 2.0.
  */
 
+import { transformDataToNdjson } from '@kbn/securitysolution-utils';
+
 import { RulesClient } from '../../../../../alerting/server';
 import { getNonPackagedRules } from './get_existing_prepackaged_rules';
 import { getExportDetailsNdjson } from './get_export_details_ndjson';
 import { transformAlertsToRules } from '../routes/rules/utils';
-import { transformDataToNdjson } from '../../../utils/read_stream/create_stream_from_ndjson';
 
 export const getExportAll = async (
   rulesClient: RulesClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.ts
index 31a7604306de7..4cf3ad9133a71 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.ts
@@ -6,13 +6,13 @@
  */
 
 import { chunk } from 'lodash';
+import { transformDataToNdjson } from '@kbn/securitysolution-utils';
 
 import { RulesSchema } from '../../../../common/detection_engine/schemas/response/rules_schema';
 import { RulesClient } from '../../../../../alerting/server';
 import { getExportDetailsNdjson } from './get_export_details_ndjson';
 import { isAlertType } from '../rules/types';
 import { transformAlertToRule } from '../routes/rules/utils';
-import { transformDataToNdjson } from '../../../utils/read_stream/create_stream_from_ndjson';
 import { INTERNAL_RULE_ID_KEY } from '../../../../common/constants';
 import { findRules } from './find_rules';
 
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
index 2966fa3decc26..7c9906d0eae48 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
@@ -8,10 +8,11 @@
 import { cloneDeep } from 'lodash';
 import axios from 'axios';
 import { URL } from 'url';
+import { transformDataToNdjson } from '@kbn/securitysolution-utils';
+
 import { Logger } from 'src/core/server';
 import { TelemetryPluginStart, TelemetryPluginSetup } from 'src/plugins/telemetry/server';
 import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { transformDataToNdjson } from '../../utils/read_stream/create_stream_from_ndjson';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/helpers.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/helpers.ts
index a33b8be0c2f31..c857e7fa38a27 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/helpers.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/helpers.ts
@@ -6,6 +6,7 @@
  */
 
 import { omit } from 'lodash/fp';
+import { transformDataToNdjson } from '@kbn/securitysolution-utils';
 
 import {
   ExportedTimelines,
@@ -15,8 +16,6 @@ import {
 import { NoteSavedObject } from '../../../../../../common/types/timeline/note';
 import { PinnedEventSavedObject } from '../../../../../../common/types/timeline/pinned_event';
 
-import { transformDataToNdjson } from '../../../../../utils/read_stream/create_stream_from_ndjson';
-
 import { FrameworkRequest } from '../../../../framework';
 import * as noteLib from '../../../saved_object/notes';
 import * as pinnedEventLib from '../../../saved_object/pinned_events';
diff --git a/x-pack/plugins/security_solution/server/utils/read_stream/create_stream_from_ndjson.test.ts b/x-pack/plugins/security_solution/server/utils/read_stream/create_stream_from_ndjson.test.ts
deleted file mode 100644
index c3163da6ac949..0000000000000
--- a/x-pack/plugins/security_solution/server/utils/read_stream/create_stream_from_ndjson.test.ts
+++ /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 { transformDataToNdjson } from './create_stream_from_ndjson';
-import { ImportRulesSchemaDecoded } from '../../../common/detection_engine/schemas/request/import_rules_schema';
-import { getRulesSchemaMock } from '../../../common/detection_engine/schemas/response/rules_schema.mocks';
-
-export const getOutputSample = (): Partial<ImportRulesSchemaDecoded> => ({
-  rule_id: 'rule-1',
-  output_index: '.siem-signals',
-  risk_score: 50,
-  description: 'some description',
-  from: 'now-5m',
-  to: 'now',
-  index: ['index-1'],
-  name: 'some-name',
-  severity: 'low',
-  interval: '5m',
-  type: 'query',
-});
-
-export const getSampleAsNdjson = (sample: Partial<ImportRulesSchemaDecoded>): string => {
-  return `${JSON.stringify(sample)}\n`;
-};
-
-describe('create_rules_stream_from_ndjson', () => {
-  describe('transformDataToNdjson', () => {
-    test('if rules are empty it returns an empty string', () => {
-      const ruleNdjson = transformDataToNdjson([]);
-      expect(ruleNdjson).toEqual('');
-    });
-
-    test('single rule will transform with new line ending character for ndjson', () => {
-      const rule = getRulesSchemaMock();
-      const ruleNdjson = transformDataToNdjson([rule]);
-      expect(ruleNdjson.endsWith('\n')).toBe(true);
-    });
-
-    test('multiple rules will transform with two new line ending characters for ndjson', () => {
-      const result1 = getRulesSchemaMock();
-      const result2 = getRulesSchemaMock();
-      result2.id = 'some other id';
-      result2.rule_id = 'some other id';
-      result2.name = 'Some other rule';
-
-      const ruleNdjson = transformDataToNdjson([result1, result2]);
-      // this is how we count characters in JavaScript :-)
-      const count = ruleNdjson.split('\n').length - 1;
-      expect(count).toBe(2);
-    });
-
-    test('you can parse two rules back out without errors', () => {
-      const result1 = getRulesSchemaMock();
-      const result2 = getRulesSchemaMock();
-      result2.id = 'some other id';
-      result2.rule_id = 'some other id';
-      result2.name = 'Some other rule';
-
-      const ruleNdjson = transformDataToNdjson([result1, result2]);
-      const ruleStrings = ruleNdjson.split('\n');
-      const reParsed1 = JSON.parse(ruleStrings[0]);
-      const reParsed2 = JSON.parse(ruleStrings[1]);
-      expect(reParsed1).toEqual(result1);
-      expect(reParsed2).toEqual(result2);
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/server/utils/read_stream/create_stream_from_ndjson.ts b/x-pack/plugins/security_solution/server/utils/read_stream/create_stream_from_ndjson.ts
index 42f1b467ed4c2..eb5abaee8cd3b 100644
--- a/x-pack/plugins/security_solution/server/utils/read_stream/create_stream_from_ndjson.ts
+++ b/x-pack/plugins/security_solution/server/utils/read_stream/create_stream_from_ndjson.ts
@@ -48,12 +48,3 @@ export const createLimitStream = (limit: number): Transform => {
     },
   });
 };
-
-export const transformDataToNdjson = (data: unknown[]): string => {
-  if (data.length !== 0) {
-    const dataString = data.map((rule) => JSON.stringify(rule)).join('\n');
-    return `${dataString}\n`;
-  } else {
-    return '';
-  }
-};
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/export_exception_list.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/export_exception_list.ts
new file mode 100644
index 0000000000000..d35d34fde5bcc
--- /dev/null
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/export_exception_list.ts
@@ -0,0 +1,155 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import type { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
+
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import {
+  removeExceptionListServerGeneratedProperties,
+  removeExceptionListItemServerGeneratedProperties,
+  binaryToString,
+  deleteAllExceptions,
+} from '../../utils';
+import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  describe('export_exception_list_route', () => {
+    describe('exporting exception lists', () => {
+      afterEach(async () => {
+        await deleteAllExceptions(es);
+      });
+
+      it('should set the response content types to be expected', async () => {
+        // create an exception list
+        const { body } = await supertest
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await supertest
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await supertest
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect('Content-Disposition', `attachment; filename="${body.list_id}"`)
+          .expect(200);
+      });
+
+      it('should return 404 if given ids that do not exist', async () => {
+        // create an exception list
+        await supertest
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await supertest
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        const { body: exportBody } = await supertest
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=not_exist&list_id=not_exist&namespace_type=single`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(400);
+
+        expect(exportBody).to.eql({
+          message: 'exception list with list_id: not_exist does not exist',
+          status_code: 400,
+        });
+      });
+
+      it('should export a single list with a list id', async () => {
+        const { body } = await supertest
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        const { body: itemBody } = await supertest
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        const { body: exportResult } = await supertest
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200)
+          .parse(binaryToString);
+
+        const exportedItemsToArray = exportResult.toString().split('\n');
+        const list = JSON.parse(exportedItemsToArray[0]);
+        const item = JSON.parse(exportedItemsToArray[1]);
+
+        expect(removeExceptionListServerGeneratedProperties(list)).to.eql(
+          removeExceptionListServerGeneratedProperties(body)
+        );
+        expect(removeExceptionListItemServerGeneratedProperties(item)).to.eql(
+          removeExceptionListItemServerGeneratedProperties(itemBody)
+        );
+      });
+
+      it('should export two list items with a list id', async () => {
+        const { body } = await supertest
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await supertest
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        const secondExceptionListItem: CreateExceptionListItemSchema = {
+          ...getCreateExceptionListItemMinimalSchemaMock(),
+          item_id: 'some-list-item-id-2',
+        };
+        await supertest
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(secondExceptionListItem)
+          .expect(200);
+
+        const { body: exportResult } = await supertest
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200)
+          .parse(binaryToString);
+
+        const bodyString = exportResult.toString();
+        expect(bodyString.includes('some-list-item-id-2')).to.be(true);
+        expect(bodyString.includes('some-list-item-id')).to.be(true);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/index.ts
index 89a1183da6790..afb6057dedfff 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/index.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/index.ts
@@ -24,6 +24,7 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
     loadTestFile(require.resolve('./find_list_items'));
     loadTestFile(require.resolve('./import_list_items'));
     loadTestFile(require.resolve('./export_list_items'));
+    loadTestFile(require.resolve('./export_exception_list'));
     loadTestFile(require.resolve('./create_exception_lists'));
     loadTestFile(require.resolve('./create_exception_list_items'));
     loadTestFile(require.resolve('./read_exception_lists'));

From 95e8595a1287ee9148846f1f9e4707b703c2d65d Mon Sep 17 00:00:00 2001
From: Justin Ibarra <brokensound77@users.noreply.github.com>
Date: Wed, 13 Oct 2021 21:49:07 -0800
Subject: [PATCH 057/117] [Detection Rules] Add 7.16 rules (#114939)

---
 ...ion_email_powershell_exchange_mailbox.json |  11 +-
 .../collection_winrar_encryption.json         |  11 +-
 ...ommand_and_control_common_webservices.json |  29 ++-
 ..._control_dns_directly_to_the_internet.json |   4 +-
 ...nd_and_control_dns_tunneling_nslookup.json |  11 +-
 ...download_rar_powershell_from_internet.json |   4 +-
 .../command_and_control_iexplore_via_com.json |  24 ++-
 ...ntrol_port_forwarding_added_registry.json} |  23 +--
 ...command_and_control_rdp_tunnel_plink.json} |  18 +-
 ..._and_control_remote_file_copy_scripts.json |   4 +-
 ...d_control_teamviewer_remote_file_copy.json |   7 +-
 .../credential_access_cmdline_dump_tool.json  |  16 +-
 ...ess_copy_ntds_sam_volshadowcp_cmdline.json |  11 +-
 ...cess_domain_backup_dpapi_private_keys.json |   7 +-
 ...credential_access_dump_registry_hives.json |  16 +-
 ..._access_kerberoasting_unusual_process.json |   4 +-
 .../credential_access_kerberosdump_kcc.json   |  14 +-
 ...ial_access_lsass_memdump_file_created.json |  11 +-
 ..._potential_lsa_memdump_via_mirrordump.json |  55 ++++++
 ...redential_access_saved_creds_vaultcmd.json |  14 +-
 ...e_evasion_clearing_windows_event_logs.json |  11 +-
 ...vasion_clearing_windows_security_logs.json |  14 +-
 ...ion_defender_exclusion_via_powershell.json |   4 +-
 ...ble_windows_firewall_rules_with_netsh.json |   8 +-
 ...efense_evasion_disabling_windows_logs.json |  11 +-
 ...vasion_dotnet_compiler_parent_process.json |  15 +-
 ...n_elasticache_security_group_creation.json |  61 ++++++
 ...he_security_group_modified_or_deleted.json |  61 ++++++
 ...evasion_enable_inbound_rdp_with_netsh.json |   8 +-
 ...n_enable_network_discovery_with_netsh.json |   8 +-
 ...ecution_control_panel_suspicious_args.json |  56 ++++++
 ...ecution_msbuild_started_by_office_app.json |  11 +-
 ...n_execution_msbuild_started_by_script.json |  11 +-
 ...ion_msbuild_started_by_system_process.json |  11 +-
 ...ion_execution_msbuild_started_renamed.json |  11 +-
 ...sion_execution_windefend_unusual_path.json |   7 +-
 ..._evasion_file_creation_mult_extension.json |  24 ++-
 ...on_frontdoor_firewall_policy_deletion.json |  60 ++++++
 ...sion_hide_encoded_executable_registry.json |   7 +-
 ...ense_evasion_iis_httplogging_disabled.json |  15 +-
 .../defense_evasion_installutil_beacon.json   |   4 +-
 ...e_evasion_masquerading_renamed_autoit.json |  11 +-
 ...vasion_masquerading_trusted_directory.json |  11 +-
 ...defense_evasion_masquerading_werfault.json |   4 +-
 ...on_msbuild_making_network_connections.json |  11 +-
 ...cess_termination_followed_by_deletion.json |  11 +-
 .../defense_evasion_unusual_dir_ads.json      |  11 +-
 .../defense_evasion_via_filter_manager.json   |  15 +-
 ...on_whitespace_padding_in_command_line.json |   4 +-
 .../discovery_adfind_command_activity.json    |   9 +-
 .../discovery_admin_recon.json                |  11 +-
 .../discovery_net_command_system_account.json |   8 +-
 .../discovery_security_software_wmic.json     |  11 +-
 ...y_virtual_machine_fingerprinting_grep.json |  52 ++++++
 .../execution_enumeration_via_wmiprvse.json   |  27 ++-
 ...le_program_connecting_to_the_internet.json |  17 +-
 ...tion_scheduled_task_powershell_source.json |  11 +-
 .../execution_via_compiled_html_file.json     |  17 +-
 .../exfiltration_rds_snapshot_export.json     |   5 +-
 .../impact_backup_file_deletion.json          |  52 ++++++
 ...eleting_backup_catalogs_with_wbadmin.json} |  23 +--
 ...oft_365_potential_ransomware_activity.json |  54 ++++++
 ...t_365_unusual_volume_of_file_deletion.json |  54 ++++++
 ...> impact_modification_of_boot_config.json} |  23 +--
 ...mpact_stop_process_service_threshold.json} |  25 +--
 ...opy_deletion_or_resized_via_vssadmin.json} |   8 +-
 ...e_shadow_copy_deletion_via_powershell.json |  52 ++++++
 ...volume_shadow_copy_deletion_via_wmic.json} |  23 +--
 .../rules/prepackaged_rules/index.ts          | 174 +++++++++++-------
 ...65_user_restricted_from_sending_email.json |  54 ++++++
 ...ta_user_attempted_unauthorized_access.json |  74 ++++++++
 ...ss_suspicious_ms_office_child_process.json |   4 +-
 ...ential_access_kerberos_bifrostconsole.json |  11 +-
 .../lateral_movement_dcom_hta.json            |  35 +++-
 .../lateral_movement_dcom_mmc20.json          |  13 +-
 ...t_dcom_shellwindow_shellbrowserwindow.json |  13 +-
 ...vement_direct_outbound_smb_connection.json |  15 +-
 .../lateral_movement_dns_server_overflow.json |   4 +-
 ...movement_executable_tool_transfer_smb.json |   4 +-
 ...vement_incoming_winrm_shell_execution.json |   4 +-
 .../lateral_movement_incoming_wmi.json        |   4 +-
 ...l_movement_powershell_remoting_target.json |   4 +-
 ...lateral_movement_rdp_enabled_registry.json |  11 +-
 .../lateral_movement_rdp_sharprdp_target.json |  13 +-
 .../lateral_movement_remote_services.json     |   4 +-
 ...ateral_movement_scheduled_task_target.json |  15 +-
 .../ml_auth_rare_user_logon.json              |   4 +-
 ...pike_in_logon_events_from_a_source_ip.json |   4 +-
 .../ml_cloudtrail_error_message_spike.json    |   4 +-
 .../ml_cloudtrail_rare_error_code.json        |   4 +-
 .../ml_cloudtrail_rare_method_by_city.json    |   4 +-
 .../ml_cloudtrail_rare_method_by_country.json |   4 +-
 .../ml_cloudtrail_rare_method_by_user.json    |   4 +-
 .../ml_rare_process_by_host_windows.json      |   4 +-
 ..._group_configuration_change_detection.json |  19 +-
 ...evasion_hidden_local_account_creation.json |  11 +-
 ...egistry_startup_shell_folder_modified.json |   4 +-
 ...e_suspicious_mailbox_right_delegation.json |  57 ++++++
 ...sistence_gpo_schtask_service_creation.json |  11 +-
 ...sistence_local_scheduled_job_creation.json |  11 +-
 ...stence_local_scheduled_task_scripting.json |  11 +-
 ...l_exch_mailbox_activesync_add_device.json} |  28 +--
 .../persistence_rds_instance_creation.json    |   5 +-
 .../persistence_registry_uncommon.json        |  17 +-
 ...tence_route_table_modified_or_deleted.json |  55 ++++++
 ...saver_engine_unexpected_child_process.json |  50 +++++
 ...e_screensaver_plist_file_modification.json |  50 +++++
 ...nce_suspicious_scheduled_task_runtime.json |  11 +-
 ..._account_added_to_privileged_group_ad.json |  15 +-
 .../persistence_user_account_creation.json    |  11 +-
 ...emetrycontroller_scheduledtask_hijack.json |  11 +-
 ...nt_instrumentation_event_subscription.json |  11 +-
 .../persistence_webshell_detection.json       |   4 +-
 ...ion_new_or_modified_federation_domain.json |  61 ++++++
 ..._escalation_sts_getsessiontoken_abuse.json |  74 ++++++++
 ...tion_unusual_parentchild_relationship.json |   4 +-
 .../threat_intel_module_match.json            |   6 +-
 117 files changed, 1920 insertions(+), 377 deletions(-)
 rename x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/{defense_evasion_port_forwarding_added_registry.json => command_and_control_port_forwarding_added_registry.json} (66%)
 rename x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/{lateral_movement_rdp_tunnel_plink.json => command_and_control_rdp_tunnel_plink.json} (69%)
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_potential_lsa_memdump_via_mirrordump.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_elasticache_security_group_creation.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_elasticache_security_group_modified_or_deleted.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_control_panel_suspicious_args.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_frontdoor_firewall_policy_deletion.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_virtual_machine_fingerprinting_grep.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_backup_file_deletion.json
 rename x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/{defense_evasion_deleting_backup_catalogs_with_wbadmin.json => impact_deleting_backup_catalogs_with_wbadmin.json} (66%)
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_microsoft_365_potential_ransomware_activity.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_microsoft_365_unusual_volume_of_file_deletion.json
 rename x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/{defense_evasion_modification_of_boot_config.json => impact_modification_of_boot_config.json} (69%)
 rename x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/{defense_evasion_stop_process_service_threshold.json => impact_stop_process_service_threshold.json} (64%)
 rename x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/{impact_volume_shadow_copy_deletion_via_vssadmin.json => impact_volume_shadow_copy_deletion_or_resized_via_vssadmin.json} (70%)
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_via_powershell.json
 rename x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/{defense_evasion_volume_shadow_copy_deletion_via_wmic.json => impact_volume_shadow_copy_deletion_via_wmic.json} (66%)
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_user_restricted_from_sending_email.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_okta_user_attempted_unauthorized_access.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_exchange_suspicious_mailbox_right_delegation.json
 rename x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/{collection_persistence_powershell_exch_mailbox_activesync_add_device.json => persistence_powershell_exch_mailbox_activesync_add_device.json} (72%)
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_route_table_modified_or_deleted.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_screensaver_engine_unexpected_child_process.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_screensaver_plist_file_modification.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_new_or_modified_federation_domain.json
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sts_getsessiontoken_abuse.json

diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_email_powershell_exchange_mailbox.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_email_powershell_exchange_mailbox.json
index 25ad15f1b0a51..6e2073bbb82b6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_email_powershell_exchange_mailbox.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_email_powershell_exchange_mailbox.json
@@ -42,7 +42,14 @@
         {
           "id": "T1114",
           "name": "Email Collection",
-          "reference": "https://attack.mitre.org/techniques/T1114/"
+          "reference": "https://attack.mitre.org/techniques/T1114/",
+          "subtechnique": [
+            {
+              "id": "T1114.002",
+              "name": "Remote Email Collection",
+              "reference": "https://attack.mitre.org/techniques/T1114/002/"
+            }
+          ]
         },
         {
           "id": "T1005",
@@ -54,5 +61,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_winrar_encryption.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_winrar_encryption.json
index 73c4300556a02..fa0ee2b18bb15 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_winrar_encryption.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_winrar_encryption.json
@@ -38,12 +38,19 @@
         {
           "id": "T1560",
           "name": "Archive Collected Data",
-          "reference": "https://attack.mitre.org/techniques/T1560/"
+          "reference": "https://attack.mitre.org/techniques/T1560/",
+          "subtechnique": [
+            {
+              "id": "T1560.001",
+              "name": "Archive via Utility",
+              "reference": "https://attack.mitre.org/techniques/T1560/001/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_common_webservices.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_common_webservices.json
index 0d80e78c556b9..b1774ab3dd052 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_common_webservices.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_common_webservices.json
@@ -38,9 +38,36 @@
           "reference": "https://attack.mitre.org/techniques/T1102/"
         }
       ]
+    },
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0010",
+        "name": "Exfiltration",
+        "reference": "https://attack.mitre.org/tactics/TA0010/"
+      },
+      "technique": [
+        {
+          "id": "T1567",
+          "name": "Exfiltration Over Web Service",
+          "reference": "https://attack.mitre.org/techniques/T1567/",
+          "subtechnique": [
+            {
+              "id": "T1567.001",
+              "name": "Exfiltration to Code Repository",
+              "reference": "https://attack.mitre.org/techniques/T1567/001/"
+            },
+            {
+              "id": "T1567.002",
+              "name": "Exfiltration to Cloud Storage",
+              "reference": "https://attack.mitre.org/techniques/T1567/002/"
+            }
+          ]
+        }
+      ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_directly_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_directly_to_the_internet.json
index 8567b18670301..f57bd65b6d992 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_directly_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_directly_to_the_internet.json
@@ -2,7 +2,7 @@
   "author": [
     "Elastic"
   ],
-  "description": "This rule detects when an internal network client sends DNS traffic directly to the Internet. This is atypical behavior for a managed network and can be indicative of malware, exfiltration, command and control, or simply misconfiguration. This DNS activity also impacts your organization's ability to provide enterprise monitoring and logging of DNS and it opens your network to a variety of abuses and malicious communications.",
+  "description": "This rule detects when an internal network client sends DNS traffic directly to the Internet. This is atypical behavior for a managed network and can be indicative of malware, exfiltration, command and control, or simply misconfiguration. This DNS activity also impacts your organization's ability to provide enterprise monitoring and logging of DNS, and it opens your network to a variety of abuses and malicious communications.",
   "false_positives": [
     "Exclude DNS servers from this rule as this is expected behavior. Endpoints usually query local DNS servers defined in their DHCP scopes, but this may be overridden if a user configures their endpoint to use a remote DNS server. This is uncommon in managed enterprise networks because it could break intranet name resolution when split horizon DNS is utilized. Some consumer VPN services and browser plug-ins may send DNS traffic to remote Internet destinations. In that case, such devices or networks can be excluded from this rule when this is expected behavior."
   ],
@@ -45,5 +45,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 11
+  "version": 12
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_tunneling_nslookup.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_tunneling_nslookup.json
index 0920f336bab44..29c30f6bc0b49 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_tunneling_nslookup.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_dns_tunneling_nslookup.json
@@ -38,7 +38,14 @@
         {
           "id": "T1071",
           "name": "Application Layer Protocol",
-          "reference": "https://attack.mitre.org/techniques/T1071/"
+          "reference": "https://attack.mitre.org/techniques/T1071/",
+          "subtechnique": [
+            {
+              "id": "T1071.004",
+              "name": "DNS",
+              "reference": "https://attack.mitre.org/techniques/T1071/004/"
+            }
+          ]
         }
       ]
     }
@@ -50,5 +57,5 @@
     "value": 15
   },
   "type": "threshold",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_download_rar_powershell_from_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_download_rar_powershell_from_internet.json
index 0bcbb0d2d031d..dcca38dd242d8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_download_rar_powershell_from_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_download_rar_powershell_from_internet.json
@@ -2,7 +2,7 @@
   "author": [
     "Elastic"
   ],
-  "description": "Detects a Roshal Archive (RAR) file or PowerShell script downloaded from the internet by an internal host. Gaining initial access to a system and then downloading encoded or encrypted tools to move laterally is a common practice for adversaries as a way to protect their more valuable tools and TTPs (tactics, techniques, and procedures). This may be atypical behavior for a managed network and can be indicative of malware, exfiltration, or command and control.",
+  "description": "Detects a Roshal Archive (RAR) file or PowerShell script downloaded from the internet by an internal host. Gaining initial access to a system and then downloading encoded or encrypted tools to move laterally is a common practice for adversaries as a way to protect their more valuable tools and tactics, techniques, and procedures (TTPs). This may be atypical behavior for a managed network and can be indicative of malware, exfiltration, or command and control.",
   "false_positives": [
     "Downloading RAR or PowerShell files from the Internet may be expected for certain systems. This rule should be tailored to either exclude systems as sources or destinations in which this behavior is expected."
   ],
@@ -52,5 +52,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_iexplore_via_com.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_iexplore_via_com.json
index 2cfbbc1c5e101..d0039ab4f02d4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_iexplore_via_com.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_iexplore_via_com.json
@@ -41,8 +41,30 @@
           "reference": "https://attack.mitre.org/techniques/T1071/"
         }
       ]
+    },
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0002",
+        "name": "Execution",
+        "reference": "https://attack.mitre.org/tactics/TA0002/"
+      },
+      "technique": [
+        {
+          "id": "T1559",
+          "name": "Inter-Process Communication",
+          "reference": "https://attack.mitre.org/techniques/T1559/",
+          "subtechnique": [
+            {
+              "id": "T1559.001",
+              "name": "Component Object Model",
+              "reference": "https://attack.mitre.org/techniques/T1559/001/"
+            }
+          ]
+        }
+      ]
     }
   ],
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_port_forwarding_added_registry.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_forwarding_added_registry.json
similarity index 66%
rename from x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_port_forwarding_added_registry.json
rename to x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_forwarding_added_registry.json
index cb5c8e87dcae8..65612e6c28f20 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_port_forwarding_added_registry.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_forwarding_added_registry.json
@@ -24,33 +24,26 @@
     "Host",
     "Windows",
     "Threat Detection",
-    "Defense Evasion"
+    "Command and Control"
   ],
   "threat": [
     {
       "framework": "MITRE ATT&CK",
       "tactic": {
-        "id": "TA0005",
-        "name": "Defense Evasion",
-        "reference": "https://attack.mitre.org/tactics/TA0005/"
+        "id": "TA0011",
+        "name": "Command and Control",
+        "reference": "https://attack.mitre.org/tactics/TA0011/"
       },
       "technique": [
         {
-          "id": "T1562",
-          "name": "Impair Defenses",
-          "reference": "https://attack.mitre.org/techniques/T1562/",
-          "subtechnique": [
-            {
-              "id": "T1562.001",
-              "name": "Disable or Modify Tools",
-              "reference": "https://attack.mitre.org/techniques/T1562/001/"
-            }
-          ]
+          "id": "T1572",
+          "name": "Protocol Tunneling",
+          "reference": "https://attack.mitre.org/techniques/T1572/"
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_tunnel_plink.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_tunnel_plink.json
similarity index 69%
rename from x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_tunnel_plink.json
rename to x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_tunnel_plink.json
index dd6bdfa0c37d6..3c89ff7c9ff9a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_tunnel_plink.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_tunnel_plink.json
@@ -2,7 +2,7 @@
   "author": [
     "Elastic"
   ],
-  "description": "Identifies potential use of an SSH utility to establish RDP over a reverse SSH Tunnel. This could be indicative of adversary lateral movement to interactively access restricted networks.",
+  "description": "Identifies potential use of an SSH utility to establish RDP over a reverse SSH Tunnel. This can be used by attackers to enable routing of network packets that would otherwise not reach their intended destination.",
   "from": "now-9m",
   "index": [
     "logs-endpoint.events.*",
@@ -24,26 +24,26 @@
     "Host",
     "Windows",
     "Threat Detection",
-    "Lateral Movement"
+    "Command and Control"
   ],
   "threat": [
     {
       "framework": "MITRE ATT&CK",
       "tactic": {
-        "id": "TA0008",
-        "name": "Lateral Movement",
-        "reference": "https://attack.mitre.org/tactics/TA0008/"
+        "id": "TA0011",
+        "name": "Command and Control",
+        "reference": "https://attack.mitre.org/tactics/TA0011/"
       },
       "technique": [
         {
-          "id": "T1021",
-          "name": "Remote Services",
-          "reference": "https://attack.mitre.org/techniques/T1021/"
+          "id": "T1572",
+          "name": "Protocol Tunneling",
+          "reference": "https://attack.mitre.org/techniques/T1572/"
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_scripts.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_scripts.json
index 428b08891c15a..eed29634daeef 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_scripts.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_scripts.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote File Download via Script Interpreter",
-  "query": "sequence by host.id, process.entity_id\n  [network where process.name : (\"wscript.exe\", \"cscript.exe\") and network.protocol != \"dns\" and\n   network.direction == \"outgoing\" and network.type == \"ipv4\" and destination.ip != \"127.0.0.1\"\n  ]\n  [file where event.type == \"creation\" and file.extension : (\"exe\", \"dll\")]\n",
+  "query": "sequence by host.id, process.entity_id\n  [network where process.name : (\"wscript.exe\", \"cscript.exe\") and network.protocol != \"dns\" and\n   network.direction : (\"outgoing\", \"egress\") and network.type == \"ipv4\" and destination.ip != \"127.0.0.1\"\n  ]\n  [file where event.type == \"creation\" and file.extension : (\"exe\", \"dll\")]\n",
   "risk_score": 47,
   "rule_id": "1d276579-3380-4095-ad38-e596a01bc64f",
   "severity": "medium",
@@ -41,5 +41,5 @@
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_teamviewer_remote_file_copy.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_teamviewer_remote_file_copy.json
index 08d4df2556f6a..a1f0f061a69bc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_teamviewer_remote_file_copy.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_teamviewer_remote_file_copy.json
@@ -39,11 +39,16 @@
           "id": "T1105",
           "name": "Ingress Tool Transfer",
           "reference": "https://attack.mitre.org/techniques/T1105/"
+        },
+        {
+          "id": "T1219",
+          "name": "Remote Access Software",
+          "reference": "https://attack.mitre.org/techniques/T1219/"
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_cmdline_dump_tool.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_cmdline_dump_tool.json
index 32c271f736e4a..9671f3c4edf2a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_cmdline_dump_tool.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_cmdline_dump_tool.json
@@ -38,12 +38,24 @@
         {
           "id": "T1003",
           "name": "OS Credential Dumping",
-          "reference": "https://attack.mitre.org/techniques/T1003/"
+          "reference": "https://attack.mitre.org/techniques/T1003/",
+          "subtechnique": [
+            {
+              "id": "T1003.001",
+              "name": "LSASS Memory",
+              "reference": "https://attack.mitre.org/techniques/T1003/001/"
+            },
+            {
+              "id": "T1003.003",
+              "name": "NTDS",
+              "reference": "https://attack.mitre.org/techniques/T1003/003/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_copy_ntds_sam_volshadowcp_cmdline.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_copy_ntds_sam_volshadowcp_cmdline.json
index 91613078c6167..0aeba88224138 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_copy_ntds_sam_volshadowcp_cmdline.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_copy_ntds_sam_volshadowcp_cmdline.json
@@ -41,12 +41,19 @@
         {
           "id": "T1003",
           "name": "OS Credential Dumping",
-          "reference": "https://attack.mitre.org/techniques/T1003/"
+          "reference": "https://attack.mitre.org/techniques/T1003/",
+          "subtechnique": [
+            {
+              "id": "T1003.002",
+              "name": "Security Account Manager",
+              "reference": "https://attack.mitre.org/techniques/T1003/002/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_domain_backup_dpapi_private_keys.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_domain_backup_dpapi_private_keys.json
index c031fcbf464b1..43ea1078d1583 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_domain_backup_dpapi_private_keys.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_domain_backup_dpapi_private_keys.json
@@ -48,11 +48,16 @@
               "reference": "https://attack.mitre.org/techniques/T1552/004/"
             }
           ]
+        },
+        {
+          "id": "T1555",
+          "name": "Credentials from Password Stores",
+          "reference": "https://attack.mitre.org/techniques/T1555/"
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dump_registry_hives.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dump_registry_hives.json
index c3868162cc839..10c6996fa56aa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dump_registry_hives.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dump_registry_hives.json
@@ -38,12 +38,24 @@
         {
           "id": "T1003",
           "name": "OS Credential Dumping",
-          "reference": "https://attack.mitre.org/techniques/T1003/"
+          "reference": "https://attack.mitre.org/techniques/T1003/",
+          "subtechnique": [
+            {
+              "id": "T1003.002",
+              "name": "Security Account Manager",
+              "reference": "https://attack.mitre.org/techniques/T1003/002/"
+            },
+            {
+              "id": "T1003.004",
+              "name": "LSA Secrets",
+              "reference": "https://attack.mitre.org/techniques/T1003/004/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberoasting_unusual_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberoasting_unusual_process.json
index b05ddd7bcc8a2..8fc7cd7b379b8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberoasting_unusual_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberoasting_unusual_process.json
@@ -15,7 +15,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Kerberos Traffic from Unusual Process",
-  "query": "network where event.type == \"start\" and network.direction == \"outgoing\" and\n destination.port == 88 and source.port >= 49152 and\n process.executable != \"C:\\\\Windows\\\\System32\\\\lsass.exe\" and destination.address !=\"127.0.0.1\" and destination.address !=\"::1\" and\n /* insert False Positives here */\n not process.name in (\"swi_fc.exe\", \"fsIPcam.exe\", \"IPCamera.exe\", \"MicrosoftEdgeCP.exe\", \"MicrosoftEdge.exe\", \"iexplore.exe\", \"chrome.exe\", \"msedge.exe\", \"opera.exe\", \"firefox.exe\")\n",
+  "query": "network where event.type == \"start\" and network.direction : (\"outgoing\", \"egress\") and\n destination.port == 88 and source.port >= 49152 and\n process.executable != \"C:\\\\Windows\\\\System32\\\\lsass.exe\" and destination.address !=\"127.0.0.1\" and destination.address !=\"::1\" and\n /* insert False Positives here */\n not process.name in (\"swi_fc.exe\", \"fsIPcam.exe\", \"IPCamera.exe\", \"MicrosoftEdgeCP.exe\", \"MicrosoftEdge.exe\", \"iexplore.exe\", \"chrome.exe\", \"msedge.exe\", \"opera.exe\", \"firefox.exe\")\n",
   "risk_score": 47,
   "rule_id": "897dc6b5-b39f-432a-8d75-d3730d50c782",
   "severity": "medium",
@@ -45,5 +45,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberosdump_kcc.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberosdump_kcc.json
index de5a9d80ed3df..3338895f30feb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberosdump_kcc.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberosdump_kcc.json
@@ -39,11 +39,23 @@
           "id": "T1003",
           "name": "OS Credential Dumping",
           "reference": "https://attack.mitre.org/techniques/T1003/"
+        },
+        {
+          "id": "T1558",
+          "name": "Steal or Forge Kerberos Tickets",
+          "reference": "https://attack.mitre.org/techniques/T1558/",
+          "subtechnique": [
+            {
+              "id": "T1558.003",
+              "name": "Kerberoasting",
+              "reference": "https://attack.mitre.org/techniques/T1558/003/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_file_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_file_created.json
index 36b614c628b19..d083fb322e895 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_file_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_file_created.json
@@ -39,12 +39,19 @@
         {
           "id": "T1003",
           "name": "OS Credential Dumping",
-          "reference": "https://attack.mitre.org/techniques/T1003/"
+          "reference": "https://attack.mitre.org/techniques/T1003/",
+          "subtechnique": [
+            {
+              "id": "T1003.001",
+              "name": "LSASS Memory",
+              "reference": "https://attack.mitre.org/techniques/T1003/001/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_potential_lsa_memdump_via_mirrordump.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_potential_lsa_memdump_via_mirrordump.json
new file mode 100644
index 0000000000000..1024d7f3461f5
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_potential_lsa_memdump_via_mirrordump.json
@@ -0,0 +1,55 @@
+{
+  "author": [
+    "Elastic"
+  ],
+  "description": "Identifies suspicious access to an LSASS handle via DuplicateHandle from an unknown call trace module. This may indicate an attempt to bypass the NtOpenProcess API to evade detection and dump Lsass memory for credential access.",
+  "from": "now-9m",
+  "index": [
+    "winlogbeat-*",
+    "logs-windows.*"
+  ],
+  "language": "eql",
+  "license": "Elastic License v2",
+  "name": "Potential Credential Access via DuplicateHandle in LSASS",
+  "query": "process where event.code == \"10\" and \n\n /* LSASS requesting DuplicateHandle access right to another process */\n process.name : \"lsass.exe\" and winlog.event_data.GrantedAccess == \"0x40\" and\n\n /* call is coming from an unknown executable region */\n winlog.event_data.CallTrace : \"*UNKNOWN*\"\n",
+  "references": [
+    "https://github.com/CCob/MirrorDump"
+  ],
+  "risk_score": 47,
+  "rule_id": "02a4576a-7480-4284-9327-548a806b5e48",
+  "severity": "medium",
+  "tags": [
+    "Elastic",
+    "Host",
+    "Windows",
+    "Threat Detection",
+    "Credential Access"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0006",
+        "name": "Credential Access",
+        "reference": "https://attack.mitre.org/tactics/TA0006/"
+      },
+      "technique": [
+        {
+          "id": "T1003",
+          "name": "OS Credential Dumping",
+          "reference": "https://attack.mitre.org/techniques/T1003/",
+          "subtechnique": [
+            {
+              "id": "T1003.001",
+              "name": "LSASS Memory",
+              "reference": "https://attack.mitre.org/techniques/T1003/001/"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "eql",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_saved_creds_vaultcmd.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_saved_creds_vaultcmd.json
index bfb4e44d39b0d..c6db4426ac8c1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_saved_creds_vaultcmd.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_saved_creds_vaultcmd.json
@@ -40,11 +40,23 @@
           "id": "T1003",
           "name": "OS Credential Dumping",
           "reference": "https://attack.mitre.org/techniques/T1003/"
+        },
+        {
+          "id": "T1555",
+          "name": "Credentials from Password Stores",
+          "reference": "https://attack.mitre.org/techniques/T1555/",
+          "subtechnique": [
+            {
+              "id": "T1555.004",
+              "name": "Windows Credential Manager",
+              "reference": "https://attack.mitre.org/techniques/T1555/004/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_event_logs.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_event_logs.json
index 79e059d68a52a..2759055b0fe5b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_event_logs.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_event_logs.json
@@ -35,12 +35,19 @@
         {
           "id": "T1070",
           "name": "Indicator Removal on Host",
-          "reference": "https://attack.mitre.org/techniques/T1070/"
+          "reference": "https://attack.mitre.org/techniques/T1070/",
+          "subtechnique": [
+            {
+              "id": "T1070.001",
+              "name": "Clear Windows Event Logs",
+              "reference": "https://attack.mitre.org/techniques/T1070/001/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 9
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json
index d04c2b2a38915..eedca883e371c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json
@@ -7,7 +7,8 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*"
+    "logs-windows.*",
+    "logs-system.*"
   ],
   "language": "kuery",
   "license": "Elastic License v2",
@@ -35,12 +36,19 @@
         {
           "id": "T1070",
           "name": "Indicator Removal on Host",
-          "reference": "https://attack.mitre.org/techniques/T1070/"
+          "reference": "https://attack.mitre.org/techniques/T1070/",
+          "subtechnique": [
+            {
+              "id": "T1070.001",
+              "name": "Clear Windows Event Logs",
+              "reference": "https://attack.mitre.org/techniques/T1070/001/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_defender_exclusion_via_powershell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_defender_exclusion_via_powershell.json
index 000384eac660e..716040d337c10 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_defender_exclusion_via_powershell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_defender_exclusion_via_powershell.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Windows Defender Exclusions Added via PowerShell",
-  "note": "## Triage and analysis\n\nDetections should be investigated to identify if the activity corresponds to legitimate activity used to put in exceptions for Windows Defender. As this rule detects post-exploitation process activity, investigations into this should be prioritized.",
+  "note": "## Triage and analysis\n\n### Investigating Windows Defender Exclusions\n\nMicrosoft Windows Defender is an anti-virus product built-in within Microsoft Windows. Since this software product is\nused to prevent and stop malware, it's important to monitor what specific exclusions are made to the product's configuration\nsettings. These can often be signs of an adversary or malware trying to bypass Windows Defender's capabilities. One of the more\nnotable [examples](https://www.cyberbit.com/blog/endpoint-security/latest-trickbot-variant-has-new-tricks-up-its-sleeve/) was observed in 2018 where Trickbot incorporated mechanisms to disable Windows Defense to avoid detection.\n\n#### Possible investigation steps:\n- With this specific rule, it's completely possible to trigger detections on network administrative activity or benign users\nusing scripting and PowerShell to configure the different exclusions for Windows Defender. Therefore, it's important to\nidentify the source of the activity first and determine if there is any mal-intent behind the events.\n- The actual exclusion such as the process, the file or directory should be reviewed in order to determine the original\nintent behind the exclusion. Is the excluded file or process malicious in nature or is it related to software that needs\nto be legitimately whitelisted from Windows Defender?\n\n### False Positive Analysis\n- This rule has a higher chance to produce false positives based on the nature around configuring exclusions by possibly\na network administrator. In order to validate the activity further, review the specific exclusion made and determine based\non the exclusion of the original intent behind the exclusion. There are often many legitimate reasons why exclusions are made\nwith Windows Defender so it's important to gain context around the exclusion.\n\n### Related Rules\n- Windows Defender Disabled via Registry Modification\n- Disabling Windows Defender Security Settings via PowerShell\n\n### Response and Remediation\n- Since this is related to post-exploitation activity, immediate response should be taken to review, investigate and\npotentially isolate further activity\n- If further analysis showed malicious intent was behind the Defender exclusions, administrators should remove\nthe exclusion and ensure antimalware capability has not been disabled or deleted\n- Exclusion lists for antimalware capabilities should always be routinely monitored for review\n",
   "query": "process where event.type == \"start\" and\n (process.name : (\"powershell.exe\", \"pwsh.exe\") or process.pe.original_file_name : (\"powershell.exe\", \"pwsh.exe\")) and\n  process.args : (\"*Add-MpPreference*-Exclusion*\", \"*Set-MpPreference*-Exclusion*\")\n",
   "references": [
     "https://www.bitdefender.com/files/News/CaseStudies/study/400/Bitdefender-PR-Whitepaper-MosaicLoader-creat5540-en-EN.pdf"
@@ -80,5 +80,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json
index 00f18df34f864..2e18f3ba62786 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json
@@ -38,9 +38,9 @@
           "reference": "https://attack.mitre.org/techniques/T1562/",
           "subtechnique": [
             {
-              "id": "T1562.001",
-              "name": "Disable or Modify Tools",
-              "reference": "https://attack.mitre.org/techniques/T1562/001/"
+              "id": "T1562.004",
+              "name": "Disable or Modify System Firewall",
+              "reference": "https://attack.mitre.org/techniques/T1562/004/"
             }
           ]
         }
@@ -49,5 +49,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 9
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disabling_windows_logs.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disabling_windows_logs.json
index d2612101a3e4c..256d1c7d9c135 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disabling_windows_logs.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disabling_windows_logs.json
@@ -40,12 +40,19 @@
         {
           "id": "T1070",
           "name": "Indicator Removal on Host",
-          "reference": "https://attack.mitre.org/techniques/T1070/"
+          "reference": "https://attack.mitre.org/techniques/T1070/",
+          "subtechnique": [
+            {
+              "id": "T1070.001",
+              "name": "Clear Windows Event Logs",
+              "reference": "https://attack.mitre.org/techniques/T1070/001/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_dotnet_compiler_parent_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_dotnet_compiler_parent_process.json
index 4588a8ab28657..e8edb8fba6472 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_dotnet_compiler_parent_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_dotnet_compiler_parent_process.json
@@ -33,14 +33,21 @@
       },
       "technique": [
         {
-          "id": "T1055",
-          "name": "Process Injection",
-          "reference": "https://attack.mitre.org/techniques/T1055/"
+          "id": "T1027",
+          "name": "Obfuscated Files or Information",
+          "reference": "https://attack.mitre.org/techniques/T1027/",
+          "subtechnique": [
+            {
+              "id": "T1027.004",
+              "name": "Compile After Delivery",
+              "reference": "https://attack.mitre.org/techniques/T1027/004/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_elasticache_security_group_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_elasticache_security_group_creation.json
new file mode 100644
index 0000000000000..5685ac76b3ef9
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_elasticache_security_group_creation.json
@@ -0,0 +1,61 @@
+{
+  "author": [
+    "Austin Songer"
+  ],
+  "description": "Identifies when an ElastiCache security group has been created.",
+  "false_positives": [
+    "A ElastiCache security group may be created by a system or network administrator. Verify whether the user identity, user agent, and/or hostname should be making changes in your environment. Security group creations from unfamiliar users or hosts should be investigated. If known behavior is causing false positives, it can be exempted from the rule."
+  ],
+  "from": "now-60m",
+  "index": [
+    "filebeat-*",
+    "logs-aws*"
+  ],
+  "interval": "10m",
+  "language": "kuery",
+  "license": "Elastic License v2",
+  "name": "AWS ElastiCache Security Group Created",
+  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
+  "query": "event.dataset:aws.cloudtrail and event.provider:elasticache.amazonaws.com and event.action:\"Create Cache Security Group\" and \nevent.outcome:success\n",
+  "references": [
+    "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_CreateCacheSecurityGroup.html"
+  ],
+  "risk_score": 21,
+  "rule_id": "7b3da11a-60a2-412e-8aa7-011e1eb9ed47",
+  "severity": "low",
+  "tags": [
+    "Elastic",
+    "Cloud",
+    "AWS",
+    "Continuous Monitoring",
+    "SecOps",
+    "Monitoring"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0005",
+        "name": "Defense Evasion",
+        "reference": "https://attack.mitre.org/tactics/TA0005/"
+      },
+      "technique": [
+        {
+          "id": "T1562",
+          "name": "Impair Defenses",
+          "reference": "https://attack.mitre.org/techniques/T1562/",
+          "subtechnique": [
+            {
+              "id": "T1562.007",
+              "name": "Disable or Modify Cloud Firewall",
+              "reference": "https://attack.mitre.org/techniques/T1562/007/"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "query",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_elasticache_security_group_modified_or_deleted.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_elasticache_security_group_modified_or_deleted.json
new file mode 100644
index 0000000000000..83b58c0c046e0
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_elasticache_security_group_modified_or_deleted.json
@@ -0,0 +1,61 @@
+{
+  "author": [
+    "Austin Songer"
+  ],
+  "description": "Identifies when an ElastiCache security group has been modified or deleted.",
+  "false_positives": [
+    "A ElastiCache security group deletion may be done by a system or network administrator. Verify whether the user identity, user agent, and/or hostname should be making changes in your environment. Security Group deletions from unfamiliar users or hosts should be investigated. If known behavior is causing false positives, it can be exempted from the rule."
+  ],
+  "from": "now-60m",
+  "index": [
+    "filebeat-*",
+    "logs-aws*"
+  ],
+  "interval": "10m",
+  "language": "kuery",
+  "license": "Elastic License v2",
+  "name": "AWS ElastiCache Security Group Modified or Deleted",
+  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
+  "query": "event.dataset:aws.cloudtrail and event.provider:elasticache.amazonaws.com and event.action:(\"Delete Cache Security Group\" or \n\"Authorize Cache Security Group Ingress\" or  \"Revoke Cache Security Group Ingress\" or \"AuthorizeCacheSecurityGroupEgress\" or \n\"RevokeCacheSecurityGroupEgress\") and event.outcome:success\n",
+  "references": [
+    "https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/Welcome.html"
+  ],
+  "risk_score": 21,
+  "rule_id": "1ba5160d-f5a2-4624-b0ff-6a1dc55d2516",
+  "severity": "low",
+  "tags": [
+    "Elastic",
+    "Cloud",
+    "AWS",
+    "Continuous Monitoring",
+    "SecOps",
+    "Monitoring"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0005",
+        "name": "Defense Evasion",
+        "reference": "https://attack.mitre.org/tactics/TA0005/"
+      },
+      "technique": [
+        {
+          "id": "T1562",
+          "name": "Impair Defenses",
+          "reference": "https://attack.mitre.org/techniques/T1562/",
+          "subtechnique": [
+            {
+              "id": "T1562.007",
+              "name": "Disable or Modify Cloud Firewall",
+              "reference": "https://attack.mitre.org/techniques/T1562/007/"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "query",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_inbound_rdp_with_netsh.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_inbound_rdp_with_netsh.json
index 93454122d1160..e6b53af71433a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_inbound_rdp_with_netsh.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_inbound_rdp_with_netsh.json
@@ -38,9 +38,9 @@
           "reference": "https://attack.mitre.org/techniques/T1562/",
           "subtechnique": [
             {
-              "id": "T1562.001",
-              "name": "Disable or Modify Tools",
-              "reference": "https://attack.mitre.org/techniques/T1562/001/"
+              "id": "T1562.004",
+              "name": "Disable or Modify System Firewall",
+              "reference": "https://attack.mitre.org/techniques/T1562/004/"
             }
           ]
         }
@@ -49,5 +49,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_network_discovery_with_netsh.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_network_discovery_with_netsh.json
index 5fcbec498a177..bf688fd74ce14 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_network_discovery_with_netsh.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_network_discovery_with_netsh.json
@@ -41,9 +41,9 @@
           "reference": "https://attack.mitre.org/techniques/T1562/",
           "subtechnique": [
             {
-              "id": "T1562.001",
-              "name": "Disable or Modify Tools",
-              "reference": "https://attack.mitre.org/techniques/T1562/001/"
+              "id": "T1562.004",
+              "name": "Disable or Modify System Firewall",
+              "reference": "https://attack.mitre.org/techniques/T1562/004/"
             }
           ]
         }
@@ -52,5 +52,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_control_panel_suspicious_args.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_control_panel_suspicious_args.json
new file mode 100644
index 0000000000000..787e61cfe25c4
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_control_panel_suspicious_args.json
@@ -0,0 +1,56 @@
+{
+  "author": [
+    "Elastic"
+  ],
+  "description": "Identifies unusual instances of Control Panel with suspicious keywords or paths in the process command line value. Adversaries may abuse Control.exe to proxy execution of malicious code.",
+  "from": "now-9m",
+  "index": [
+    "logs-endpoint.events.*",
+    "winlogbeat-*",
+    "logs-windows.*"
+  ],
+  "language": "eql",
+  "license": "Elastic License v2",
+  "name": "Control Panel Process with Unusual Arguments",
+  "query": "process where event.type in (\"start\", \"process_started\") and\n process.executable : (\"?:\\\\Windows\\\\SysWOW64\\\\control.exe\", \"?:\\\\Windows\\\\System32\\\\control.exe\") and\n process.command_line :\n          (\"*.jpg*\",\n           \"*.png*\",\n           \"*.gif*\",\n           \"*.bmp*\",\n           \"*.jpeg*\",\n           \"*.TIFF*\",\n           \"*.inf*\",\n           \"*.dat*\",\n           \"*.cpl:*/*\",\n           \"*../../..*\",\n           \"*/AppData/Local/*\",\n           \"*:\\\\Users\\\\Public\\\\*\",\n           \"*\\\\AppData\\\\Local\\\\*\")\n",
+  "references": [
+    "https://www.joesandbox.com/analysis/476188/1/html"
+  ],
+  "risk_score": 73,
+  "rule_id": "416697ae-e468-4093-a93d-59661fa619ec",
+  "severity": "high",
+  "tags": [
+    "Elastic",
+    "Host",
+    "Windows",
+    "Threat Detection",
+    "Defense Evasion"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0005",
+        "name": "Defense Evasion",
+        "reference": "https://attack.mitre.org/tactics/TA0005/"
+      },
+      "technique": [
+        {
+          "id": "T1218",
+          "name": "Signed Binary Proxy Execution",
+          "reference": "https://attack.mitre.org/techniques/T1218/",
+          "subtechnique": [
+            {
+              "id": "T1218.002",
+              "name": "Control Panel",
+              "reference": "https://attack.mitre.org/techniques/T1218/002/"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "eql",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_office_app.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_office_app.json
index d56c90552d457..0ad45f03a0499 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_office_app.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_office_app.json
@@ -41,7 +41,14 @@
         {
           "id": "T1127",
           "name": "Trusted Developer Utilities Proxy Execution",
-          "reference": "https://attack.mitre.org/techniques/T1127/"
+          "reference": "https://attack.mitre.org/techniques/T1127/",
+          "subtechnique": [
+            {
+              "id": "T1127.001",
+              "name": "MSBuild",
+              "reference": "https://attack.mitre.org/techniques/T1127/001/"
+            }
+          ]
         }
       ]
     },
@@ -57,5 +64,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_script.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_script.json
index 3b640d8757b51..60b2a8f50c3f4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_script.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_script.json
@@ -38,7 +38,14 @@
         {
           "id": "T1127",
           "name": "Trusted Developer Utilities Proxy Execution",
-          "reference": "https://attack.mitre.org/techniques/T1127/"
+          "reference": "https://attack.mitre.org/techniques/T1127/",
+          "subtechnique": [
+            {
+              "id": "T1127.001",
+              "name": "MSBuild",
+              "reference": "https://attack.mitre.org/techniques/T1127/001/"
+            }
+          ]
         }
       ]
     },
@@ -54,5 +61,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_system_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_system_process.json
index 33094a88af313..fdee8ee548218 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_system_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_system_process.json
@@ -38,7 +38,14 @@
         {
           "id": "T1127",
           "name": "Trusted Developer Utilities Proxy Execution",
-          "reference": "https://attack.mitre.org/techniques/T1127/"
+          "reference": "https://attack.mitre.org/techniques/T1127/",
+          "subtechnique": [
+            {
+              "id": "T1127.001",
+              "name": "MSBuild",
+              "reference": "https://attack.mitre.org/techniques/T1127/001/"
+            }
+          ]
         }
       ]
     },
@@ -54,5 +61,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_renamed.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_renamed.json
index 43051cb8b27c9..a22594083bedb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_renamed.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_renamed.json
@@ -38,12 +38,19 @@
         {
           "id": "T1036",
           "name": "Masquerading",
-          "reference": "https://attack.mitre.org/techniques/T1036/"
+          "reference": "https://attack.mitre.org/techniques/T1036/",
+          "subtechnique": [
+            {
+              "id": "T1036.003",
+              "name": "Rename System Utilities",
+              "reference": "https://attack.mitre.org/techniques/T1036/003/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_windefend_unusual_path.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_windefend_unusual_path.json
index 7812dee8235ca..826d55f3b1882 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_windefend_unusual_path.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_windefend_unusual_path.json
@@ -1,6 +1,7 @@
 {
   "author": [
-    "Elastic"
+    "Elastic",
+    "Dennis Perto"
   ],
   "description": "Identifies a Windows trusted program that is known to be vulnerable to DLL Search Order Hijacking starting after being renamed or from a non-standard path. This is uncommon behavior and may indicate an attempt to evade defenses via side-loading a malicious DLL within the memory space of one of those processes.",
   "false_positives": [
@@ -15,7 +16,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential DLL Side-Loading via Microsoft Antimalware Service Executable",
-  "query": "process where event.type == \"start\" and\n  (process.pe.original_file_name == \"MsMpEng.exe\" and not process.name : \"MsMpEng.exe\") or\n  (process.name : \"MsMpEng.exe\" and not\n        process.executable : (\"?:\\\\ProgramData\\\\Microsoft\\\\Windows Defender\\\\*.exe\",\n                              \"?:\\\\Program Files\\\\Windows Defender\\\\*.exe\",\n                              \"?:\\\\Program Files (x86)\\\\Windows Defender\\\\*.exe\"))\n",
+  "query": "process where event.type == \"start\" and\n  (process.pe.original_file_name == \"MsMpEng.exe\" and not process.name : \"MsMpEng.exe\") or\n  (process.name : \"MsMpEng.exe\" and not\n        process.executable : (\"?:\\\\ProgramData\\\\Microsoft\\\\Windows Defender\\\\*.exe\",\n                              \"?:\\\\Program Files\\\\Windows Defender\\\\*.exe\",\n                              \"?:\\\\Program Files (x86)\\\\Windows Defender\\\\*.exe\",\n                              \"?:\\\\Program Files\\\\Microsoft Security Client\\\\*.exe\",\n                              \"?:\\\\Program Files (x86)\\\\Microsoft Security Client\\\\*.exe\"))\n",
   "references": [
     "https://news.sophos.com/en-us/2021/07/04/independence-day-revil-uses-supply-chain-exploit-to-attack-hundreds-of-businesses/"
   ],
@@ -55,5 +56,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_creation_mult_extension.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_creation_mult_extension.json
index 24cbb1e41dad6..4cbfb8bbbce6c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_creation_mult_extension.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_creation_mult_extension.json
@@ -45,9 +45,31 @@
           ]
         }
       ]
+    },
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0002",
+        "name": "Execution",
+        "reference": "https://attack.mitre.org/tactics/TA0002/"
+      },
+      "technique": [
+        {
+          "id": "T1204",
+          "name": "User Execution",
+          "reference": "https://attack.mitre.org/techniques/T1204/",
+          "subtechnique": [
+            {
+              "id": "T1204.002",
+              "name": "Malicious File",
+              "reference": "https://attack.mitre.org/techniques/T1204/002/"
+            }
+          ]
+        }
+      ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_frontdoor_firewall_policy_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_frontdoor_firewall_policy_deletion.json
new file mode 100644
index 0000000000000..c443d45dde4f0
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_frontdoor_firewall_policy_deletion.json
@@ -0,0 +1,60 @@
+{
+  "author": [
+    "Austin Songer"
+  ],
+  "description": "Identifies the deletion of a Frontdoor Web Application Firewall (WAF) Policy in Azure. An adversary may delete a Frontdoor Web Application Firewall (WAF) Policy in an attempt to evade defenses and/or to eliminate barriers in carrying out their initiative.",
+  "false_positives": [
+    "Azure Front Web Application Firewall (WAF) Policy deletions may be done by a system or network administrator. Verify whether the username, hostname, and/or resource name should be making changes in your environment. Azure Front Web Application Firewall (WAF) Policy deletions from unfamiliar users or hosts should be investigated. If known behavior is causing false positives, it can be exempted from the rule."
+  ],
+  "from": "now-25m",
+  "index": [
+    "filebeat-*",
+    "logs-azure*"
+  ],
+  "language": "kuery",
+  "license": "Elastic License v2",
+  "name": "Azure Frontdoor Web Application Firewall (WAF) Policy Deleted",
+  "note": "## Config\n\nThe Azure Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
+  "query": "event.dataset:azure.activitylogs and azure.activitylogs.operation_name:\"MICROSOFT.NETWORK/FRONTDOORWEBAPPLICATIONFIREWALLPOLICIES/DELETE\" and event.outcome:(Success or success)\n",
+  "references": [
+    "https://docs.microsoft.com/en-us/azure/role-based-access-control/resource-provider-operations#networking"
+  ],
+  "risk_score": 21,
+  "rule_id": "09d028a5-dcde-409f-8ae0-557cef1b7082",
+  "severity": "low",
+  "tags": [
+    "Elastic",
+    "Cloud",
+    "Azure",
+    "Continuous Monitoring",
+    "SecOps",
+    "Network Security"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0005",
+        "name": "Defense Evasion",
+        "reference": "https://attack.mitre.org/tactics/TA0005/"
+      },
+      "technique": [
+        {
+          "id": "T1562",
+          "name": "Impair Defenses",
+          "reference": "https://attack.mitre.org/techniques/T1562/",
+          "subtechnique": [
+            {
+              "id": "T1562.001",
+              "name": "Disable or Modify Tools",
+              "reference": "https://attack.mitre.org/techniques/T1562/001/"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "query",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hide_encoded_executable_registry.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hide_encoded_executable_registry.json
index 006f95054d047..c40bbf236d668 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hide_encoded_executable_registry.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hide_encoded_executable_registry.json
@@ -36,11 +36,16 @@
           "id": "T1140",
           "name": "Deobfuscate/Decode Files or Information",
           "reference": "https://attack.mitre.org/techniques/T1140/"
+        },
+        {
+          "id": "T1112",
+          "name": "Modify Registry",
+          "reference": "https://attack.mitre.org/techniques/T1112/"
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_iis_httplogging_disabled.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_iis_httplogging_disabled.json
index 16de1c9c21f97..da12646d40226 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_iis_httplogging_disabled.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_iis_httplogging_disabled.json
@@ -34,14 +34,21 @@
       },
       "technique": [
         {
-          "id": "T1070",
-          "name": "Indicator Removal on Host",
-          "reference": "https://attack.mitre.org/techniques/T1070/"
+          "id": "T1562",
+          "name": "Impair Defenses",
+          "reference": "https://attack.mitre.org/techniques/T1562/",
+          "subtechnique": [
+            {
+              "id": "T1562.002",
+              "name": "Disable Windows Event Logging",
+              "reference": "https://attack.mitre.org/techniques/T1562/002/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_installutil_beacon.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_installutil_beacon.json
index 4917cffd64ccb..72ef939fd2c1c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_installutil_beacon.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_installutil_beacon.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "InstallUtil Process Making Network Connections",
-  "query": "/* the benefit of doing this as an eql sequence vs kql is this will limit to alerting only on the first network connection */\n\nsequence by process.entity_id\n  [process where event.type in (\"start\", \"process_started\") and process.name : \"installutil.exe\"]\n  [network where process.name : \"installutil.exe\" and network.direction == \"outgoing\"]\n",
+  "query": "/* the benefit of doing this as an eql sequence vs kql is this will limit to alerting only on the first network connection */\n\nsequence by process.entity_id\n  [process where event.type in (\"start\", \"process_started\") and process.name : \"installutil.exe\"]\n  [network where process.name : \"installutil.exe\" and network.direction : (\"outgoing\", \"egress\")]\n",
   "risk_score": 21,
   "rule_id": "a13167f1-eec2-4015-9631-1fee60406dcf",
   "severity": "medium",
@@ -48,5 +48,5 @@
     }
   ],
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_masquerading_renamed_autoit.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_masquerading_renamed_autoit.json
index bd0a3ac9f918d..5c855207dda7d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_masquerading_renamed_autoit.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_masquerading_renamed_autoit.json
@@ -35,12 +35,19 @@
         {
           "id": "T1036",
           "name": "Masquerading",
-          "reference": "https://attack.mitre.org/techniques/T1036/"
+          "reference": "https://attack.mitre.org/techniques/T1036/",
+          "subtechnique": [
+            {
+              "id": "T1036.003",
+              "name": "Rename System Utilities",
+              "reference": "https://attack.mitre.org/techniques/T1036/003/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_masquerading_trusted_directory.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_masquerading_trusted_directory.json
index b0d11121c1a15..7ac21a70100c0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_masquerading_trusted_directory.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_masquerading_trusted_directory.json
@@ -35,12 +35,19 @@
         {
           "id": "T1036",
           "name": "Masquerading",
-          "reference": "https://attack.mitre.org/techniques/T1036/"
+          "reference": "https://attack.mitre.org/techniques/T1036/",
+          "subtechnique": [
+            {
+              "id": "T1036.005",
+              "name": "Match Legitimate Name or Location",
+              "reference": "https://attack.mitre.org/techniques/T1036/005/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_masquerading_werfault.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_masquerading_werfault.json
index 2733bf992838e..a08e3040c6c95 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_masquerading_werfault.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_masquerading_werfault.json
@@ -15,7 +15,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential Windows Error Manager Masquerading",
-  "query": "sequence by host.id, process.entity_id with maxspan = 5s\n  [process where event.type:\"start\" and process.name : (\"wermgr.exe\", \"WerFault.exe\") and process.args_count == 1]\n  [network where process.name : (\"wermgr.exe\", \"WerFault.exe\") and network.protocol != \"dns\" and\n    network.direction == \"outgoing\" and destination.ip !=\"::1\" and destination.ip !=\"127.0.0.1\"\n  ]\n",
+  "query": "sequence by host.id, process.entity_id with maxspan = 5s\n  [process where event.type:\"start\" and process.name : (\"wermgr.exe\", \"WerFault.exe\") and process.args_count == 1]\n  [network where process.name : (\"wermgr.exe\", \"WerFault.exe\") and network.protocol != \"dns\" and\n    network.direction : (\"outgoing\", \"egress\") and destination.ip !=\"::1\" and destination.ip !=\"127.0.0.1\"\n  ]\n",
   "references": [
     "https://twitter.com/SBousseaden/status/1235533224337641473",
     "https://www.hexacorn.com/blog/2019/09/20/werfault-command-line-switches-v0-1/",
@@ -49,5 +49,5 @@
     }
   ],
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_msbuild_making_network_connections.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_msbuild_making_network_connections.json
index a2019165f93c6..6d0110c229c33 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_msbuild_making_network_connections.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_msbuild_making_network_connections.json
@@ -35,11 +35,18 @@
         {
           "id": "T1127",
           "name": "Trusted Developer Utilities Proxy Execution",
-          "reference": "https://attack.mitre.org/techniques/T1127/"
+          "reference": "https://attack.mitre.org/techniques/T1127/",
+          "subtechnique": [
+            {
+              "id": "T1127.001",
+              "name": "MSBuild",
+              "reference": "https://attack.mitre.org/techniques/T1127/001/"
+            }
+          ]
         }
       ]
     }
   ],
   "type": "eql",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_process_termination_followed_by_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_process_termination_followed_by_deletion.json
index b7d65b2336001..85316f7836b89 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_process_termination_followed_by_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_process_termination_followed_by_deletion.json
@@ -33,11 +33,18 @@
         {
           "id": "T1070",
           "name": "Indicator Removal on Host",
-          "reference": "https://attack.mitre.org/techniques/T1070/"
+          "reference": "https://attack.mitre.org/techniques/T1070/",
+          "subtechnique": [
+            {
+              "id": "T1070.004",
+              "name": "File Deletion",
+              "reference": "https://attack.mitre.org/techniques/T1070/004/"
+            }
+          ]
         }
       ]
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unusual_dir_ads.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unusual_dir_ads.json
index 196a3de9b9e6f..f926a1ba24faf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unusual_dir_ads.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_unusual_dir_ads.json
@@ -35,12 +35,19 @@
         {
           "id": "T1564",
           "name": "Hide Artifacts",
-          "reference": "https://attack.mitre.org/techniques/T1564/"
+          "reference": "https://attack.mitre.org/techniques/T1564/",
+          "subtechnique": [
+            {
+              "id": "T1564.004",
+              "name": "NTFS File Attributes",
+              "reference": "https://attack.mitre.org/techniques/T1564/004/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_via_filter_manager.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_via_filter_manager.json
index 51d1789804548..c0d171739b76d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_via_filter_manager.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_via_filter_manager.json
@@ -33,14 +33,21 @@
       },
       "technique": [
         {
-          "id": "T1222",
-          "name": "File and Directory Permissions Modification",
-          "reference": "https://attack.mitre.org/techniques/T1222/"
+          "id": "T1562",
+          "name": "Impair Defenses",
+          "reference": "https://attack.mitre.org/techniques/T1562/",
+          "subtechnique": [
+            {
+              "id": "T1562.001",
+              "name": "Disable or Modify Tools",
+              "reference": "https://attack.mitre.org/techniques/T1562/001/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_whitespace_padding_in_command_line.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_whitespace_padding_in_command_line.json
index fc9b480023c95..f022f0c27ff5e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_whitespace_padding_in_command_line.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_whitespace_padding_in_command_line.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Whitespace Padding in Process Command Line",
-  "note": "## Triage and analysis\n\n- Analyze the command line of the process in question for evidence of malicious code execution.\n- Review the ancestry and child processes spawned by the process in question for indicators of further malicious code execution.",
+  "note": "## Triage and analysis\n\n- Analyze the command line of the process in question for evidence of malicious code execution.\n- Review the ancestor and child processes spawned by the process in question for indicators of further malicious code execution.",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  process.command_line regex \".*[ ]{20,}.*\" or \n  \n  /* this will match on 3 or more separate occurrences of 5+ contiguous whitespace characters */\n  process.command_line regex \".*(.*[ ]{5,}[^ ]*){3,}.*\"\n",
   "references": [
     "https://twitter.com/JohnLaTwC/status/1419251082736201737"
@@ -40,5 +40,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_adfind_command_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_adfind_command_activity.json
index 97ba7da6c5f3b..9af3832303666 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_adfind_command_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_adfind_command_activity.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "AdFind Command Activity",
-  "note": "## Triage and analysis\n\n`AdFind.exe` is a legitimate domain query tool. Rule alerts should be investigated to identify if the user has a role that would explain using this tool and that it is being run from an expected directory and endpoint. Leverage the exception workflow in the Kibana Security App or Elasticsearch API to tune this rule to your environment.",
+  "note": "## Triage and analysis\n\n### Investigating AdFind Command Activity\n\n[AdFind](http://www.joeware.net/freetools/tools/adfind/) is a freely available command-line tool used to retrieve information from\nActivity Directory (AD). Network discovery and enumeration tools like `AdFind` are useful to adversaries in the same ways\nthey are effective for network administrators. This tool provides quick ability to scope AD person/computer objects and\nunderstand subnets and domain information. There are many [examples](https://thedfirreport.com/category/adfind/)\nobserved where this tool has been adopted by ransomware and criminal groups and used in compromises.\n\n#### Possible investigation steps:\n- `AdFind` is a legitimate Active Directory enumeration tool used by network administrators, it's important to understand\nthe source of the activity.  This could involve identifying the account using `AdFind` and determining based on the command-lines\nwhat information was retrieved, then further determining if these actions are in scope of that user's traditional responsibilities.\n- In multiple public references, `AdFind` is leveraged after initial access is achieved, review previous activity on impacted\nmachine looking for suspicious indicators such as previous anti-virus/EDR alerts, phishing emails received, or network traffic\nto suspicious infrastructure\n\n### False Positive Analysis\n- This rule has the high chance to produce false positives as it is a legitimate tool used by network administrators. One\noption could be whitelisting specific users or groups who use the tool as part of their daily responsibilities. This can\nbe done by leveraging the exception workflow in the Kibana Security App or Elasticsearch API to tune this rule to your environment\n- Malicious behavior with `AdFind` should be investigated as part of a step within an attack chain. It doesn't happen in\nisolation, so reviewing previous logs/activity from impacted machines could be very telling.\n\n### Related Rules\n- Windows Network Enumeration\n- Enumeration of Administrator Accounts\n- Enumeration Command Spawned via WMIPrvSE\n\n### Response and Remediation\n- Immediate response should be taken to validate activity, investigate and potentially isolate activity to prevent further\npost-compromise behavior\n- It's important to understand that `AdFind` is an Active Directory enumeration tool and can be used for malicious or legitimate\npurposes, so understanding the intent behind the activity will help determine the appropropriate response.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and \n  (process.name : \"AdFind.exe\" or process.pe.original_file_name == \"AdFind.exe\") and \n  process.args : (\"objectcategory=computer\", \"(objectcategory=computer)\", \n                  \"objectcategory=person\", \"(objectcategory=person)\",\n                  \"objectcategory=subnet\", \"(objectcategory=subnet)\",\n                  \"objectcategory=group\", \"(objectcategory=group)\", \n                  \"objectcategory=organizationalunit\", \"(objectcategory=organizationalunit)\",\n                  \"objectcategory=attributeschema\", \"(objectcategory=attributeschema)\",\n                  \"domainlist\", \"dcmodes\", \"adinfo\", \"dclist\", \"computers_pwnotreqd\", \"trustdmp\")\n",
   "references": [
     "http://www.joeware.net/freetools/tools/adfind/",
@@ -69,11 +69,16 @@
           "id": "T1482",
           "name": "Domain Trust Discovery",
           "reference": "https://attack.mitre.org/techniques/T1482/"
+        },
+        {
+          "id": "T1018",
+          "name": "Remote System Discovery",
+          "reference": "https://attack.mitre.org/techniques/T1018/"
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_admin_recon.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_admin_recon.json
index 1a3ceebe7218f..d5026780fdf56 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_admin_recon.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_admin_recon.json
@@ -35,7 +35,14 @@
         {
           "id": "T1069",
           "name": "Permission Groups Discovery",
-          "reference": "https://attack.mitre.org/techniques/T1069/"
+          "reference": "https://attack.mitre.org/techniques/T1069/",
+          "subtechnique": [
+            {
+              "id": "T1069.002",
+              "name": "Domain Groups",
+              "reference": "https://attack.mitre.org/techniques/T1069/002/"
+            }
+          ]
         },
         {
           "id": "T1087",
@@ -47,5 +54,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json
index 87b32d14791bb..dc855f3ed9a57 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json
@@ -33,14 +33,14 @@
       },
       "technique": [
         {
-          "id": "T1087",
-          "name": "Account Discovery",
-          "reference": "https://attack.mitre.org/techniques/T1087/"
+          "id": "T1033",
+          "name": "System Owner/User Discovery",
+          "reference": "https://attack.mitre.org/techniques/T1033/"
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_security_software_wmic.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_security_software_wmic.json
index d0f26c6e41756..92731ab40e78a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_security_software_wmic.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_security_software_wmic.json
@@ -35,12 +35,19 @@
         {
           "id": "T1518",
           "name": "Software Discovery",
-          "reference": "https://attack.mitre.org/techniques/T1518/"
+          "reference": "https://attack.mitre.org/techniques/T1518/",
+          "subtechnique": [
+            {
+              "id": "T1518.001",
+              "name": "Security Software Discovery",
+              "reference": "https://attack.mitre.org/techniques/T1518/001/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_virtual_machine_fingerprinting_grep.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_virtual_machine_fingerprinting_grep.json
new file mode 100644
index 0000000000000..e557e37db23d6
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_virtual_machine_fingerprinting_grep.json
@@ -0,0 +1,52 @@
+{
+  "author": [
+    "Elastic"
+  ],
+  "description": "An adversary may attempt to get detailed information about the operating system and hardware. This rule identifies common locations used to discover virtual machine hardware by a non-root user. This technique has been used by the Pupy RAT and other malware.",
+  "false_positives": [
+    "Certain tools or automated software may enumerate hardware information. These tools can be exempted via user name or process arguments to eliminate potential noise."
+  ],
+  "from": "now-9m",
+  "index": [
+    "auditbeat-*",
+    "logs-endpoint.events.*"
+  ],
+  "language": "eql",
+  "license": "Elastic License v2",
+  "name": "Virtual Machine Fingerprinting via Grep",
+  "query": "process where event.type == \"start\" and\n process.name in (\"grep\", \"egrep\") and user.id != \"0\" and\n process.args : (\"parallels*\", \"vmware*\", \"virtualbox*\") and process.args : \"Manufacturer*\" and \n not process.parent.executable in (\"/Applications/Docker.app/Contents/MacOS/Docker\", \"/usr/libexec/kcare/virt-what\")\n",
+  "references": [
+    "https://objective-see.com/blog/blog_0x4F.html"
+  ],
+  "risk_score": 47,
+  "rule_id": "c85eb82c-d2c8-485c-a36f-534f914b7663",
+  "severity": "medium",
+  "tags": [
+    "Elastic",
+    "Host",
+    "macOS",
+    "Linux",
+    "Threat Detection",
+    "Discovery"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0007",
+        "name": "Discovery",
+        "reference": "https://attack.mitre.org/tactics/TA0007/"
+      },
+      "technique": [
+        {
+          "id": "T1082",
+          "name": "System Information Discovery",
+          "reference": "https://attack.mitre.org/techniques/T1082/"
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "eql",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_enumeration_via_wmiprvse.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_enumeration_via_wmiprvse.json
index 6a967d9644c47..441e01b4a1b12 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_enumeration_via_wmiprvse.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_enumeration_via_wmiprvse.json
@@ -38,9 +38,34 @@
           "reference": "https://attack.mitre.org/techniques/T1047/"
         }
       ]
+    },
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0007",
+        "name": "Discovery",
+        "reference": "https://attack.mitre.org/tactics/TA0007/"
+      },
+      "technique": [
+        {
+          "id": "T1518",
+          "name": "Software Discovery",
+          "reference": "https://attack.mitre.org/techniques/T1518/"
+        },
+        {
+          "id": "T1087",
+          "name": "Account Discovery",
+          "reference": "https://attack.mitre.org/techniques/T1087/"
+        },
+        {
+          "id": "T1018",
+          "name": "Remote System Discovery",
+          "reference": "https://attack.mitre.org/techniques/T1018/"
+        }
+      ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_html_help_executable_program_connecting_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_html_help_executable_program_connecting_to_the_internet.json
index abc41d9f6d5c3..094b87f33ada7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_html_help_executable_program_connecting_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_html_help_executable_program_connecting_to_the_internet.json
@@ -34,7 +34,20 @@
         "name": "Execution",
         "reference": "https://attack.mitre.org/tactics/TA0002/"
       },
-      "technique": []
+      "technique": [
+        {
+          "id": "T1204",
+          "name": "User Execution",
+          "reference": "https://attack.mitre.org/techniques/T1204/",
+          "subtechnique": [
+            {
+              "id": "T1204.002",
+              "name": "Malicious File",
+              "reference": "https://attack.mitre.org/techniques/T1204/002/"
+            }
+          ]
+        }
+      ]
     },
     {
       "framework": "MITRE ATT&CK",
@@ -60,5 +73,5 @@
     }
   ],
   "type": "eql",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_scheduled_task_powershell_source.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_scheduled_task_powershell_source.json
index 24492343e98c0..3814b00321417 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_scheduled_task_powershell_source.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_scheduled_task_powershell_source.json
@@ -41,11 +41,18 @@
         {
           "id": "T1053",
           "name": "Scheduled Task/Job",
-          "reference": "https://attack.mitre.org/techniques/T1053/"
+          "reference": "https://attack.mitre.org/techniques/T1053/",
+          "subtechnique": [
+            {
+              "id": "T1053.005",
+              "name": "Scheduled Task",
+              "reference": "https://attack.mitre.org/techniques/T1053/005/"
+            }
+          ]
         }
       ]
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_via_compiled_html_file.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_via_compiled_html_file.json
index efc3884b417fb..73c796c4e206d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_via_compiled_html_file.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_via_compiled_html_file.json
@@ -34,7 +34,20 @@
         "name": "Execution",
         "reference": "https://attack.mitre.org/tactics/TA0002/"
       },
-      "technique": []
+      "technique": [
+        {
+          "id": "T1204",
+          "name": "User Execution",
+          "reference": "https://attack.mitre.org/techniques/T1204/",
+          "subtechnique": [
+            {
+              "id": "T1204.002",
+              "name": "Malicious File",
+              "reference": "https://attack.mitre.org/techniques/T1204/002/"
+            }
+          ]
+        }
+      ]
     },
     {
       "framework": "MITRE ATT&CK",
@@ -61,5 +74,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_rds_snapshot_export.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_rds_snapshot_export.json
index 430d97690b6f4..b59adc45b4236 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_rds_snapshot_export.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/exfiltration_rds_snapshot_export.json
@@ -1,6 +1,7 @@
 {
   "author": [
-    "Elastic"
+    "Elastic",
+    "Austin Songer"
   ],
   "description": "Identifies the export of an Amazon Relational Database Service (RDS) Aurora database snapshot.",
   "false_positives": [
@@ -44,5 +45,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_backup_file_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_backup_file_deletion.json
new file mode 100644
index 0000000000000..93c4c287d12ce
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_backup_file_deletion.json
@@ -0,0 +1,52 @@
+{
+  "author": [
+    "Elastic"
+  ],
+  "description": "Identifies the deletion of backup files, saved using third-party software, by a process outside of the backup suite. Adversaries may delete Backup files to ensure that recovery from a Ransomware attack is less likely.",
+  "false_positives": [
+    "Certain utilities that delete files for disk cleanup or Administrators manually removing backup files."
+  ],
+  "from": "now-9m",
+  "index": [
+    "winlogbeat-*",
+    "logs-endpoint.events.*",
+    "logs-windows.*"
+  ],
+  "language": "eql",
+  "license": "Elastic License v2",
+  "name": "Third-party Backup Files Deleted via Unexpected Process",
+  "query": "file where event.type == \"deletion\" and\n  (\n  /* Veeam Related Backup Files */\n  (file.extension : (\"VBK\", \"VIB\", \"VBM\") and\n  not process.executable : (\"?:\\\\Windows\\\\Veeam\\\\Backup\\\\*\",\n                            \"?:\\\\Program Files\\\\Veeam\\\\Backup and Replication\\\\*\",\n                            \"?:\\\\Program Files (x86)\\\\Veeam\\\\Backup and Replication\\\\*\")) or\n\n  /* Veritas Backup Exec Related Backup File */\n  (file.extension : \"BKF\" and\n  not process.executable : (\"?:\\\\Program Files\\\\Veritas\\\\Backup Exec\\\\*\",\n                            \"?:\\\\Program Files (x86)\\\\Veritas\\\\Backup Exec\\\\*\"))\n  )\n",
+  "references": [
+    "https://www.advintel.io/post/backup-removal-solutions-from-conti-ransomware-with-love"
+  ],
+  "risk_score": 47,
+  "rule_id": "11ea6bec-ebde-4d71-a8e9-784948f8e3e9",
+  "severity": "medium",
+  "tags": [
+    "Elastic",
+    "Host",
+    "Windows",
+    "Threat Detection",
+    "Impact"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0040",
+        "name": "Impact",
+        "reference": "https://attack.mitre.org/tactics/TA0040/"
+      },
+      "technique": [
+        {
+          "id": "T1490",
+          "name": "Inhibit System Recovery",
+          "reference": "https://attack.mitre.org/techniques/T1490/"
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "eql",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_deleting_backup_catalogs_with_wbadmin.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_deleting_backup_catalogs_with_wbadmin.json
similarity index 66%
rename from x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_deleting_backup_catalogs_with_wbadmin.json
rename to x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_deleting_backup_catalogs_with_wbadmin.json
index 5d1233ebfcb78..0c0c2a71b8263 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_deleting_backup_catalogs_with_wbadmin.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_deleting_backup_catalogs_with_wbadmin.json
@@ -21,33 +21,26 @@
     "Host",
     "Windows",
     "Threat Detection",
-    "Defense Evasion"
+    "Impact"
   ],
   "threat": [
     {
       "framework": "MITRE ATT&CK",
       "tactic": {
-        "id": "TA0005",
-        "name": "Defense Evasion",
-        "reference": "https://attack.mitre.org/tactics/TA0005/"
+        "id": "TA0040",
+        "name": "Impact",
+        "reference": "https://attack.mitre.org/tactics/TA0040/"
       },
       "technique": [
         {
-          "id": "T1070",
-          "name": "Indicator Removal on Host",
-          "reference": "https://attack.mitre.org/techniques/T1070/",
-          "subtechnique": [
-            {
-              "id": "T1070.004",
-              "name": "File Deletion",
-              "reference": "https://attack.mitre.org/techniques/T1070/004/"
-            }
-          ]
+          "id": "T1490",
+          "name": "Inhibit System Recovery",
+          "reference": "https://attack.mitre.org/techniques/T1490/"
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 9
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_microsoft_365_potential_ransomware_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_microsoft_365_potential_ransomware_activity.json
new file mode 100644
index 0000000000000..52094400232b6
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_microsoft_365_potential_ransomware_activity.json
@@ -0,0 +1,54 @@
+{
+  "author": [
+    "Austin Songer"
+  ],
+  "description": "Identifies when Microsoft Cloud App Security reported when a user uploads files to the cloud that might be infected with ransomware.",
+  "false_positives": [
+    "If Cloud App Security identifies, for example, a high rate of file uploads or file deletion activities it may represent an adverse encryption process."
+  ],
+  "from": "now-30m",
+  "index": [
+    "filebeat-*",
+    "logs-o365*"
+  ],
+  "language": "kuery",
+  "license": "Elastic License v2",
+  "name": "Microsoft 365 Potential ransomware activity",
+  "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n",
+  "query": "event.dataset:o365.audit and event.provider:SecurityComplianceCenter and event.category:web and event.action:\"Potential ransomware activity\" and event.outcome:success\n",
+  "references": [
+    "https://docs.microsoft.com/en-us/cloud-app-security/anomaly-detection-policy",
+    "https://docs.microsoft.com/en-us/cloud-app-security/policy-template-reference"
+  ],
+  "risk_score": 47,
+  "rule_id": "721999d0-7ab2-44bf-b328-6e63367b9b29",
+  "severity": "medium",
+  "tags": [
+    "Elastic",
+    "Cloud",
+    "Microsoft 365",
+    "Continuous Monitoring",
+    "SecOps",
+    "Configuration Audit"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0040",
+        "name": "Impact",
+        "reference": "https://attack.mitre.org/tactics/TA0040/"
+      },
+      "technique": [
+        {
+          "id": "T1486",
+          "name": "Data Encrypted for Impact",
+          "reference": "https://attack.mitre.org/techniques/T1486/"
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "query",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_microsoft_365_unusual_volume_of_file_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_microsoft_365_unusual_volume_of_file_deletion.json
new file mode 100644
index 0000000000000..c3a53310781df
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_microsoft_365_unusual_volume_of_file_deletion.json
@@ -0,0 +1,54 @@
+{
+  "author": [
+    "Austin Songer"
+  ],
+  "description": "Identifies that a user has deleted an unusually large volume of files  as reported by Microsoft Cloud App Security.",
+  "false_positives": [
+    "Users or System Administrator cleaning out folders."
+  ],
+  "from": "now-30m",
+  "index": [
+    "filebeat-*",
+    "logs-o365*"
+  ],
+  "language": "kuery",
+  "license": "Elastic License v2",
+  "name": "Microsoft 365 Unusual Volume of File Deletion",
+  "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n",
+  "query": "event.dataset:o365.audit and event.provider:SecurityComplianceCenter and event.category:web and event.action:\"Unusual volume of file deletion\" and event.outcome:success\n",
+  "references": [
+    "https://docs.microsoft.com/en-us/cloud-app-security/anomaly-detection-policy",
+    "https://docs.microsoft.com/en-us/cloud-app-security/policy-template-reference"
+  ],
+  "risk_score": 47,
+  "rule_id": "b2951150-658f-4a60-832f-a00d1e6c6745",
+  "severity": "medium",
+  "tags": [
+    "Elastic",
+    "Cloud",
+    "Microsoft 365",
+    "Continuous Monitoring",
+    "SecOps",
+    "Configuration Audit"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0040",
+        "name": "Impact",
+        "reference": "https://attack.mitre.org/tactics/TA0040/"
+      },
+      "technique": [
+        {
+          "id": "T1485",
+          "name": "Data Destruction",
+          "reference": "https://attack.mitre.org/techniques/T1485/"
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "query",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_modification_of_boot_config.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_modification_of_boot_config.json
similarity index 69%
rename from x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_modification_of_boot_config.json
rename to x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_modification_of_boot_config.json
index 7c58d82ec1061..91f5959bee119 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_modification_of_boot_config.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_modification_of_boot_config.json
@@ -21,33 +21,26 @@
     "Host",
     "Windows",
     "Threat Detection",
-    "Defense Evasion"
+    "Impact"
   ],
   "threat": [
     {
       "framework": "MITRE ATT&CK",
       "tactic": {
-        "id": "TA0005",
-        "name": "Defense Evasion",
-        "reference": "https://attack.mitre.org/tactics/TA0005/"
+        "id": "TA0040",
+        "name": "Impact",
+        "reference": "https://attack.mitre.org/tactics/TA0040/"
       },
       "technique": [
         {
-          "id": "T1070",
-          "name": "Indicator Removal on Host",
-          "reference": "https://attack.mitre.org/techniques/T1070/",
-          "subtechnique": [
-            {
-              "id": "T1070.004",
-              "name": "File Deletion",
-              "reference": "https://attack.mitre.org/techniques/T1070/004/"
-            }
-          ]
+          "id": "T1490",
+          "name": "Inhibit System Recovery",
+          "reference": "https://attack.mitre.org/techniques/T1490/"
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_stop_process_service_threshold.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_stop_process_service_threshold.json
similarity index 64%
rename from x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_stop_process_service_threshold.json
rename to x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_stop_process_service_threshold.json
index 86903058b62fe..ec361a8795538 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_stop_process_service_threshold.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_stop_process_service_threshold.json
@@ -2,7 +2,7 @@
   "author": [
     "Elastic"
   ],
-  "description": "This rule identifies a high number (10) of process terminations (stop, delete, or suspend) from the same host within a short time period. This may indicate a defense evasion attempt.",
+  "description": "This rule identifies a high number (10) of process terminations (stop, delete, or suspend) from the same host within a short time period.",
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
@@ -21,28 +21,21 @@
     "Host",
     "Windows",
     "Threat Detection",
-    "Defense Evasion"
+    "Impact"
   ],
   "threat": [
     {
       "framework": "MITRE ATT&CK",
       "tactic": {
-        "id": "TA0005",
-        "name": "Defense Evasion",
-        "reference": "https://attack.mitre.org/tactics/TA0005/"
+        "id": "TA0040",
+        "name": "Impact",
+        "reference": "https://attack.mitre.org/tactics/TA0040/"
       },
       "technique": [
         {
-          "id": "T1562",
-          "name": "Impair Defenses",
-          "reference": "https://attack.mitre.org/techniques/T1562/",
-          "subtechnique": [
-            {
-              "id": "T1562.001",
-              "name": "Disable or Modify Tools",
-              "reference": "https://attack.mitre.org/techniques/T1562/001/"
-            }
-          ]
+          "id": "T1489",
+          "name": "Service Stop",
+          "reference": "https://attack.mitre.org/techniques/T1489/"
         }
       ]
     }
@@ -54,5 +47,5 @@
     "value": 10
   },
   "type": "threshold",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_via_vssadmin.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_or_resized_via_vssadmin.json
similarity index 70%
rename from x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_via_vssadmin.json
rename to x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_or_resized_via_vssadmin.json
index f0ac38e98441e..940229bf63751 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_via_vssadmin.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_or_resized_via_vssadmin.json
@@ -2,7 +2,7 @@
   "author": [
     "Elastic"
   ],
-  "description": "Identifies use of vssadmin.exe for shadow copy deletion on endpoints. This commonly occurs in tandem with ransomware or other destructive attacks.",
+  "description": "Identifies use of vssadmin.exe for shadow copy deletion or resizing on endpoints. This commonly occurs in tandem with ransomware or other destructive attacks.",
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
@@ -11,8 +11,8 @@
   ],
   "language": "eql",
   "license": "Elastic License v2",
-  "name": "Volume Shadow Copy Deletion via VssAdmin",
-  "query": "process where event.type in (\"start\", \"process_started\") and\n  (process.name : \"vssadmin.exe\" or process.pe.original_file_name == \"VSSADMIN.EXE\") and\n  process.args : \"delete\" and process.args : \"shadows\"\n",
+  "name": "Volume Shadow Copy Deleted or Resized via VssAdmin",
+  "query": "process where event.type in (\"start\", \"process_started\") and event.action == \"start\" \n  and (process.name : \"vssadmin.exe\" or process.pe.original_file_name == \"VSSADMIN.EXE\") and\n  process.args in (\"delete\", \"resize\") and process.args : \"shadows*\"\n",
   "risk_score": 73,
   "rule_id": "b5ea4bfe-a1b2-421f-9d47-22a75a6f2921",
   "severity": "high",
@@ -42,5 +42,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 9
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_via_powershell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_via_powershell.json
new file mode 100644
index 0000000000000..43dce4acf4df8
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_via_powershell.json
@@ -0,0 +1,52 @@
+{
+  "author": [
+    "Elastic",
+    "Austin Songer"
+  ],
+  "description": "Identifies the use of the Win32_ShadowCopy class and related cmdlets to achieve shadow copy deletion. This commonly occurs in tandem with ransomware or other destructive attacks.",
+  "from": "now-9m",
+  "index": [
+    "winlogbeat-*",
+    "logs-endpoint.events.*",
+    "logs-windows.*"
+  ],
+  "language": "eql",
+  "license": "Elastic License v2",
+  "name": "Volume Shadow Copy Deletion via PowerShell",
+  "query": "process where event.type in (\"start\", \"process_started\") and\n  process.name : (\"powershell.exe\", \"pwsh.exe\") and \n  process.args : (\"*Get-WmiObject*\", \"*gwmi*\", \"*Get-CimInstance*\", \"*gcim*\") and\n  process.args : (\"*Win32_ShadowCopy*\") and\n  process.args : (\"*.Delete()*\", \"*Remove-WmiObject*\", \"*rwmi*\", \"*Remove-CimInstance*\", \"*rcim*\")\n",
+  "references": [
+    "https://docs.microsoft.com/en-us/previous-versions/windows/desktop/vsswmi/win32-shadowcopy",
+    "https://powershell.one/wmi/root/cimv2/win32_shadowcopy",
+    "https://www.fortinet.com/blog/threat-research/stomping-shadow-copies-a-second-look-into-deletion-methods"
+  ],
+  "risk_score": 73,
+  "rule_id": "d99a037b-c8e2-47a5-97b9-170d076827c4",
+  "severity": "high",
+  "tags": [
+    "Elastic",
+    "Host",
+    "Windows",
+    "Threat Detection",
+    "Impact"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0040",
+        "name": "Impact",
+        "reference": "https://attack.mitre.org/tactics/TA0040/"
+      },
+      "technique": [
+        {
+          "id": "T1490",
+          "name": "Inhibit System Recovery",
+          "reference": "https://attack.mitre.org/techniques/T1490/"
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "eql",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_volume_shadow_copy_deletion_via_wmic.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_via_wmic.json
similarity index 66%
rename from x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_volume_shadow_copy_deletion_via_wmic.json
rename to x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_via_wmic.json
index e519b23a32b0d..f4f530362a5b8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_volume_shadow_copy_deletion_via_wmic.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_volume_shadow_copy_deletion_via_wmic.json
@@ -21,33 +21,26 @@
     "Host",
     "Windows",
     "Threat Detection",
-    "Defense Evasion"
+    "Impact"
   ],
   "threat": [
     {
       "framework": "MITRE ATT&CK",
       "tactic": {
-        "id": "TA0005",
-        "name": "Defense Evasion",
-        "reference": "https://attack.mitre.org/tactics/TA0005/"
+        "id": "TA0040",
+        "name": "Impact",
+        "reference": "https://attack.mitre.org/tactics/TA0040/"
       },
       "technique": [
         {
-          "id": "T1070",
-          "name": "Indicator Removal on Host",
-          "reference": "https://attack.mitre.org/techniques/T1070/",
-          "subtechnique": [
-            {
-              "id": "T1070.004",
-              "name": "File Deletion",
-              "reference": "https://attack.mitre.org/techniques/T1070/004/"
-            }
-          ]
+          "id": "T1490",
+          "name": "Inhibit System Recovery",
+          "reference": "https://attack.mitre.org/techniques/T1490/"
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 9
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts
index 093d5c806c282..1c5006f5e6f48 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts
@@ -41,38 +41,38 @@ import rule28 from './command_and_control_vnc_virtual_network_computing_to_the_i
 import rule29 from './defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json';
 import rule30 from './defense_evasion_clearing_windows_event_logs.json';
 import rule31 from './defense_evasion_delete_volume_usn_journal_with_fsutil.json';
-import rule32 from './defense_evasion_deleting_backup_catalogs_with_wbadmin.json';
-import rule33 from './defense_evasion_disable_windows_firewall_rules_with_netsh.json';
-import rule34 from './defense_evasion_misc_lolbin_connecting_to_the_internet.json';
-import rule35 from './defense_evasion_msbuild_making_network_connections.json';
-import rule36 from './defense_evasion_suspicious_certutil_commands.json';
-import rule37 from './defense_evasion_unusual_network_connection_via_rundll32.json';
-import rule38 from './defense_evasion_unusual_process_network_connection.json';
-import rule39 from './defense_evasion_via_filter_manager.json';
-import rule40 from './defense_evasion_volume_shadow_copy_deletion_via_wmic.json';
-import rule41 from './discovery_whoami_command_activity.json';
-import rule42 from './endgame_adversary_behavior_detected.json';
-import rule43 from './endgame_cred_dumping_detected.json';
-import rule44 from './endgame_cred_dumping_prevented.json';
-import rule45 from './endgame_cred_manipulation_detected.json';
-import rule46 from './endgame_cred_manipulation_prevented.json';
-import rule47 from './endgame_exploit_detected.json';
-import rule48 from './endgame_exploit_prevented.json';
-import rule49 from './endgame_malware_detected.json';
-import rule50 from './endgame_malware_prevented.json';
-import rule51 from './endgame_permission_theft_detected.json';
-import rule52 from './endgame_permission_theft_prevented.json';
-import rule53 from './endgame_process_injection_detected.json';
-import rule54 from './endgame_process_injection_prevented.json';
-import rule55 from './endgame_ransomware_detected.json';
-import rule56 from './endgame_ransomware_prevented.json';
-import rule57 from './execution_command_prompt_connecting_to_the_internet.json';
-import rule58 from './execution_command_shell_started_by_svchost.json';
-import rule59 from './execution_html_help_executable_program_connecting_to_the_internet.json';
-import rule60 from './execution_psexec_lateral_movement_command.json';
-import rule61 from './execution_register_server_program_connecting_to_the_internet.json';
-import rule62 from './execution_via_compiled_html_file.json';
-import rule63 from './impact_volume_shadow_copy_deletion_via_vssadmin.json';
+import rule32 from './defense_evasion_disable_windows_firewall_rules_with_netsh.json';
+import rule33 from './defense_evasion_misc_lolbin_connecting_to_the_internet.json';
+import rule34 from './defense_evasion_msbuild_making_network_connections.json';
+import rule35 from './defense_evasion_suspicious_certutil_commands.json';
+import rule36 from './defense_evasion_unusual_network_connection_via_rundll32.json';
+import rule37 from './defense_evasion_unusual_process_network_connection.json';
+import rule38 from './defense_evasion_via_filter_manager.json';
+import rule39 from './discovery_whoami_command_activity.json';
+import rule40 from './endgame_adversary_behavior_detected.json';
+import rule41 from './endgame_cred_dumping_detected.json';
+import rule42 from './endgame_cred_dumping_prevented.json';
+import rule43 from './endgame_cred_manipulation_detected.json';
+import rule44 from './endgame_cred_manipulation_prevented.json';
+import rule45 from './endgame_exploit_detected.json';
+import rule46 from './endgame_exploit_prevented.json';
+import rule47 from './endgame_malware_detected.json';
+import rule48 from './endgame_malware_prevented.json';
+import rule49 from './endgame_permission_theft_detected.json';
+import rule50 from './endgame_permission_theft_prevented.json';
+import rule51 from './endgame_process_injection_detected.json';
+import rule52 from './endgame_process_injection_prevented.json';
+import rule53 from './endgame_ransomware_detected.json';
+import rule54 from './endgame_ransomware_prevented.json';
+import rule55 from './execution_command_prompt_connecting_to_the_internet.json';
+import rule56 from './execution_command_shell_started_by_svchost.json';
+import rule57 from './execution_html_help_executable_program_connecting_to_the_internet.json';
+import rule58 from './execution_psexec_lateral_movement_command.json';
+import rule59 from './execution_register_server_program_connecting_to_the_internet.json';
+import rule60 from './execution_via_compiled_html_file.json';
+import rule61 from './impact_deleting_backup_catalogs_with_wbadmin.json';
+import rule62 from './impact_volume_shadow_copy_deletion_or_resized_via_vssadmin.json';
+import rule63 from './impact_volume_shadow_copy_deletion_via_wmic.json';
 import rule64 from './initial_access_rpc_remote_procedure_call_from_the_internet.json';
 import rule65 from './initial_access_rpc_remote_procedure_call_to_the_internet.json';
 import rule66 from './initial_access_script_executing_powershell.json';
@@ -95,7 +95,7 @@ import rule82 from './persistence_system_shells_via_services.json';
 import rule83 from './persistence_user_account_creation.json';
 import rule84 from './persistence_via_application_shimming.json';
 import rule85 from './privilege_escalation_unusual_parentchild_relationship.json';
-import rule86 from './defense_evasion_modification_of_boot_config.json';
+import rule86 from './impact_modification_of_boot_config.json';
 import rule87 from './privilege_escalation_uac_bypass_event_viewer.json';
 import rule88 from './defense_evasion_msxsl_network.json';
 import rule89 from './discovery_net_command_system_account.json';
@@ -328,7 +328,7 @@ import rule315 from './command_and_control_cobalt_strike_default_teamserver_cert
 import rule316 from './defense_evasion_enable_inbound_rdp_with_netsh.json';
 import rule317 from './defense_evasion_execution_lolbas_wuauclt.json';
 import rule318 from './privilege_escalation_unusual_svchost_childproc_childless.json';
-import rule319 from './lateral_movement_rdp_tunnel_plink.json';
+import rule319 from './command_and_control_rdp_tunnel_plink.json';
 import rule320 from './privilege_escalation_uac_bypass_winfw_mmc_hijack.json';
 import rule321 from './persistence_ms_office_addins_file.json';
 import rule322 from './discovery_adfind_command_activity.json';
@@ -428,8 +428,8 @@ import rule415 from './credential_access_copy_ntds_sam_volshadowcp_cmdline.json'
 import rule416 from './credential_access_lsass_memdump_file_created.json';
 import rule417 from './lateral_movement_incoming_winrm_shell_execution.json';
 import rule418 from './lateral_movement_powershell_remoting_target.json';
-import rule419 from './defense_evasion_hide_encoded_executable_registry.json';
-import rule420 from './defense_evasion_port_forwarding_added_registry.json';
+import rule419 from './command_and_control_port_forwarding_added_registry.json';
+import rule420 from './defense_evasion_hide_encoded_executable_registry.json';
 import rule421 from './lateral_movement_rdp_enabled_registry.json';
 import rule422 from './privilege_escalation_printspooler_registry_copyfiles.json';
 import rule423 from './privilege_escalation_rogue_windir_environment_var.json';
@@ -443,7 +443,7 @@ import rule430 from './credential_access_microsoft_365_brute_force_user_account_
 import rule431 from './microsoft_365_teams_custom_app_interaction_allowed.json';
 import rule432 from './persistence_microsoft_365_teams_external_access_enabled.json';
 import rule433 from './credential_access_microsoft_365_potential_password_spraying_attack.json';
-import rule434 from './defense_evasion_stop_process_service_threshold.json';
+import rule434 from './impact_stop_process_service_threshold.json';
 import rule435 from './collection_winrar_encryption.json';
 import rule436 from './defense_evasion_unusual_dir_ads.json';
 import rule437 from './discovery_admin_recon.json';
@@ -466,8 +466,8 @@ import rule453 from './execution_apt_solarwinds_backdoor_child_cmd_powershell.js
 import rule454 from './execution_apt_solarwinds_backdoor_unusual_child_processes.json';
 import rule455 from './initial_access_azure_active_directory_powershell_signin.json';
 import rule456 from './collection_email_powershell_exchange_mailbox.json';
-import rule457 from './collection_persistence_powershell_exch_mailbox_activesync_add_device.json';
-import rule458 from './execution_scheduled_task_powershell_source.json';
+import rule457 from './execution_scheduled_task_powershell_source.json';
+import rule458 from './persistence_powershell_exch_mailbox_activesync_add_device.json';
 import rule459 from './persistence_docker_shortcuts_plist_modification.json';
 import rule460 from './persistence_evasion_hidden_local_account_creation.json';
 import rule461 from './persistence_finder_sync_plugin_pluginkit.json';
@@ -551,36 +551,54 @@ import rule538 from './persistence_ec2_security_group_configuration_change_detec
 import rule539 from './defense_evasion_disabling_windows_logs.json';
 import rule540 from './persistence_route_53_domain_transfer_lock_disabled.json';
 import rule541 from './persistence_route_53_domain_transferred_to_another_account.json';
-import rule542 from './credential_access_user_excessive_sso_logon_errors.json';
-import rule543 from './defense_evasion_suspicious_execution_from_mounted_device.json';
-import rule544 from './defense_evasion_unusual_network_connection_via_dllhost.json';
-import rule545 from './defense_evasion_amsienable_key_mod.json';
-import rule546 from './impact_rds_group_deletion.json';
-import rule547 from './persistence_rds_group_creation.json';
-import rule548 from './exfiltration_rds_snapshot_export.json';
-import rule549 from './persistence_rds_instance_creation.json';
-import rule550 from './ml_auth_rare_hour_for_a_user_to_logon.json';
-import rule551 from './ml_auth_rare_source_ip_for_a_user.json';
-import rule552 from './ml_auth_rare_user_logon.json';
-import rule553 from './ml_auth_spike_in_failed_logon_events.json';
-import rule554 from './ml_auth_spike_in_logon_events.json';
-import rule555 from './ml_auth_spike_in_logon_events_from_a_source_ip.json';
-import rule556 from './privilege_escalation_cyberarkpas_error_audit_event_promotion.json';
-import rule557 from './privilege_escalation_cyberarkpas_recommended_events_to_monitor_promotion.json';
-import rule558 from './privilege_escalation_printspooler_malicious_driver_file_changes.json';
-import rule559 from './privilege_escalation_printspooler_malicious_registry_modification.json';
-import rule560 from './privilege_escalation_printspooler_suspicious_file_deletion.json';
-import rule561 from './privilege_escalation_unusual_printspooler_childprocess.json';
-import rule562 from './defense_evasion_disabling_windows_defender_powershell.json';
-import rule563 from './defense_evasion_enable_network_discovery_with_netsh.json';
-import rule564 from './defense_evasion_execution_windefend_unusual_path.json';
-import rule565 from './defense_evasion_agent_spoofing_mismatched_id.json';
-import rule566 from './defense_evasion_agent_spoofing_multiple_hosts.json';
-import rule567 from './defense_evasion_parent_process_pid_spoofing.json';
-import rule568 from './defense_evasion_defender_exclusion_via_powershell.json';
-import rule569 from './defense_evasion_whitespace_padding_in_command_line.json';
-import rule570 from './persistence_webshell_detection.json';
-import rule571 from './persistence_via_bits_job_notify_command.json';
+import rule542 from './initial_access_okta_user_attempted_unauthorized_access.json';
+import rule543 from './credential_access_user_excessive_sso_logon_errors.json';
+import rule544 from './persistence_exchange_suspicious_mailbox_right_delegation.json';
+import rule545 from './privilege_escalation_new_or_modified_federation_domain.json';
+import rule546 from './privilege_escalation_sts_getsessiontoken_abuse.json';
+import rule547 from './defense_evasion_suspicious_execution_from_mounted_device.json';
+import rule548 from './defense_evasion_unusual_network_connection_via_dllhost.json';
+import rule549 from './defense_evasion_amsienable_key_mod.json';
+import rule550 from './impact_rds_group_deletion.json';
+import rule551 from './persistence_rds_group_creation.json';
+import rule552 from './persistence_route_table_modified_or_deleted.json';
+import rule553 from './exfiltration_rds_snapshot_export.json';
+import rule554 from './persistence_rds_instance_creation.json';
+import rule555 from './ml_auth_rare_hour_for_a_user_to_logon.json';
+import rule556 from './ml_auth_rare_source_ip_for_a_user.json';
+import rule557 from './ml_auth_rare_user_logon.json';
+import rule558 from './ml_auth_spike_in_failed_logon_events.json';
+import rule559 from './ml_auth_spike_in_logon_events.json';
+import rule560 from './ml_auth_spike_in_logon_events_from_a_source_ip.json';
+import rule561 from './privilege_escalation_cyberarkpas_error_audit_event_promotion.json';
+import rule562 from './privilege_escalation_cyberarkpas_recommended_events_to_monitor_promotion.json';
+import rule563 from './privilege_escalation_printspooler_malicious_driver_file_changes.json';
+import rule564 from './privilege_escalation_printspooler_malicious_registry_modification.json';
+import rule565 from './privilege_escalation_printspooler_suspicious_file_deletion.json';
+import rule566 from './privilege_escalation_unusual_printspooler_childprocess.json';
+import rule567 from './defense_evasion_disabling_windows_defender_powershell.json';
+import rule568 from './defense_evasion_enable_network_discovery_with_netsh.json';
+import rule569 from './defense_evasion_execution_windefend_unusual_path.json';
+import rule570 from './defense_evasion_agent_spoofing_mismatched_id.json';
+import rule571 from './defense_evasion_agent_spoofing_multiple_hosts.json';
+import rule572 from './defense_evasion_parent_process_pid_spoofing.json';
+import rule573 from './impact_microsoft_365_potential_ransomware_activity.json';
+import rule574 from './impact_microsoft_365_unusual_volume_of_file_deletion.json';
+import rule575 from './initial_access_microsoft_365_user_restricted_from_sending_email.json';
+import rule576 from './defense_evasion_elasticache_security_group_creation.json';
+import rule577 from './defense_evasion_elasticache_security_group_modified_or_deleted.json';
+import rule578 from './impact_volume_shadow_copy_deletion_via_powershell.json';
+import rule579 from './defense_evasion_defender_exclusion_via_powershell.json';
+import rule580 from './defense_evasion_whitespace_padding_in_command_line.json';
+import rule581 from './defense_evasion_frontdoor_firewall_policy_deletion.json';
+import rule582 from './persistence_webshell_detection.json';
+import rule583 from './defense_evasion_execution_control_panel_suspicious_args.json';
+import rule584 from './credential_access_potential_lsa_memdump_via_mirrordump.json';
+import rule585 from './discovery_virtual_machine_fingerprinting_grep.json';
+import rule586 from './impact_backup_file_deletion.json';
+import rule587 from './persistence_screensaver_engine_unexpected_child_process.json';
+import rule588 from './persistence_screensaver_plist_file_modification.json';
+import rule589 from './persistence_via_bits_job_notify_command.json';
 
 export const rawRules = [
   rule1,
@@ -1154,4 +1172,22 @@ export const rawRules = [
   rule569,
   rule570,
   rule571,
+  rule572,
+  rule573,
+  rule574,
+  rule575,
+  rule576,
+  rule577,
+  rule578,
+  rule579,
+  rule580,
+  rule581,
+  rule582,
+  rule583,
+  rule584,
+  rule585,
+  rule586,
+  rule587,
+  rule588,
+  rule589,
 ];
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_user_restricted_from_sending_email.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_user_restricted_from_sending_email.json
new file mode 100644
index 0000000000000..31950fc345c0e
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_microsoft_365_user_restricted_from_sending_email.json
@@ -0,0 +1,54 @@
+{
+  "author": [
+    "Austin Songer"
+  ],
+  "description": "Identifies when a user has been restricted from sending email due to exceeding sending limits of the service policies per the Security Compliance Center.",
+  "false_positives": [
+    "A user sending emails using personal distribution folders may trigger the event."
+  ],
+  "from": "now-30m",
+  "index": [
+    "filebeat-*",
+    "logs-o365*"
+  ],
+  "language": "kuery",
+  "license": "Elastic License v2",
+  "name": "Microsoft 365 User Restricted from Sending Email",
+  "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n",
+  "query": "event.dataset:o365.audit and event.provider:SecurityComplianceCenter and event.category:web and event.action:\"User restricted from sending email\" and event.outcome:success\n",
+  "references": [
+    "https://docs.microsoft.com/en-us/cloud-app-security/anomaly-detection-policy",
+    "https://docs.microsoft.com/en-us/cloud-app-security/policy-template-reference"
+  ],
+  "risk_score": 47,
+  "rule_id": "0136b315-b566-482f-866c-1d8e2477ba16",
+  "severity": "medium",
+  "tags": [
+    "Elastic",
+    "Cloud",
+    "Microsoft 365",
+    "Continuous Monitoring",
+    "SecOps",
+    "Configuration Audit"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0001",
+        "name": "Initial Access",
+        "reference": "https://attack.mitre.org/tactics/TA0001/"
+      },
+      "technique": [
+        {
+          "id": "T1078",
+          "name": "Valid Accounts",
+          "reference": "https://attack.mitre.org/techniques/T1078/"
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "query",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_okta_user_attempted_unauthorized_access.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_okta_user_attempted_unauthorized_access.json
new file mode 100644
index 0000000000000..222d30723bc9e
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_okta_user_attempted_unauthorized_access.json
@@ -0,0 +1,74 @@
+{
+  "author": [
+    "Elastic",
+    "Austin Songer"
+  ],
+  "description": "Identifies when an unauthorized access attempt is made by a user for an Okta application.",
+  "index": [
+    "filebeat-*",
+    "logs-okta*"
+  ],
+  "language": "kuery",
+  "license": "Elastic License v2",
+  "name": "Unauthorized Access to an Okta Application",
+  "note": "## Config\n\nThe Okta Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
+  "query": "event.dataset:okta.system and event.action:app.generic.unauth_app_access_attempt\n",
+  "risk_score": 21,
+  "rule_id": "4edd3e1a-3aa0-499b-8147-4d2ea43b1613",
+  "severity": "low",
+  "tags": [
+    "Elastic",
+    "Identity",
+    "Okta",
+    "Continuous Monitoring",
+    "SecOps",
+    "Identity and Access"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0001",
+        "name": "Initial Access",
+        "reference": "https://attack.mitre.org/tactics/TA0001/"
+      },
+      "technique": [
+        {
+          "id": "T1078",
+          "name": "Valid Accounts",
+          "reference": "https://attack.mitre.org/techniques/T1078/"
+        }
+      ]
+    },
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0005",
+        "name": "Defense Evasion",
+        "reference": "https://attack.mitre.org/tactics/TA0005/"
+      },
+      "technique": []
+    },
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0003",
+        "name": "Persistence",
+        "reference": "https://attack.mitre.org/tactics/TA0003/"
+      },
+      "technique": []
+    },
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0004",
+        "name": "Privilege Escalation",
+        "reference": "https://attack.mitre.org/tactics/TA0004/"
+      },
+      "technique": []
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "query",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_suspicious_ms_office_child_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_suspicious_ms_office_child_process.json
index 16486590cb093..17e9195181f3d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_suspicious_ms_office_child_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_suspicious_ms_office_child_process.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Suspicious MS Office Child Process",
-  "query": "process where event.type in (\"start\", \"process_started\") and\n  process.parent.name : (\"eqnedt32.exe\", \"excel.exe\", \"fltldr.exe\", \"msaccess.exe\", \"mspub.exe\", \"powerpnt.exe\", \"winword.exe\") and\n  process.name : (\"Microsoft.Workflow.Compiler.exe\", \"arp.exe\", \"atbroker.exe\", \"bginfo.exe\", \"bitsadmin.exe\", \"cdb.exe\", \"certutil.exe\",\n                \"cmd.exe\", \"cmstp.exe\", \"cscript.exe\", \"csi.exe\", \"dnx.exe\", \"dsget.exe\", \"dsquery.exe\", \"forfiles.exe\", \"fsi.exe\",\n                \"ftp.exe\", \"gpresult.exe\", \"hostname.exe\", \"ieexec.exe\", \"iexpress.exe\", \"installutil.exe\", \"ipconfig.exe\", \"mshta.exe\",\n                \"msxsl.exe\", \"nbtstat.exe\", \"net.exe\", \"net1.exe\", \"netsh.exe\", \"netstat.exe\", \"nltest.exe\", \"odbcconf.exe\", \"ping.exe\",\n                \"powershell.exe\", \"pwsh.exe\", \"qprocess.exe\", \"quser.exe\", \"qwinsta.exe\", \"rcsi.exe\", \"reg.exe\", \"regasm.exe\", \"regsvcs.exe\",\n                \"regsvr32.exe\", \"sc.exe\", \"schtasks.exe\", \"systeminfo.exe\", \"tasklist.exe\", \"tracert.exe\", \"whoami.exe\",\n                \"wmic.exe\", \"wscript.exe\", \"xwizard.exe\", \"explorer.exe\", \"rundll32.exe\", \"hh.exe\")\n",
+  "query": "process where event.type in (\"start\", \"process_started\") and\n  process.parent.name : (\"eqnedt32.exe\", \"excel.exe\", \"fltldr.exe\", \"msaccess.exe\", \"mspub.exe\", \"powerpnt.exe\", \"winword.exe\") and\n  process.name : (\"Microsoft.Workflow.Compiler.exe\", \"arp.exe\", \"atbroker.exe\", \"bginfo.exe\", \"bitsadmin.exe\", \"cdb.exe\", \"certutil.exe\",\n                \"cmd.exe\", \"cmstp.exe\", \"control.exe\", \"cscript.exe\", \"csi.exe\", \"dnx.exe\", \"dsget.exe\", \"dsquery.exe\", \"forfiles.exe\", \n                \"fsi.exe\", \"ftp.exe\", \"gpresult.exe\", \"hostname.exe\", \"ieexec.exe\", \"iexpress.exe\", \"installutil.exe\", \"ipconfig.exe\", \n                \"mshta.exe\", \"msxsl.exe\", \"nbtstat.exe\", \"net.exe\", \"net1.exe\", \"netsh.exe\", \"netstat.exe\", \"nltest.exe\", \"odbcconf.exe\", \n                \"ping.exe\", \"powershell.exe\", \"pwsh.exe\", \"qprocess.exe\", \"quser.exe\", \"qwinsta.exe\", \"rcsi.exe\", \"reg.exe\", \"regasm.exe\", \n                \"regsvcs.exe\", \"regsvr32.exe\", \"sc.exe\", \"schtasks.exe\", \"systeminfo.exe\", \"tasklist.exe\", \"tracert.exe\", \"whoami.exe\",\n                \"wmic.exe\", \"wscript.exe\", \"xwizard.exe\", \"explorer.exe\", \"rundll32.exe\", \"hh.exe\")\n",
   "risk_score": 47,
   "rule_id": "a624863f-a70d-417f-a7d2-7a404638d47f",
   "severity": "medium",
@@ -49,5 +49,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_credential_access_kerberos_bifrostconsole.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_credential_access_kerberos_bifrostconsole.json
index 82fa9d8d72a92..0fd10fc807846 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_credential_access_kerberos_bifrostconsole.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_credential_access_kerberos_bifrostconsole.json
@@ -60,12 +60,19 @@
         {
           "id": "T1558",
           "name": "Steal or Forge Kerberos Tickets",
-          "reference": "https://attack.mitre.org/techniques/T1558/"
+          "reference": "https://attack.mitre.org/techniques/T1558/",
+          "subtechnique": [
+            {
+              "id": "T1558.003",
+              "name": "Kerberoasting",
+              "reference": "https://attack.mitre.org/techniques/T1558/003/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dcom_hta.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dcom_hta.json
index 707596aa333d0..f832eb51336f8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dcom_hta.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dcom_hta.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Incoming DCOM Lateral Movement via MSHTA",
-  "query": "sequence with maxspan=1m\n  [process where event.type in (\"start\", \"process_started\") and\n     process.name : \"mshta.exe\" and process.args : \"-Embedding\"\n  ] by host.id, process.entity_id\n  [network where event.type == \"start\" and process.name : \"mshta.exe\" and \n     network.direction == \"incoming\" and network.transport == \"tcp\" and\n     source.port > 49151 and destination.port > 49151 and not source.address in (\"127.0.0.1\", \"::1\")\n  ] by host.id, process.entity_id\n",
+  "query": "sequence with maxspan=1m\n  [process where event.type in (\"start\", \"process_started\") and\n     process.name : \"mshta.exe\" and process.args : \"-Embedding\"\n  ] by host.id, process.entity_id\n  [network where event.type == \"start\" and process.name : \"mshta.exe\" and \n     network.direction : (\"incoming\", \"ingress\") and network.transport == \"tcp\" and\n     source.port > 49151 and destination.port > 49151 and not source.address in (\"127.0.0.1\", \"::1\")\n  ] by host.id, process.entity_id\n",
   "references": [
     "https://codewhitesec.blogspot.com/2018/07/lethalhta.html"
   ],
@@ -38,11 +38,40 @@
         {
           "id": "T1021",
           "name": "Remote Services",
-          "reference": "https://attack.mitre.org/techniques/T1021/"
+          "reference": "https://attack.mitre.org/techniques/T1021/",
+          "subtechnique": [
+            {
+              "id": "T1021.003",
+              "name": "Distributed Component Object Model",
+              "reference": "https://attack.mitre.org/techniques/T1021/003/"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0005",
+        "name": "Defense Evasion",
+        "reference": "https://attack.mitre.org/tactics/TA0005/"
+      },
+      "technique": [
+        {
+          "id": "T1218",
+          "name": "Signed Binary Proxy Execution",
+          "reference": "https://attack.mitre.org/techniques/T1218/",
+          "subtechnique": [
+            {
+              "id": "T1218.005",
+              "name": "Mshta",
+              "reference": "https://attack.mitre.org/techniques/T1218/005/"
+            }
+          ]
         }
       ]
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dcom_mmc20.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dcom_mmc20.json
index c78343223a10f..8cb2e2c3690e6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dcom_mmc20.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dcom_mmc20.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Incoming DCOM Lateral Movement with MMC",
-  "query": "sequence by host.id with maxspan=1m\n [network where event.type == \"start\" and process.name : \"mmc.exe\" and\n  source.port >= 49152 and destination.port >= 49152 and source.address not in (\"127.0.0.1\", \"::1\") and\n  network.direction == \"incoming\" and network.transport == \"tcp\"\n ] by process.entity_id\n [process where event.type in (\"start\", \"process_started\") and process.parent.name : \"mmc.exe\"\n ] by process.parent.entity_id\n",
+  "query": "sequence by host.id with maxspan=1m\n [network where event.type == \"start\" and process.name : \"mmc.exe\" and\n  source.port >= 49152 and destination.port >= 49152 and source.address not in (\"127.0.0.1\", \"::1\") and\n  network.direction : (\"incoming\", \"ingress\") and network.transport == \"tcp\"\n ] by process.entity_id\n [process where event.type in (\"start\", \"process_started\") and process.parent.name : \"mmc.exe\"\n ] by process.parent.entity_id\n",
   "references": [
     "https://enigma0x3.net/2017/01/05/lateral-movement-using-the-mmc20-application-com-object/"
   ],
@@ -38,11 +38,18 @@
         {
           "id": "T1021",
           "name": "Remote Services",
-          "reference": "https://attack.mitre.org/techniques/T1021/"
+          "reference": "https://attack.mitre.org/techniques/T1021/",
+          "subtechnique": [
+            {
+              "id": "T1021.003",
+              "name": "Distributed Component Object Model",
+              "reference": "https://attack.mitre.org/techniques/T1021/003/"
+            }
+          ]
         }
       ]
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dcom_shellwindow_shellbrowserwindow.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dcom_shellwindow_shellbrowserwindow.json
index 617cbc2fab05e..9ca759cc2facd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dcom_shellwindow_shellbrowserwindow.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dcom_shellwindow_shellbrowserwindow.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Incoming DCOM Lateral Movement with ShellBrowserWindow or ShellWindows",
-  "query": "sequence by host.id with maxspan=5s\n [network where event.type == \"start\" and process.name : \"explorer.exe\" and\n  network.direction == \"incoming\" and network.transport == \"tcp\" and\n  source.port > 49151 and destination.port > 49151 and not source.address in (\"127.0.0.1\", \"::1\")\n ] by process.entity_id\n [process where event.type in (\"start\", \"process_started\") and\n  process.parent.name : \"explorer.exe\"\n ] by process.parent.entity_id\n",
+  "query": "sequence by host.id with maxspan=5s\n [network where event.type == \"start\" and process.name : \"explorer.exe\" and\n  network.direction : (\"incoming\", \"ingress\") and network.transport == \"tcp\" and\n  source.port > 49151 and destination.port > 49151 and not source.address in (\"127.0.0.1\", \"::1\")\n ] by process.entity_id\n [process where event.type in (\"start\", \"process_started\") and\n  process.parent.name : \"explorer.exe\"\n ] by process.parent.entity_id\n",
   "references": [
     "https://enigma0x3.net/2017/01/23/lateral-movement-via-dcom-round-2/"
   ],
@@ -38,11 +38,18 @@
         {
           "id": "T1021",
           "name": "Remote Services",
-          "reference": "https://attack.mitre.org/techniques/T1021/"
+          "reference": "https://attack.mitre.org/techniques/T1021/",
+          "subtechnique": [
+            {
+              "id": "T1021.003",
+              "name": "Distributed Component Object Model",
+              "reference": "https://attack.mitre.org/techniques/T1021/003/"
+            }
+          ]
         }
       ]
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_direct_outbound_smb_connection.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_direct_outbound_smb_connection.json
index b4534c48d0fa2..c9983d2ba186e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_direct_outbound_smb_connection.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_direct_outbound_smb_connection.json
@@ -33,13 +33,20 @@
       },
       "technique": [
         {
-          "id": "T1210",
-          "name": "Exploitation of Remote Services",
-          "reference": "https://attack.mitre.org/techniques/T1210/"
+          "id": "T1021",
+          "name": "Remote Services",
+          "reference": "https://attack.mitre.org/techniques/T1021/",
+          "subtechnique": [
+            {
+              "id": "T1021.002",
+              "name": "SMB/Windows Admin Shares",
+              "reference": "https://attack.mitre.org/techniques/T1021/002/"
+            }
+          ]
         }
       ]
     }
   ],
   "type": "eql",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json
index b34badc7c8611..6e11258e23d00 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json
@@ -13,7 +13,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Abnormally Large DNS Response",
-  "note": "## Triage and analysis\n\n### Investigating Large DNS Responses\nDetection alerts from this rule indicate an attempt was made to exploit CVE-2020-1350 (SigRed) through the use of large DNS responses on a Windows DNS server. Here are some possible avenues of investigation:\n- Investigate any corresponding Intrusion Detection Signatures (IDS) alerts that can validate this detection alert.\n- Examine the `dns.question_type` network fieldset with a protocol analyzer, such as Zeek, Packetbeat, or Suricata, for `SIG` or `RRSIG` data.\n- Validate the patch level and OS of the targeted DNS server to validate the observed activity was not large-scale Internet vulnerability scanning.\n- Validate that the source of the network activity was not from an authorized vulnerability scan or compromise assessment.",
+  "note": "## Triage and analysis\n\n### Investigating Large DNS Responses\nDetection alerts from this rule indicate possible anomalous activity around large byte DNS responses from a Windows DNS\nserver. This detection rule was created based on activity represented in exploitation of vulnerability (CVE-2020-1350)\nalso known as [SigRed](https://www.elastic.co/blog/detection-rules-for-sigred-vulnerability) during July 2020.\n\n#### Possible investigation steps:\n- This specific rule is sourced from network log activity such as DNS or network level data. It's important to validate\nthe source of the incoming traffic and determine if this activity has been observed previously within an environment.\n- Activity can be further investigated and validated by reviewing available corresponding Intrusion Detection Signatures (IDS) alerts associated with activity.\n- Further examination can be made by reviewing the `dns.question_type` network fieldset with a protocol analyzer, such as Zeek, Packetbeat, or Suricata, for `SIG` or `RRSIG` data.\n- Validate the patch level and OS of the targeted DNS server to validate the observed activity was not large-scale Internet vulnerability scanning.\n- Validate that the source of the network activity was not from an authorized vulnerability scan or compromise assessment.\n\n#### False Positive Analysis\n- Based on this rule which looks for a threshold of 60k bytes, it is possible for activity to be generated under 65k bytes\nand related to legitimate behavior.  In packet capture files received by the [SANS Internet Storm Center](https://isc.sans.edu/forums/diary/PATCH+NOW+SIGRed+CVE20201350+Microsoft+DNS+Server+Vulnerability/26356/), byte responses\nwere all observed as greater than 65k bytes.\n- This activity has the ability to be triggered from compliance/vulnerability scanning or compromise assessment, it's\nimportant to determine the source of the activity and potential whitelist the source host\n\n\n### Related Rules\n- Unusual Child Process of dns.exe\n- Unusual File Modification by dns.exe\n\n### Response and Remediation\n- Review and implement the above detection logic within your environment using technology such as Endpoint security, Winlogbeat, Packetbeat, or network security monitoring (NSM) platforms such as Zeek or Suricata.\n- Ensure that you have deployed the latest Microsoft [Security Update](https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2020-1350) (Monthly Rollup or Security Only) and restart the\npatched machines. If unable to patch immediately: Microsoft [released](https://support.microsoft.com/en-us/help/4569509/windows-dns-server-remote-code-execution-vulnerability) a registry-based workaround that doesn\u2019t require a\nrestart. This can be used as a temporary solution before the patch is applied.\n- Maintain backups of your critical systems to aid in quick recovery.\n- Perform routine vulnerability scans of your systems, monitor [CISA advisories](https://us-cert.cisa.gov/ncas/current-activity) and patch identified vulnerabilities.\n- If observed true positive activity, implement a remediation plan and monitor host-based artifacts for additional post-exploitation behavior.\n",
   "query": "event.category:(network or network_traffic) and destination.port:53 and\n  (event.dataset:zeek.dns or type:dns or event.type:connection) and network.bytes > 60000\n",
   "references": [
     "https://research.checkpoint.com/2020/resolving-your-way-into-domain-admin-exploiting-a-17-year-old-bug-in-windows-dns-servers/",
@@ -48,5 +48,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_executable_tool_transfer_smb.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_executable_tool_transfer_smb.json
index 8173ddc6f1003..5fe9d066bc76d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_executable_tool_transfer_smb.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_executable_tool_transfer_smb.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Lateral Tool Transfer",
-  "query": "sequence by host.id with maxspan=30s\n  [network where event.type == \"start\" and process.pid == 4 and destination.port == 445 and\n   network.direction == \"incoming\" and network.transport == \"tcp\" and\n   source.address != \"127.0.0.1\" and source.address != \"::1\"\n  ] by process.entity_id\n  /* add more executable extensions here if they are not noisy in your environment */\n  [file where event.type in (\"creation\", \"change\") and process.pid == 4 and file.extension : (\"exe\", \"dll\", \"bat\", \"cmd\")] by process.entity_id\n",
+  "query": "sequence by host.id with maxspan=30s\n  [network where event.type == \"start\" and process.pid == 4 and destination.port == 445 and\n   network.direction : (\"incoming\", \"ingress\") and network.transport == \"tcp\" and\n   source.address != \"127.0.0.1\" and source.address != \"::1\"\n  ] by process.entity_id\n  /* add more executable extensions here if they are not noisy in your environment */\n  [file where event.type in (\"creation\", \"change\") and process.pid == 4 and file.extension : (\"exe\", \"dll\", \"bat\", \"cmd\")] by process.entity_id\n",
   "risk_score": 47,
   "rule_id": "58bc134c-e8d2-4291-a552-b4b3e537c60b",
   "severity": "medium",
@@ -41,5 +41,5 @@
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_incoming_winrm_shell_execution.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_incoming_winrm_shell_execution.json
index 062013549e1da..04a60f99556f4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_incoming_winrm_shell_execution.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_incoming_winrm_shell_execution.json
@@ -15,7 +15,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Incoming Execution via WinRM Remote Shell",
-  "query": "sequence by host.id with maxspan=30s\n   [network where process.pid == 4 and network.direction == \"incoming\" and\n    destination.port in (5985, 5986) and network.protocol == \"http\" and not source.address in (\"::1\", \"127.0.0.1\")\n   ]\n   [process where event.type == \"start\" and process.parent.name : \"winrshost.exe\" and not process.name : \"conhost.exe\"]\n",
+  "query": "sequence by host.id with maxspan=30s\n   [network where process.pid == 4 and network.direction : (\"incoming\", \"ingress\") and\n    destination.port in (5985, 5986) and network.protocol == \"http\" and not source.address in (\"::1\", \"127.0.0.1\")\n   ]\n   [process where event.type == \"start\" and process.parent.name : \"winrshost.exe\" and not process.name : \"conhost.exe\"]\n",
   "risk_score": 47,
   "rule_id": "1cd01db9-be24-4bef-8e7c-e923f0ff78ab",
   "severity": "medium",
@@ -44,5 +44,5 @@
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_incoming_wmi.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_incoming_wmi.json
index 901a19d896ff3..9b13ade43812f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_incoming_wmi.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_incoming_wmi.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "WMI Incoming Lateral Movement",
-  "query": "sequence by host.id with maxspan = 2s\n\n /* Accepted Incoming RPC connection by Winmgmt service */\n\n  [network where process.name : \"svchost.exe\" and network.direction == \"incoming\" and\n   source.address != \"127.0.0.1\" and source.address != \"::1\" and \n   source.port >= 49152 and destination.port >= 49152\n  ]\n\n  /* Excluding Common FPs Nessus and SCCM */\n\n  [process where event.type in (\"start\", \"process_started\") and process.parent.name : \"WmiPrvSE.exe\" and\n   not process.args : (\"C:\\\\windows\\\\temp\\\\nessus_*.txt\", \n                       \"C:\\\\windows\\\\TEMP\\\\nessus_*.TMP\", \n                       \"C:\\\\Windows\\\\CCM\\\\SystemTemp\\\\*\", \n                       \"C:\\\\Windows\\\\CCMCache\\\\*\", \n                       \"C:\\\\CCM\\\\Cache\\\\*\")\n   ]\n",
+  "query": "sequence by host.id with maxspan = 2s\n\n /* Accepted Incoming RPC connection by Winmgmt service */\n\n  [network where process.name : \"svchost.exe\" and network.direction : (\"incoming\", \"ingress\") and\n   source.address != \"127.0.0.1\" and source.address != \"::1\" and \n   source.port >= 49152 and destination.port >= 49152\n  ]\n\n  /* Excluding Common FPs Nessus and SCCM */\n\n  [process where event.type in (\"start\", \"process_started\") and process.parent.name : \"WmiPrvSE.exe\" and\n   not process.args : (\"C:\\\\windows\\\\temp\\\\nessus_*.txt\", \n                       \"C:\\\\windows\\\\TEMP\\\\nessus_*.TMP\", \n                       \"C:\\\\Windows\\\\CCM\\\\SystemTemp\\\\*\", \n                       \"C:\\\\Windows\\\\CCMCache\\\\*\", \n                       \"C:\\\\CCM\\\\Cache\\\\*\")\n   ]\n",
   "risk_score": 47,
   "rule_id": "f3475224-b179-4f78-8877-c2bd64c26b88",
   "severity": "medium",
@@ -50,5 +50,5 @@
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_powershell_remoting_target.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_powershell_remoting_target.json
index 33b5ef7c0dacb..94708f90d20bb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_powershell_remoting_target.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_powershell_remoting_target.json
@@ -15,7 +15,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Incoming Execution via PowerShell Remoting",
-  "query": "sequence by host.id with maxspan = 30s\n   [network where network.direction == \"incoming\" and destination.port in (5985, 5986) and\n    network.protocol == \"http\" and source.address != \"127.0.0.1\" and source.address != \"::1\"\n   ]\n   [process where event.type == \"start\" and process.parent.name : \"wsmprovhost.exe\" and not process.name : \"conhost.exe\"]\n",
+  "query": "sequence by host.id with maxspan = 30s\n   [network where network.direction : (\"incoming\", \"ingress\") and destination.port in (5985, 5986) and\n    network.protocol == \"http\" and source.address != \"127.0.0.1\" and source.address != \"::1\"\n   ]\n   [process where event.type == \"start\" and process.parent.name : \"wsmprovhost.exe\" and not process.name : \"conhost.exe\"]\n",
   "references": [
     "https://docs.microsoft.com/en-us/powershell/scripting/learn/remoting/running-remote-commands?view=powershell-7.1"
   ],
@@ -47,5 +47,5 @@
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_enabled_registry.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_enabled_registry.json
index 6b2f782e488c4..584f24cfb30f3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_enabled_registry.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_enabled_registry.json
@@ -35,12 +35,19 @@
         {
           "id": "T1021",
           "name": "Remote Services",
-          "reference": "https://attack.mitre.org/techniques/T1021/"
+          "reference": "https://attack.mitre.org/techniques/T1021/",
+          "subtechnique": [
+            {
+              "id": "T1021.001",
+              "name": "Remote Desktop Protocol",
+              "reference": "https://attack.mitre.org/techniques/T1021/001/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_sharprdp_target.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_sharprdp_target.json
index 0318883e374d3..0e5b7e7bc9001 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_sharprdp_target.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_sharprdp_target.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential SharpRDP Behavior",
-  "query": "/* Incoming RDP followed by a new RunMRU string value set to cmd, powershell, taskmgr or tsclient, followed by process execution within 1m */\n\nsequence by host.id with maxspan=1m\n  [network where event.type == \"start\" and process.name : \"svchost.exe\" and destination.port == 3389 and \n   network.direction == \"incoming\" and network.transport == \"tcp\" and\n   source.address != \"127.0.0.1\" and source.address != \"::1\"\n  ]\n\n  [registry where process.name : \"explorer.exe\" and \n   registry.path : (\"HKEY_USERS\\\\*\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\RunMRU\\\\*\") and\n   registry.data.strings : (\"cmd.exe*\", \"powershell.exe*\", \"taskmgr*\", \"\\\\\\\\tsclient\\\\*.exe\\\\*\")\n  ]\n  \n  [process where event.type in (\"start\", \"process_started\") and\n   (process.parent.name : (\"cmd.exe\", \"powershell.exe\", \"taskmgr.exe\") or process.args : (\"\\\\\\\\tsclient\\\\*.exe\")) and \n   not process.name : \"conhost.exe\"\n   ]\n",
+  "query": "/* Incoming RDP followed by a new RunMRU string value set to cmd, powershell, taskmgr or tsclient, followed by process execution within 1m */\n\nsequence by host.id with maxspan=1m\n  [network where event.type == \"start\" and process.name : \"svchost.exe\" and destination.port == 3389 and \n   network.direction : (\"incoming\", \"ingress\") and network.transport == \"tcp\" and\n   source.address != \"127.0.0.1\" and source.address != \"::1\"\n  ]\n\n  [registry where process.name : \"explorer.exe\" and \n   registry.path : (\"HKEY_USERS\\\\*\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\RunMRU\\\\*\") and\n   registry.data.strings : (\"cmd.exe*\", \"powershell.exe*\", \"taskmgr*\", \"\\\\\\\\tsclient\\\\*.exe\\\\*\")\n  ]\n  \n  [process where event.type in (\"start\", \"process_started\") and\n   (process.parent.name : (\"cmd.exe\", \"powershell.exe\", \"taskmgr.exe\") or process.args : (\"\\\\\\\\tsclient\\\\*.exe\")) and \n   not process.name : \"conhost.exe\"\n   ]\n",
   "references": [
     "https://posts.specterops.io/revisiting-remote-desktop-lateral-movement-8fb905cb46c3",
     "https://github.com/sbousseaden/EVTX-ATTACK-SAMPLES/blob/master/Lateral%20Movement/LM_sysmon_3_12_13_1_SharpRDP.evtx"
@@ -39,11 +39,18 @@
         {
           "id": "T1021",
           "name": "Remote Services",
-          "reference": "https://attack.mitre.org/techniques/T1021/"
+          "reference": "https://attack.mitre.org/techniques/T1021/",
+          "subtechnique": [
+            {
+              "id": "T1021.001",
+              "name": "Remote Desktop Protocol",
+              "reference": "https://attack.mitre.org/techniques/T1021/001/"
+            }
+          ]
         }
       ]
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_remote_services.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_remote_services.json
index 88f5e0e63a052..5220506d37f58 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_remote_services.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_remote_services.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remotely Started Services via RPC",
-  "query": "sequence with maxspan=1s\n   [network where process.name : \"services.exe\" and\n      network.direction == \"incoming\" and network.transport == \"tcp\" and \n      source.port >= 49152 and destination.port >= 49152 and source.address not in (\"127.0.0.1\", \"::1\")\n   ] by host.id, process.entity_id\n\n   [process where event.type in (\"start\", \"process_started\") and process.parent.name : \"services.exe\" and \n       not (process.name : \"svchost.exe\" and process.args : \"tiledatamodelsvc\") and \n       not (process.name : \"msiexec.exe\" and process.args : \"/V\")\n   \n    /* uncomment if psexec is noisy in your environment */\n    /* and not process.name : \"PSEXESVC.exe\" */\n   ] by host.id, process.parent.entity_id\n",
+  "query": "sequence with maxspan=1s\n   [network where process.name : \"services.exe\" and\n      network.direction : (\"incoming\", \"ingress\") and network.transport == \"tcp\" and \n      source.port >= 49152 and destination.port >= 49152 and source.address not in (\"127.0.0.1\", \"::1\")\n   ] by host.id, process.entity_id\n\n   [process where event.type in (\"start\", \"process_started\") and process.parent.name : \"services.exe\" and \n       not (process.name : \"svchost.exe\" and process.args : \"tiledatamodelsvc\") and \n       not (process.name : \"msiexec.exe\" and process.args : \"/V\")\n   \n    /* uncomment if psexec is noisy in your environment */\n    /* and not process.name : \"PSEXESVC.exe\" */\n   ] by host.id, process.parent.entity_id\n",
   "risk_score": 47,
   "rule_id": "aa9a274d-6b53-424d-ac5e-cb8ca4251650",
   "severity": "medium",
@@ -41,5 +41,5 @@
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_scheduled_task_target.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_scheduled_task_target.json
index b66b5a94fe27f..b60717e61765a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_scheduled_task_target.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_scheduled_task_target.json
@@ -12,8 +12,8 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote Scheduled Task Creation",
-  "note": "## Triage and analysis\n\nDecode the base64 encoded tasks actions registry value to investigate the task configured action.",
-  "query": "/* Task Scheduler service incoming connection followed by TaskCache registry modification  */\n\nsequence by host.id, process.entity_id with maxspan = 1m\n   [network where process.name : \"svchost.exe\" and\n   network.direction == \"incoming\" and source.port >= 49152 and destination.port >= 49152 and\n   source.address != \"127.0.0.1\" and source.address != \"::1\"\n   ]\n   [registry where registry.path : \"HKLM\\\\SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion\\\\Schedule\\\\TaskCache\\\\Tasks\\\\*\\\\Actions\"]\n",
+  "note": "## Triage and analysis\n\n### Investigating Creation of Remote Scheduled Tasks\n\n[Scheduled tasks](https://docs.microsoft.com/en-us/windows/win32/taskschd/about-the-task-scheduler) are a great mechanism used for persistence and executing programs. These features can\nbe used remotely for a variety of legitimate reasons, but at the same time used by malware and adversaries.\nWhen investigating scheduled tasks that have been set-up remotely, one of the first methods should be determining the\noriginal intent behind the configuration and verify if the activity is tied to benign behavior such as software installations or any kind\nof network administrator work. One objective for these alerts is to understand the configured action within the scheduled\ntask, this is captured within the registry event data for this rule and can be base64 decoded to view the value.\n\n#### Possible investigation steps:\n- Review the base64 encoded tasks actions registry value to investigate the task configured action.\n- Determine if task is related to legitimate or benign behavior based on the corresponding process or program tied to the\nscheduled task.\n- Further examination should include both the source and target machines where host-based artifacts and network logs\nshould be reviewed further around the time window of the creation of the scheduled task.\n\n### False Positive Analysis\n- There is a high possibility of benign activity tied to the creation of remote scheduled tasks as it is a general feature\nwithin Windows and used for legitimate purposes for a wide range of activity. Any kind of context should be found to\nfurther understand the source of the activity and determine the intent based on the scheduled task contents.\n\n### Related Rules\n- Service Command Lateral Movement\n- Remotely Started Services via RPC\n\n### Response and Remediation\n- This behavior represents post-exploitation actions such as persistence or lateral movement, immediate response should\nbe taken to review and investigate the activity and potentially isolate involved machines to prevent further post-compromise\nbehavior.\n- Remove scheduled task and any other related artifacts to the activity.\n- Review privileged account management and user account management settings such as implementing GPO policies to further\nrestrict activity or configure settings that only allow Administrators to create remote scheduled tasks.\n",
+  "query": "/* Task Scheduler service incoming connection followed by TaskCache registry modification  */\n\nsequence by host.id, process.entity_id with maxspan = 1m\n   [network where process.name : \"svchost.exe\" and\n   network.direction : (\"incoming\", \"ingress\") and source.port >= 49152 and destination.port >= 49152 and\n   source.address != \"127.0.0.1\" and source.address != \"::1\"\n   ]\n   [registry where registry.path : \"HKLM\\\\SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion\\\\Schedule\\\\TaskCache\\\\Tasks\\\\*\\\\Actions\"]\n",
   "risk_score": 47,
   "rule_id": "954ee7c8-5437-49ae-b2d6-2960883898e9",
   "severity": "medium",
@@ -51,11 +51,18 @@
         {
           "id": "T1053",
           "name": "Scheduled Task/Job",
-          "reference": "https://attack.mitre.org/techniques/T1053/"
+          "reference": "https://attack.mitre.org/techniques/T1053/",
+          "subtechnique": [
+            {
+              "id": "T1053.005",
+              "name": "Scheduled Task",
+              "reference": "https://attack.mitre.org/techniques/T1053/005/"
+            }
+          ]
         }
       ]
     }
   ],
   "type": "eql",
-  "version": 3
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_auth_rare_user_logon.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_auth_rare_user_logon.json
index 2f0a60b3efba9..d5d055bfa1658 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_auth_rare_user_logon.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_auth_rare_user_logon.json
@@ -3,7 +3,7 @@
   "author": [
     "Elastic"
   ],
-  "description": "A machine learning job found an unusual user name in the authentication logs. An unusual user name is one way of detecting credentialed access by means of a new or dormant user account. A user account that is normally inactive (because the user has left the organization) that becomes active may be due to credentialed access using a compromised account password. Threat actors will sometimes also create new users as a means of persisting in a compromised web application.",
+  "description": "A machine learning job found an unusual user name in the authentication logs. An unusual user name is one way of detecting credentialed access by means of a new or dormant user account. An inactive user account (because the user has left the organization) that becomes active may be due to credentialed access using a compromised account password. Threat actors will sometimes also create new users as a means of persisting in a compromised web application.",
   "false_positives": [
     "User accounts that are rarely active, such as a site reliability engineer (SRE) or developer logging into a production server for troubleshooting, may trigger this alert. Under some conditions, a newly created user account may briefly trigger this alert while the model is learning."
   ],
@@ -25,5 +25,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_auth_spike_in_logon_events_from_a_source_ip.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_auth_spike_in_logon_events_from_a_source_ip.json
index 8e007c96c37fb..ee9acc43ac8d7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_auth_spike_in_logon_events_from_a_source_ip.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_auth_spike_in_logon_events_from_a_source_ip.json
@@ -3,7 +3,7 @@
   "author": [
     "Elastic"
   ],
-  "description": "A machine learning job found an unusually large spike in successful authentication events events from a particular source IP address. This can be due to password spraying, user enumeration or brute force activity.",
+  "description": "A machine learning job found an unusually large spike in successful authentication events from a particular source IP address. This can be due to password spraying, user enumeration or brute force activity.",
   "false_positives": [
     "Build servers and CI systems can sometimes trigger this alert. Security test cycles that include brute force or password spraying activities may trigger this alert."
   ],
@@ -25,5 +25,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_error_message_spike.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_error_message_spike.json
index e9ebbf2470b53..1b64f1d85301a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_error_message_spike.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_error_message_spike.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "machine_learning_job_id": "high_distinct_count_error_message",
   "name": "Spike in AWS Error Messages",
-  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n## Triage and analysis\n\n### Investigating Spikes in CloudTrail Errors\nDetection alerts from this rule indicate a large spike in the number of CloudTrail log messages that contain a particular error message. The error message in question was associated with the response to an AWS API command or method call. Here are some possible avenues of investigation:\n- Examine the history of the error. Has it manifested before? If the error, which is visible in the `aws.cloudtrail.error_message` field, only manifested recently, it might be related to recent changes in an automation module or script.\n- Examine the request parameters. These may provide indications as to the nature of the task being performed when the error occurred. Is the error related to unsuccessful attempts to enumerate or access objects, data, or secrets? If so, this can sometimes be a byproduct of discovery, privilege escalation or lateral movement attempts.\n- Consider the user as identified by the user.name field. Is this activity part of an expected workflow for the user context? Examine the user identity in the `aws.cloudtrail.user_identity.arn` field and the access key id in the `aws.cloudtrail.user_identity.access_key_id` field, which can help identify the precise user context. The user agent details in the `user_agent.original` field may also indicate what kind of a client made the request.\n- Consider the source IP address and geolocation for the calling user who issued the command. Do they look normal for the calling user? If the source is an EC2 IP address, is it associated with an EC2 instance in one of your accounts, or could it be sourcing from an EC2 instance not under your control? If it is an authorized EC2 instance, is the activity associated with normal behavior for the instance role or roles? Are there any other alerts or signs of suspicious activity involving this instance?",
+  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n## Triage and analysis\n\n### Investigating Spikes in CloudTrail Errors\n\nCloudTrail logging provides visibility on actions taken within an AWS environment. By monitoring these events and understanding\nwhat is considered normal behavior within an organization, suspicious or malicious activity can be spotted when deviations\nare observed. This example rule triggers from a large spike in the number of CloudTrail log messages that contain a\nparticular error message. The error message in question was associated with the response to an AWS API command or method call,\nthis has the potential to uncover unknown threats or activity.\n\n#### Possible investigation steps:\n- Examine the history of the error. Has it manifested before? If the error, which is visible in the `aws.cloudtrail.error_message` field, only manifested recently, it might be related to recent changes in an automation module or script.\n- Examine the request parameters. These may provide indications as to the nature of the task being performed when the error occurred. Is the error related to unsuccessful attempts to enumerate or access objects, data, or secrets? If so, this can sometimes be a byproduct of discovery, privilege escalation or lateral movement attempts.\n- Consider the user as identified by the `user.name field`. Is this activity part of an expected workflow for the user context? Examine the user identity in the `aws.cloudtrail.user_identity.arn` field and the access key ID in the `aws.cloudtrail.user_identity.access_key_id` field, which can help identify the precise user context. The user agent details in the `user_agent.original` field may also indicate what kind of a client made the request.\n- Consider the source IP address and geolocation for the calling user who issued the command. Do they look normal for the calling user? If the source is an EC2 IP address, is it associated with an EC2 instance in one of your accounts, or could it be sourcing from an EC2 instance that's not under your control? If it is an authorized EC2 instance, is the activity associated with normal behavior for the instance role or roles? Are there any other alerts or signs of suspicious activity involving this instance?\n\n### False Positive Analysis\n- This rule has the possibility to produce false positives based on unexpected activity occurring such as bugs or recent\nchanges to automation modules or scripting.\n- Adoption of new services or implementing new functionality to scripts may generate false positives\n\n### Related Rules\n- Unusual AWS Command for a User\n- Rare AWS Error Code\n\n### Response and Remediation\n- If activity is observed as suspicious or malicious, immediate response should be looked into rotating and deleting AWS IAM access keys\n- Validate if any unauthorized new users were created, remove these accounts and request password resets for other IAM users\n- Look into enabling multi-factor authentication for users\n- Follow security best practices [outlined](https://aws.amazon.com/premiumsupport/knowledge-center/security-best-practices/) by AWS\n",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
   ],
@@ -26,5 +26,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_error_code.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_error_code.json
index ac7a867f5cd6e..d9e2b3e358760 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_error_code.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_error_code.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "machine_learning_job_id": "rare_error_code",
   "name": "Rare AWS Error Code",
-  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n## Triage and analysis\n\nInvestigating Unusual CloudTrail Error Activity ###\nDetection alerts from this rule indicate a rare and unusual error code that was associated with the response to an AWS API command or method call. Here are some possible avenues of investigation:\n- Examine the history of the error. Has it manifested before? If the error, which is visible in the `aws.cloudtrail.error_code field`, only manifested recently, it might be related to recent changes in an automation module or script.\n- Examine the request parameters. These may provide indications as to the nature of the task being performed when the error occurred. Is the error related to unsuccessful attempts to enumerate or access objects, data, or secrets? If so, this can sometimes be a byproduct of discovery, privilege escalation, or lateral movement attempts.\n- Consider the user as identified by the `user.name` field. Is this activity part of an expected workflow for the user context? Examine the user identity in the `aws.cloudtrail.user_identity.arn` field and the access key id in the `aws.cloudtrail.user_identity.access_key_id` field, which can help identify the precise user context. The user agent details in the `user_agent.original` field may also indicate what kind of a client made the request.\n- Consider the source IP address and geolocation for the calling user who issued the command. Do they look normal for the calling user? If the source is an EC2 IP address, is it associated with an EC2 instance in one of your accounts, or could it be sourcing from an EC2 instance not under your control? If it is an authorized EC2 instance, is the activity associated with normal behavior for the instance role or roles? Are there any other alerts or signs of suspicious activity involving this instance?",
+  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n## Triage and analysis\n\nInvestigating Unusual CloudTrail Error Activity ###\nDetection alerts from this rule indicate a rare and unusual error code that was associated with the response to an AWS API command or method call. Here are some possible avenues of investigation:\n- Examine the history of the error. Has it manifested before? If the error, which is visible in the `aws.cloudtrail.error_code field`, only manifested recently, it might be related to recent changes in an automation module or script.\n- Examine the request parameters. These may provide indications as to the nature of the task being performed when the error occurred. Is the error related to unsuccessful attempts to enumerate or access objects, data, or secrets? If so, this can sometimes be a byproduct of discovery, privilege escalation, or lateral movement attempts.\n- Consider the user as identified by the `user.name` field. Is this activity part of an expected workflow for the user context? Examine the user identity in the `aws.cloudtrail.user_identity.arn` field and the access key ID in the `aws.cloudtrail.user_identity.access_key_id` field, which can help identify the precise user context. The user agent details in the `user_agent.original` field may also indicate what kind of a client made the request.\n- Consider the source IP address and geolocation for the calling user who issued the command. Do they look normal for the calling user? If the source is an EC2 IP address, is it associated with an EC2 instance in one of your accounts, or could it be sourcing from an EC2 instance that's not under your control? If it is an authorized EC2 instance, is the activity associated with normal behavior for the instance role or roles? Are there any other alerts or signs of suspicious activity involving this instance?",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
   ],
@@ -26,5 +26,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_method_by_city.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_method_by_city.json
index 2a31ce8c065d8..a3d6208eb9f05 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_method_by_city.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_method_by_city.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "machine_learning_job_id": "rare_method_for_a_city",
   "name": "Unusual City For an AWS Command",
-  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n## Triage and analysis\n\n### Investigating an Unusual CloudTrail Event\nDetection alerts from this rule indicate an AWS API command or method call that is rare and unusual for the geolocation of the source IP address. Here are some possible avenues of investigation:\n- Consider the source IP address and geolocation for the calling user who issued the command. Do they look normal for the calling user? If the source is an EC2 IP address, is it associated with an EC2 instance in one of your accounts, or could it be sourcing from an EC2 instance not under your control? If it is an authorized EC2 instance, is the activity associated with normal behavior for the instance role or roles? Are there any other alerts or signs of suspicious activity involving this instance?\n- Consider the user as identified by the `user.name` field. Is this command part of an expected workflow for the user context? Examine the user identity in the `aws.cloudtrail.user_identity.arn` field and the access key id in the `aws.cloudtrail.user_identity.access_key_id` field, which can help identify the precise user context. The user agent details in the `user_agent.original` field may also indicate what kind of a client made the request.\n- Consider the time of day. If the user is a human, not a program or script, did the activity take place during a normal time of day?\n- Examine the history of the command. If the command, which is visible in the `event.action field`, only manifested recently, it might be part of a new automation module or script. If it has a consistent cadence (for example, if it appears in small numbers on a weekly or monthly cadence), it might be part of a housekeeping or maintenance process.\n- Examine the request parameters. These may provide indications as to the source of the program or the nature of the tasks it is performing.",
+  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n## Triage and analysis\n\n### Investigating an Unusual CloudTrail Event\nDetection alerts from this rule indicate an AWS API command or method call that is rare and unusual for the geolocation of the source IP address. Here are some possible avenues of investigation:\n- Consider the source IP address and geolocation for the calling user who issued the command. Do they look normal for the calling user? If the source is an EC2 IP address, is it associated with an EC2 instance in one of your accounts, or could it be sourcing from an EC2 instance that's not under your control? If it is an authorized EC2 instance, is the activity associated with normal behavior for the instance role or roles? Are there any other alerts or signs of suspicious activity involving this instance?\n- Consider the user as identified by the `user.name` field. Is this command part of an expected workflow for the user context? Examine the user identity in the `aws.cloudtrail.user_identity.arn` field and the access key ID in the `aws.cloudtrail.user_identity.access_key_id` field, which can help identify the precise user context. The user agent details in the `user_agent.original` field may also indicate what kind of a client made the request.\n- Consider the time of day. If the user is a human, not a program or script, did the activity take place during a normal time of day?\n- Examine the history of the command. If the command, which is visible in the `event.action field`, only manifested recently, it might be part of a new automation module or script. If it has a consistent cadence (for example, if it appears in small numbers on a weekly or monthly cadence), it might be part of a housekeeping or maintenance process.\n- Examine the request parameters. These may provide indications as to the source of the program or the nature of the tasks it is performing.",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
   ],
@@ -26,5 +26,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_method_by_country.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_method_by_country.json
index ebe7971e94289..4576b080e1ea6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_method_by_country.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_method_by_country.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "machine_learning_job_id": "rare_method_for_a_country",
   "name": "Unusual Country For an AWS Command",
-  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n## Triage and analysis\n\n### Investigating an Unusual CloudTrail Event\nDetection alerts from this rule indicate an AWS API command or method call that is rare and unusual for the geolocation of the source IP address. Here are some possible avenues of investigation:\n- Consider the source IP address and geolocation for the calling user who issued the command. Do they look normal for the calling user? If the source is an EC2 IP address, is it associated with an EC2 instance in one of your accounts, or could it be sourcing from an EC2 instance not under your control? If it is an authorized EC2 instance, is the activity associated with normal behavior for the instance role or roles? Are there any other alerts or signs of suspicious activity involving this instance?\n- Consider the user as identified by the `user.name` field. Is this command part of an expected workflow for the user context? Examine the user identity in the `aws.cloudtrail.user_identity.arn` field and the access key id in the `aws.cloudtrail.user_identity.access_key_id` field, which can help identify the precise user context. The user agent details in the `user_agent.original` field may also indicate what kind of a client made the request.\n- Consider the time of day. If the user is a human, not a program or script, did the activity take place during a normal time of day?\n- Examine the history of the command. If the command, which is visible in the `event.action field`, only manifested recently, it might be part of a new automation module or script. If it has a consistent cadence (for example, if it appears in small numbers on a weekly or monthly cadence), it might be part of a housekeeping or maintenance process.\n- Examine the request parameters. These may provide indications as to the source of the program or the nature of the tasks it is performing.",
+  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n## Triage and analysis\n\n### Investigating an Unusual Country For an AWS Command\n\nCloudTrail logging provides visibility on actions taken within an AWS environment. By monitoring these events and understanding\nwhat is considered normal behavior within an organization, suspicious or malicious activity can be spotted when deviations\nare observed. This example rule focuses on AWS command activity where the country from the source of the activity has been\nconsidered unusual based on previous history.\n\n#### Possible investigation steps:\n- Consider the source IP address and geolocation for the calling user who issued the command. Do they look normal for the calling user? If the source is an EC2 IP address, is it associated with an EC2 instance in one of your accounts, or could it be sourcing from an EC2 instance that's not under your control? If it is an authorized EC2 instance, is the activity associated with normal behavior for the instance role or roles? Are there any other alerts or signs of suspicious activity involving this instance?\n- Consider the user as identified by the `user.name` field. Is this command part of an expected workflow for the user context? Examine the user identity in the `aws.cloudtrail.user_identity.arn` field and the access key ID in the `aws.cloudtrail.user_identity.access_key_id` field, which can help identify the precise user context. The user agent details in the `user_agent.original` field may also indicate what kind of a client made the request.\n- Consider the time of day. If the user is a human, not a program or script, did the activity take place during a normal time of day?\n- Examine the history of the command. If the command, which is visible in the `event.action field`, only manifested recently, it might be part of a new automation module or script. If it has a consistent cadence (for example, if it appears in small numbers on a weekly or monthly cadence), it might be part of a housekeeping or maintenance process.\n- Examine the request parameters. These may provide indications as to the source of the program or the nature of the tasks it is performing.\n\n### False Positive Analysis\n- False positives can occur if activity is coming from new employees based in a country with no previous history in AWS,\ntherefore it's important to validate the activity listed in the investigation steps above.\n\n### Related Rules\n- Unusual City For an AWS Command\n- Unusual AWS Command for a User\n- Rare AWS Error Code\n\n### Response and Remediation\n- If activity is observed as suspicious or malicious, immediate response should be looked into rotating and deleting AWS IAM access keys\n- Validate if any unauthorized new users were created, remove these accounts and request password resets for other IAM users\n- Look into enabling multi-factor authentication for users\n- Follow security best practices [outlined](https://aws.amazon.com/premiumsupport/knowledge-center/security-best-practices/) by AWS\n",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
   ],
@@ -26,5 +26,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_method_by_user.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_method_by_user.json
index ab9364c453423..53f9fab8d1b48 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_method_by_user.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_cloudtrail_rare_method_by_user.json
@@ -12,7 +12,7 @@
   "license": "Elastic License v2",
   "machine_learning_job_id": "rare_method_for_a_username",
   "name": "Unusual AWS Command for a User",
-  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n## Triage and analysis\n\n### Investigating an Unusual CloudTrail Event\n\nDetection alerts from this rule indicate an AWS API command or method call that is rare and unusual for the calling IAM user. Here are some possible avenues of investigation:\n- Consider the user as identified by the `user.name` field. Is this command part of an expected workflow for the user context? Examine the user identity in the `aws.cloudtrail.user_identity.arn` field and the access key id in the `aws.cloudtrail.user_identity.access_key_id` field, which can help identify the precise user context. The user agent details in the `user_agent.original` field may also indicate what kind of a client made the request.\n- Consider the source IP address and geolocation for the calling user who issued the command. Do they look normal for the calling user? If the source is an EC2 IP address, is it associated with an EC2 instance in one of your accounts, or could it be sourcing from an EC2 instance not under your control? If it is an authorized EC2 instance, is the activity associated with normal behavior for the instance role or roles? Are there any other alerts or signs of suspicious activity involving this instance?\n- Consider the time of day. If the user is a human, not a program or script, did the activity take place during a normal time of day?\n- Examine the history of the command. If the command, which is visible in the `event.action field`, only manifested recently, it might be part of a new automation module or script. If it has a consistent cadence (for example, if it appears in small numbers on a weekly or monthly cadence), it might be part of a housekeeping or maintenance process.\n- Examine the request parameters. These may provide indications as to the source of the program or the nature of the tasks it is performing.",
+  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.\n\n## Triage and analysis\n\n### Investigating an Unusual CloudTrail Event\n\nDetection alerts from this rule indicate an AWS API command or method call that is rare and unusual for the calling IAM user. Here are some possible avenues of investigation:\n- Consider the user as identified by the `user.name` field. Is this command part of an expected workflow for the user context? Examine the user identity in the `aws.cloudtrail.user_identity.arn` field and the access key ID in the `aws.cloudtrail.user_identity.access_key_id` field, which can help identify the precise user context. The user agent details in the `user_agent.original` field may also indicate what kind of a client made the request.\n- Consider the source IP address and geolocation for the calling user who issued the command. Do they look normal for the calling user? If the source is an EC2 IP address, is it associated with an EC2 instance in one of your accounts, or could it be sourcing from an EC2 instance that's not under your control? If it is an authorized EC2 instance, is the activity associated with normal behavior for the instance role or roles? Are there any other alerts or signs of suspicious activity involving this instance?\n- Consider the time of day. If the user is a human, not a program or script, did the activity take place during a normal time of day?\n- Examine the history of the command. If the command, which is visible in the `event.action field`, only manifested recently, it might be part of a new automation module or script. If it has a consistent cadence (for example, if it appears in small numbers on a weekly or monthly cadence), it might be part of a housekeeping or maintenance process.\n- Examine the request parameters. These may provide indications as to the source of the program or the nature of the tasks it is performing.",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
   ],
@@ -26,5 +26,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_process_by_host_windows.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_process_by_host_windows.json
index 8729de9a8689d..d8bf26884b16f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_process_by_host_windows.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/ml_rare_process_by_host_windows.json
@@ -15,7 +15,7 @@
     "v2_rare_process_by_host_windows_ecs"
   ],
   "name": "Unusual Process For a Windows Host",
-  "note": "## Triage and analysis\n\n### Investigating an Unusual Windows Process\nDetection alerts from this rule indicate the presence of a Windows process that is rare and unusual for the host it ran on. Here are some possible avenues of investigation:\n- Consider the user as identified by the username field. Is this program part of an expected workflow for the user who ran this program on this host?\n- Examine the history of execution. If this process only manifested recently, it might be part of a new software package. If it has a consistent cadence (for example if it runs monthly or quarterly), it might be part of a monthly or quarterly business process.\n- Examine the process metadata like the values of the Company, Description and Product fields which may indicate whether the program is associated with an expected software vendor or package.\n- Examine arguments and working directory. These may provide indications as to the source of the program or the nature of the tasks it is performing.\n- Consider the same for the parent process. If the parent process is a legitimate system utility or service, this could be related to software updates or system management. If the parent process is something user-facing like an Office application, this process could be more suspicious.\n- If you have file hash values in the event data, and you suspect malware, you can optionally run a search for the file hash to see if the file is identified as malware by anti-malware tools. ",
+  "note": "## Triage and analysis\n\n###  Investigating an Unusual Windows Process\n\nSearching for abnormal Windows processes is a good methodology to find potentially malicious activity within a network.\nBy understanding what is commonly run within an environment and developing baselines for legitimate activity can help\nuncover potential malware and suspicious behaviors.\n\n#### Possible investigation steps:\n- Consider the user as identified by the `user.name` field. Is this program part of an expected workflow for the user who ran this program on this host?\n- Examine the history of execution. If this process only manifested recently, it might be part of a new software package. If it has a consistent cadence (for example if it runs monthly or quarterly), it might be part of a monthly or quarterly business process.\n- Examine the process metadata like the values of the Company, Description and Product fields which may indicate whether the program is associated with an expected software vendor or package.\n- Examine arguments and working directory. These may provide indications as to the source of the program or the nature of the tasks it is performing.\n- Consider the same for the parent process. If the parent process is a legitimate system utility or service, this could be related to software updates or system management. If the parent process is something user-facing like an Office application, this process could be more suspicious.\n- If you have file hash values in the event data, and you suspect malware, you can optionally run a search for the file hash to see if the file is identified as malware by anti-malware tools.\n\n### False Positive Analysis\n- Validate the unusual Windows process is not related to new benign software installation activity. If related to\nlegitimate software, this can be done by leveraging the exception workflow in the Kibana Security App or Elasticsearch\nAPI to tune this rule to your environment\n- Try to understand the context of the execution by thinking about the user, machine, or business purpose.  It's possible that a small number of endpoints\nsuch as servers that have very unique software that might appear to be unusual, but satisfy a specific business need.\n\n### Related Rules\n- Anomalous Windows Process Creation\n- Unusual Windows Path Activity\n- Unusual Windows Process Calling the Metadata Service\n\n### Response and Remediation\n- This rule is related to process execution events and should be immediately reviewed and investigated to determine if malicious\n- Based on validation and if malicious, the impacted machine should be isolated and analyzed to determine other post-compromise\nbehavior such as setting up persistence or performing lateral movement.\n- Look into preventive measures such as Windows Defender Application Control and AppLocker to gain better control on\nwhat is allowed to run on Windows infrastructure.\n",
   "references": [
     "https://www.elastic.co/guide/en/security/current/prebuilt-ml-jobs.html"
   ],
@@ -30,5 +30,5 @@
     "ML"
   ],
   "type": "machine_learning",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_security_group_configuration_change_detection.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_security_group_configuration_change_detection.json
index a3468f4a68948..b7421934ba8e8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_security_group_configuration_change_detection.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_security_group_configuration_change_detection.json
@@ -3,7 +3,7 @@
     "Elastic",
     "Austin Songer"
   ],
-  "description": "Identifies a change to an AWS Security Group Configuration. A security group is like a virtul firewall and modifying configurations may allow unauthorized access. Threat actors may abuse this to establish persistence, exfiltrate data, or pivot in a AWS environment.",
+  "description": "Identifies a change to an AWS Security Group Configuration. A security group is like a virtual firewall, and modifying configurations may allow unauthorized access. Threat actors may abuse this to establish persistence, exfiltrate data, or pivot in an AWS environment.",
   "false_positives": [
     "A security group may be created by a system or network administrator. Verify whether the user identity, user agent, and/or hostname should be making changes in your environment. Security group creations from unfamiliar users or hosts should be investigated. If known behavior is causing false positives, it can be exempted from the rule."
   ],
@@ -49,10 +49,23 @@
         "name": "Defense Evasion",
         "reference": "https://attack.mitre.org/tactics/TA0005/"
       },
-      "technique": []
+      "technique": [
+        {
+          "id": "T1562",
+          "name": "Impair Defenses",
+          "reference": "https://attack.mitre.org/techniques/T1562/",
+          "subtechnique": [
+            {
+              "id": "T1562.007",
+              "name": "Disable or Modify Cloud Firewall",
+              "reference": "https://attack.mitre.org/techniques/T1562/007/"
+            }
+          ]
+        }
+      ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_hidden_local_account_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_hidden_local_account_creation.json
index 8edaef5dc72fd..24f0f3d4d95b1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_hidden_local_account_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_hidden_local_account_creation.json
@@ -39,12 +39,19 @@
         {
           "id": "T1136",
           "name": "Create Account",
-          "reference": "https://attack.mitre.org/techniques/T1136/"
+          "reference": "https://attack.mitre.org/techniques/T1136/",
+          "subtechnique": [
+            {
+              "id": "T1136.001",
+              "name": "Local Account",
+              "reference": "https://attack.mitre.org/techniques/T1136/001/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_registry_startup_shell_folder_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_registry_startup_shell_folder_modified.json
index 947c1c748af69..21ad9c5161541 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_registry_startup_shell_folder_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_registry_startup_shell_folder_modified.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Suspicious Startup Shell Folder Modification",
-  "note": "## Triage and analysis\n\nVerify file creation events in the new Windows Startup folder location.",
+  "note": "## Triage and analysis\n\n### Investigating Suspicious Startup Shell Activity\n\nTechniques used within malware and by adversaries often leverage the Windows registry to store malicious programs for\npersistence. Startup shell folders are often targeted as they are not as prevalent as normal Startup folder paths so this\nbehavior may evade existing AV/EDR solutions. Another preference is that these programs might run with higher privileges\nwhich can be ideal for an attacker.\n\n#### Possible investigation steps:\n- Review the source process and related file tied to the Windows Registry entry\n- Validate the activity is not related to planned patches, updates, network administrator activity or legitimate software\ninstallations\n- Determine if activity is unique by validating if other machines in same organization have similar entry\n\n### False Positive Analysis\n- There is a high possibility of benign legitimate programs being added to Shell folders. This activity could be based\non new software installations, patches, or any kind of network administrator related activity. Before entering further\ninvestigation, this activity should be validated that is it not related to benign activity\n\n### Related Rules\n- Startup or Run Key Registry Modification\n- Persistent Scripts in the Startup Directory\n\n### Response and Remediation\n- Activity should first be validated as a true positive event if so then immediate response should be taken to review,\ninvestigate and potentially isolate activity to prevent further post-compromise behavior\n- The respective binary or program tied to this persistence method should be further analyzed and reviewed to understand\nit's behavior and capabilities\n- Since this activity is considered post-exploitation behavior, it's important to understand how the behavior was first\ninitialized such as through a macro-enabled document that was attached in a phishing email. By understanding the source\nof the attack, this information can then be used to search for similar indicators on other machines in the same environment.\n",
   "query": "registry where\n registry.path : (\n     \"HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\User Shell Folders\\\\Common Startup\",\n     \"HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\Shell Folders\\\\Common Startup\",\n     \"HKEY_USERS\\\\*\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\User Shell Folders\\\\Startup\",\n     \"HKEY_USERS\\\\*\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\Shell Folders\\\\Startup\"\n     ) and\n  registry.data.strings != null and\n  /* Normal Startup Folder Paths */\n  not registry.data.strings : (\n           \"C:\\\\ProgramData\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\",\n           \"%ProgramData%\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\",\n           \"%USERPROFILE%\\\\AppData\\\\Roaming\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\",\n           \"C:\\\\Users\\\\*\\\\AppData\\\\Roaming\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\"\n           )\n",
   "risk_score": 73,
   "rule_id": "c8b150f0-0164-475b-a75e-74b47800a9ff",
@@ -50,5 +50,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_exchange_suspicious_mailbox_right_delegation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_exchange_suspicious_mailbox_right_delegation.json
new file mode 100644
index 0000000000000..e950569f19878
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_exchange_suspicious_mailbox_right_delegation.json
@@ -0,0 +1,57 @@
+{
+  "author": [
+    "Elastic",
+    "Austin Songer"
+  ],
+  "description": "Identifies the assignment of rights to accesss content from another mailbox. An adversary may use the compromised account to send messages to other accounts in the network of the target business while creating inbox rules, so messages can evade spam/phishing detection mechanisms.",
+  "false_positives": [
+    "Assignment of rights to a service account."
+  ],
+  "index": [
+    "filebeat-*",
+    "logs-o365*"
+  ],
+  "language": "kuery",
+  "license": "Elastic License v2",
+  "name": "O365 Exchange Suspicious Mailbox Right Delegation",
+  "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.action:Add-MailboxPermission and \no365.audit.Parameters.AccessRights:(FullAccess or SendAs or SendOnBehalf) and event.outcome:success\n",
+  "risk_score": 21,
+  "rule_id": "0ce6487d-8069-4888-9ddd-61b52490cebc",
+  "severity": "low",
+  "tags": [
+    "Elastic",
+    "Cloud",
+    "Microsoft 365",
+    "Continuous Monitoring",
+    "SecOps",
+    "Configuration Audit"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0003",
+        "name": "Persistence",
+        "reference": "https://attack.mitre.org/tactics/TA0003/"
+      },
+      "technique": [
+        {
+          "id": "T1098",
+          "name": "Account Manipulation",
+          "reference": "https://attack.mitre.org/techniques/T1098/",
+          "subtechnique": [
+            {
+              "id": "T1098.002",
+              "name": "Exchange Email Delegate Permissions",
+              "reference": "https://attack.mitre.org/techniques/T1098/002/"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "query",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gpo_schtask_service_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gpo_schtask_service_creation.json
index 86b1cd3e71eaf..ebbe2448c75df 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gpo_schtask_service_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_gpo_schtask_service_creation.json
@@ -35,12 +35,19 @@
         {
           "id": "T1053",
           "name": "Scheduled Task/Job",
-          "reference": "https://attack.mitre.org/techniques/T1053/"
+          "reference": "https://attack.mitre.org/techniques/T1053/",
+          "subtechnique": [
+            {
+              "id": "T1053.005",
+              "name": "Scheduled Task",
+              "reference": "https://attack.mitre.org/techniques/T1053/005/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_job_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_job_creation.json
index 6e656209fd055..60afcad90333c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_job_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_job_creation.json
@@ -38,12 +38,19 @@
         {
           "id": "T1053",
           "name": "Scheduled Task/Job",
-          "reference": "https://attack.mitre.org/techniques/T1053/"
+          "reference": "https://attack.mitre.org/techniques/T1053/",
+          "subtechnique": [
+            {
+              "id": "T1053.005",
+              "name": "Scheduled Task",
+              "reference": "https://attack.mitre.org/techniques/T1053/005/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_scripting.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_scripting.json
index 712e98d4ac941..128fdd9de5575 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_scripting.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_scripting.json
@@ -39,11 +39,18 @@
         {
           "id": "T1053",
           "name": "Scheduled Task/Job",
-          "reference": "https://attack.mitre.org/techniques/T1053/"
+          "reference": "https://attack.mitre.org/techniques/T1053/",
+          "subtechnique": [
+            {
+              "id": "T1053.005",
+              "name": "Scheduled Task",
+              "reference": "https://attack.mitre.org/techniques/T1053/005/"
+            }
+          ]
         }
       ]
     }
   ],
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_persistence_powershell_exch_mailbox_activesync_add_device.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_powershell_exch_mailbox_activesync_add_device.json
similarity index 72%
rename from x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_persistence_powershell_exch_mailbox_activesync_add_device.json
rename to x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_powershell_exch_mailbox_activesync_add_device.json
index 9a494a13fa297..75044e20ca5fd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/collection_persistence_powershell_exch_mailbox_activesync_add_device.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_powershell_exch_mailbox_activesync_add_device.json
@@ -28,31 +28,33 @@
     "Host",
     "Windows",
     "Threat Detection",
-    "Collection"
+    "Persistence"
   ],
   "threat": [
     {
       "framework": "MITRE ATT&CK",
       "tactic": {
-        "id": "TA0009",
-        "name": "Collection",
-        "reference": "https://attack.mitre.org/tactics/TA0009/"
+        "id": "TA0003",
+        "name": "Persistence",
+        "reference": "https://attack.mitre.org/tactics/TA0003/"
       },
       "technique": [
         {
-          "id": "T1114",
-          "name": "Email Collection",
-          "reference": "https://attack.mitre.org/techniques/T1114/"
-        },
-        {
-          "id": "T1005",
-          "name": "Data from Local System",
-          "reference": "https://attack.mitre.org/techniques/T1005/"
+          "id": "T1098",
+          "name": "Account Manipulation",
+          "reference": "https://attack.mitre.org/techniques/T1098/",
+          "subtechnique": [
+            {
+              "id": "T1098.002",
+              "name": "Exchange Email Delegate Permissions",
+              "reference": "https://attack.mitre.org/techniques/T1098/002/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_rds_instance_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_rds_instance_creation.json
index aa2c946d3a001..4ea6631025c11 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_rds_instance_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_rds_instance_creation.json
@@ -1,6 +1,7 @@
 {
   "author": [
-    "Elastic"
+    "Elastic",
+    "Austin Songer"
   ],
   "description": "Identifies the creation of an Amazon Relational Database Service (RDS) Aurora database instance.",
   "false_positives": [
@@ -44,5 +45,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_registry_uncommon.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_registry_uncommon.json
index 7629ee4b821da..2b94ded55e7d4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_registry_uncommon.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_registry_uncommon.json
@@ -34,7 +34,20 @@
         "name": "Persistence",
         "reference": "https://attack.mitre.org/tactics/TA0003/"
       },
-      "technique": []
+      "technique": [
+        {
+          "id": "T1547",
+          "name": "Boot or Logon Autostart Execution",
+          "reference": "https://attack.mitre.org/techniques/T1547/",
+          "subtechnique": [
+            {
+              "id": "T1547.001",
+              "name": "Registry Run Keys / Startup Folder",
+              "reference": "https://attack.mitre.org/techniques/T1547/001/"
+            }
+          ]
+        }
+      ]
     },
     {
       "framework": "MITRE ATT&CK",
@@ -54,5 +67,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_route_table_modified_or_deleted.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_route_table_modified_or_deleted.json
new file mode 100644
index 0000000000000..54180a3a59a54
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_route_table_modified_or_deleted.json
@@ -0,0 +1,55 @@
+{
+  "author": [
+    "Elastic",
+    "Austin Songer"
+  ],
+  "description": "Identifies when an AWS Route Table has been modified or deleted.",
+  "false_positives": [
+    "Route Table could be modified or deleted by a system administrator. Verify whether the user identity, user agent, and/or hostname should be making changes in your environment. Route Table being modified from unfamiliar users should be investigated. If known behavior is causing false positives, it can be exempted from the rule.  Also automated processes that uses Terraform may lead to false positives."
+  ],
+  "from": "now-60m",
+  "index": [
+    "filebeat-*",
+    "logs-aws*"
+  ],
+  "interval": "10m",
+  "language": "kuery",
+  "license": "Elastic License v2",
+  "name": "AWS Route Table Modified or Deleted",
+  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
+  "query": "event.dataset:aws.cloudtrail and event.provider:cloudtrail.amazonaws.com and event.action:(ReplaceRoute or ReplaceRouteTableAssociation or\nDeleteRouteTable or DeleteRoute or DisassociateRouteTable) and event.outcome:success\n",
+  "references": [
+    "https://github.com/easttimor/aws-incident-response#network-routing",
+    "https://docs.datadoghq.com/security_platform/default_rules/cloudtrail-aws-route-table-modified",
+    "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ReplaceRoute.html",
+    "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ReplaceRouteTableAssociation",
+    "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DeleteRouteTable.html",
+    "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DeleteRoute.html",
+    "https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DisassociateRouteTable.html"
+  ],
+  "risk_score": 21,
+  "rule_id": "e7cd5982-17c8-4959-874c-633acde7d426",
+  "severity": "low",
+  "tags": [
+    "Elastic",
+    "Cloud",
+    "AWS",
+    "Continuous Monitoring",
+    "SecOps",
+    "Network Security"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0003",
+        "name": "Persistence",
+        "reference": "https://attack.mitre.org/tactics/TA0003/"
+      },
+      "technique": []
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "query",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_screensaver_engine_unexpected_child_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_screensaver_engine_unexpected_child_process.json
new file mode 100644
index 0000000000000..544049d2c2df1
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_screensaver_engine_unexpected_child_process.json
@@ -0,0 +1,50 @@
+{
+  "author": [
+    "Elastic"
+  ],
+  "description": "Identifies when a child process is spawned by the screensaver engine process, which is consistent with an attacker's malicious payload being executed after the screensaver activated on the endpoint. An adversary can maintain persistence on a macOS endpoint by creating a malicious screensaver (.saver) file and configuring the screensaver plist file to execute code each time the screensaver is activated.",
+  "from": "now-9m",
+  "index": [
+    "auditbeat-*",
+    "logs-endpoint.events.*"
+  ],
+  "language": "eql",
+  "license": "Elastic License v2",
+  "name": "Unexpected Child Process of macOS Screensaver Engine",
+  "note": "## Triage and analysis\n\n- Analyze the descendant processes of the ScreenSaverEngine process for malicious code and suspicious behavior such\nas downloading a payload from a server\n- Review the installed and activated screensaver on the host. Triage the screensaver (.saver) file that was triggered to\nidentify whether the file is malicious or not.\n",
+  "query": "process where event.type == \"start\" and process.parent.name == \"ScreenSaverEngine\"\n",
+  "references": [
+    "https://posts.specterops.io/saving-your-access-d562bf5bf90b",
+    "https://github.com/D00MFist/PersistentJXA"
+  ],
+  "risk_score": 47,
+  "rule_id": "48d7f54d-c29e-4430-93a9-9db6b5892270",
+  "severity": "medium",
+  "tags": [
+    "Elastic",
+    "Host",
+    "macOS",
+    "Threat Detection",
+    "Persistence"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0003",
+        "name": "Persistence",
+        "reference": "https://attack.mitre.org/tactics/TA0003/"
+      },
+      "technique": [
+        {
+          "id": "T1546",
+          "name": "Event Triggered Execution",
+          "reference": "https://attack.mitre.org/techniques/T1546/"
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "eql",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_screensaver_plist_file_modification.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_screensaver_plist_file_modification.json
new file mode 100644
index 0000000000000..dcd7427d7cbcd
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_screensaver_plist_file_modification.json
@@ -0,0 +1,50 @@
+{
+  "author": [
+    "Elastic"
+  ],
+  "description": "Identifies when a screensaver plist file is modified by an unexpected process. An adversary can maintain persistence on a macOS endpoint by creating a malicious screensaver (.saver) file and configuring the screensaver plist file to execute code each time the screensaver is activated.",
+  "from": "now-9m",
+  "index": [
+    "auditbeat-*",
+    "logs-endpoint.events.*"
+  ],
+  "language": "eql",
+  "license": "Elastic License v2",
+  "name": "Screensaver Plist File Modified by Unexpected Process",
+  "note": "## Triage and analysis\n\n- Analyze the plist file modification event to identify whether the change was expected or not\n- Investigate the process that modified the plist file for malicious code or other suspicious behavior\n- Identify if any suspicious or known malicious screensaver (.saver) files were recently written to or modified on the host",
+  "query": "file where event.type != \"deletion\" and\n  file.name: \"com.apple.screensaver.*.plist\" and\n  file.path : (\n    \"/Users/*/Library/Preferences/ByHost/*\",\n    \"/Library/Managed Preferences/*\",\n    \"/System/Library/Preferences/*\"\n    ) and\n  /* Filter OS processes modifying screensaver plist files */\n  not process.executable : (\n    \"/usr/sbin/cfprefsd\",\n    \"/usr/libexec/xpcproxy\",\n    \"/System/Library/CoreServices/ManagedClient.app/Contents/Resources/MCXCompositor\",\n    \"/System/Library/CoreServices/ManagedClient.app/Contents/MacOS/ManagedClient\"\n    )\n",
+  "references": [
+    "https://posts.specterops.io/saving-your-access-d562bf5bf90b",
+    "https://github.com/D00MFist/PersistentJXA"
+  ],
+  "risk_score": 47,
+  "rule_id": "e6e8912f-283f-4d0d-8442-e0dcaf49944b",
+  "severity": "medium",
+  "tags": [
+    "Elastic",
+    "Host",
+    "macOS",
+    "Threat Detection",
+    "Persistence"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0003",
+        "name": "Persistence",
+        "reference": "https://attack.mitre.org/tactics/TA0003/"
+      },
+      "technique": [
+        {
+          "id": "T1546",
+          "name": "Event Triggered Execution",
+          "reference": "https://attack.mitre.org/techniques/T1546/"
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "eql",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_suspicious_scheduled_task_runtime.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_suspicious_scheduled_task_runtime.json
index ea5917a246afe..812c35350677f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_suspicious_scheduled_task_runtime.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_suspicious_scheduled_task_runtime.json
@@ -38,12 +38,19 @@
         {
           "id": "T1053",
           "name": "Scheduled Task/Job",
-          "reference": "https://attack.mitre.org/techniques/T1053/"
+          "reference": "https://attack.mitre.org/techniques/T1053/",
+          "subtechnique": [
+            {
+              "id": "T1053.005",
+              "name": "Scheduled Task",
+              "reference": "https://attack.mitre.org/techniques/T1053/005/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_added_to_privileged_group_ad.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_added_to_privileged_group_ad.json
index c63d96b106a01..1e55f014806f3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_added_to_privileged_group_ad.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_added_to_privileged_group_ad.json
@@ -36,21 +36,14 @@
       },
       "technique": [
         {
-          "id": "T1136",
-          "name": "Create Account",
-          "reference": "https://attack.mitre.org/techniques/T1136/",
-          "subtechnique": [
-            {
-              "id": "T1136.001",
-              "name": "Local Account",
-              "reference": "https://attack.mitre.org/techniques/T1136/001/"
-            }
-          ]
+          "id": "T1098",
+          "name": "Account Manipulation",
+          "reference": "https://attack.mitre.org/techniques/T1098/"
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json
index 0e2b01a1967d2..0777dfccab4bf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json
@@ -35,12 +35,19 @@
         {
           "id": "T1136",
           "name": "Create Account",
-          "reference": "https://attack.mitre.org/techniques/T1136/"
+          "reference": "https://attack.mitre.org/techniques/T1136/",
+          "subtechnique": [
+            {
+              "id": "T1136.001",
+              "name": "Local Account",
+              "reference": "https://attack.mitre.org/techniques/T1136/001/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 8
+  "version": 9
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_via_telemetrycontroller_scheduledtask_hijack.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_via_telemetrycontroller_scheduledtask_hijack.json
index dca20728b40fa..0d9cd0cb4020a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_via_telemetrycontroller_scheduledtask_hijack.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_via_telemetrycontroller_scheduledtask_hijack.json
@@ -38,12 +38,19 @@
         {
           "id": "T1053",
           "name": "Scheduled Task/Job",
-          "reference": "https://attack.mitre.org/techniques/T1053/"
+          "reference": "https://attack.mitre.org/techniques/T1053/",
+          "subtechnique": [
+            {
+              "id": "T1053.005",
+              "name": "Scheduled Task",
+              "reference": "https://attack.mitre.org/techniques/T1053/005/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 5
+  "version": 6
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_via_windows_management_instrumentation_event_subscription.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_via_windows_management_instrumentation_event_subscription.json
index fc3d94498d0cb..79e887a548bcb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_via_windows_management_instrumentation_event_subscription.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_via_windows_management_instrumentation_event_subscription.json
@@ -35,12 +35,19 @@
         {
           "id": "T1546",
           "name": "Event Triggered Execution",
-          "reference": "https://attack.mitre.org/techniques/T1546/"
+          "reference": "https://attack.mitre.org/techniques/T1546/",
+          "subtechnique": [
+            {
+              "id": "T1546.003",
+              "name": "Windows Management Instrumentation Event Subscription",
+              "reference": "https://attack.mitre.org/techniques/T1546/003/"
+            }
+          ]
         }
       ]
     }
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_webshell_detection.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_webshell_detection.json
index 26248009f5a49..8da3be0b69d91 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_webshell_detection.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_webshell_detection.json
@@ -4,7 +4,7 @@
   ],
   "description": "Identifies suspicious commands executed via a web server, which may suggest a vulnerability and remote shell access.",
   "false_positives": [
-    "Security audits, maintenance and network administrative scripts may trigger this alert when run under web processes."
+    "Security audits, maintenance, and network administrative scripts may trigger this alert when run under web processes."
   ],
   "from": "now-9m",
   "index": [
@@ -71,5 +71,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_new_or_modified_federation_domain.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_new_or_modified_federation_domain.json
new file mode 100644
index 0000000000000..2a1231e96d8a5
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_new_or_modified_federation_domain.json
@@ -0,0 +1,61 @@
+{
+  "author": [
+    "Austin Songer"
+  ],
+  "description": "Identifies a new or modified federation domain, which can be used to create a trust between O365 and an external identity provider.",
+  "index": [
+    "filebeat-*",
+    "logs-o365*"
+  ],
+  "language": "kuery",
+  "license": "Elastic License v2",
+  "name": "New or Modified Federation Domain",
+  "note": "## Config\n\nThe Microsoft 365 Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
+  "query": "event.dataset:o365.audit and event.provider:Exchange and event.category:web and event.action:(\"Set-AcceptedDomain\" or \n\"Set-MsolDomainFederationSettings\" or \"Add-FederatedDomain\" or \"New-AcceptedDomain\" or \"Remove-AcceptedDomain\" or \"Remove-FederatedDomain\") and \nevent.outcome:success\n",
+  "references": [
+    "https://docs.microsoft.com/en-us/powershell/module/exchange/remove-accepteddomain?view=exchange-ps",
+    "https://docs.microsoft.com/en-us/powershell/module/exchange/remove-federateddomain?view=exchange-ps",
+    "https://docs.microsoft.com/en-us/powershell/module/exchange/new-accepteddomain?view=exchange-ps",
+    "https://docs.microsoft.com/en-us/powershell/module/exchange/add-federateddomain?view=exchange-ps",
+    "https://docs.microsoft.com/en-us/powershell/module/exchange/set-accepteddomain?view=exchange-ps",
+    "https://docs.microsoft.com/en-us/powershell/module/msonline/set-msoldomainfederationsettings?view=azureadps-1.0"
+  ],
+  "risk_score": 21,
+  "rule_id": "684554fc-0777-47ce-8c9b-3d01f198d7f8",
+  "severity": "low",
+  "tags": [
+    "Elastic",
+    "Cloud",
+    "Microsoft 365",
+    "Continuous Monitoring",
+    "SecOps",
+    "Identity and Access"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0004",
+        "name": "Privilege Escalation",
+        "reference": "https://attack.mitre.org/tactics/TA0004/"
+      },
+      "technique": [
+        {
+          "id": "T1484",
+          "name": "Domain Policy Modification",
+          "reference": "https://attack.mitre.org/techniques/T1484/",
+          "subtechnique": [
+            {
+              "id": "T1484.002",
+              "name": "Domain Trust Modification",
+              "reference": "https://attack.mitre.org/techniques/T1484/002/"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "query",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sts_getsessiontoken_abuse.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sts_getsessiontoken_abuse.json
new file mode 100644
index 0000000000000..c5e2669c1fade
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sts_getsessiontoken_abuse.json
@@ -0,0 +1,74 @@
+{
+  "author": [
+    "Austin Songer"
+  ],
+  "description": "Identifies the suspicious use of GetSessionToken. Tokens could be created and used by attackers to move laterally and escalate privileges.",
+  "false_positives": [
+    "GetSessionToken may be done by a system or network administrator. Verify whether the user identity, user agent, and/or hostname should be making changes in your environment. GetSessionToken from unfamiliar users or hosts should be investigated. If known behavior is causing false positives, it can be exempted from the rule."
+  ],
+  "index": [
+    "filebeat-*",
+    "logs-aws*"
+  ],
+  "language": "kuery",
+  "license": "Elastic License v2",
+  "name": "AWS STS GetSessionToken Abuse",
+  "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
+  "query": "event.dataset:aws.cloudtrail and event.provider:sts.amazonaws.com and event.action:GetSessionToken and \naws.cloudtrail.user_identity.type:IAMUser and event.outcome:success\n",
+  "references": [
+    "https://docs.aws.amazon.com/STS/latest/APIReference/API_GetSessionToken.html"
+  ],
+  "risk_score": 21,
+  "rule_id": "b45ab1d2-712f-4f01-a751-df3826969807",
+  "severity": "low",
+  "tags": [
+    "Elastic",
+    "Cloud",
+    "AWS",
+    "Continuous Monitoring",
+    "SecOps",
+    "Identity and Access"
+  ],
+  "threat": [
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0004",
+        "name": "Privilege Escalation",
+        "reference": "https://attack.mitre.org/tactics/TA0004/"
+      },
+      "technique": [
+        {
+          "id": "T1548",
+          "name": "Abuse Elevation Control Mechanism",
+          "reference": "https://attack.mitre.org/techniques/T1548/"
+        }
+      ]
+    },
+    {
+      "framework": "MITRE ATT&CK",
+      "tactic": {
+        "id": "TA0008",
+        "name": "Lateral Movement",
+        "reference": "https://attack.mitre.org/tactics/TA0008/"
+      },
+      "technique": [
+        {
+          "id": "T1550",
+          "name": "Use Alternate Authentication Material",
+          "reference": "https://attack.mitre.org/techniques/T1550/",
+          "subtechnique": [
+            {
+              "id": "T1550.001",
+              "name": "Application Access Token",
+              "reference": "https://attack.mitre.org/techniques/T1550/001/"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "timestamp_override": "event.ingested",
+  "type": "query",
+  "version": 1
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_parentchild_relationship.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_parentchild_relationship.json
index 9cdf474efb450..d9b7280392f38 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_parentchild_relationship.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_parentchild_relationship.json
@@ -14,7 +14,7 @@
   "name": "Unusual Parent-Child Relationship",
   "query": "process where event.type in (\"start\", \"process_started\") and\nprocess.parent.name != null and\n (\n   /* suspicious parent processes */\n   (process.name:\"autochk.exe\" and not process.parent.name:\"smss.exe\") or\n   (process.name:(\"fontdrvhost.exe\", \"dwm.exe\") and not process.parent.name:(\"wininit.exe\", \"winlogon.exe\")) or\n   (process.name:(\"consent.exe\", \"RuntimeBroker.exe\", \"TiWorker.exe\") and not process.parent.name:\"svchost.exe\") or\n   (process.name:\"SearchIndexer.exe\" and not process.parent.name:\"services.exe\") or\n   (process.name:\"SearchProtocolHost.exe\" and not process.parent.name:(\"SearchIndexer.exe\", \"dllhost.exe\")) or\n   (process.name:\"dllhost.exe\" and not process.parent.name:(\"services.exe\", \"svchost.exe\")) or\n   (process.name:\"smss.exe\" and not process.parent.name:(\"System\", \"smss.exe\")) or\n   (process.name:\"csrss.exe\" and not process.parent.name:(\"smss.exe\", \"svchost.exe\")) or\n   (process.name:\"wininit.exe\" and not process.parent.name:\"smss.exe\") or\n   (process.name:\"winlogon.exe\" and not process.parent.name:\"smss.exe\") or\n   (process.name:(\"lsass.exe\", \"LsaIso.exe\") and not process.parent.name:\"wininit.exe\") or\n   (process.name:\"LogonUI.exe\" and not process.parent.name:(\"wininit.exe\", \"winlogon.exe\")) or\n   (process.name:\"services.exe\" and not process.parent.name:\"wininit.exe\") or\n   (process.name:\"svchost.exe\" and not process.parent.name:(\"MsMpEng.exe\", \"services.exe\")) or\n   (process.name:\"spoolsv.exe\" and not process.parent.name:\"services.exe\") or\n   (process.name:\"taskhost.exe\" and not process.parent.name:(\"services.exe\", \"svchost.exe\")) or\n   (process.name:\"taskhostw.exe\" and not process.parent.name:(\"services.exe\", \"svchost.exe\")) or\n   (process.name:\"userinit.exe\" and not process.parent.name:(\"dwm.exe\", \"winlogon.exe\")) or\n   (process.name:(\"wmiprvse.exe\", \"wsmprovhost.exe\", \"winrshost.exe\") and not process.parent.name:\"svchost.exe\") or\n   /* suspicious child processes */\n   (process.parent.name:(\"SearchProtocolHost.exe\", \"taskhost.exe\", \"csrss.exe\") and not process.name:(\"werfault.exe\", \"wermgr.exe\", \"WerFaultSecure.exe\")) or\n   (process.parent.name:\"autochk.exe\" and not process.name:(\"chkdsk.exe\", \"doskey.exe\", \"WerFault.exe\")) or\n   (process.parent.name:\"smss.exe\" and not process.name:(\"autochk.exe\", \"smss.exe\", \"csrss.exe\", \"wininit.exe\", \"winlogon.exe\", \"setupcl.exe\", \"WerFault.exe\")) or\n   (process.parent.name:\"wermgr.exe\" and not process.name:(\"WerFaultSecure.exe\", \"wermgr.exe\", \"WerFault.exe\")) or\n   (process.parent.name:\"conhost.exe\" and not process.name:(\"mscorsvw.exe\", \"wermgr.exe\", \"WerFault.exe\", \"WerFaultSecure.exe\"))\n  )\n",
   "references": [
-    "https://github.com/sbousseaden/Slides/blob/master/Hunting MindMaps/PNG/Windows Processes%20TH.map.png",
+    "https://github.com/sbousseaden/Slides/blob/master/Hunting%20MindMaps/PNG/Windows%20Processes%20TH.map.png",
     "https://www.andreafortuna.org/2017/06/15/standard-windows-processes-a-brief-reference/"
   ],
   "risk_score": 47,
@@ -53,5 +53,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 9
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/threat_intel_module_match.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/threat_intel_module_match.json
index f582eba053d64..e4b1309c42644 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/threat_intel_module_match.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/threat_intel_module_match.json
@@ -16,7 +16,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Threat Intel Filebeat Module Indicator Match",
-  "note": "## Triage and Analysis\n\nIf an indicator matches a local observation, the following enriched fields will be generated to identify the indicator, field, and type matched.\n\n- `threatintel.indicator.matched.atomic` - this identifies the atomic indicator that matched the local observation\n- `threatintel.indicator.matched.field` - this identifies the indicator field that matched the local observation\n- `threatintel.indicator.matched.type` - this identifies the indicator type that matched the local observation\n",
+  "note": "## Triage and Analysis\n\n### Investigating Threat Intel Indicator Matches\n\nThreat Intel indicator match rules allow matching from a local observation such as an endpoint event that records a file\nhash with an entry of a file hash stored within the Threat Intel Filebeat module. Other examples of matches can occur on\nan IP address, registry path, URL and imphash.\n\nThe matches will be based on the incoming feed data so it's important to validate the data and review the results by\ninvestigating the associated activity to determine if it requires further investigation.\n\nIf an indicator matches a local observation, the following enriched fields will be generated to identify the indicator, field, and type matched.\n\n- `threatintel.indicator.matched.atomic` - this identifies the atomic indicator that matched the local observation\n- `threatintel.indicator.matched.field` - this identifies the indicator field that matched the local observation\n- `threatintel.indicator.matched.type` - this identifies the indicator type that matched the local observation\n\n#### Possible investigation steps:\n- Investigation should be validated and reviewed based on the data (file hash, registry path, URL, imphash) that was matched\nand viewing the source of that activity.\n- Consider the history of the indicator that was matched. Has it happened before? Is it happening on multiple machines?\nThese kinds of questions can help understand if the activity is related to legitimate behavior.\n- Consider the user and their role within the company, is this something related to their job or work function?\n\n### False Positive Analysis\n- For any matches found, it's important to consider the initial release date of that indicator. Threat intelligence can\nbe a great tool for augmenting existing security processes, while at the same time it should be understood that threat\nintelligence can represent a specific set of activity observed at a point in time. For example, an IP address\nmay have hosted malware observed in a Dridex campaign six months ago, but it's possible that IP has been remediated and\nno longer represents any threat.\n- Adversaries often use legitimate tools as network administrators such as `PsExec` or `AdFind`, these tools often find their\nway into indicator lists creating the potential for false positives.\n- It's possible after large and publicly written campaigns, curious employees might end up going directly to attacker infrastructure and generating these rules\n\n### Response and Remediation\n- If suspicious or malicious behavior is observed, immediate response should be taken to isolate activity to prevent further\npost-compromise behavior.\n- One example of a response if a machine matched a command and control IP address would be to add an entry to a network\ndevice such as a firewall or proxy appliance to prevent any outbound activity from leaving that machine.\n- Another example of a response with a malicious file hash match would involve validating if the file was properly quarantined,\nreview current running processes looking for any abnormal activity, and investigating for any other follow-up actions such as persistence or lateral movement\n",
   "query": "file.hash.*:* or file.pe.imphash:* or source.ip:* or destination.ip:* or url.full:* or registry.path:*\n",
   "references": [
     "https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-threatintel.html"
@@ -190,9 +190,9 @@
       ]
     }
   ],
-  "threat_query": "event.module:threatintel and (threatintel.indicator.file.hash.*:* or threatintel.indicator.file.pe.imphash:* or threatintel.indicator.ip:* or threatintel.indicator.registry.path:* or threatintel.indicator.url.full:*)",
+  "threat_query": "@timestamp >= \"now-30d\" and event.module:threatintel and (threatintel.indicator.file.hash.*:* or threatintel.indicator.file.pe.imphash:* or threatintel.indicator.ip:* or threatintel.indicator.registry.path:* or threatintel.indicator.url.full:*)",
   "timeline_id": "495ad7a7-316e-4544-8a0f-9c098daee76e",
   "timeline_title": "Generic Threat Match Timeline",
   "type": "threat_match",
-  "version": 1
+  "version": 2
 }

From b64604ac890f5bedd4ec68c27e84f32c3fa35510 Mon Sep 17 00:00:00 2001
From: Dmitry Shevchenko <dmshevch@gmail.com>
Date: Thu, 14 Oct 2021 10:09:45 +0200
Subject: [PATCH 058/117] Implement hybrid approach to writing rule execution
 event logs (#114852)

---
 .../event_log_adapter/event_log_adapter.ts    | 56 ++++++++++++-------
 .../rule_execution_log_client.ts              |  2 +-
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log_adapter/event_log_adapter.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log_adapter/event_log_adapter.ts
index 6b1a0cd5b18d0..086cc12788a40 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log_adapter/event_log_adapter.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log_adapter/event_log_adapter.ts
@@ -5,7 +5,10 @@
  * 2.0.
  */
 
+import { sum } from 'lodash';
+import { SavedObjectsClientContract } from '../../../../../../../../src/core/server';
 import { IEventLogService } from '../../../../../../event_log/server';
+import { SavedObjectsAdapter } from '../saved_objects_adapter/saved_objects_adapter';
 import {
   FindBulkExecutionLogArgs,
   FindExecutionLogArgs,
@@ -18,21 +21,32 @@ import { EventLogClient } from './event_log_client';
 
 export class EventLogAdapter implements IRuleExecutionLogClient {
   private eventLogClient: EventLogClient;
+  /**
+   * @deprecated Saved objects adapter is used during the transition period while the event log doesn't support all features needed to implement the execution log.
+   * We use savedObjectsAdapter to write/read the latest rule execution status and eventLogClient to read/write historical execution data.
+   * We can remove savedObjectsAdapter as soon as the event log supports all methods that we need (find, findBulk).
+   */
+  private savedObjectsAdapter: IRuleExecutionLogClient;
 
-  constructor(eventLogService: IEventLogService) {
+  constructor(eventLogService: IEventLogService, savedObjectsClient: SavedObjectsClientContract) {
     this.eventLogClient = new EventLogClient(eventLogService);
+    this.savedObjectsAdapter = new SavedObjectsAdapter(savedObjectsClient);
   }
 
-  public async find({ ruleId, logsCount = 1, spaceId }: FindExecutionLogArgs) {
-    return []; // TODO Implement
+  public async find(args: FindExecutionLogArgs) {
+    return this.savedObjectsAdapter.find(args);
   }
 
-  public async findBulk({ ruleIds, logsCount = 1, spaceId }: FindBulkExecutionLogArgs) {
-    return {}; // TODO Implement
+  public async findBulk(args: FindBulkExecutionLogArgs) {
+    return this.savedObjectsAdapter.findBulk(args);
   }
 
-  public async update({ attributes, spaceId, ruleName, ruleType }: UpdateExecutionLogArgs) {
-    // execution events are immutable, so we just log a status change istead of updating previous
+  public async update(args: UpdateExecutionLogArgs) {
+    const { attributes, spaceId, ruleName, ruleType } = args;
+
+    await this.savedObjectsAdapter.update(args);
+
+    // EventLog execution events are immutable, so we just log a status change istead of updating previous
     if (attributes.status) {
       this.eventLogClient.logStatusChange({
         ruleName,
@@ -45,16 +59,15 @@ export class EventLogAdapter implements IRuleExecutionLogClient {
   }
 
   public async delete(id: string) {
-    // execution events are immutable, nothing to do here
+    await this.savedObjectsAdapter.delete(id);
+
+    // EventLog execution events are immutable, nothing to do here
   }
 
-  public async logExecutionMetrics({
-    ruleId,
-    spaceId,
-    ruleType,
-    ruleName,
-    metrics,
-  }: LogExecutionMetricsArgs) {
+  public async logExecutionMetrics(args: LogExecutionMetricsArgs) {
+    const { ruleId, spaceId, ruleType, ruleName, metrics } = args;
+    await this.savedObjectsAdapter.logExecutionMetrics(args);
+
     this.eventLogClient.logExecutionMetrics({
       ruleId,
       ruleName,
@@ -62,16 +75,19 @@ export class EventLogAdapter implements IRuleExecutionLogClient {
       spaceId,
       metrics: {
         executionGapDuration: metrics.executionGap?.asSeconds(),
-        totalIndexingDuration: metrics.indexingDurations?.reduce(
-          (acc, cur) => acc + Number(cur),
-          0
-        ),
-        totalSearchDuration: metrics.searchDurations?.reduce((acc, cur) => acc + Number(cur), 0),
+        totalIndexingDuration: metrics.indexingDurations
+          ? sum(metrics.indexingDurations.map(Number))
+          : undefined,
+        totalSearchDuration: metrics.searchDurations
+          ? sum(metrics.searchDurations.map(Number))
+          : undefined,
       },
     });
   }
 
   public async logStatusChange(args: LogStatusChangeArgs) {
+    await this.savedObjectsAdapter.logStatusChange(args);
+
     if (args.metrics) {
       this.logExecutionMetrics({
         ruleId: args.ruleId,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/rule_execution_log_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/rule_execution_log_client.ts
index 87a3b00cf4ed3..2d773fc35cce0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/rule_execution_log_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/rule_execution_log_client.ts
@@ -38,7 +38,7 @@ export class RuleExecutionLogClient implements IRuleExecutionLogClient {
         this.client = new SavedObjectsAdapter(savedObjectsClient);
         break;
       case UnderlyingLogClient.eventLog:
-        this.client = new EventLogAdapter(eventLogService);
+        this.client = new EventLogAdapter(eventLogService, savedObjectsClient);
         break;
     }
   }

From 32f650f9f705cc2f466a1d39f2830e9d9a800807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ester=20Mart=C3=AD=20Vilaseca?=
 <ester.martivilaseca@elastic.co>
Date: Thu, 14 Oct 2021 10:48:36 +0200
Subject: [PATCH 059/117] [Stack monitoring] Fix logstash functional tests for
 react (#114819)

* update logstash pipelines test subject

* Add sorting to table options for pipelines table

* fix sorting in logstash node pipelines table

* remove commented code
---
 .../public/application/pages/logstash/node_pipelines.tsx  | 4 +---
 .../public/application/pages/logstash/pipelines.tsx       | 8 +++-----
 x-pack/test/functional/apps/monitoring/index.js           | 4 ----
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
index e09850eaad5c9..740202da57d24 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
@@ -58,7 +58,6 @@ export const LogStashNodePipelinesPage: React.FC<ComponentProps> = ({ clusters }
 
   const getPageData = useCallback(async () => {
     const bounds = services.data?.query.timefilter.timefilter.getBounds();
-    const options: any = getPaginationRouteOptions();
     const url = `../api/monitoring/v1/clusters/${clusterUuid}/logstash/node/${match.params.uuid}/pipelines`;
     const response = await services.http?.fetch(url, {
       method: 'POST',
@@ -68,8 +67,7 @@ export const LogStashNodePipelinesPage: React.FC<ComponentProps> = ({ clusters }
           min: bounds.min.toISOString(),
           max: bounds.max.toISOString(),
         },
-        pagination: options.pagination,
-        queryText: options.queryText,
+        ...getPaginationRouteOptions(),
       }),
     });
 
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
index ac750ff81ddaa..c2dfe1c0dae7d 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
@@ -46,7 +46,6 @@ export const LogStashPipelinesPage: React.FC<ComponentProps> = ({ clusters }) =>
     const bounds = services.data?.query.timefilter.timefilter.getBounds();
     const url = `../api/monitoring/v1/clusters/${clusterUuid}/logstash/pipelines`;
 
-    const options: any = getPaginationRouteOptions();
     const response = await services.http?.fetch(url, {
       method: 'POST',
       body: JSON.stringify({
@@ -55,8 +54,7 @@ export const LogStashPipelinesPage: React.FC<ComponentProps> = ({ clusters }) =>
           min: bounds.min.toISOString(),
           max: bounds.max.toISOString(),
         },
-        pagination: options.pagination,
-        queryText: options.queryText,
+        ...getPaginationRouteOptions(),
       }),
     });
 
@@ -96,10 +94,10 @@ export const LogStashPipelinesPage: React.FC<ComponentProps> = ({ clusters }) =>
       title={title}
       pageTitle={pageTitle}
       getPageData={getPageData}
-      data-test-subj="elasticsearchOverviewPage"
+      data-test-subj="logstashPipelinesListing"
       cluster={cluster}
     >
-      <div data-test-subj="elasticsearchOverviewPage">{renderOverview(data)}</div>
+      <div data-test-subj="logstashPipelinesListing">{renderOverview(data)}</div>
     </LogstashTemplate>
   );
 };
diff --git a/x-pack/test/functional/apps/monitoring/index.js b/x-pack/test/functional/apps/monitoring/index.js
index 213007c7b71df..6a5b6ea813171 100644
--- a/x-pack/test/functional/apps/monitoring/index.js
+++ b/x-pack/test/functional/apps/monitoring/index.js
@@ -34,10 +34,6 @@ export default function ({ loadTestFile }) {
     loadTestFile(require.resolve('./kibana/instance'));
     loadTestFile(require.resolve('./kibana/instance_mb'));
 
-    // loadTestFile(require.resolve('./logstash/overview'));
-    // loadTestFile(require.resolve('./logstash/nodes'));
-    // loadTestFile(require.resolve('./logstash/node'));
-
     loadTestFile(require.resolve('./logstash/pipelines'));
     loadTestFile(require.resolve('./logstash/pipelines_mb'));
 

From f2f6bb52951f08227fb451d361f2d00b976852ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yulia=20=C4=8Cech?=
 <6585477+yuliacech@users.noreply.github.com>
Date: Thu, 14 Oct 2021 10:50:26 +0200
Subject: [PATCH 060/117] [Index Management] Added `data-test-subj` values to
 the index context menu buttons (#114900)

---
 .../__jest__/components/index_table.test.js   | 53 ++++++++++---------
 .../index_actions_context_menu.js             | 19 +++++--
 2 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/x-pack/plugins/index_management/__jest__/components/index_table.test.js b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
index ba07db10d22d8..808c44ddecce0 100644
--- a/x-pack/plugins/index_management/__jest__/components/index_table.test.js
+++ b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
@@ -88,7 +88,7 @@ const snapshot = (rendered) => {
   expect(rendered).toMatchSnapshot();
 };
 
-const openMenuAndClickButton = (rendered, rowIndex, buttonIndex) => {
+const openMenuAndClickButton = (rendered, rowIndex, buttonSelector) => {
   // Select a row.
   const checkboxes = findTestSubject(rendered, 'indexTableRowCheckbox');
   checkboxes.at(rowIndex).simulate('change', { target: { checked: true } });
@@ -100,18 +100,18 @@ const openMenuAndClickButton = (rendered, rowIndex, buttonIndex) => {
   rendered.update();
 
   // Click an action in the context menu.
-  const contextMenuButtons = findTestSubject(rendered, 'indexTableContextMenuButton');
-  contextMenuButtons.at(buttonIndex).simulate('click');
+  const contextMenuButton = findTestSubject(rendered, buttonSelector);
+  contextMenuButton.simulate('click');
   rendered.update();
 };
 
-const testEditor = (rendered, buttonIndex, rowIndex = 0) => {
-  openMenuAndClickButton(rendered, rowIndex, buttonIndex);
+const testEditor = (rendered, buttonSelector, rowIndex = 0) => {
+  openMenuAndClickButton(rendered, rowIndex, buttonSelector);
   rendered.update();
   snapshot(findTestSubject(rendered, 'detailPanelTabSelected').text());
 };
 
-const testAction = (rendered, buttonIndex, rowIndex = 0) => {
+const testAction = (rendered, buttonSelector, rowIndex = 0) => {
   // This is leaking some implementation details about how Redux works. Not sure exactly what's going on
   // but it looks like we're aware of how many Redux actions are dispatched in response to user interaction,
   // so we "time" our assertion based on how many Redux actions we observe. This is brittle because it
@@ -127,7 +127,7 @@ const testAction = (rendered, buttonIndex, rowIndex = 0) => {
     dispatchedActionsCount++;
   });
 
-  openMenuAndClickButton(rendered, rowIndex, buttonIndex);
+  openMenuAndClickButton(rendered, rowIndex, buttonSelector);
   // take snapshot of initial state.
   snapshot(status(rendered, rowIndex));
 };
@@ -140,6 +140,11 @@ const namesText = (rendered) => {
   return names(rendered).map((button) => button.text());
 };
 
+const getActionMenuButtons = (rendered) => {
+  return findTestSubject(rendered, 'indexContextMenu')
+    .find('button')
+    .map((span) => span.text());
+};
 describe('index table', () => {
   beforeEach(() => {
     // Mock initialization of services
@@ -232,7 +237,7 @@ describe('index table', () => {
     await runAllPromises();
     rendered.update();
 
-    let button = findTestSubject(rendered, 'indexTableContextMenuButton');
+    let button = findTestSubject(rendered, 'indexActionsContextMenuButton');
     expect(button.length).toEqual(0);
 
     const checkboxes = findTestSubject(rendered, 'indexTableRowCheckbox');
@@ -247,7 +252,7 @@ describe('index table', () => {
     await runAllPromises();
     rendered.update();
 
-    let button = findTestSubject(rendered, 'indexTableContextMenuButton');
+    let button = findTestSubject(rendered, 'indexActionsContextMenuButton');
     expect(button.length).toEqual(0);
 
     const checkboxes = findTestSubject(rendered, 'indexTableRowCheckbox');
@@ -353,7 +358,7 @@ describe('index table', () => {
     const actionButton = findTestSubject(rendered, 'indexActionsContextMenuButton');
     actionButton.simulate('click');
     rendered.update();
-    snapshot(findTestSubject(rendered, 'indexTableContextMenuButton').map((span) => span.text()));
+    snapshot(getActionMenuButtons(rendered));
   });
 
   test('should show the right context menu options when one index is selected and closed', async () => {
@@ -367,7 +372,7 @@ describe('index table', () => {
     const actionButton = findTestSubject(rendered, 'indexActionsContextMenuButton');
     actionButton.simulate('click');
     rendered.update();
-    snapshot(findTestSubject(rendered, 'indexTableContextMenuButton').map((span) => span.text()));
+    snapshot(getActionMenuButtons(rendered));
   });
 
   test('should show the right context menu options when one open and one closed index is selected', async () => {
@@ -382,7 +387,7 @@ describe('index table', () => {
     const actionButton = findTestSubject(rendered, 'indexActionsContextMenuButton');
     actionButton.simulate('click');
     rendered.update();
-    snapshot(findTestSubject(rendered, 'indexTableContextMenuButton').map((span) => span.text()));
+    snapshot(getActionMenuButtons(rendered));
   });
 
   test('should show the right context menu options when more than one open index is selected', async () => {
@@ -397,7 +402,7 @@ describe('index table', () => {
     const actionButton = findTestSubject(rendered, 'indexActionsContextMenuButton');
     actionButton.simulate('click');
     rendered.update();
-    snapshot(findTestSubject(rendered, 'indexTableContextMenuButton').map((span) => span.text()));
+    snapshot(getActionMenuButtons(rendered));
   });
 
   test('should show the right context menu options when more than one closed index is selected', async () => {
@@ -412,28 +417,28 @@ describe('index table', () => {
     const actionButton = findTestSubject(rendered, 'indexActionsContextMenuButton');
     actionButton.simulate('click');
     rendered.update();
-    snapshot(findTestSubject(rendered, 'indexTableContextMenuButton').map((span) => span.text()));
+    snapshot(getActionMenuButtons(rendered));
   });
 
   test('flush button works from context menu', async () => {
     const rendered = mountWithIntl(component);
     await runAllPromises();
     rendered.update();
-    testAction(rendered, 8);
+    testAction(rendered, 'flushIndexMenuButton');
   });
 
   test('clear cache button works from context menu', async () => {
     const rendered = mountWithIntl(component);
     await runAllPromises();
     rendered.update();
-    testAction(rendered, 7);
+    testAction(rendered, 'clearCacheIndexMenuButton');
   });
 
   test('refresh button works from context menu', async () => {
     const rendered = mountWithIntl(component);
     await runAllPromises();
     rendered.update();
-    testAction(rendered, 6);
+    testAction(rendered, 'refreshIndexMenuButton');
   });
 
   test('force merge button works from context menu', async () => {
@@ -442,7 +447,7 @@ describe('index table', () => {
     rendered.update();
 
     const rowIndex = 0;
-    openMenuAndClickButton(rendered, rowIndex, 5);
+    openMenuAndClickButton(rendered, rowIndex, 'forcemergeIndexMenuButton');
     snapshot(status(rendered, rowIndex));
     expect(rendered.find('.euiModal').length).toBe(1);
 
@@ -478,7 +483,7 @@ describe('index table', () => {
       JSON.stringify(modifiedIndices),
     ]);
 
-    testAction(rendered, 4);
+    testAction(rendered, 'closeIndexMenuButton');
   });
 
   test('open index button works from context menu', async () => {
@@ -499,34 +504,34 @@ describe('index table', () => {
       JSON.stringify(modifiedIndices),
     ]);
 
-    testAction(rendered, 3, 1);
+    testAction(rendered, 'openIndexMenuButton', 1);
   });
 
   test('show settings button works from context menu', async () => {
     const rendered = mountWithIntl(component);
     await runAllPromises();
     rendered.update();
-    testEditor(rendered, 0);
+    testEditor(rendered, 'showSettingsIndexMenuButton');
   });
 
   test('show mappings button works from context menu', async () => {
     const rendered = mountWithIntl(component);
     await runAllPromises();
     rendered.update();
-    testEditor(rendered, 1);
+    testEditor(rendered, 'showMappingsIndexMenuButton');
   });
 
   test('show stats button works from context menu', async () => {
     const rendered = mountWithIntl(component);
     await runAllPromises();
     rendered.update();
-    testEditor(rendered, 2);
+    testEditor(rendered, 'showStatsIndexMenuButton');
   });
 
   test('edit index button works from context menu', async () => {
     const rendered = mountWithIntl(component);
     await runAllPromises();
     rendered.update();
-    testEditor(rendered, 3);
+    testEditor(rendered, 'editIndexMenuButton');
   });
 });
diff --git a/x-pack/plugins/index_management/public/application/sections/home/index_list/index_actions_context_menu/index_actions_context_menu.js b/x-pack/plugins/index_management/public/application/sections/home/index_list/index_actions_context_menu/index_actions_context_menu.js
index a97d5b11161b1..c5bd62feff826 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/index_list/index_actions_context_menu/index_actions_context_menu.js
+++ b/x-pack/plugins/index_management/public/application/sections/home/index_list/index_actions_context_menu/index_actions_context_menu.js
@@ -75,6 +75,7 @@ export class IndexActionsContextMenu extends Component {
     const items = [];
     if (!detailPanel && selectedIndexCount === 1) {
       items.push({
+        'data-test-subj': 'showSettingsIndexMenuButton',
         name: i18n.translate('xpack.idxMgmt.indexActionsMenu.showIndexSettingsLabel', {
           defaultMessage:
             'Show {selectedIndexCount, plural, one {index} other {indices} } settings',
@@ -85,6 +86,7 @@ export class IndexActionsContextMenu extends Component {
         },
       });
       items.push({
+        'data-test-subj': 'showMappingsIndexMenuButton',
         name: i18n.translate('xpack.idxMgmt.indexActionsMenu.showIndexMappingLabel', {
           defaultMessage: 'Show {selectedIndexCount, plural, one {index} other {indices} } mapping',
           values: { selectedIndexCount },
@@ -95,6 +97,7 @@ export class IndexActionsContextMenu extends Component {
       });
       if (allOpen) {
         items.push({
+          'data-test-subj': 'showStatsIndexMenuButton',
           name: i18n.translate('xpack.idxMgmt.indexActionsMenu.showIndexStatsLabel', {
             defaultMessage: 'Show {selectedIndexCount, plural, one {index} other {indices} } stats',
             values: { selectedIndexCount },
@@ -105,6 +108,7 @@ export class IndexActionsContextMenu extends Component {
         });
       }
       items.push({
+        'data-test-subj': 'editIndexMenuButton',
         name: i18n.translate('xpack.idxMgmt.indexActionsMenu.editIndexSettingsLabel', {
           defaultMessage:
             'Edit {selectedIndexCount, plural, one {index} other {indices} } settings',
@@ -117,6 +121,7 @@ export class IndexActionsContextMenu extends Component {
     }
     if (allOpen) {
       items.push({
+        'data-test-subj': 'closeIndexMenuButton',
         name: i18n.translate('xpack.idxMgmt.indexActionsMenu.closeIndexLabel', {
           defaultMessage: 'Close {selectedIndexCount, plural, one {index} other {indices} }',
           values: { selectedIndexCount },
@@ -131,6 +136,7 @@ export class IndexActionsContextMenu extends Component {
         },
       });
       items.push({
+        'data-test-subj': 'forcemergeIndexMenuButton',
         name: i18n.translate('xpack.idxMgmt.indexActionsMenu.forceMergeIndexLabel', {
           defaultMessage: 'Force merge {selectedIndexCount, plural, one {index} other {indices} }',
           values: { selectedIndexCount },
@@ -141,6 +147,7 @@ export class IndexActionsContextMenu extends Component {
         },
       });
       items.push({
+        'data-test-subj': 'refreshIndexMenuButton',
         name: i18n.translate('xpack.idxMgmt.indexActionsMenu.refreshIndexLabel', {
           defaultMessage: 'Refresh {selectedIndexCount, plural, one {index} other {indices} }',
           values: { selectedIndexCount },
@@ -150,6 +157,7 @@ export class IndexActionsContextMenu extends Component {
         },
       });
       items.push({
+        'data-test-subj': 'clearCacheIndexMenuButton',
         name: i18n.translate('xpack.idxMgmt.indexActionsMenu.clearIndexCacheLabel', {
           defaultMessage: 'Clear {selectedIndexCount, plural, one {index} other {indices} } cache',
           values: { selectedIndexCount },
@@ -159,6 +167,7 @@ export class IndexActionsContextMenu extends Component {
         },
       });
       items.push({
+        'data-test-subj': 'flushIndexMenuButton',
         name: i18n.translate('xpack.idxMgmt.indexActionsMenu.flushIndexLabel', {
           defaultMessage: 'Flush {selectedIndexCount, plural, one {index} other {indices} }',
           values: { selectedIndexCount },
@@ -191,6 +200,7 @@ export class IndexActionsContextMenu extends Component {
       }
     } else {
       items.push({
+        'data-test-subj': 'openIndexMenuButton',
         name: i18n.translate('xpack.idxMgmt.indexActionsMenu.openIndexLabel', {
           defaultMessage: 'Open {selectedIndexCount, plural, one {index} other {indices} }',
           values: { selectedIndexCount },
@@ -239,9 +249,6 @@ export class IndexActionsContextMenu extends Component {
         }
       }
     });
-    items.forEach((item) => {
-      item['data-test-subj'] = 'indexTableContextMenuButton';
-    });
     const panelTree = {
       id: 0,
       title: i18n.translate('xpack.idxMgmt.indexActionsMenu.panelTitle', {
@@ -732,7 +739,11 @@ export class IndexActionsContextMenu extends Component {
                 anchorPosition={anchorPosition}
                 repositionOnScroll
               >
-                <EuiContextMenu initialPanelId={0} panels={panels} />
+                <EuiContextMenu
+                  initialPanelId={0}
+                  panels={panels}
+                  data-test-subj="indexContextMenu"
+                />
               </EuiPopover>
             </div>
           );

From b0daf935cf01ffe4377063a115648a2fdfbe081d Mon Sep 17 00:00:00 2001
From: Walter Rafelsberger <walter@elastic.co>
Date: Thu, 14 Oct 2021 11:07:26 +0200
Subject: [PATCH 061/117] [ML] APM Correlations: Round duration values to be
 used in range aggregations. (#114833)

A change in the ES range agg no longer accepts numbers with decimals if the underlying field is typed as long. This fixes the issue by rounding the values we pass on to the range agg.
---
 .../queries/query_histogram_range_steps.test.ts               | 4 ++--
 .../search_strategies/queries/query_histogram_range_steps.ts  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/apm/server/lib/search_strategies/queries/query_histogram_range_steps.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/queries/query_histogram_range_steps.test.ts
index 25ce39cbcf17b..ffc86c7ef6c32 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/queries/query_histogram_range_steps.test.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/queries/query_histogram_range_steps.test.ts
@@ -106,8 +106,8 @@ describe('query_histogram_range_steps', () => {
       );
 
       expect(resp.length).toEqual(100);
-      expect(resp[0]).toEqual(9.260965422132594);
-      expect(resp[99]).toEqual(18521.930844265193);
+      expect(resp[0]).toEqual(9);
+      expect(resp[99]).toEqual(18522);
       expect(esClientSearchMock).toHaveBeenCalledTimes(1);
     });
   });
diff --git a/x-pack/plugins/apm/server/lib/search_strategies/queries/query_histogram_range_steps.ts b/x-pack/plugins/apm/server/lib/search_strategies/queries/query_histogram_range_steps.ts
index 973787833577c..790919d193028 100644
--- a/x-pack/plugins/apm/server/lib/search_strategies/queries/query_histogram_range_steps.ts
+++ b/x-pack/plugins/apm/server/lib/search_strategies/queries/query_histogram_range_steps.ts
@@ -19,10 +19,11 @@ import { getRequestBase } from './get_request_base';
 
 const getHistogramRangeSteps = (min: number, max: number, steps: number) => {
   // A d3 based scale function as a helper to get equally distributed bins on a log scale.
+  // We round the final values because the ES range agg we use won't accept numbers with decimals for `transaction.duration.us`.
   const logFn = scaleLog().domain([min, max]).range([1, steps]);
   return [...Array(steps).keys()]
     .map(logFn.invert)
-    .map((d) => (isNaN(d) ? 0 : d));
+    .map((d) => (isNaN(d) ? 0 : Math.round(d)));
 };
 
 export const getHistogramIntervalRequest = (

From 1d3c8b7dc70f2ba260cca330fdad0b973ffbccb9 Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Thu, 14 Oct 2021 11:26:49 +0200
Subject: [PATCH 062/117] [Security Solution] Edit host isolation exception IP
 UI (#114279)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../pages/event_filters/store/middleware.ts   |   2 +-
 .../host_isolation_exceptions/service.ts      |  24 +++
 .../host_isolation_exceptions/store/action.ts |  21 ++-
 .../store/middleware.test.ts                  | 107 +++++++++++-
 .../store/middleware.ts                       |  88 +++++++++-
 .../store/reducer.ts                          |   9 +
 .../store/selector.ts                         |  16 ++
 .../pages/host_isolation_exceptions/types.ts  |   5 +-
 .../view/components/delete_modal.test.tsx     |   2 +-
 .../view/components/form.test.tsx             |  53 +++++-
 .../view/components/form.tsx                  |  16 +-
 .../view/components/form_flyout.test.tsx      | 117 ++++++++++++-
 .../view/components/form_flyout.tsx           | 163 +++++++++++++-----
 .../view/components/translations.ts           |  65 +++++++
 .../view/host_isolation_exceptions_list.tsx   |  22 ++-
 .../pages/trusted_apps/store/middleware.ts    |   2 +-
 16 files changed, 633 insertions(+), 79 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.ts
index 0c90e21b49530..c77494aad2de2 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.ts
@@ -231,8 +231,8 @@ const refreshListDataIfNeeded: MiddlewareActionHandler = async (store, eventFilt
     dispatch({
       type: 'eventFiltersListPageDataChanged',
       payload: {
-        type: 'LoadingResourceState',
         // @ts-expect-error-next-line will be fixed with when AsyncResourceState is refactored (#830)
+        type: 'LoadingResourceState',
         previousState: getCurrentListPageDataState(state),
       },
     });
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts
index 8af353a3c9531..b58c2d901c2cc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts
@@ -9,6 +9,7 @@ import {
   CreateExceptionListItemSchema,
   ExceptionListItemSchema,
   FoundExceptionListItemSchema,
+  UpdateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
 import { HttpStart } from 'kibana/public';
@@ -88,3 +89,26 @@ export async function deleteHostIsolationExceptionItems(http: HttpStart, id: str
     },
   });
 }
+
+export async function getOneHostIsolationExceptionItem(
+  http: HttpStart,
+  id: string
+): Promise<UpdateExceptionListItemSchema> {
+  await ensureHostIsolationExceptionsListExists(http);
+  return http.get<ExceptionListItemSchema>(EXCEPTION_LIST_ITEM_URL, {
+    query: {
+      id,
+      namespace_type: 'agnostic',
+    },
+  });
+}
+
+export async function updateOneHostIsolationExceptionItem(
+  http: HttpStart,
+  exception: UpdateExceptionListItemSchema
+): Promise<ExceptionListItemSchema> {
+  await ensureHostIsolationExceptionsListExists(http);
+  return http.put<ExceptionListItemSchema>(EXCEPTION_LIST_ITEM_URL, {
+    body: JSON.stringify(exception),
+  });
+}
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/action.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/action.ts
index a5fae36486f98..237868ad18c50 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/action.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/action.ts
@@ -5,7 +5,10 @@
  * 2.0.
  */
 
-import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import {
+  ExceptionListItemSchema,
+  UpdateExceptionListItemSchema,
+} from '@kbn/securitysolution-io-ts-list-types';
 import { Action } from 'redux';
 import { HostIsolationExceptionsPageState } from '../types';
 
@@ -38,10 +41,24 @@ export type HostIsolationExceptionsDeleteStatusChanged =
   Action<'hostIsolationExceptionsDeleteStatusChanged'> & {
     payload: HostIsolationExceptionsPageState['deletion']['status'];
   };
+
+export type HostIsolationExceptionsMarkToEdit = Action<'hostIsolationExceptionsMarkToEdit'> & {
+  payload: {
+    id: string;
+  };
+};
+
+export type HostIsolationExceptionsSubmitEdit = Action<'hostIsolationExceptionsSubmitEdit'> & {
+  payload: UpdateExceptionListItemSchema;
+};
+
 export type HostIsolationExceptionsPageAction =
   | HostIsolationExceptionsPageDataChanged
   | HostIsolationExceptionsCreateEntry
   | HostIsolationExceptionsFormStateChanged
   | HostIsolationExceptionsDeleteItem
   | HostIsolationExceptionsSubmitDelete
-  | HostIsolationExceptionsDeleteStatusChanged;
+  | HostIsolationExceptionsDeleteStatusChanged
+  | HostIsolationExceptionsFormEntryChanged
+  | HostIsolationExceptionsMarkToEdit
+  | HostIsolationExceptionsSubmitEdit;
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/middleware.test.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/middleware.test.ts
index 266853fdab5e2..878c17a1a2757 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/middleware.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/middleware.test.ts
@@ -5,7 +5,10 @@
  * 2.0.
  */
 
-import { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import {
+  CreateExceptionListItemSchema,
+  UpdateEndpointListItemSchema,
+} from '@kbn/securitysolution-io-ts-list-types';
 import { applyMiddleware, createStore, Store } from 'redux';
 import { coreMock } from '../../../../../../../../src/core/public/mocks';
 import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
@@ -24,6 +27,8 @@ import {
   createHostIsolationExceptionItem,
   deleteHostIsolationExceptionItems,
   getHostIsolationExceptionItems,
+  getOneHostIsolationExceptionItem,
+  updateOneHostIsolationExceptionItem,
 } from '../service';
 import { HostIsolationExceptionsPageState } from '../types';
 import { createEmptyHostIsolationException } from '../utils';
@@ -36,6 +41,8 @@ jest.mock('../service');
 const getHostIsolationExceptionItemsMock = getHostIsolationExceptionItems as jest.Mock;
 const deleteHostIsolationExceptionItemsMock = deleteHostIsolationExceptionItems as jest.Mock;
 const createHostIsolationExceptionItemMock = createHostIsolationExceptionItem as jest.Mock;
+const getOneHostIsolationExceptionItemMock = getOneHostIsolationExceptionItem as jest.Mock;
+const updateOneHostIsolationExceptionItemMock = updateOneHostIsolationExceptionItem as jest.Mock;
 
 const fakeCoreStart = coreMock.createStart({ basePath: '/mock' });
 
@@ -170,6 +177,7 @@ describe('Host isolation exceptions middleware', () => {
         ],
       };
     });
+
     it('should dispatch a form loading state when an entry is submited', async () => {
       const waiter = spyMiddleware.waitForAction('hostIsolationExceptionsFormStateChanged', {
         validate({ payload }) {
@@ -182,6 +190,7 @@ describe('Host isolation exceptions middleware', () => {
       });
       await waiter;
     });
+
     it('should dispatch a form success state when an entry is confirmed by the API', async () => {
       const waiter = spyMiddleware.waitForAction('hostIsolationExceptionsFormStateChanged', {
         validate({ payload }) {
@@ -198,6 +207,7 @@ describe('Host isolation exceptions middleware', () => {
         exception: entry,
       });
     });
+
     it('should dispatch a form failure state when an entry is rejected by the API', async () => {
       createHostIsolationExceptionItemMock.mockRejectedValue({
         body: { message: 'error message', statusCode: 500, error: 'Not today' },
@@ -215,6 +225,101 @@ describe('Host isolation exceptions middleware', () => {
     });
   });
 
+  describe('When updating an item from host isolation exceptions', () => {
+    const fakeId = 'dc5d1d00-2766-11ec-981f-7f84cfc8764f';
+    let fakeException: UpdateEndpointListItemSchema;
+    beforeEach(() => {
+      fakeException = {
+        ...createEmptyHostIsolationException(),
+        name: 'name edit me',
+        description: 'initial description',
+        id: fakeId,
+        item_id: fakeId,
+        entries: [
+          {
+            field: 'destination.ip',
+            operator: 'included',
+            type: 'match',
+            value: '10.0.0.5',
+          },
+        ],
+      };
+      getOneHostIsolationExceptionItemMock.mockReset();
+      getOneHostIsolationExceptionItemMock.mockImplementation(async () => {
+        return fakeException;
+      });
+    });
+
+    it('should load data from an entry when an exception is marked to edit', async () => {
+      const waiter = spyMiddleware.waitForAction('hostIsolationExceptionsFormEntryChanged');
+      store.dispatch({
+        type: 'hostIsolationExceptionsMarkToEdit',
+        payload: {
+          id: fakeId,
+        },
+      });
+      await waiter;
+      expect(getOneHostIsolationExceptionItemMock).toHaveBeenCalledWith(fakeCoreStart.http, fakeId);
+    });
+
+    it('should call the update API when an item edit is submitted', async () => {
+      const waiter = Promise.all([
+        // loading status
+        spyMiddleware.waitForAction('hostIsolationExceptionsFormStateChanged', {
+          validate: ({ payload }) => {
+            return isLoadingResourceState(payload);
+          },
+        }),
+        // loaded status
+        spyMiddleware.waitForAction('hostIsolationExceptionsFormStateChanged', {
+          validate({ payload }) {
+            return isLoadedResourceState(payload);
+          },
+        }),
+      ]);
+      store.dispatch({
+        type: 'hostIsolationExceptionsSubmitEdit',
+        payload: fakeException,
+      });
+      expect(updateOneHostIsolationExceptionItemMock).toHaveBeenCalledWith(fakeCoreStart.http, {
+        name: 'name edit me',
+        description: 'initial description',
+        id: fakeId,
+        item_id: fakeId,
+        entries: [
+          {
+            field: 'destination.ip',
+            operator: 'included',
+            type: 'match',
+            value: '10.0.0.5',
+          },
+        ],
+        namespace_type: 'agnostic',
+        os_types: ['windows', 'linux', 'macos'],
+        tags: ['policy:all'],
+        type: 'simple',
+        comments: [],
+      });
+      await waiter;
+    });
+
+    it('should dispatch a form failure state when an entry is rejected by the API', async () => {
+      updateOneHostIsolationExceptionItemMock.mockRejectedValue({
+        body: { message: 'error message', statusCode: 500, error: 'Not today' },
+      });
+      const waiter = spyMiddleware.waitForAction('hostIsolationExceptionsFormStateChanged', {
+        validate({ payload }) {
+          return isFailedResourceState(payload);
+        },
+      });
+      store.dispatch({
+        type: 'hostIsolationExceptionsSubmitEdit',
+        payload: fakeException,
+      });
+      await waiter;
+    });
+  });
+
   describe('When deleting an item from host isolation exceptions', () => {
     beforeEach(() => {
       deleteHostIsolationExceptionItemsMock.mockReset();
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/middleware.ts
index bbc754e8155b0..2587fff5bfafd 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/middleware.ts
@@ -9,11 +9,12 @@ import {
   CreateExceptionListItemSchema,
   ExceptionListItemSchema,
   FoundExceptionListItemSchema,
+  UpdateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { CoreStart, HttpSetup, HttpStart } from 'kibana/public';
 import { matchPath } from 'react-router-dom';
-import { transformNewItemOutput } from '@kbn/securitysolution-list-hooks';
-import { AppLocation, Immutable } from '../../../../../common/endpoint/types';
+import { transformNewItemOutput, transformOutput } from '@kbn/securitysolution-list-hooks';
+import { AppLocation, Immutable, ImmutableObject } from '../../../../../common/endpoint/types';
 import { ImmutableMiddleware, ImmutableMiddlewareAPI } from '../../../../common/store';
 import { AppAction } from '../../../../common/store/actions';
 import { MANAGEMENT_ROUTING_HOST_ISOLATION_EXCEPTIONS_PATH } from '../../../common/constants';
@@ -21,11 +22,14 @@ import { parseQueryFilterToKQL } from '../../../common/utils';
 import {
   createFailedResourceState,
   createLoadedResourceState,
+  createLoadingResourceState,
 } from '../../../state/async_resource_builders';
 import {
   deleteHostIsolationExceptionItems,
   getHostIsolationExceptionItems,
   createHostIsolationExceptionItem,
+  getOneHostIsolationExceptionItem,
+  updateOneHostIsolationExceptionItem,
 } from '../service';
 import { HostIsolationExceptionsPageState } from '../types';
 import { getCurrentListPageDataState, getCurrentLocation, getItemToDelete } from './selector';
@@ -53,6 +57,14 @@ export const createHostIsolationExceptionsPageMiddleware = (
     if (action.type === 'hostIsolationExceptionsSubmitDelete') {
       deleteHostIsolationExceptionsItem(store, coreStart.http);
     }
+
+    if (action.type === 'hostIsolationExceptionsMarkToEdit') {
+      loadHostIsolationExceptionsItem(store, coreStart.http, action.payload.id);
+    }
+
+    if (action.type === 'hostIsolationExceptionsSubmitEdit') {
+      updateHostIsolationExceptionsItem(store, coreStart.http, action.payload);
+    }
   };
 };
 
@@ -67,8 +79,8 @@ async function createHostIsolationException(
   dispatch({
     type: 'hostIsolationExceptionsFormStateChanged',
     payload: {
-      type: 'LoadingResourceState',
       // @ts-expect-error-next-line will be fixed with when AsyncResourceState is refactored (#830)
+      type: 'LoadingResourceState',
       previousState: entry,
     },
   });
@@ -110,8 +122,8 @@ async function loadHostIsolationExceptionsList(
     dispatch({
       type: 'hostIsolationExceptionsPageDataChanged',
       payload: {
-        type: 'LoadingResourceState',
         // @ts-expect-error-next-line will be fixed with when AsyncResourceState is refactored (#830)
+        type: 'LoadingResourceState',
         previousState: getCurrentListPageDataState(store.getState()),
       },
     });
@@ -152,8 +164,8 @@ async function deleteHostIsolationExceptionsItem(
     dispatch({
       type: 'hostIsolationExceptionsDeleteStatusChanged',
       payload: {
-        type: 'LoadingResourceState',
         // @ts-expect-error-next-line will be fixed with when AsyncResourceState is refactored (#830)
+        type: 'LoadingResourceState',
         previousState: store.getState().deletion.status,
       },
     });
@@ -172,3 +184,69 @@ async function deleteHostIsolationExceptionsItem(
     });
   }
 }
+
+async function loadHostIsolationExceptionsItem(
+  store: ImmutableMiddlewareAPI<HostIsolationExceptionsPageState, AppAction>,
+  http: HttpSetup,
+  id: string
+) {
+  const { dispatch } = store;
+  try {
+    const exception: UpdateExceptionListItemSchema = await getOneHostIsolationExceptionItem(
+      http,
+      id
+    );
+    dispatch({
+      type: 'hostIsolationExceptionsFormEntryChanged',
+      payload: exception,
+    });
+  } catch (error) {
+    dispatch({
+      type: 'hostIsolationExceptionsFormStateChanged',
+      payload: createFailedResourceState<ExceptionListItemSchema>(error.body ?? error),
+    });
+  }
+}
+async function updateHostIsolationExceptionsItem(
+  store: ImmutableMiddlewareAPI<HostIsolationExceptionsPageState, AppAction>,
+  http: HttpSetup,
+  exception: ImmutableObject<UpdateExceptionListItemSchema>
+) {
+  const { dispatch } = store;
+  dispatch({
+    type: 'hostIsolationExceptionsFormStateChanged',
+    payload: createLoadingResourceState(createLoadedResourceState(exception)),
+  });
+
+  try {
+    const entry = transformOutput(exception as UpdateExceptionListItemSchema);
+    // Clean unnecessary fields for update action
+    const fieldsToRemove: Array<keyof ExceptionListItemSchema> = [
+      'created_at',
+      'created_by',
+      'created_at',
+      'created_by',
+      'list_id',
+      'tie_breaker_id',
+      'updated_at',
+      'updated_by',
+    ];
+
+    fieldsToRemove.forEach((field) => {
+      delete entry[field as keyof UpdateExceptionListItemSchema];
+    });
+    const response: ExceptionListItemSchema = await updateOneHostIsolationExceptionItem(
+      http,
+      entry
+    );
+    dispatch({
+      type: 'hostIsolationExceptionsFormStateChanged',
+      payload: createLoadedResourceState(response),
+    });
+  } catch (error) {
+    dispatch({
+      type: 'hostIsolationExceptionsFormStateChanged',
+      payload: createFailedResourceState<ExceptionListItemSchema>(error.body ?? error),
+    });
+  }
+}
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/reducer.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/reducer.ts
index d97295598f445..77a1c248d0cf0 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/reducer.ts
@@ -56,6 +56,15 @@ export const hostIsolationExceptionsPageReducer: StateReducer = (
         },
       };
     }
+    case 'hostIsolationExceptionsFormEntryChanged': {
+      return {
+        ...state,
+        form: {
+          ...state.form,
+          entry: action.payload,
+        },
+      };
+    }
     case 'hostIsolationExceptionsPageDataChanged': {
       return {
         ...state,
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/selector.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/selector.ts
index 4462864e90702..3eca524d830d5 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/selector.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/selector.ts
@@ -9,6 +9,7 @@ import { Pagination } from '@elastic/eui';
 import {
   ExceptionListItemSchema,
   FoundExceptionListItemSchema,
+  UpdateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { createSelector } from 'reselect';
 import { Immutable } from '../../../../../common/endpoint/types';
@@ -108,3 +109,18 @@ export const getDeleteError: HostIsolationExceptionsSelector<ServerApiError | un
       return status.error;
     }
   });
+
+const getFormState: HostIsolationExceptionsSelector<StoreState['form']> = (state) => {
+  return state.form;
+};
+
+export const getFormStatusFailure: HostIsolationExceptionsSelector<ServerApiError | undefined> =
+  createSelector(getFormState, (form) => {
+    if (isFailedResourceState(form.status)) {
+      return form.status.error;
+    }
+  });
+
+export const getExceptionToEdit: HostIsolationExceptionsSelector<
+  UpdateExceptionListItemSchema | undefined
+> = (state) => (state.form.entry ? (state.form.entry as UpdateExceptionListItemSchema) : undefined);
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/types.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/types.ts
index 1a74042fb652e..2e61a39eb7542 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/types.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/types.ts
@@ -9,6 +9,7 @@ import type {
   CreateExceptionListItemSchema,
   ExceptionListItemSchema,
   FoundExceptionListItemSchema,
+  UpdateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { AsyncResourceState } from '../../state/async_resource_state';
 
@@ -29,7 +30,7 @@ export interface HostIsolationExceptionsPageState {
     status: AsyncResourceState<ExceptionListItemSchema>;
   };
   form: {
-    entry?: CreateExceptionListItemSchema;
-    status: AsyncResourceState<ExceptionListItemSchema>;
+    entry?: CreateExceptionListItemSchema | UpdateExceptionListItemSchema;
+    status: AsyncResourceState<CreateExceptionListItemSchema | UpdateExceptionListItemSchema>;
   };
 }
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx
index 0b09b4bfa14c4..2a75ab0622128 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx
@@ -83,7 +83,7 @@ describe('When on the host isolation exceptions delete modal', () => {
     act(() => {
       fireEvent.click(cancelButton);
     });
-    await waiter;
+    expect(await waiter).toBeTruthy();
   });
 
   it('should show success toast after the delete is completed', async () => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.test.tsx
index b06449de69d8c..826f7bf6c4d8a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.test.tsx
@@ -12,12 +12,16 @@ import {
   AppContextTestRender,
   createAppRootMockRenderer,
 } from '../../../../../common/mock/endpoint';
-import { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import {
+  CreateExceptionListItemSchema,
+  UpdateExceptionListItemSchema,
+} from '@kbn/securitysolution-io-ts-list-types';
 import userEvent from '@testing-library/user-event';
+import uuid from 'uuid';
 
 describe('When on the host isolation exceptions add entry form', () => {
   let render: (
-    exception: CreateExceptionListItemSchema
+    exception: CreateExceptionListItemSchema | UpdateExceptionListItemSchema
   ) => ReturnType<AppContextTestRender['render']>;
   let renderResult: ReturnType<typeof render>;
   const onChange = jest.fn();
@@ -27,7 +31,7 @@ describe('When on the host isolation exceptions add entry form', () => {
     onChange.mockReset();
     onError.mockReset();
     const mockedContext = createAppRootMockRenderer();
-    render = (exception: CreateExceptionListItemSchema) => {
+    render = (exception) => {
       return mockedContext.render(
         <HostIsolationExceptionsForm exception={exception} onChange={onChange} onError={onError} />
       );
@@ -72,4 +76,47 @@ describe('When on the host isolation exceptions add entry form', () => {
       });
     });
   });
+  describe('When editing an existing exception', () => {
+    let existingException: UpdateExceptionListItemSchema;
+    beforeEach(() => {
+      existingException = {
+        ...createEmptyHostIsolationException(),
+        name: 'name edit me',
+        description: 'initial description',
+        id: uuid.v4(),
+        item_id: uuid.v4(),
+        entries: [
+          {
+            field: 'destination.ip',
+            operator: 'included',
+            type: 'match',
+            value: '10.0.0.1',
+          },
+        ],
+      };
+      renderResult = render(existingException);
+    });
+    it('should render the form with pre-filled inputs', () => {
+      expect(renderResult.getByTestId('hostIsolationExceptions-form-name-input')).toHaveValue(
+        'name edit me'
+      );
+      expect(renderResult.getByTestId('hostIsolationExceptions-form-ip-input')).toHaveValue(
+        '10.0.0.1'
+      );
+      expect(
+        renderResult.getByTestId('hostIsolationExceptions-form-description-input')
+      ).toHaveValue('initial description');
+    });
+    it('should call onChange when a value is introduced in a field', () => {
+      const ipInput = renderResult.getByTestId('hostIsolationExceptions-form-ip-input');
+      userEvent.clear(ipInput);
+      userEvent.type(ipInput, '10.0.100.1');
+      expect(onChange).toHaveBeenCalledWith({
+        ...existingException,
+        entries: [
+          { field: 'destination.ip', operator: 'included', type: 'match', value: '10.0.100.1' },
+        ],
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.tsx
index 84263f9d07c81..7b13df16da483 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form.tsx
@@ -16,7 +16,10 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import {
+  CreateExceptionListItemSchema,
+  UpdateExceptionListItemSchema,
+} from '@kbn/securitysolution-io-ts-list-types';
 import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { isValidIPv4OrCIDR } from '../../utils';
 import {
@@ -34,18 +37,19 @@ interface ExceptionIpEntry {
   field: 'destination.ip';
   operator: 'included';
   type: 'match';
-  value: '';
+  value: string;
 }
 
 export const HostIsolationExceptionsForm: React.FC<{
-  exception: CreateExceptionListItemSchema;
+  exception: CreateExceptionListItemSchema | UpdateExceptionListItemSchema;
   onError: (error: boolean) => void;
-  onChange: (exception: CreateExceptionListItemSchema) => void;
+  onChange: (exception: CreateExceptionListItemSchema | UpdateExceptionListItemSchema) => void;
 }> = memo(({ exception, onError, onChange }) => {
+  const ipEntry = exception.entries[0] as ExceptionIpEntry;
   const [hasBeenInputNameVisited, setHasBeenInputNameVisited] = useState(false);
   const [hasBeenInputIpVisited, setHasBeenInputIpVisited] = useState(false);
-  const [hasNameError, setHasNameError] = useState(true);
-  const [hasIpError, setHasIpError] = useState(true);
+  const [hasNameError, setHasNameError] = useState(!exception.name);
+  const [hasIpError, setHasIpError] = useState(!ipEntry.value);
 
   useEffect(() => {
     onError(hasNameError || hasIpError);
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.test.tsx
index 6cfc9f56beadf..4ab4ed785e491 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.test.tsx
@@ -14,6 +14,8 @@ import userEvent from '@testing-library/user-event';
 import { HostIsolationExceptionsFormFlyout } from './form_flyout';
 import { act } from 'react-dom/test-utils';
 import { HOST_ISOLATION_EXCEPTIONS_PATH } from '../../../../../../common/constants';
+import uuid from 'uuid';
+import { createEmptyHostIsolationException } from '../../utils';
 
 jest.mock('../../service.ts');
 
@@ -23,8 +25,6 @@ describe('When on the host isolation exceptions flyout form', () => {
   let renderResult: ReturnType<typeof render>;
   let waitForAction: AppContextTestRender['middlewareSpy']['waitForAction'];
 
-  // const createHostIsolationExceptionItemMock = createHostIsolationExceptionItem as jest.mock;
-
   beforeEach(() => {
     mockedContext = createAppRootMockRenderer();
     render = () => {
@@ -34,7 +34,11 @@ describe('When on the host isolation exceptions flyout form', () => {
   });
 
   describe('When creating a new exception', () => {
-    describe('with invalid data', () => {
+    beforeEach(() => {
+      mockedContext.history.push(`${HOST_ISOLATION_EXCEPTIONS_PATH}?show=create`);
+    });
+
+    describe('with invalida data', () => {
       it('should show disabled buttons when the form first load', () => {
         renderResult = render();
         expect(renderResult.getByTestId('add-exception-cancel-button')).not.toHaveAttribute(
@@ -45,6 +49,7 @@ describe('When on the host isolation exceptions flyout form', () => {
         );
       });
     });
+
     describe('with valid data', () => {
       beforeEach(() => {
         renderResult = render();
@@ -53,6 +58,7 @@ describe('When on the host isolation exceptions flyout form', () => {
         userEvent.type(nameInput, 'test name');
         userEvent.type(ipInput, '10.0.0.1');
       });
+
       it('should show enable buttons when the form is valid', () => {
         expect(renderResult.getByTestId('add-exception-cancel-button')).not.toHaveAttribute(
           'disabled'
@@ -61,13 +67,15 @@ describe('When on the host isolation exceptions flyout form', () => {
           'disabled'
         );
       });
+
       it('should submit the entry data when submit is pressed with valid data', async () => {
         const confirmButton = renderResult.getByTestId('add-exception-confirm-button');
         expect(confirmButton).not.toHaveAttribute('disabled');
         const waiter = waitForAction('hostIsolationExceptionsCreateEntry');
         userEvent.click(confirmButton);
-        await waiter;
+        expect(await waiter).toBeTruthy();
       });
+
       it('should disable the submit button when an operation is in progress', () => {
         act(() => {
           mockedContext.store.dispatch({
@@ -81,6 +89,7 @@ describe('When on the host isolation exceptions flyout form', () => {
         const confirmButton = renderResult.getByTestId('add-exception-confirm-button');
         expect(confirmButton).toHaveAttribute('disabled');
       });
+
       it('should show a toast and close the flyout when the operation is finished', () => {
         mockedContext.history.push(`${HOST_ISOLATION_EXCEPTIONS_PATH}?show=create`);
         act(() => {
@@ -95,13 +104,14 @@ describe('When on the host isolation exceptions flyout form', () => {
         expect(mockedContext.coreStart.notifications.toasts.addSuccess).toHaveBeenCalled();
         expect(mockedContext.history.location.search).toBe('');
       });
-      it('should show an error toast operation fails and enable the submit button', () => {
+
+      it('should show an error toast if operation fails and enable the submit button', async () => {
         act(() => {
           mockedContext.store.dispatch({
             type: 'hostIsolationExceptionsFormStateChanged',
             payload: {
               type: 'FailedResourceState',
-              previousState: { type: 'UninitialisedResourceState' },
+              error: new Error('mocked error'),
             },
           });
         });
@@ -111,4 +121,99 @@ describe('When on the host isolation exceptions flyout form', () => {
       });
     });
   });
+  describe('When editing an existing exception', () => {
+    const fakeId = 'dc5d1d00-2766-11ec-981f-7f84cfc8764f';
+    beforeEach(() => {
+      mockedContext.history.push(`${HOST_ISOLATION_EXCEPTIONS_PATH}?show=edit&id=${fakeId}`);
+    });
+
+    describe('without loaded data', () => {
+      it('should show a loading status while the item is loaded', () => {
+        renderResult = render();
+        expect(renderResult.getByTestId('loading-spinner')).toBeTruthy();
+      });
+
+      it('should request to load data about the editing exception', async () => {
+        const waiter = waitForAction('hostIsolationExceptionsMarkToEdit', {
+          validate: ({ payload }) => {
+            return payload.id === fakeId;
+          },
+        });
+        renderResult = render();
+        expect(await waiter).toBeTruthy();
+      });
+
+      it('should show a warning toast if the item fails to load', () => {
+        renderResult = render();
+        act(() => {
+          mockedContext.store.dispatch({
+            type: 'hostIsolationExceptionsFormEntryChanged',
+            payload: undefined,
+          });
+
+          mockedContext.store.dispatch({
+            type: 'hostIsolationExceptionsFormStateChanged',
+            payload: {
+              type: 'FailedResourceState',
+              error: new Error('mocked error'),
+            },
+          });
+        });
+        expect(mockedContext.coreStart.notifications.toasts.addWarning).toHaveBeenCalled();
+      });
+    });
+
+    describe('with loaded data', () => {
+      beforeEach(async () => {
+        mockedContext.store.dispatch({
+          type: 'hostIsolationExceptionsFormEntryChanged',
+          payload: {
+            ...createEmptyHostIsolationException(),
+            name: 'name edit me',
+            description: 'initial description',
+            id: fakeId,
+            item_id: uuid.v4(),
+            entries: [
+              {
+                field: 'destination.ip',
+                operator: 'included',
+                type: 'match',
+                value: '10.0.0.5',
+              },
+            ],
+          },
+        });
+        renderResult = render();
+      });
+
+      it('should request data again if the url id is changed', async () => {
+        const otherId = 'd75fbd74-2a92-11ec-8d3d-0242ac130003';
+        act(() => {
+          mockedContext.history.push(`${HOST_ISOLATION_EXCEPTIONS_PATH}?show=edit&id=${otherId}`);
+        });
+        await waitForAction('hostIsolationExceptionsMarkToEdit', {
+          validate: ({ payload }) => {
+            return payload.id === otherId;
+          },
+        });
+      });
+
+      it('should enable the buttons from the start', () => {
+        expect(renderResult.getByTestId('add-exception-cancel-button')).not.toHaveAttribute(
+          'disabled'
+        );
+        expect(renderResult.getByTestId('add-exception-confirm-button')).not.toHaveAttribute(
+          'disabled'
+        );
+      });
+
+      it('should submit the entry data when submit is pressed with valid data', async () => {
+        const confirmButton = renderResult.getByTestId('add-exception-confirm-button');
+        expect(confirmButton).not.toHaveAttribute('disabled');
+        const waiter = waitForAction('hostIsolationExceptionsSubmitEdit');
+        userEvent.click(confirmButton);
+        expect(await waiter).toBeTruthy();
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx
index 5502a1b8ea2b1..de12616c67a3c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx
@@ -16,20 +16,32 @@ import {
   EuiFlyoutHeader,
   EuiTitle,
 } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import {
+  CreateExceptionListItemSchema,
+  UpdateExceptionListItemSchema,
+} from '@kbn/securitysolution-io-ts-list-types';
+import { omit } from 'lodash';
 import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { useDispatch } from 'react-redux';
+import { useHistory } from 'react-router-dom';
 import { Dispatch } from 'redux';
 import { Loader } from '../../../../../common/components/loader';
 import { useToasts } from '../../../../../common/lib/kibana';
+import { getHostIsolationExceptionsListPath } from '../../../../common/routing';
 import {
-  isFailedResourceState,
   isLoadedResourceState,
   isLoadingResourceState,
 } from '../../../../state/async_resource_state';
+import {
+  getCreateErrorMessage,
+  getCreationSuccessMessage,
+  getLoadErrorMessage,
+  getUpdateErrorMessage,
+  getUpdateSuccessMessage,
+} from './translations';
 import { HostIsolationExceptionsPageAction } from '../../store/action';
+import { getCurrentLocation, getExceptionToEdit, getFormStatusFailure } from '../../store/selector';
 import { createEmptyHostIsolationException } from '../../utils';
 import {
   useHostIsolationExceptionsNavigateCallback,
@@ -41,20 +53,26 @@ export const HostIsolationExceptionsFormFlyout: React.FC<{}> = memo(() => {
   const dispatch = useDispatch<Dispatch<HostIsolationExceptionsPageAction>>();
   const toasts = useToasts();
 
+  const location = useHostIsolationExceptionsSelector(getCurrentLocation);
+
   const creationInProgress = useHostIsolationExceptionsSelector((state) =>
     isLoadingResourceState(state.form.status)
   );
   const creationSuccessful = useHostIsolationExceptionsSelector((state) =>
     isLoadedResourceState(state.form.status)
   );
-  const creationFailure = useHostIsolationExceptionsSelector((state) =>
-    isFailedResourceState(state.form.status)
-  );
+  const creationFailure = useHostIsolationExceptionsSelector(getFormStatusFailure);
+
+  const exceptionToEdit = useHostIsolationExceptionsSelector(getExceptionToEdit);
 
   const navigateCallback = useHostIsolationExceptionsNavigateCallback();
 
+  const history = useHistory();
+
   const [formHasError, setFormHasError] = useState(true);
-  const [exception, setException] = useState<CreateExceptionListItemSchema | undefined>(undefined);
+  const [exception, setException] = useState<
+    CreateExceptionListItemSchema | UpdateExceptionListItemSchema | undefined
+  >(undefined);
 
   const onCancel = useCallback(
     () =>
@@ -65,12 +83,31 @@ export const HostIsolationExceptionsFormFlyout: React.FC<{}> = memo(() => {
     [navigateCallback]
   );
 
+  // load data to edit or create
   useEffect(() => {
-    setException(createEmptyHostIsolationException());
-  }, []);
+    if (location.show === 'create' && exception === undefined) {
+      setException(createEmptyHostIsolationException());
+    } else if (location.show === 'edit') {
+      // prevent flyout to show edit without an id
+      if (!location.id) {
+        onCancel();
+        return;
+      }
+      // load the exception to edit
+      if (!exceptionToEdit || location.id !== exceptionToEdit.id) {
+        dispatch({
+          type: 'hostIsolationExceptionsMarkToEdit',
+          payload: { id: location.id! },
+        });
+      } else {
+        setException(exceptionToEdit);
+      }
+    }
+  }, [dispatch, exception, exceptionToEdit, location.id, location.show, onCancel]);
 
+  // handle creation and edit success
   useEffect(() => {
-    if (creationSuccessful) {
+    if (creationSuccessful && exception?.name) {
       onCancel();
       dispatch({
         type: 'hostIsolationExceptionsFormStateChanged',
@@ -78,30 +115,45 @@ export const HostIsolationExceptionsFormFlyout: React.FC<{}> = memo(() => {
           type: 'UninitialisedResourceState',
         },
       });
-      toasts.addSuccess(
-        i18n.translate(
-          'xpack.securitySolution.hostIsolationExceptions.form.creationSuccessToastTitle',
-          {
-            defaultMessage: '"{name}" has been added to the host isolation exceptions list.',
-            values: { name: exception?.name },
-          }
-        )
-      );
+      if (exception?.item_id) {
+        toasts.addSuccess(getUpdateSuccessMessage(exception.name));
+      } else {
+        toasts.addSuccess(getCreationSuccessMessage(exception.name));
+      }
+    }
+  }, [creationSuccessful, dispatch, exception?.item_id, exception?.name, onCancel, toasts]);
+
+  // handle load item to edit error
+  useEffect(() => {
+    if (creationFailure && location.show === 'edit' && !exception?.item_id) {
+      toasts.addWarning(getLoadErrorMessage(creationFailure));
+      history.replace(getHostIsolationExceptionsListPath(omit(location, ['show', 'id'])));
+      dispatch({
+        type: 'hostIsolationExceptionsFormStateChanged',
+        payload: {
+          type: 'UninitialisedResourceState',
+        },
+      });
     }
-  }, [creationSuccessful, onCancel, dispatch, toasts, exception?.name]);
+  }, [creationFailure, dispatch, exception?.item_id, history, location, toasts]);
 
+  // handle edit or creation error
   useEffect(() => {
     if (creationFailure) {
-      toasts.addDanger(
-        i18n.translate(
-          'xpack.securitySolution.hostIsolationExceptions.form.creationFailureToastTitle',
-          {
-            defaultMessage: 'There was an error creating the exception',
-          }
-        )
-      );
+      // failed to load the entry
+      if (exception?.item_id) {
+        toasts.addDanger(getUpdateErrorMessage(creationFailure));
+      } else {
+        toasts.addDanger(getCreateErrorMessage(creationFailure));
+      }
+      dispatch({
+        type: 'hostIsolationExceptionsFormStateChanged',
+        payload: {
+          type: 'UninitialisedResourceState',
+        },
+      });
     }
-  }, [dispatch, toasts, creationFailure]);
+  }, [creationFailure, dispatch, exception?.item_id, toasts]);
 
   const handleOnCancel = useCallback(() => {
     if (creationInProgress) return;
@@ -109,10 +161,17 @@ export const HostIsolationExceptionsFormFlyout: React.FC<{}> = memo(() => {
   }, [creationInProgress, onCancel]);
 
   const handleOnSubmit = useCallback(() => {
-    dispatch({
-      type: 'hostIsolationExceptionsCreateEntry',
-      payload: exception,
-    });
+    if (exception?.item_id) {
+      dispatch({
+        type: 'hostIsolationExceptionsSubmitEdit',
+        payload: exception,
+      });
+    } else {
+      dispatch({
+        type: 'hostIsolationExceptionsCreateEntry',
+        payload: exception,
+      });
+    }
   }, [dispatch, exception]);
 
   const confirmButtonMemo = useMemo(
@@ -124,13 +183,20 @@ export const HostIsolationExceptionsFormFlyout: React.FC<{}> = memo(() => {
         onClick={handleOnSubmit}
         isLoading={creationInProgress}
       >
-        <FormattedMessage
-          id="xpack.securitySolution.hostIsolationExceptions.flyout.actions.create"
-          defaultMessage="Add Host Isolation Exception"
-        />
+        {exception?.item_id ? (
+          <FormattedMessage
+            id="xpack.securitySolution.hostIsolationExceptions.flyout.editButton"
+            defaultMessage="Edit Host Isolation Exception"
+          />
+        ) : (
+          <FormattedMessage
+            id="xpack.securitySolution.hostIsolationExceptions.flyout.createButton"
+            defaultMessage="Add Host Isolation Exception"
+          />
+        )}
       </EuiButton>
     ),
-    [formHasError, creationInProgress, handleOnSubmit]
+    [formHasError, creationInProgress, handleOnSubmit, exception?.item_id]
   );
 
   return exception ? (
@@ -141,12 +207,21 @@ export const HostIsolationExceptionsFormFlyout: React.FC<{}> = memo(() => {
     >
       <EuiFlyoutHeader hasBorder>
         <EuiTitle size="m">
-          <h2>
-            <FormattedMessage
-              id="xpack.securitySolution.hostIsolationExceptions.flyout.title"
-              defaultMessage="Add Host Isolation Exception"
-            />
-          </h2>
+          {exception?.item_id ? (
+            <h2>
+              <FormattedMessage
+                id="xpack.securitySolution.hostIsolationExceptions.flyout.editTitle"
+                defaultMessage="Edit Host Isolation Exception"
+              />
+            </h2>
+          ) : (
+            <h2>
+              <FormattedMessage
+                id="xpack.securitySolution.hostIsolationExceptions.flyout.title"
+                defaultMessage="Add Host Isolation Exception"
+              />
+            </h2>
+          )}
         </EuiTitle>
       </EuiFlyoutHeader>
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/translations.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/translations.ts
index df179c7a2221c..207e094453d90 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/translations.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/translations.ts
@@ -6,6 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { ServerApiError } from '../../../../../common/types';
 
 export const NAME_PLACEHOLDER = i18n.translate(
   'xpack.securitySolution.hostIsolationExceptions.form.name.placeholder',
@@ -62,3 +63,67 @@ export const IP_ERROR = i18n.translate(
     defaultMessage: 'The ip is invalid. Only IPv4 with optional CIDR is supported',
   }
 );
+
+export const DELETE_HOST_ISOLATION_EXCEPTION_LABEL = i18n.translate(
+  'xpack.securitySolution.hostIsolationExceptions.list.action.delete',
+  {
+    defaultMessage: 'Delete Exception',
+  }
+);
+
+export const EDIT_HOST_ISOLATION_EXCEPTION_LABEL = i18n.translate(
+  'xpack.securitySolution.hostIsolationExceptions.list.action.edit',
+  {
+    defaultMessage: 'Edit Exception',
+  }
+);
+
+export const getCreateErrorMessage = (creationError: ServerApiError) => {
+  return i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.form.failedToastTitle.create',
+    {
+      defaultMessage: 'There was an error creating the exception: "{error}"',
+      values: { error: creationError.message },
+    }
+  );
+};
+
+export const getUpdateErrorMessage = (updateError: ServerApiError) => {
+  return i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.form.failedToastTitle.update',
+    {
+      defaultMessage: 'There was an error updating the exception: "{error}"',
+      values: { error: updateError.message },
+    }
+  );
+};
+
+export const getLoadErrorMessage = (getError: ServerApiError) => {
+  return i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.form.failedToastTitle.get',
+    {
+      defaultMessage: 'Unable to edit exception: "{error}"',
+      values: { error: getError.message },
+    }
+  );
+};
+
+export const getUpdateSuccessMessage = (name: string) => {
+  return i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.form.editingSuccessToastTitle',
+    {
+      defaultMessage: '"{name}" has been updated.',
+      values: { name },
+    }
+  );
+};
+
+export const getCreationSuccessMessage = (name: string) => {
+  return i18n.translate(
+    'xpack.securitySolution.hostIsolationExceptions.form.creationSuccessToastTitle',
+    {
+      defaultMessage: '"{name}" has been added to the host isolation exceptions list.',
+      values: { name },
+    }
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.tsx
index cfb0121396e24..3c634a917c0ce 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.tsx
@@ -33,19 +33,16 @@ import { HostIsolationExceptionsEmptyState } from './components/empty';
 import { HostIsolationExceptionsPageAction } from '../store/action';
 import { HostIsolationExceptionDeleteModal } from './components/delete_modal';
 import { HostIsolationExceptionsFormFlyout } from './components/form_flyout';
+import {
+  DELETE_HOST_ISOLATION_EXCEPTION_LABEL,
+  EDIT_HOST_ISOLATION_EXCEPTION_LABEL,
+} from './components/translations';
 
 type HostIsolationExceptionPaginatedContent = PaginatedContentProps<
   Immutable<ExceptionListItemSchema>,
   typeof ExceptionItem
 >;
 
-const DELETE_HOST_ISOLATION_EXCEPTION_LABEL = i18n.translate(
-  'xpack.securitySolution.hostIsolationExceptions.list.actions.delete',
-  {
-    defaultMessage: 'Delete Exception',
-  }
-);
-
 export const HostIsolationExceptionsList = () => {
   const listItems = useHostIsolationExceptionsSelector(getListItems);
   const pagination = useHostIsolationExceptionsSelector(getListPagination);
@@ -70,6 +67,17 @@ export const HostIsolationExceptionsList = () => {
     item: element,
     'data-test-subj': `hostIsolationExceptionsCard`,
     actions: [
+      {
+        icon: 'trash',
+        onClick: () => {
+          navigateCallback({
+            show: 'edit',
+            id: element.id,
+          });
+        },
+        'data-test-subj': 'editHostIsolationException',
+        children: EDIT_HOST_ISOLATION_EXCEPTION_LABEL,
+      },
       {
         icon: 'trash',
         onClick: () => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts
index f772986bff146..0ff6282f8a018 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts
@@ -412,8 +412,8 @@ const fetchEditTrustedAppIfNeeded = async (
         dispatch({
           type: 'trustedAppCreationEditItemStateChanged',
           payload: {
-            type: 'LoadingResourceState',
             // @ts-expect-error-next-line will be fixed with when AsyncResourceState is refactored (#830)
+            type: 'LoadingResourceState',
             previousState: editItemState(currentState)!,
           },
         });

From 5ee779c3c244d0be457a304d4708163f6cae26de Mon Sep 17 00:00:00 2001
From: Mark Hopkin <mark.hopkin@elastic.co>
Date: Thu, 14 Oct 2021 11:42:14 +0100
Subject: [PATCH 063/117] remove stray semicolon (#114969)

---
 .../fleet/sections/agent_policy/details_page/index.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/index.tsx
index 76994feb18fea..c1d0e089fcc65 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/index.tsx
@@ -343,7 +343,7 @@ export const AgentPolicyDetailsPage: React.FunctionComponent = () => {
             />
           </EuiPortal>
         )}
-        <AgentPolicyDetailsContent agentPolicy={agentPolicy} />;
+        <AgentPolicyDetailsContent agentPolicy={agentPolicy} />
       </>
     );
   }, [

From 06e469394a06d56c40a1a7e896da1d152c87bc5e Mon Sep 17 00:00:00 2001
From: Gloria Hornero <snootchie.boochies@gmail.com>
Date: Thu, 14 Oct 2021 13:15:02 +0200
Subject: [PATCH 064/117] cleanup (#114902)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../cypress/screens/alerts.ts                 | 11 -----
 .../cypress/screens/alerts_details.ts         |  6 ---
 .../cypress/screens/alerts_detection_rules.ts | 10 -----
 .../cypress/screens/all_cases.ts              |  6 ---
 .../cypress/screens/case_details.ts           |  9 -----
 .../cypress/screens/common/callouts.ts        |  2 -
 .../cypress/screens/configure_cases.ts        |  2 -
 .../cypress/screens/create_new_rule.ts        | 11 -----
 .../cypress/screens/edit_rule.ts              |  1 -
 .../cypress/screens/exceptions.ts             |  4 --
 .../cypress/screens/fields_browser.ts         | 11 -----
 .../cypress/screens/hosts/events.ts           | 10 -----
 .../cypress/screens/hosts/main.ts             |  2 -
 .../cypress/screens/rule_details.ts           |  4 --
 .../cypress/screens/shared.ts                 |  2 -
 .../cypress/screens/sourcerer.ts              |  1 -
 .../cypress/screens/timeline.ts               | 40 -------------------
 .../cypress/screens/timelines.ts              |  2 -
 .../security_solution/cypress/tasks/alerts.ts | 16 --------
 .../cypress/tasks/alerts_detection_rules.ts   | 25 +-----------
 .../cypress/tasks/case_details.ts             | 13 +-----
 .../cypress/tasks/create_new_rule.ts          |  5 ---
 .../cypress/tasks/exceptions.ts               | 21 ----------
 .../cypress/tasks/exceptions_table.ts         |  5 ---
 .../cypress/tasks/fields_browser.ts           | 13 ------
 .../cypress/tasks/hosts/events.ts             | 12 ------
 .../cypress/tasks/security_header.ts          |  4 --
 .../cypress/tasks/security_main.ts            |  8 ----
 .../cypress/tasks/timeline.ts                 | 25 ------------
 29 files changed, 2 insertions(+), 279 deletions(-)

diff --git a/x-pack/plugins/security_solution/cypress/screens/alerts.ts b/x-pack/plugins/security_solution/cypress/screens/alerts.ts
index d18a8e1ba10ab..0a815705f5b21 100644
--- a/x-pack/plugins/security_solution/cypress/screens/alerts.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/alerts.ts
@@ -16,8 +16,6 @@ export const ALERT_CHECKBOX = '[data-test-subj="select-event"].euiCheckbox__inpu
 
 export const ALERT_GRID_CELL = '[data-test-subj="dataGridRowCell"]';
 
-export const ALERT_ID = '[data-test-subj="draggable-content-_id"]';
-
 export const ALERT_RISK_SCORE_HEADER =
   '[data-test-subj="dataGridHeaderCell-signal.rule.risk_score"]';
 
@@ -45,26 +43,17 @@ export const MANAGE_ALERT_DETECTION_RULES_BTN = '[data-test-subj="manage-alert-d
 
 export const MARK_ALERT_ACKNOWLEDGED_BTN = '[data-test-subj="acknowledged-alert-status"]';
 
-export const MARK_SELECTED_ALERTS_ACKNOWLEDGED_BTN =
-  '[data-test-subj="markSelectedAlertsAcknowledgedButton"]';
-
 export const NUMBER_OF_ALERTS =
   '[data-test-subj="events-viewer-panel"] [data-test-subj="server-side-event-count"]';
 
 export const OPEN_ALERT_BTN = '[data-test-subj="open-alert-status"]';
 
-export const OPEN_SELECTED_ALERTS_BTN = '[data-test-subj="openSelectedAlertsButton"]';
-
 export const OPENED_ALERTS_FILTER_BTN = '[data-test-subj="openAlerts"]';
 
-export const SELECT_EVENT_CHECKBOX = '[data-test-subj="select-event"]';
-
 export const SELECTED_ALERTS = '[data-test-subj="selectedShowBulkActionsButton"]';
 
 export const SEND_ALERT_TO_TIMELINE_BTN = '[data-test-subj="send-alert-to-timeline-button"]';
 
-export const SHOWING_ALERTS = '[data-test-subj="showingAlerts"]';
-
 export const TAKE_ACTION_POPOVER_BTN = '[data-test-subj="selectedShowBulkActionsButton"]';
 
 export const TIMELINE_CONTEXT_MENU_BTN = '[data-test-subj="timeline-context-menu-button"]';
diff --git a/x-pack/plugins/security_solution/cypress/screens/alerts_details.ts b/x-pack/plugins/security_solution/cypress/screens/alerts_details.ts
index 2c288aa59374c..c740a669d059a 100644
--- a/x-pack/plugins/security_solution/cypress/screens/alerts_details.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/alerts_details.ts
@@ -24,8 +24,6 @@ export const INVESTIGATION_TIME_ENRICHMENT_SECTION =
 
 export const JSON_VIEW_WRAPPER = '[data-test-subj="jsonViewWrapper"]';
 
-export const JSON_CONTENT = '[data-test-subj="jsonView"]';
-
 export const JSON_LINES = '.euiCodeBlock__line';
 
 export const JSON_VIEW_TAB = '[data-test-subj="jsonViewTab"]';
@@ -36,16 +34,12 @@ export const TABLE_TAB = '[data-test-subj="tableTab"]';
 
 export const TABLE_ROWS = '.euiTableRow';
 
-export const THREAT_CONTENT = '[data-test-subj^=draggable-content-]';
-
 export const THREAT_DETAILS_ACCORDION = '.euiAccordion__triggerWrapper';
 
 export const THREAT_DETAILS_VIEW = '[data-test-subj="threat-details-view-0"]';
 
 export const THREAT_INTEL_TAB = '[data-test-subj="threatIntelTab"]';
 
-export const THREAT_SUMMARY_VIEW = '[data-test-subj="threat-summary-view"]';
-
 export const TITLE = '.euiTitle';
 
 export const UPDATE_ENRICHMENT_RANGE_BUTTON = '[data-test-subj="enrichment-button"]';
diff --git a/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts b/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts
index 315796a715cd3..39e08e29bdc2a 100644
--- a/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts
@@ -21,14 +21,10 @@ export const DUPLICATE_RULE_ACTION_BTN = '[data-test-subj="duplicateRuleAction"]
 
 export const DUPLICATE_RULE_MENU_PANEL_BTN = '[data-test-subj="rules-details-duplicate-rule"]';
 
-export const REFRESH_BTN = '[data-test-subj="refreshRulesAction"] button';
-
 export const ACTIVATE_RULE_BULK_BTN = '[data-test-subj="activateRuleBulk"]';
 
 export const DEACTIVATE_RULE_BULK_BTN = '[data-test-subj="deactivateRuleBulk"]';
 
-export const EXPORT_RULE_BULK_BTN = '[data-test-subj="exportRuleBulk"]';
-
 export const DELETE_RULE_BULK_BTN = '[data-test-subj="deleteRuleBulk"]';
 
 export const DUPLICATE_RULE_BULK_BTN = '[data-test-subj="duplicateRuleBulk"]';
@@ -37,8 +33,6 @@ export const ELASTIC_RULES_BTN = '[data-test-subj="showElasticRulesFilterButton"
 
 export const EXPORT_ACTION_BTN = '[data-test-subj="exportRuleAction"]';
 
-export const FIFTH_RULE = 4;
-
 export const FIRST_RULE = 0;
 
 export const FOURTH_RULE = 3;
@@ -72,8 +66,6 @@ export const RULES_ROW = '.euiTableRow';
 
 export const RULES_MONIROTING_TABLE = '[data-test-subj="allRulesTableTab-monitoring"]';
 
-export const SEVENTH_RULE = 6;
-
 export const SEVERITY = '[data-test-subj="severity"]';
 
 export const SHOWING_RULES_TEXT = '[data-test-subj="showingRules"]';
@@ -92,8 +84,6 @@ export const rowsPerPageSelector = (count: number) =>
 export const pageSelector = (pageNumber: number) =>
   `[data-test-subj="pagination-button-${pageNumber - 1}"]`;
 
-export const NEXT_BTN = '[data-test-subj="pagination-button-next"]';
-
 export const SELECT_ALL_RULES_BTN = '[data-test-subj="selectAllRules"]';
 
 export const RULES_EMPTY_PROMPT = '[data-test-subj="rulesEmptyPrompt"]';
diff --git a/x-pack/plugins/security_solution/cypress/screens/all_cases.ts b/x-pack/plugins/security_solution/cypress/screens/all_cases.ts
index fa6b6add57bac..9d653fb384a1a 100644
--- a/x-pack/plugins/security_solution/cypress/screens/all_cases.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/all_cases.ts
@@ -5,10 +5,6 @@
  * 2.0.
  */
 
-export const ALL_CASES_CASE = (id: string) => {
-  return `[data-test-subj="cases-table-row-${id}"]`;
-};
-
 export const ALL_CASES_CLOSED_CASES_STATS = '[data-test-subj="closedStatsHeader"]';
 
 export const ALL_CASES_COMMENTS_COUNT = '[data-test-subj="case-table-column-commentCount"]';
@@ -19,8 +15,6 @@ export const ALL_CASES_CREATE_NEW_CASE_TABLE_BTN = '[data-test-subj="cases-table
 
 export const ALL_CASES_IN_PROGRESS_CASES_STATS = '[data-test-subj="inProgressStatsHeader"]';
 
-export const ALL_CASES_ITEM_ACTIONS_BTN = '[data-test-subj="euiCollapsedItemActionsButton"]';
-
 export const ALL_CASES_NAME = '[data-test-subj="case-details-link"]';
 
 export const ALL_CASES_OPEN_CASES_COUNT = '[data-test-subj="case-status-filter"]';
diff --git a/x-pack/plugins/security_solution/cypress/screens/case_details.ts b/x-pack/plugins/security_solution/cypress/screens/case_details.ts
index ef8f45b222dd0..8ec9a3fdacffc 100644
--- a/x-pack/plugins/security_solution/cypress/screens/case_details.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/case_details.ts
@@ -5,16 +5,11 @@
  * 2.0.
  */
 
-export const CASE_ACTIONS_BTN = '[data-test-subj="property-actions-ellipses"]';
-
 export const CASE_DETAILS_DESCRIPTION =
   '[data-test-subj="description-action"] [data-test-subj="user-action-markdown"]';
 
 export const CASE_DETAILS_PAGE_TITLE = '[data-test-subj="header-page-title"]';
 
-export const CASE_DETAILS_PUSH_TO_EXTERNAL_SERVICE_BTN =
-  '[data-test-subj="push-to-external-service"]';
-
 export const CASE_DETAILS_STATUS = '[data-test-subj="case-view-status-dropdown"]';
 
 export const CASE_DETAILS_TAGS = '[data-test-subj="case-tags"]';
@@ -34,10 +29,6 @@ export const CONNECTOR_CARD_DETAILS = '[data-test-subj="connector-card"]';
 
 export const CONNECTOR_TITLE = '[data-test-subj="connector-card"] span.euiTitle';
 
-export const DELETE_CASE_BTN = '[data-test-subj="property-actions-trash"]';
-
-export const DELETE_CASE_CONFIRMATION_BTN = '[data-test-subj="confirmModalConfirmButton"]';
-
 export const PARTICIPANTS = 1;
 
 export const REPORTER = 0;
diff --git a/x-pack/plugins/security_solution/cypress/screens/common/callouts.ts b/x-pack/plugins/security_solution/cypress/screens/common/callouts.ts
index 032d244f76977..d2dbf6da4aed2 100644
--- a/x-pack/plugins/security_solution/cypress/screens/common/callouts.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/common/callouts.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-export const CALLOUT = '[data-test-subj^="callout-"]';
-
 export const callOutWithId = (id: string) => `[data-test-subj^="callout-${id}"]`;
 
 export const CALLOUT_DISMISS_BTN = '[data-test-subj^="callout-dismiss-"]';
diff --git a/x-pack/plugins/security_solution/cypress/screens/configure_cases.ts b/x-pack/plugins/security_solution/cypress/screens/configure_cases.ts
index 1ad91ed0977a0..1014835f81efe 100644
--- a/x-pack/plugins/security_solution/cypress/screens/configure_cases.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/configure_cases.ts
@@ -20,8 +20,6 @@ export const PASSWORD = '[data-test-subj="connector-servicenow-password-form-inp
 
 export const SAVE_BTN = '[data-test-subj="saveNewActionButton"]';
 
-export const SAVE_CHANGES_BTN = '[data-test-subj="case-configure-action-bottom-bar-save-button"]';
-
 export const SERVICE_NOW_CONNECTOR_CARD = '[data-test-subj=".servicenow-card"]';
 
 export const TOASTER = '[data-test-subj="euiToastHeader"]';
diff --git a/x-pack/plugins/security_solution/cypress/screens/create_new_rule.ts b/x-pack/plugins/security_solution/cypress/screens/create_new_rule.ts
index 4748a48dbeb11..3510df6186870 100644
--- a/x-pack/plugins/security_solution/cypress/screens/create_new_rule.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/create_new_rule.ts
@@ -58,8 +58,6 @@ export const COMBO_BOX_CLEAR_BTN = '[data-test-subj="comboBoxClearButton"]';
 
 export const COMBO_BOX_INPUT = '[data-test-subj="comboBoxInput"]';
 
-export const COMBO_BOX_RESULT = '.euiFilterSelectItem';
-
 export const CREATE_AND_ACTIVATE_BTN = '[data-test-subj="create-activate"]';
 
 export const CUSTOM_QUERY_INPUT = '[data-test-subj="queryInput"]';
@@ -70,9 +68,6 @@ export const THREAT_MAPPING_COMBO_BOX_INPUT =
 export const THREAT_MATCH_CUSTOM_QUERY_INPUT =
   '[data-test-subj="detectionEngineStepDefineRuleQueryBar"] [data-test-subj="queryInput"]';
 
-export const THREAT_MATCH_INDICATOR_QUERY_INPUT =
-  '[data-test-subj="detectionEngineStepDefineRuleThreatMatchIndices"] [data-test-subj="queryInput"]';
-
 export const THREAT_MATCH_QUERY_INPUT =
   '[data-test-subj="detectionEngineStepDefineThreatRuleQueryBar"] [data-test-subj="queryInput"]';
 
@@ -206,12 +201,6 @@ export const SCHEDULE_INTERVAL_AMOUNT_INPUT =
 export const SCHEDULE_INTERVAL_UNITS_INPUT =
   '[data-test-subj="detectionEngineStepScheduleRuleInterval"] [data-test-subj="timeType"]';
 
-export const SCHEDULE_LOOKBACK_AMOUNT_INPUT =
-  '[data-test-subj="detectionEngineStepScheduleRuleFrom"] [data-test-subj="timeType"]';
-
-export const SCHEDULE_LOOKBACK_UNITS_INPUT =
-  '[data-test-subj="detectionEngineStepScheduleRuleFrom"] [data-test-subj="schedule-units-input"]';
-
 export const SEVERITY_DROPDOWN =
   '[data-test-subj="detectionEngineStepAboutRuleSeverity"] [data-test-subj="select"]';
 
diff --git a/x-pack/plugins/security_solution/cypress/screens/edit_rule.ts b/x-pack/plugins/security_solution/cypress/screens/edit_rule.ts
index 8d8520e109b15..73f3640071251 100644
--- a/x-pack/plugins/security_solution/cypress/screens/edit_rule.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/edit_rule.ts
@@ -7,5 +7,4 @@
 
 export const EDIT_SUBMIT_BUTTON = '[data-test-subj="ruleEditSubmitButton"]';
 export const BACK_TO_RULE_DETAILS = '[data-test-subj="ruleEditBackToRuleDetails"]';
-export const KIBANA_LOADING_INDICATOR = '[data-test-subj="globalLoadingIndicator"]';
 export const KIBANA_LOADING_COMPLETE_INDICATOR = '[data-test-subj="globalLoadingIndicator-hidden"]';
diff --git a/x-pack/plugins/security_solution/cypress/screens/exceptions.ts b/x-pack/plugins/security_solution/cypress/screens/exceptions.ts
index bd6d3b7887206..e5027ee8b4f3a 100644
--- a/x-pack/plugins/security_solution/cypress/screens/exceptions.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/exceptions.ts
@@ -32,14 +32,10 @@ export const ADD_NESTED_BTN = '[data-test-subj="exceptionsNestedButton"]';
 
 export const ENTRY_DELETE_BTN = '[data-test-subj="builderItemEntryDeleteButton"]';
 
-export const FIELD_INPUT_LIST_BTN = '[data-test-subj="comboBoxToggleListButton"]';
-
 export const CANCEL_BTN = '[data-test-subj="cancelExceptionAddButton"]';
 
 export const BUILDER_MODAL_BODY = '[data-test-subj="exceptionsBuilderWrapper"]';
 
-export const EXCEPTIONS_TABLE_TAB = '[data-test-subj="allRulesTableTab-exceptions"]';
-
 export const EXCEPTIONS_TABLE = '[data-test-subj="exceptions-table"]';
 
 export const EXCEPTIONS_TABLE_SEARCH = '[data-test-subj="exceptionsHeaderSearchInput"]';
diff --git a/x-pack/plugins/security_solution/cypress/screens/fields_browser.ts b/x-pack/plugins/security_solution/cypress/screens/fields_browser.ts
index 1115dfb00914e..4a5f813c301db 100644
--- a/x-pack/plugins/security_solution/cypress/screens/fields_browser.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/fields_browser.ts
@@ -15,14 +15,10 @@ export const FIELDS_BROWSER_CHECKBOX = (id: string) => {
 
 export const FIELDS_BROWSER_CONTAINER = '[data-test-subj="fields-browser-container"]';
 
-export const FIELDS_BROWSER_DRAGGABLE_HOST_GEO_COUNTRY_NAME_HEADER = `${FIELDS_BROWSER_CONTAINER} [data-test-subj="field-name-host.geo.country_name"]`;
-
 export const FIELDS_BROWSER_FIELDS_COUNT = `${FIELDS_BROWSER_CONTAINER} [data-test-subj="fields-count"]`;
 
 export const FIELDS_BROWSER_FILTER_INPUT = `${FIELDS_BROWSER_CONTAINER} [data-test-subj="field-search"]`;
 
-export const FIELDS_BROWSER_HEADER_DROP_AREA = '[data-test-subj="headers-group"]';
-
 export const FIELDS_BROWSER_HOST_CATEGORIES_COUNT = `${FIELDS_BROWSER_CONTAINER} [data-test-subj="host-category-count"]`;
 
 export const FIELDS_BROWSER_HOST_GEO_CITY_NAME_CHECKBOX = `${FIELDS_BROWSER_CONTAINER} [data-test-subj="field-host.geo.city_name-checkbox"]`;
@@ -35,11 +31,6 @@ export const FIELDS_BROWSER_HOST_GEO_CONTINENT_NAME_CHECKBOX = `${FIELDS_BROWSER
 export const FIELDS_BROWSER_HEADER_HOST_GEO_CONTINENT_NAME_HEADER =
   '[data-test-subj="timeline"] [data-test-subj="header-text-host.geo.continent_name"]';
 
-export const FIELDS_BROWSER_HOST_GEO_COUNTRY_NAME_CHECKBOX = `${FIELDS_BROWSER_CONTAINER} [data-test-subj="field-host.geo.country_name-checkbox"]`;
-
-export const FIELDS_BROWSER_HOST_GEO_COUNTRY_NAME_HEADER =
-  '[data-test-subj="timeline"] [data-test-subj="header-text-host.geo.country_name"]';
-
 export const FIELDS_BROWSER_MESSAGE_CHECKBOX = `${FIELDS_BROWSER_CONTAINER} [data-test-subj="field-message-checkbox"]`;
 
 export const FIELDS_BROWSER_MESSAGE_HEADER =
@@ -47,8 +38,6 @@ export const FIELDS_BROWSER_MESSAGE_HEADER =
 
 export const FIELDS_BROWSER_RESET_FIELDS = `${FIELDS_BROWSER_CONTAINER} [data-test-subj="reset-fields"]`;
 
-export const FIELDS_BROWSER_TITLE = `${FIELDS_BROWSER_CONTAINER} [data-test-subj="field-browser-title"]`;
-
 export const FIELDS_BROWSER_SELECTED_CATEGORY_COUNT = `${FIELDS_BROWSER_CONTAINER} [data-test-subj="selected-category-count-badge"]`;
 
 export const FIELDS_BROWSER_SELECTED_CATEGORY_TITLE = `${FIELDS_BROWSER_CONTAINER} [data-test-subj="selected-category-title"]`;
diff --git a/x-pack/plugins/security_solution/cypress/screens/hosts/events.ts b/x-pack/plugins/security_solution/cypress/screens/hosts/events.ts
index de4acdd721c68..57de63b92a08b 100644
--- a/x-pack/plugins/security_solution/cypress/screens/hosts/events.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/hosts/events.ts
@@ -5,18 +5,11 @@
  * 2.0.
  */
 
-export const CLOSE_MODAL = '[data-test-subj="modal-inspect-close"]';
-
 export const EVENTS_VIEWER_FIELDS_BUTTON =
   '[data-test-subj="events-viewer-panel"] [data-test-subj="show-field-browser"]';
 
-export const EVENTS_VIEWER_PANEL = '[data-test-subj="events-viewer-panel"]';
-
 export const FIELDS_BROWSER_CONTAINER = '[data-test-subj="fields-browser-container"]';
 
-export const HEADER_SUBTITLE =
-  '[data-test-subj="events-viewer-panel"] [data-test-subj="header-panel-subtitle"]';
-
 export const HOST_GEO_CITY_NAME_CHECKBOX = '[data-test-subj="field-host.geo.city_name-checkbox"]';
 
 export const HOST_GEO_CITY_NAME_HEADER =
@@ -32,9 +25,6 @@ export const INSPECT_MODAL = '[data-test-subj="modal-inspect-euiModal"]';
 export const INSPECT_QUERY =
   '[data-test-subj="events-viewer-panel"] [data-test-subj="inspect-icon-button"]';
 
-export const LOAD_MORE =
-  '[data-test-subj="events-viewer-panel"] [data-test-subj="TimelineMoreButton"';
-
 export const SERVER_SIDE_EVENT_COUNT = '[data-test-subj="server-side-event-count"]';
 
 export const EVENTS_VIEWER_PAGINATION =
diff --git a/x-pack/plugins/security_solution/cypress/screens/hosts/main.ts b/x-pack/plugins/security_solution/cypress/screens/hosts/main.ts
index 95381b06f44e9..4f1dd8387c63f 100644
--- a/x-pack/plugins/security_solution/cypress/screens/hosts/main.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/hosts/main.ts
@@ -13,8 +13,6 @@ export const AUTHENTICATIONS_TAB = '[data-test-subj="navigation-authentications"
 
 export const EVENTS_TAB = '[data-test-subj="navigation-events"]';
 
-export const KQL_SEARCH_BAR = '[data-test-subj="queryInput"]';
-
 export const UNCOMMON_PROCESSES_TAB = '[data-test-subj="navigation-uncommonProcesses"]';
 
 export const HOST_OVERVIEW = `[data-test-subj="host-overview"]`;
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 9bc22f35741d9..fb1fded1fe8a6 100644
--- a/x-pack/plugins/security_solution/cypress/screens/rule_details.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/rule_details.ts
@@ -58,8 +58,6 @@ export const FIELDS_BROWSER_BTN =
 
 export const REFRESH_BUTTON = '[data-test-subj="refreshButton"]';
 
-export const RULE_ABOUT_DETAILS_HEADER_TOGGLE = '[data-test-subj="stepAboutDetailsToggle"]';
-
 export const RULE_NAME_HEADER = '[data-test-subj="header-page-title"]';
 
 export const RULE_NAME_OVERRIDE_DETAILS = 'Rule name override';
@@ -83,8 +81,6 @@ export const RUNS_EVERY_DETAILS = 'Runs every';
 export const SCHEDULE_DETAILS =
   '[data-test-subj=schedule] [data-test-subj="listItemColumnStepRuleDescription"]';
 
-export const SCHEDULE_STEP = '[data-test-subj="schedule"]  .euiDescriptionList__description';
-
 export const SEVERITY_DETAILS = 'Severity';
 
 export const TAGS_DETAILS = 'Tags';
diff --git a/x-pack/plugins/security_solution/cypress/screens/shared.ts b/x-pack/plugins/security_solution/cypress/screens/shared.ts
index 99a0e423c563a..8a7ba48b1415d 100644
--- a/x-pack/plugins/security_solution/cypress/screens/shared.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/shared.ts
@@ -5,6 +5,4 @@
  * 2.0.
  */
 
-export const NOTIFICATION_TOASTS = '[data-test-subj="globalToastList"]';
-
 export const TOAST_ERROR = '.euiToast--danger';
diff --git a/x-pack/plugins/security_solution/cypress/screens/sourcerer.ts b/x-pack/plugins/security_solution/cypress/screens/sourcerer.ts
index 142307735d340..874fc7352e908 100644
--- a/x-pack/plugins/security_solution/cypress/screens/sourcerer.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/sourcerer.ts
@@ -28,4 +28,3 @@ export const SOURCERER_TIMELINE = {
   radioCustomLabel:
     '[data-test-subj="timeline-sourcerer-radio"] label.euiRadio__label[for="custom"]',
 };
-export const SOURCERER_TIMELINE_ADVANCED = '[data-test-subj="advanced-settings"]';
diff --git a/x-pack/plugins/security_solution/cypress/screens/timeline.ts b/x-pack/plugins/security_solution/cypress/screens/timeline.ts
index 4cf5d2f87f7a9..2e412bbed6fdc 100644
--- a/x-pack/plugins/security_solution/cypress/screens/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/timeline.ts
@@ -26,8 +26,6 @@ export const CASE = (id: string) => {
 
 export const CLOSE_TIMELINE_BTN = '[data-test-subj="close-timeline"]';
 
-export const COLUMN_HEADERS = '[data-test-subj="column-headers"] [data-test-subj^=header-text]';
-
 export const COMBO_BOX = '.euiComboBoxOption__content';
 
 export const CREATE_NEW_TIMELINE = '[data-test-subj="timeline-new"]';
@@ -41,17 +39,8 @@ export const FAVORITE_TIMELINE = '[data-test-subj="timeline-favorite-filled-star
 
 export const FIELD_BROWSER = '[data-test-subj="show-field-browser"]';
 
-export const GRAPH_TAB_BUTTON = '[data-test-subj="timelineTabs-graph"]';
-
-export const HEADER = '[data-test-subj="header"]';
-
-export const HEADERS_GROUP =
-  '[data-test-subj="events-viewer-panel"] [data-test-subj="headers-group"]';
-
 export const ID_HEADER_FIELD = '[data-test-subj="timeline"] [data-test-subj="header-text-_id"]';
 
-export const ID_FIELD = '[data-test-subj="timeline"] [data-test-subj="field-name-_id"]';
-
 export const ID_TOGGLE_FIELD = '[data-test-subj="toggle-field-_id"]';
 
 export const ID_HOVER_ACTION_OVERFLOW_BTN = '[data-test-subj="more-actions-_id"]';
@@ -66,11 +55,6 @@ export const NOTE_CARD_CONTENT = '[data-test-subj="notes"]';
 
 export const EVENT_NOTE = '[data-test-subj="timeline-notes-button-small"]';
 
-export const NOTE_BY_NOTE_ID = (noteId: string) =>
-  `[data-test-subj="note-preview-${noteId}"] .euiMarkdownFormat`;
-
-export const NOTE_CONTENT = (noteId: string) => `${NOTE_BY_NOTE_ID(noteId)} p`;
-
 export const NOTES_TEXT_AREA = '[data-test-subj="add-a-note"] textarea';
 
 export const NOTES_TAB_BUTTON = '[data-test-subj="timelineTabs-notes"]';
@@ -96,12 +80,8 @@ export const OPEN_TIMELINE_TEMPLATE_ICON =
 
 export const PIN_EVENT = '[data-test-subj="pin"]';
 
-export const PINNED_TAB_BUTTON = '[data-test-subj="timelineTabs-pinned"]';
-
 export const PROVIDER_BADGE = '[data-test-subj="providerBadge"]';
 
-export const REMOVE_COLUMN = '[data-test-subj="remove-column"]';
-
 export const RESET_FIELDS =
   '[data-test-subj="fields-browser-container"] [data-test-subj="reset-fields"]';
 
@@ -112,18 +92,6 @@ export const SEARCH_OR_FILTER_CONTAINER =
 
 export const INDICATOR_MATCH_ROW_RENDER = '[data-test-subj="threat-match-row"]';
 
-export const QUERY_TAB_EVENTS_TABLE = '[data-test-subj="query-events-table"]';
-
-export const QUERY_TAB_EVENTS_BODY = '[data-test-subj="query-tab-flyout-body"]';
-
-export const QUERY_TAB_EVENTS_FOOTER = '[data-test-subj="query-tab-flyout-footer"]';
-
-export const PINNED_TAB_EVENTS_TABLE = '[data-test-subj="pinned-events-table"]';
-
-export const PINNED_TAB_EVENTS_BODY = '[data-test-subj="pinned-tab-flyout-body"]';
-
-export const PINNED_TAB_EVENTS_FOOTER = '[data-test-subj="pinned-tab-flyout-footer"]';
-
 export const QUERY_TAB_BUTTON = '[data-test-subj="timelineTabs-query"]';
 
 export const SERVER_SIDE_EVENT_COUNT = '[data-test-subj="server-side-event-count"]';
@@ -145,8 +113,6 @@ export const TIMELINE_CORRELATION_INPUT = '[data-test-subj="eqlQueryBarTextInput
 
 export const TIMELINE_CORRELATION_TAB = '[data-test-subj="timelineTabs-eql"]';
 
-export const TIMELINE_BOTTOM_BAR_CONTAINER = '[data-test-subj="timeline-bottom-bar-container"]';
-
 export const TIMELINE_DATA_PROVIDERS_ACTION_MENU = '[data-test-subj="providerActions"]';
 
 export const TIMELINE_ADD_FIELD_BUTTON = '[data-test-subj="addField"]';
@@ -213,8 +179,6 @@ export const TIMELINE_SETTINGS_ICON = '[data-test-subj="settings-plus-in-circle"
 
 export const TIMELINE_SEARCH_OR_FILTER = '[data-test-subj="timeline-select-search-or-filter"]';
 
-export const TIMELINE_SEARCH_OR_FILTER_CONTENT = '.searchOrFilterPopover';
-
 export const TIMELINE_KQLMODE_SEARCH = '[data-test-subj="kqlModePopoverSearch"]';
 
 export const TIMELINE_KQLMODE_FILTER = '[data-test-subj="kqlModePopoverFilter"]';
@@ -257,10 +221,6 @@ export const TIMELINE_TABS = '[data-test-subj="timeline"] .euiTabs';
 
 export const TIMELINE_TAB_CONTENT_EQL = '[data-test-subj="timeline-tab-content-eql"]';
 
-export const TIMELINE_TAB_CONTENT_QUERY = '[data-test-subj="timeline-tab-content-query"]';
-
-export const TIMELINE_TAB_CONTENT_PINNED = '[data-test-subj="timeline-tab-content-pinned"]';
-
 export const TIMELINE_TAB_CONTENT_GRAPHS_NOTES =
   '[data-test-subj="timeline-tab-content-graph-notes"]';
 
diff --git a/x-pack/plugins/security_solution/cypress/screens/timelines.ts b/x-pack/plugins/security_solution/cypress/screens/timelines.ts
index ab6c790c599ab..ca60250330f83 100644
--- a/x-pack/plugins/security_solution/cypress/screens/timelines.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/timelines.ts
@@ -27,6 +27,4 @@ export const TIMELINES_PINNED_EVENT_COUNT = '[data-test-subj="pinned-event-count
 
 export const TIMELINES_TABLE = '[data-test-subj="timelines-table"]';
 
-export const TIMELINES_USERNAME = '[data-test-subj="username"]';
-
 export const REFRESH_BUTTON = '[data-test-subj="refreshButton-linkIcon"]';
diff --git a/x-pack/plugins/security_solution/cypress/tasks/alerts.ts b/x-pack/plugins/security_solution/cypress/tasks/alerts.ts
index 5b8ad49f61b0d..067c9957189b9 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/alerts.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/alerts.ts
@@ -17,13 +17,11 @@ import {
   LOADING_ALERTS_PANEL,
   MANAGE_ALERT_DETECTION_RULES_BTN,
   MARK_ALERT_ACKNOWLEDGED_BTN,
-  MARK_SELECTED_ALERTS_ACKNOWLEDGED_BTN,
   OPEN_ALERT_BTN,
   OPENED_ALERTS_FILTER_BTN,
   SEND_ALERT_TO_TIMELINE_BTN,
   TAKE_ACTION_POPOVER_BTN,
   TIMELINE_CONTEXT_MENU_BTN,
-  SELECT_EVENT_CHECKBOX,
 } from '../screens/alerts';
 import { LOADING_INDICATOR, REFRESH_BUTTON } from '../screens/security_header';
 import { TIMELINE_COLUMN_SPINNER } from '../screens/timeline';
@@ -73,10 +71,6 @@ export const expandFirstAlert = () => {
 
 export const viewThreatIntelTab = () => cy.get(THREAT_INTEL_TAB).click();
 
-export const viewThreatDetails = () => {
-  cy.get(EXPAND_ALERT_BTN).first().click({ force: true });
-};
-
 export const setEnrichmentDates = (from?: string, to?: string) => {
   cy.get(ENRICHMENT_QUERY_RANGE_PICKER).within(() => {
     if (from) {
@@ -130,11 +124,6 @@ export const markAcknowledgedFirstAlert = () => {
   cy.get(MARK_ALERT_ACKNOWLEDGED_BTN).click();
 };
 
-export const markAcknowledgedAlerts = () => {
-  cy.get(TAKE_ACTION_POPOVER_BTN).click({ force: true });
-  cy.get(MARK_SELECTED_ALERTS_ACKNOWLEDGED_BTN).click();
-};
-
 export const selectNumberOfAlerts = (numberOfAlerts: number) => {
   for (let i = 0; i < numberOfAlerts; i++) {
     cy.get(ALERT_CHECKBOX).eq(i).click({ force: true });
@@ -174,8 +163,3 @@ export const waitForAlertsPanelToBeLoaded = () => {
   cy.get(LOADING_ALERTS_PANEL).should('exist');
   cy.get(LOADING_ALERTS_PANEL).should('not.exist');
 };
-
-export const waitForAlertsToBeLoaded = () => {
-  const expectedNumberOfDisplayedAlerts = 25;
-  cy.get(SELECT_EVENT_CHECKBOX).should('have.length', expectedNumberOfDisplayedAlerts);
-};
diff --git a/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts b/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
index 6b985c7009b27..84b81108f8be3 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
@@ -27,7 +27,6 @@ import {
   SORT_RULES_BTN,
   EXPORT_ACTION_BTN,
   EDIT_RULE_ACTION_BTN,
-  NEXT_BTN,
   RULE_AUTO_REFRESH_IDLE_MODAL,
   RULE_AUTO_REFRESH_IDLE_MODAL_CONTINUE,
   rowsPerPageSelector,
@@ -41,10 +40,9 @@ import {
   RULES_DELETE_CONFIRMATION_MODAL,
   ACTIVATE_RULE_BULK_BTN,
   DEACTIVATE_RULE_BULK_BTN,
-  EXPORT_RULE_BULK_BTN,
   RULE_DETAILS_DELETE_BTN,
 } from '../screens/alerts_detection_rules';
-import { ALL_ACTIONS, DELETE_RULE } from '../screens/rule_details';
+import { ALL_ACTIONS } from '../screens/rule_details';
 import { LOADING_INDICATOR } from '../screens/security_header';
 
 export const activateRule = (rulePosition: number) => {
@@ -97,11 +95,6 @@ export const deleteFirstRule = () => {
   cy.get(DELETE_RULE_ACTION_BTN).click();
 };
 
-export const deleteRule = () => {
-  cy.get(ALL_ACTIONS).click();
-  cy.get(DELETE_RULE).click();
-};
-
 export const deleteSelectedRules = () => {
   cy.get(BULK_ACTIONS_BTN).click({ force: true });
   cy.get(DELETE_RULE_BULK_BTN).click();
@@ -137,11 +130,6 @@ export const deactivateSelectedRules = () => {
   cy.get(DEACTIVATE_RULE_BULK_BTN).click();
 };
 
-export const exportSelectedRules = () => {
-  cy.get(BULK_ACTIONS_BTN).click({ force: true });
-  cy.get(EXPORT_RULE_BULK_BTN).click();
-};
-
 export const exportFirstRule = () => {
   cy.get(COLLAPSED_ACTION_BTN).first().click({ force: true });
   cy.get(EXPORT_ACTION_BTN).click();
@@ -214,11 +202,6 @@ export const waitForRulesTableToBeRefreshed = () => {
   cy.get(RULES_TABLE_REFRESH_INDICATOR).should('not.exist');
 };
 
-export const waitForRulesTableToBeAutoRefreshed = () => {
-  cy.get(RULES_TABLE_AUTOREFRESH_INDICATOR).should('exist');
-  cy.get(RULES_TABLE_AUTOREFRESH_INDICATOR).should('not.exist');
-};
-
 export const waitForPrebuiltDetectionRulesToBeLoaded = () => {
   cy.get(LOAD_PREBUILT_RULES_BTN).should('not.exist');
   cy.get(RULES_TABLE).should('exist');
@@ -273,9 +256,3 @@ export const goToPage = (pageNumber: number) => {
   cy.get(pageSelector(pageNumber)).last().click({ force: true });
   waitForRulesTableToBeRefreshed();
 };
-
-export const goToNextPage = () => {
-  cy.get(RULES_TABLE_REFRESH_INDICATOR).should('not.exist');
-  cy.get(NEXT_BTN).click({ force: true });
-  waitForRulesTableToBeRefreshed();
-};
diff --git a/x-pack/plugins/security_solution/cypress/tasks/case_details.ts b/x-pack/plugins/security_solution/cypress/tasks/case_details.ts
index f64c3c9d79007..57f6f24ee890a 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/case_details.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/case_details.ts
@@ -6,18 +6,7 @@
  */
 
 import { TIMELINE_TITLE } from '../screens/timeline';
-import {
-  CASE_ACTIONS_BTN,
-  CASE_DETAILS_TIMELINE_LINK_MARKDOWN,
-  DELETE_CASE_BTN,
-  DELETE_CASE_CONFIRMATION_BTN,
-} from '../screens/case_details';
-
-export const deleteCase = () => {
-  cy.get(CASE_ACTIONS_BTN).first().click();
-  cy.get(DELETE_CASE_BTN).click();
-  cy.get(DELETE_CASE_CONFIRMATION_BTN).click();
-};
+import { CASE_DETAILS_TIMELINE_LINK_MARKDOWN } from '../screens/case_details';
 
 export const openCaseTimeline = () => {
   cy.get(CASE_DETAILS_TIMELINE_LINK_MARKDOWN).click();
diff --git a/x-pack/plugins/security_solution/cypress/tasks/create_new_rule.ts b/x-pack/plugins/security_solution/cypress/tasks/create_new_rule.ts
index b7fb0785736f6..591be21b5682b 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/create_new_rule.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/create_new_rule.ts
@@ -32,7 +32,6 @@ import {
   CUSTOM_QUERY_REQUIRED,
   DEFAULT_RISK_SCORE_INPUT,
   DEFINE_CONTINUE_BUTTON,
-  DEFINE_EDIT_TAB,
   EQL_QUERY_INPUT,
   EQL_QUERY_PREVIEW_HISTOGRAM,
   EQL_QUERY_VALIDATION_SPINNER,
@@ -495,10 +494,6 @@ export const fillDefineMachineLearningRuleAndContinue = (rule: MachineLearningRu
   cy.get(MACHINE_LEARNING_DROPDOWN_INPUT).should('not.exist');
 };
 
-export const goToDefineStepTab = () => {
-  cy.get(DEFINE_EDIT_TAB).click({ force: true });
-};
-
 export const goToAboutStepTab = () => {
   cy.get(ABOUT_EDIT_TAB).click({ force: true });
 };
diff --git a/x-pack/plugins/security_solution/cypress/tasks/exceptions.ts b/x-pack/plugins/security_solution/cypress/tasks/exceptions.ts
index 97e93ef8194a4..4548c921890c8 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/exceptions.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/exceptions.ts
@@ -5,11 +5,9 @@
  * 2.0.
  */
 
-import { Exception } from '../objects/exception';
 import {
   FIELD_INPUT,
   OPERATOR_INPUT,
-  VALUES_INPUT,
   CANCEL_BTN,
   BUILDER_MODAL_BODY,
   EXCEPTION_ITEM_CONTAINER,
@@ -38,25 +36,6 @@ export const addExceptionEntryOperatorValue = (operator: string, index = 0) => {
   cy.get(BUILDER_MODAL_BODY).click();
 };
 
-export const addExceptionEntryValue = (values: string[], index = 0) => {
-  values.forEach((value) => {
-    cy.get(VALUES_INPUT).eq(index).type(`${value}{enter}`);
-  });
-  cy.get(BUILDER_MODAL_BODY).click();
-};
-
-export const addExceptionEntry = (exception: Exception, index = 0) => {
-  addExceptionEntryFieldValue(exception.field, index);
-  addExceptionEntryOperatorValue(exception.operator, index);
-  addExceptionEntryValue(exception.values, index);
-};
-
-export const addNestedExceptionEntry = (exception: Exception, index = 0) => {
-  addExceptionEntryFieldValue(exception.field, index);
-  addExceptionEntryOperatorValue(exception.operator, index);
-  addExceptionEntryValue(exception.values, index);
-};
-
 export const closeExceptionBuilderModal = () => {
   cy.get(CANCEL_BTN).click();
 };
diff --git a/x-pack/plugins/security_solution/cypress/tasks/exceptions_table.ts b/x-pack/plugins/security_solution/cypress/tasks/exceptions_table.ts
index 838af066abd60..f2bc0c1f7e6ed 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/exceptions_table.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/exceptions_table.ts
@@ -6,7 +6,6 @@
  */
 
 import {
-  EXCEPTIONS_TABLE_TAB,
   EXCEPTIONS_TABLE,
   EXCEPTIONS_TABLE_SEARCH,
   EXCEPTIONS_TABLE_DELETE_BTN,
@@ -16,10 +15,6 @@ import {
   EXCEPTIONS_TABLE_EXPORT_BTN,
 } from '../screens/exceptions';
 
-export const goToExceptionsTable = () => {
-  cy.get(EXCEPTIONS_TABLE_TAB).should('exist').click({ force: true });
-};
-
 export const waitForExceptionsTableToBeLoaded = () => {
   cy.get(EXCEPTIONS_TABLE).should('exist');
   cy.get(EXCEPTIONS_TABLE_SEARCH).should('exist');
diff --git a/x-pack/plugins/security_solution/cypress/tasks/fields_browser.ts b/x-pack/plugins/security_solution/cypress/tasks/fields_browser.ts
index 72945f557ac1b..ee8bdb3b023dd 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/fields_browser.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/fields_browser.ts
@@ -5,12 +5,8 @@
  * 2.0.
  */
 
-import { drag, drop } from '../tasks/common';
-
 import {
   FIELDS_BROWSER_FILTER_INPUT,
-  FIELDS_BROWSER_DRAGGABLE_HOST_GEO_COUNTRY_NAME_HEADER,
-  FIELDS_BROWSER_HEADER_DROP_AREA,
   FIELDS_BROWSER_HOST_GEO_CITY_NAME_CHECKBOX,
   FIELDS_BROWSER_HOST_GEO_CONTINENT_NAME_CHECKBOX,
   FIELDS_BROWSER_MESSAGE_CHECKBOX,
@@ -37,15 +33,6 @@ export const addsHostGeoContinentNameToTimeline = () => {
   });
 };
 
-export const addsHostGeoCountryNameToTimelineDraggingIt = () => {
-  cy.get(FIELDS_BROWSER_DRAGGABLE_HOST_GEO_COUNTRY_NAME_HEADER).should('exist');
-  cy.get(FIELDS_BROWSER_DRAGGABLE_HOST_GEO_COUNTRY_NAME_HEADER).then((field) => drag(field));
-
-  cy.get(FIELDS_BROWSER_HEADER_DROP_AREA)
-    .first()
-    .then((headersDropArea) => drop(headersDropArea));
-};
-
 export const clearFieldsBrowser = () => {
   cy.get(FIELDS_BROWSER_FILTER_INPUT).type('{selectall}{backspace}');
 };
diff --git a/x-pack/plugins/security_solution/cypress/tasks/hosts/events.ts b/x-pack/plugins/security_solution/cypress/tasks/hosts/events.ts
index d40b43bac1e3f..bf8abe4328b96 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/hosts/events.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/hosts/events.ts
@@ -7,14 +7,12 @@
 
 import { drag, drop } from '../common';
 import {
-  CLOSE_MODAL,
   EVENTS_VIEWER_FIELDS_BUTTON,
   EVENTS_VIEWER_PAGINATION,
   FIELDS_BROWSER_CONTAINER,
   HOST_GEO_CITY_NAME_CHECKBOX,
   HOST_GEO_COUNTRY_NAME_CHECKBOX,
   INSPECT_QUERY,
-  LOAD_MORE,
   SERVER_SIDE_EVENT_COUNT,
 } from '../../screens/hosts/events';
 import { DATAGRID_HEADERS } from '../../screens/timeline';
@@ -32,19 +30,9 @@ export const addsHostGeoCountryNameToHeader = () => {
   });
 };
 
-export const closeModal = () => {
-  cy.get(CLOSE_MODAL).click();
-};
-
-export const loadMoreEvents = () => {
-  cy.get(LOAD_MORE).click({ force: true });
-};
-
 export const openEventsViewerFieldsBrowser = () => {
   cy.get(EVENTS_VIEWER_FIELDS_BUTTON).click({ force: true });
-
   cy.get(SERVER_SIDE_EVENT_COUNT).should('not.have.text', '0');
-
   cy.get(FIELDS_BROWSER_CONTAINER).should('exist');
 };
 
diff --git a/x-pack/plugins/security_solution/cypress/tasks/security_header.ts b/x-pack/plugins/security_solution/cypress/tasks/security_header.ts
index 0d6ab9449da86..558b750e2641b 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/security_header.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/security_header.ts
@@ -22,7 +22,3 @@ export const navigateFromHeaderTo = (page: string) => {
 export const refreshPage = () => {
   cy.get(REFRESH_BUTTON).click({ force: true }).should('not.have.text', 'Updating');
 };
-
-export const waitForThePageToBeUpdated = () => {
-  cy.get(REFRESH_BUTTON).should('not.have.text', 'Updating');
-};
diff --git a/x-pack/plugins/security_solution/cypress/tasks/security_main.ts b/x-pack/plugins/security_solution/cypress/tasks/security_main.ts
index 01651b7b943d0..9b8af6c5ceef6 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/security_main.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/security_main.ts
@@ -7,7 +7,6 @@
 
 import {
   CLOSE_TIMELINE_BUTTON,
-  MAIN_PAGE,
   TIMELINE_TOGGLE_BUTTON,
   TIMELINE_BOTTOM_BAR_TOGGLE_BUTTON,
 } from '../screens/security_main';
@@ -25,13 +24,6 @@ export const closeTimelineUsingCloseButton = () => {
   cy.get(CLOSE_TIMELINE_BUTTON).filter(':visible').click();
 };
 
-export const openTimelineIfClosed = () =>
-  cy.get(MAIN_PAGE).then(($page) => {
-    if ($page.find(TIMELINE_BOTTOM_BAR_TOGGLE_BUTTON).length === 1) {
-      openTimelineUsingToggle();
-    }
-  });
-
 export const enterFullScreenMode = () => {
   cy.get(TIMELINE_FULL_SCREEN_BUTTON).first().click({ force: true });
 };
diff --git a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
index 039e8ed44886e..4c6b73de80940 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
@@ -22,7 +22,6 @@ import {
   COMBO_BOX,
   CREATE_NEW_TIMELINE,
   FIELD_BROWSER,
-  ID_FIELD,
   ID_HEADER_FIELD,
   ID_TOGGLE_FIELD,
   ID_HOVER_ACTION_OVERFLOW_BTN,
@@ -69,8 +68,6 @@ import {
 } from '../screens/timeline';
 import { REFRESH_BUTTON, TIMELINE } from '../screens/timelines';
 
-import { drag, drop } from '../tasks/common';
-
 import { closeFieldsBrowser, filterFieldsBrowser } from '../tasks/fields_browser';
 
 export const hostExistsQuery = 'host.name: *';
@@ -121,10 +118,6 @@ export const goToCorrelationTab = () => {
   return cy.root().find(TIMELINE_CORRELATION_TAB);
 };
 
-export const getNotePreviewByNoteId = (noteId: string) => {
-  return cy.get(`[data-test-subj="note-preview-${noteId}"]`);
-};
-
 export const goToQueryTab = () => {
   cy.root()
     .pipe(($el) => {
@@ -302,10 +295,6 @@ export const populateTimeline = () => {
   cy.get(SERVER_SIDE_EVENT_COUNT).should('not.have.text', '0');
 };
 
-export const unpinFirstEvent = () => {
-  cy.get(PIN_EVENT).first().click({ force: true });
-};
-
 const clickTimestampHoverActionOverflowButton = () => {
   cy.get(TIMESTAMP_HOVER_ACTION_OVERFLOW_BTN).should('exist');
 
@@ -320,16 +309,6 @@ export const clickTimestampToggleField = () => {
   cy.get(TIMESTAMP_TOGGLE_FIELD).click({ force: true });
 };
 
-export const dragAndDropIdToggleFieldToTimeline = () => {
-  cy.get(ID_HEADER_FIELD).should('not.exist');
-
-  cy.get(ID_FIELD).then((field) => drag(field));
-
-  cy.get(`[data-test-subj="timeline"] [data-test-subj="headers-group"]`)
-    .first()
-    .then((headersDropArea) => drop(headersDropArea));
-};
-
 export const removeColumn = (columnName: string) => {
   cy.get(FIELD_BROWSER).first().click();
   filterFieldsBrowser(columnName);
@@ -350,10 +329,6 @@ export const waitForTimelineChanges = () => {
   cy.get(TIMELINE_CHANGES_IN_PROGRESS).should('not.exist');
 };
 
-export const waitForEventsPanelToBeLoaded = () => {
-  cy.get(QUERY_TAB_BUTTON).find('.euiBadge').should('exist');
-};
-
 /**
  * We keep clicking on the refresh button until we have the timeline we are looking
  * for. NOTE: That because refresh happens so fast, the click handler in most cases

From 187d9496857f2fae4395caf1d62d2a6ebb2eb0fb Mon Sep 17 00:00:00 2001
From: Kyle Pollich <kyle.pollich@elastic.co>
Date: Thu, 14 Oct 2021 07:19:50 -0400
Subject: [PATCH 065/117] [Fleet] Improve Functionality around Managed Package
 Policies (#114526)

* Enabled auto policy upgrades for APM and Synthetics

* fixup! Enabled auto policy upgrades for APM and Synthetics

* Rework preconfiguration policy upgrade flow + report errors

* Fix type error in test

* Fix type errors + tests

* wip

* Remove keep policies up to date checks

* Remove references to KEEP_POLICIES_UP_TO_DATE_PACKAGES

* Move package policy upgrade results to nonFatalErrors

* Fix types

* Fix type error

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../server/routes/setup/handlers.test.ts      |   5 +-
 .../fleet/server/routes/setup/handlers.ts     |  20 +++-
 .../services/managed_package_policies.test.ts | 104 +++++++++++++++++-
 .../services/managed_package_policies.ts      |  65 ++++++++---
 .../fleet/server/services/preconfiguration.ts |  22 ++--
 x-pack/plugins/fleet/server/services/setup.ts |   5 +-
 6 files changed, 186 insertions(+), 35 deletions(-)

diff --git a/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts b/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
index bd82989a9e828..c196054faf08c 100644
--- a/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
+++ b/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
@@ -53,7 +53,10 @@ describe('FleetSetupHandler', () => {
     );
     await fleetSetupHandler(context, request, response);
 
-    const expectedBody: PostFleetSetupResponse = { isInitialized: true, nonFatalErrors: [] };
+    const expectedBody: PostFleetSetupResponse = {
+      isInitialized: true,
+      nonFatalErrors: [],
+    };
     expect(response.customError).toHaveBeenCalledTimes(0);
     expect(response.ok).toHaveBeenCalledWith({ body: expectedBody });
   });
diff --git a/x-pack/plugins/fleet/server/routes/setup/handlers.ts b/x-pack/plugins/fleet/server/routes/setup/handlers.ts
index 6311b9d970d35..d24db96667d52 100644
--- a/x-pack/plugins/fleet/server/routes/setup/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/setup/handlers.ts
@@ -49,13 +49,21 @@ export const fleetSetupHandler: RequestHandler = async (context, request, respon
     const setupStatus = await setupFleet(soClient, esClient);
     const body: PostFleetSetupResponse = {
       ...setupStatus,
-      nonFatalErrors: setupStatus.nonFatalErrors.map((e) => {
+      nonFatalErrors: setupStatus.nonFatalErrors.flatMap((e) => {
         // JSONify the error object so it can be displayed properly in the UI
-        const error = e.error ?? e;
-        return {
-          name: error.name,
-          message: error.message,
-        };
+        if ('error' in e) {
+          return {
+            name: e.error.name,
+            message: e.error.message,
+          };
+        } else {
+          return e.errors.map((upgradePackagePolicyError: any) => {
+            return {
+              name: upgradePackagePolicyError.key,
+              message: upgradePackagePolicyError.message,
+            };
+          });
+        }
       }),
     };
 
diff --git a/x-pack/plugins/fleet/server/services/managed_package_policies.test.ts b/x-pack/plugins/fleet/server/services/managed_package_policies.test.ts
index a53b1fe648905..52c1c71446d64 100644
--- a/x-pack/plugins/fleet/server/services/managed_package_policies.test.ts
+++ b/x-pack/plugins/fleet/server/services/managed_package_policies.test.ts
@@ -18,7 +18,7 @@ jest.mock('./app_context', () => {
     ...jest.requireActual('./app_context'),
     appContextService: {
       getLogger: jest.fn(() => {
-        return { debug: jest.fn() };
+        return { error: jest.fn() };
       }),
     },
   };
@@ -27,7 +27,9 @@ jest.mock('./app_context', () => {
 describe('managed package policies', () => {
   afterEach(() => {
     (packagePolicyService.get as jest.Mock).mockReset();
+    (packagePolicyService.getUpgradeDryRunDiff as jest.Mock).mockReset();
     (getPackageInfo as jest.Mock).mockReset();
+    (packagePolicyService.upgrade as jest.Mock).mockReset();
   });
 
   it('should not upgrade policies for non-managed package', async () => {
@@ -54,6 +56,16 @@ describe('managed package policies', () => {
       }
     );
 
+    (packagePolicyService.getUpgradeDryRunDiff as jest.Mock).mockImplementationOnce(
+      (savedObjectsClient: any, id: string) => {
+        return {
+          name: 'non-managed-package-policy',
+          diff: [{ id: 'foo' }, { id: 'bar' }],
+          hasErrors: false,
+        };
+      }
+    );
+
     (getPackageInfo as jest.Mock).mockImplementationOnce(
       ({ savedObjectsClient, pkgName, pkgVersion }) => ({
         name: pkgName,
@@ -91,6 +103,16 @@ describe('managed package policies', () => {
       }
     );
 
+    (packagePolicyService.getUpgradeDryRunDiff as jest.Mock).mockImplementationOnce(
+      (savedObjectsClient: any, id: string) => {
+        return {
+          name: 'non-managed-package-policy',
+          diff: [{ id: 'foo' }, { id: 'bar' }],
+          hasErrors: false,
+        };
+      }
+    );
+
     (getPackageInfo as jest.Mock).mockImplementationOnce(
       ({ savedObjectsClient, pkgName, pkgVersion }) => ({
         name: pkgName,
@@ -103,4 +125,84 @@ describe('managed package policies', () => {
 
     expect(packagePolicyService.upgrade).toBeCalledWith(soClient, esClient, ['managed-package-id']);
   });
+
+  describe('when dry run reports conflicts', () => {
+    it('should return errors + diff without performing upgrade', async () => {
+      const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
+      const soClient = savedObjectsClientMock.create();
+
+      (packagePolicyService.get as jest.Mock).mockImplementationOnce(
+        (savedObjectsClient: any, id: string) => {
+          return {
+            id,
+            inputs: {},
+            version: '',
+            revision: 1,
+            updated_at: '',
+            updated_by: '',
+            created_at: '',
+            created_by: '',
+            package: {
+              name: 'conflicting-package',
+              title: 'Conflicting Package',
+              version: '0.0.1',
+            },
+          };
+        }
+      );
+
+      (packagePolicyService.getUpgradeDryRunDiff as jest.Mock).mockImplementationOnce(
+        (savedObjectsClient: any, id: string) => {
+          return {
+            name: 'conflicting-package-policy',
+            diff: [
+              { id: 'foo' },
+              { id: 'bar', errors: [{ key: 'some.test.value', message: 'Conflict detected' }] },
+            ],
+            hasErrors: true,
+          };
+        }
+      );
+
+      (getPackageInfo as jest.Mock).mockImplementationOnce(
+        ({ savedObjectsClient, pkgName, pkgVersion }) => ({
+          name: pkgName,
+          version: pkgVersion,
+          keepPoliciesUpToDate: true,
+        })
+      );
+
+      const result = await upgradeManagedPackagePolicies(soClient, esClient, [
+        'conflicting-package-policy',
+      ]);
+
+      expect(result).toEqual([
+        {
+          packagePolicyId: 'conflicting-package-policy',
+          diff: [
+            {
+              id: 'foo',
+            },
+            {
+              id: 'bar',
+              errors: [
+                {
+                  key: 'some.test.value',
+                  message: 'Conflict detected',
+                },
+              ],
+            },
+          ],
+          errors: [
+            {
+              key: 'some.test.value',
+              message: 'Conflict detected',
+            },
+          ],
+        },
+      ]);
+
+      expect(packagePolicyService.upgrade).not.toBeCalled();
+    });
+  });
 });
diff --git a/x-pack/plugins/fleet/server/services/managed_package_policies.ts b/x-pack/plugins/fleet/server/services/managed_package_policies.ts
index 73f85525f4c60..25e2482892712 100644
--- a/x-pack/plugins/fleet/server/services/managed_package_policies.ts
+++ b/x-pack/plugins/fleet/server/services/managed_package_policies.ts
@@ -7,12 +7,19 @@
 
 import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
 
+import type { UpgradePackagePolicyDryRunResponseItem } from '../../common';
 import { AUTO_UPDATE_PACKAGES } from '../../common';
 
 import { appContextService } from './app_context';
-import { getPackageInfo } from './epm/packages';
+import { getInstallation, getPackageInfo } from './epm/packages';
 import { packagePolicyService } from './package_policy';
 
+export interface UpgradeManagedPackagePoliciesResult {
+  packagePolicyId: string;
+  diff: UpgradePackagePolicyDryRunResponseItem['diff'];
+  errors: any;
+}
+
 /**
  * Upgrade any package policies for packages installed through setup that are denoted as `AUTO_UPGRADE` packages
  * or have the `keep_policies_up_to_date` flag set to `true`
@@ -21,8 +28,8 @@ export const upgradeManagedPackagePolicies = async (
   soClient: SavedObjectsClientContract,
   esClient: ElasticsearchClient,
   packagePolicyIds: string[]
-) => {
-  const policyIdsToUpgrade: string[] = [];
+): Promise<UpgradeManagedPackagePoliciesResult[]> => {
+  const results: UpgradeManagedPackagePoliciesResult[] = [];
 
   for (const packagePolicyId of packagePolicyIds) {
     const packagePolicy = await packagePolicyService.get(soClient, packagePolicyId);
@@ -37,22 +44,50 @@ export const upgradeManagedPackagePolicies = async (
       pkgVersion: packagePolicy.package.version,
     });
 
+    const installedPackage = await getInstallation({
+      savedObjectsClient: soClient,
+      pkgName: packagePolicy.package.name,
+    });
+
+    const isPolicyVersionAlignedWithInstalledVersion =
+      packageInfo.version === installedPackage?.version;
+
     const shouldUpgradePolicies =
-      AUTO_UPDATE_PACKAGES.some((pkg) => pkg.name === packageInfo.name) ||
-      packageInfo.keepPoliciesUpToDate;
+      !isPolicyVersionAlignedWithInstalledVersion &&
+      (AUTO_UPDATE_PACKAGES.some((pkg) => pkg.name === packageInfo.name) ||
+        packageInfo.keepPoliciesUpToDate);
 
     if (shouldUpgradePolicies) {
-      policyIdsToUpgrade.push(packagePolicy.id);
-    }
-  }
-
-  if (policyIdsToUpgrade.length) {
-    appContextService
-      .getLogger()
-      .debug(
-        `Upgrading ${policyIdsToUpgrade.length} package policies: ${policyIdsToUpgrade.join(', ')}`
+      // Since upgrades don't report diffs/errors, we need to perform a dry run first in order
+      // to notify the user of any granular policy upgrade errors that occur during Fleet's
+      // preconfiguration check
+      const dryRunResults = await packagePolicyService.getUpgradeDryRunDiff(
+        soClient,
+        packagePolicyId
       );
 
-    await packagePolicyService.upgrade(soClient, esClient, policyIdsToUpgrade);
+      if (dryRunResults.hasErrors) {
+        const errors = dryRunResults.diff?.[1].errors;
+        appContextService
+          .getLogger()
+          .error(
+            new Error(
+              `Error upgrading package policy ${packagePolicyId}: ${JSON.stringify(errors)}`
+            )
+          );
+
+        results.push({ packagePolicyId, diff: dryRunResults.diff, errors });
+        continue;
+      }
+
+      try {
+        await packagePolicyService.upgrade(soClient, esClient, [packagePolicyId]);
+        results.push({ packagePolicyId, diff: dryRunResults.diff, errors: [] });
+      } catch (error) {
+        results.push({ packagePolicyId, diff: dryRunResults.diff, errors: [error] });
+      }
+    }
   }
+
+  return results;
 };
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration.ts b/x-pack/plugins/fleet/server/services/preconfiguration.ts
index a878af64aa05e..3b322e1112d6a 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration.ts
@@ -35,13 +35,14 @@ import { agentPolicyService, addPackageToAgentPolicy } from './agent_policy';
 import type { InputsOverride } from './package_policy';
 import { overridePackageInputs } from './package_policy';
 import { appContextService } from './app_context';
+import type { UpgradeManagedPackagePoliciesResult } from './managed_package_policies';
 import { upgradeManagedPackagePolicies } from './managed_package_policies';
 import { outputService } from './output';
 
 interface PreconfigurationResult {
   policies: Array<{ id: string; updated_at: string }>;
   packages: string[];
-  nonFatalErrors: PreconfigurationError[];
+  nonFatalErrors: Array<PreconfigurationError | UpgradeManagedPackagePoliciesResult>;
 }
 
 function isPreconfiguredOutputDifferentFromCurrent(
@@ -326,16 +327,15 @@ export async function ensurePreconfiguredPackagesAndPolicies(
     }
   }
 
-  try {
-    const fulfilledPolicyPackagePolicyIds = fulfilledPolicies.flatMap<string>(
-      ({ policy }) => policy?.package_policies as string[]
-    );
+  const fulfilledPolicyPackagePolicyIds = fulfilledPolicies
+    .filter(({ policy }) => policy?.package_policies)
+    .flatMap<string>(({ policy }) => policy?.package_policies as string[]);
 
-    await upgradeManagedPackagePolicies(soClient, esClient, fulfilledPolicyPackagePolicyIds);
-    // Swallow errors that occur when upgrading
-  } catch (error) {
-    appContextService.getLogger().error(error);
-  }
+  const packagePolicyUpgradeResults = await upgradeManagedPackagePolicies(
+    soClient,
+    esClient,
+    fulfilledPolicyPackagePolicyIds
+  );
 
   return {
     policies: fulfilledPolicies.map((p) =>
@@ -353,7 +353,7 @@ export async function ensurePreconfiguredPackagesAndPolicies(
           }
     ),
     packages: fulfilledPackages.map((pkg) => pkgToPkgKey(pkg)),
-    nonFatalErrors: [...rejectedPackages, ...rejectedPolicies],
+    nonFatalErrors: [...rejectedPackages, ...rejectedPolicies, ...packagePolicyUpgradeResults],
   };
 }
 
diff --git a/x-pack/plugins/fleet/server/services/setup.ts b/x-pack/plugins/fleet/server/services/setup.ts
index 08c580d80c804..37d79c1bb691d 100644
--- a/x-pack/plugins/fleet/server/services/setup.ts
+++ b/x-pack/plugins/fleet/server/services/setup.ts
@@ -32,10 +32,13 @@ import { ensureDefaultComponentTemplate } from './epm/elasticsearch/template/ins
 import { getInstallations, installPackage } from './epm/packages';
 import { isPackageInstalled } from './epm/packages/install';
 import { pkgToPkgKey } from './epm/registry';
+import type { UpgradeManagedPackagePoliciesResult } from './managed_package_policies';
 
 export interface SetupStatus {
   isInitialized: boolean;
-  nonFatalErrors: Array<PreconfigurationError | DefaultPackagesInstallationError>;
+  nonFatalErrors: Array<
+    PreconfigurationError | DefaultPackagesInstallationError | UpgradeManagedPackagePoliciesResult
+  >;
 }
 
 export async function setupFleet(

From f598cf1ffd83d61fdc6c5205d5a9e25721f799dd Mon Sep 17 00:00:00 2001
From: Anton Dosov <anton.dosov@elastic.co>
Date: Thu, 14 Oct 2021 13:46:16 +0200
Subject: [PATCH 066/117] Update app services bundle limits (#114789)

---
 packages/kbn-optimizer/limits.yml | 36 +++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index 068408bce40fd..f331bb6dae444 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -2,7 +2,6 @@ pageLoadAssetSize:
   advancedSettings: 27596
   alerting: 106936
   apm: 64385
-  bfetch: 51874
   canvas: 1066647
   charts: 95000
   cloud: 21076
@@ -11,17 +10,12 @@ pageLoadAssetSize:
   crossClusterReplication: 65408
   dashboard: 374194
   dashboardEnhanced: 65646
-  data: 824229
-  dataEnhanced: 50420
   devTools: 38637
   discover: 99999
   discoverEnhanced: 42730
-  embeddable: 99999
-  embeddableEnhanced: 41145
   enterpriseSearch: 35741
   esUiShared: 326654
   features: 21723
-  fieldFormats: 92628
   globalSearch: 29696
   globalSearchBar: 50403
   globalSearchProviders: 25554
@@ -30,8 +24,6 @@ pageLoadAssetSize:
   home: 30182
   indexLifecycleManagement: 107090
   indexManagement: 140608
-  indexPatternManagement: 28222
-  indexPatternEditor: 25000
   infra: 184320
   fleet: 250000
   ingestPipelines: 58003
@@ -39,8 +31,6 @@ pageLoadAssetSize:
   inspector: 148711
   kibanaLegacy: 107711
   kibanaOverview: 56279
-  kibanaReact: 188705
-  kibanaUtils: 198829
   lens: 96624
   licenseManagement: 41817
   licensing: 29004
@@ -55,7 +45,6 @@ pageLoadAssetSize:
   observability: 89709
   painlessLab: 179748
   remoteClusters: 51327
-  reporting: 183418
   rollup: 97204
   savedObjects: 108518
   savedObjectsManagement: 101836
@@ -63,18 +52,14 @@ pageLoadAssetSize:
   savedObjectsTaggingOss: 20590
   searchprofiler: 67080
   security: 95864
-  share: 99061
   snapshotRestore: 79032
   spaces: 57868
   telemetry: 51957
   telemetryManagementSection: 38586
   transform: 41007
   triggersActionsUi: 100000
-  uiActions: 97717
-  uiActionsEnhanced: 32000
   upgradeAssistant: 81241
   uptime: 40825
-  urlDrilldown: 70674
   urlForwarding: 32579
   usageCollection: 39762
   visDefaultEditor: 50178
@@ -92,7 +77,6 @@ pageLoadAssetSize:
   runtimeFields: 41752
   stackAlerts: 29684
   presentationUtil: 94301
-  indexPatternFieldEditor: 50000
   osquery: 107090
   fileUpload: 25664
   dataVisualizer: 27530
@@ -110,9 +94,25 @@ pageLoadAssetSize:
   expressionShape: 34008
   interactiveSetup: 80000
   expressionTagcloud: 27505
-  expressions: 239290
   securitySolution: 231753
   customIntegrations: 28810
   expressionMetricVis: 23121
   visTypeMetric: 23332
-  dataViews: 42000
+  bfetch: 22837
+  kibanaUtils: 97808
+  data: 491273
+  dataViews: 41532
+  expressions: 140958
+  fieldFormats: 65209
+  kibanaReact: 99422
+  share: 71239
+  uiActions: 35121
+  dataEnhanced: 24980
+  embeddable: 87309
+  embeddableEnhanced: 22107
+  uiActionsEnhanced: 38494
+  urlDrilldown: 30063
+  indexPatternEditor: 19123
+  indexPatternFieldEditor: 34448
+  indexPatternManagement: 19165
+  reporting: 57003

From 29d750a8c1a319b18a2c1942d480b5bc66add010 Mon Sep 17 00:00:00 2001
From: Kevin Lacabane <kevin.lacabane@elastic.co>
Date: Thu, 14 Oct 2021 14:33:07 +0200
Subject: [PATCH 067/117] [Stack Monitoring] fix feature controls functional
 test (#114781)

* fix feature controls functional test

* target test-subj attr instead of class
---
 .../monitoring/public/application/pages/page_template.tsx       | 2 +-
 x-pack/plugins/monitoring/public/directives/main/index.html     | 2 +-
 .../apps/monitoring/feature_controls/monitoring_spaces.ts       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/monitoring/public/application/pages/page_template.tsx b/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
index 5c030814d9cdf..23eeb2c034a80 100644
--- a/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
@@ -92,7 +92,7 @@ export const PageTemplate: React.FC<PageTemplateProps> = ({
   };
 
   return (
-    <div className="app-container">
+    <div className="app-container" data-test-subj="monitoringAppContainer">
       <ActionMenu>
         <AlertsDropdown />
       </ActionMenu>
diff --git a/x-pack/plugins/monitoring/public/directives/main/index.html b/x-pack/plugins/monitoring/public/directives/main/index.html
index 558ed5e874cd6..c989c71d8c1d4 100644
--- a/x-pack/plugins/monitoring/public/directives/main/index.html
+++ b/x-pack/plugins/monitoring/public/directives/main/index.html
@@ -1,4 +1,4 @@
-<div class="app-container">
+<div class="app-container" data-test-subj="monitoringAppContainer">
   <div class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive">
     <div class="euiFlexItem euiFlexItem--flexGrowZero">
       <div class="euiFlexGroup euiFlexGroup--gutterNone euiFlexGroup--justifyContentSpaceEvenly euiFlexGroup--responsive euiFlexGroup--directionColumn">
diff --git a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts
index f2b872bccbaa7..71f100b49068f 100644
--- a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts
+++ b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts
@@ -52,7 +52,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           basePath: '/s/custom_space',
         });
 
-        const exists = await find.existsByCssSelector('monitoring-main');
+        const exists = await find.existsByCssSelector('[data-test-subj="monitoringAppContainer"]');
         expect(exists).to.be(true);
       });
     });

From b21e1ebf3806793f09770cc03d7a65a83fac5e17 Mon Sep 17 00:00:00 2001
From: Tim Roes <tim.roes@elastic.co>
Date: Thu, 14 Oct 2021 14:43:06 +0200
Subject: [PATCH 068/117] Deprecate DataView.flattenHit in favor of data plugin
 flattenHit (#114517)

* WIP replacing indexPattern.flattenHit by tabify

* Fix jest tests

* Read metaFields from index pattern

* Remove old test code

* remove unnecessary changes

* Remove flattenHitWrapper APIs

* Fix imports

* Fix missing metaFields

* Add all meta fields to allowlist

* Improve inline comments

* Move flattenHit test to new implementation

* Add deprecation comment to implementation

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../__snapshots__/tabify_docs.test.ts.snap    | 160 +----------------
 .../data/common/search/tabify/index.ts        |   2 +-
 .../common/search/tabify/tabify_docs.test.ts  | 170 ++++++++++++------
 .../data/common/search/tabify/tabify_docs.ts  |  85 ++++++++-
 src/plugins/data/public/index.ts              |   2 -
 .../data_views/common/data_views/data_view.ts |   3 +
 .../common/data_views/flatten_hit.ts          |  17 +-
 src/plugins/data_views/public/index.ts        |   2 +-
 .../public/__mocks__/index_pattern.ts         |   9 +-
 .../__mocks__/index_pattern_with_timefield.ts |   9 +-
 .../doc_table/components/table_row.tsx        |   3 +-
 .../sidebar/discover_sidebar.test.tsx         |   4 +-
 .../discover_sidebar_responsive.test.tsx      |   6 +-
 .../sidebar/lib/field_calculator.js           |   4 +-
 .../sidebar/lib/field_calculator.test.ts      |   3 +-
 .../apps/main/utils/calc_field_counts.ts      |   4 +-
 .../discover_grid/discover_grid.tsx           |   4 +-
 .../discover_grid_cell_actions.tsx            |   6 +-
 .../discover_grid_document_selection.test.tsx |  45 ++---
 .../discover_grid_expand_button.test.tsx      |  36 ++--
 .../get_render_cell_value.test.tsx            |  33 ++--
 .../components/table/table.test.tsx           |   6 +-
 .../application/components/table/table.tsx    |   3 +-
 .../generate_csv/generate_csv.test.ts         |   1 +
 .../generate_csv/generate_csv.ts              |   2 +-
 25 files changed, 293 insertions(+), 326 deletions(-)

diff --git a/src/plugins/data/common/search/tabify/__snapshots__/tabify_docs.test.ts.snap b/src/plugins/data/common/search/tabify/__snapshots__/tabify_docs.test.ts.snap
index 22276335a0599..9a85ba57ce5ef 100644
--- a/src/plugins/data/common/search/tabify/__snapshots__/tabify_docs.test.ts.snap
+++ b/src/plugins/data/common/search/tabify/__snapshots__/tabify_docs.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`tabifyDocs combines meta fields if meta option is set 1`] = `
+exports[`tabify_docs tabifyDocs converts fields by default 1`] = `
 Object {
   "columns": Array [
     Object {
@@ -108,7 +108,7 @@ Object {
 }
 `;
 
-exports[`tabifyDocs converts fields by default 1`] = `
+exports[`tabify_docs tabifyDocs converts source if option is set 1`] = `
 Object {
   "columns": Array [
     Object {
@@ -216,7 +216,7 @@ Object {
 }
 `;
 
-exports[`tabifyDocs converts source if option is set 1`] = `
+exports[`tabify_docs tabifyDocs skips nested fields if option is set 1`] = `
 Object {
   "columns": Array [
     Object {
@@ -324,115 +324,7 @@ Object {
 }
 `;
 
-exports[`tabifyDocs skips nested fields if option is set 1`] = `
-Object {
-  "columns": Array [
-    Object {
-      "id": "fieldTest",
-      "meta": Object {
-        "field": "fieldTest",
-        "index": "test-index",
-        "params": Object {
-          "id": "number",
-        },
-        "type": "number",
-      },
-      "name": "fieldTest",
-    },
-    Object {
-      "id": "invalidMapping",
-      "meta": Object {
-        "field": "invalidMapping",
-        "index": "test-index",
-        "params": undefined,
-        "type": "number",
-      },
-      "name": "invalidMapping",
-    },
-    Object {
-      "id": "nested",
-      "meta": Object {
-        "field": "nested",
-        "index": "test-index",
-        "params": undefined,
-        "type": "object",
-      },
-      "name": "nested",
-    },
-    Object {
-      "id": "sourceTest",
-      "meta": Object {
-        "field": "sourceTest",
-        "index": "test-index",
-        "params": Object {
-          "id": "number",
-        },
-        "type": "number",
-      },
-      "name": "sourceTest",
-    },
-    Object {
-      "id": "_id",
-      "meta": Object {
-        "field": "_id",
-        "index": "test-index",
-        "params": undefined,
-        "type": "string",
-      },
-      "name": "_id",
-    },
-    Object {
-      "id": "_index",
-      "meta": Object {
-        "field": "_index",
-        "index": "test-index",
-        "params": undefined,
-        "type": "string",
-      },
-      "name": "_index",
-    },
-    Object {
-      "id": "_score",
-      "meta": Object {
-        "field": "_score",
-        "index": "test-index",
-        "params": undefined,
-        "type": "number",
-      },
-      "name": "_score",
-    },
-    Object {
-      "id": "_type",
-      "meta": Object {
-        "field": "_type",
-        "index": "test-index",
-        "params": undefined,
-        "type": "string",
-      },
-      "name": "_type",
-    },
-  ],
-  "rows": Array [
-    Object {
-      "_id": "hit-id-value",
-      "_index": "hit-index-value",
-      "_score": 77,
-      "_type": "hit-type-value",
-      "fieldTest": 123,
-      "invalidMapping": 345,
-      "nested": Array [
-        Object {
-          "field": 123,
-        },
-      ],
-      "sourceTest": 123,
-    },
-  ],
-  "type": "datatable",
-}
-`;
-
-exports[`tabifyDocs works without provided index pattern 1`] = `
+exports[`tabify_docs tabifyDocs works without provided index pattern 1`] = `
 Object {
   "columns": Array [
     Object {
@@ -475,53 +367,9 @@ Object {
       },
       "name": "sourceTest",
     },
-    Object {
-      "id": "_id",
-      "meta": Object {
-        "field": "_id",
-        "index": undefined,
-        "params": undefined,
-        "type": "string",
-      },
-      "name": "_id",
-    },
-    Object {
-      "id": "_index",
-      "meta": Object {
-        "field": "_index",
-        "index": undefined,
-        "params": undefined,
-        "type": "string",
-      },
-      "name": "_index",
-    },
-    Object {
-      "id": "_score",
-      "meta": Object {
-        "field": "_score",
-        "index": undefined,
-        "params": undefined,
-        "type": "number",
-      },
-      "name": "_score",
-    },
-    Object {
-      "id": "_type",
-      "meta": Object {
-        "field": "_type",
-        "index": undefined,
-        "params": undefined,
-        "type": "string",
-      },
-      "name": "_type",
-    },
   ],
   "rows": Array [
     Object {
-      "_id": "hit-id-value",
-      "_index": "hit-index-value",
-      "_score": 77,
-      "_type": "hit-type-value",
       "fieldTest": 123,
       "invalidMapping": 345,
       "nested": Array [
diff --git a/src/plugins/data/common/search/tabify/index.ts b/src/plugins/data/common/search/tabify/index.ts
index 74fbc7ba4cfa4..279ff705f231c 100644
--- a/src/plugins/data/common/search/tabify/index.ts
+++ b/src/plugins/data/common/search/tabify/index.ts
@@ -6,6 +6,6 @@
  * Side Public License, v 1.
  */
 
-export { tabifyDocs } from './tabify_docs';
+export { tabifyDocs, flattenHit } from './tabify_docs';
 export { tabifyAggResponse } from './tabify';
 export { tabifyGetColumns } from './get_columns';
diff --git a/src/plugins/data/common/search/tabify/tabify_docs.test.ts b/src/plugins/data/common/search/tabify/tabify_docs.test.ts
index 1a3f7195b722e..a2910a1be4a9a 100644
--- a/src/plugins/data/common/search/tabify/tabify_docs.test.ts
+++ b/src/plugins/data/common/search/tabify/tabify_docs.test.ts
@@ -6,71 +6,137 @@
  * Side Public License, v 1.
  */
 
-import { tabifyDocs } from './tabify_docs';
-import { IndexPattern } from '../..';
+import { tabifyDocs, flattenHit } from './tabify_docs';
+import { IndexPattern, DataView } from '../..';
 import type { estypes } from '@elastic/elasticsearch';
 
-describe('tabifyDocs', () => {
-  const fieldFormats = {
-    getInstance: (id: string) => ({ toJSON: () => ({ id }) }),
-    getDefaultInstance: (id: string) => ({ toJSON: () => ({ id }) }),
-  };
+import { fieldFormatsMock } from '../../../../field_formats/common/mocks';
+import { stubbedSavedObjectIndexPattern } from '../../../../data_views/common/data_view.stub';
 
-  const index = new IndexPattern({
+class MockFieldFormatter {}
+
+fieldFormatsMock.getInstance = jest.fn().mockImplementation(() => new MockFieldFormatter()) as any;
+
+// helper function to create index patterns
+function create(id: string) {
+  const {
+    type,
+    version,
+    attributes: { timeFieldName, fields, title },
+  } = stubbedSavedObjectIndexPattern(id);
+
+  return new DataView({
     spec: {
-      id: 'test-index',
-      fields: {
-        sourceTest: { name: 'sourceTest', type: 'number', searchable: true, aggregatable: true },
-        fieldTest: { name: 'fieldTest', type: 'number', searchable: true, aggregatable: true },
-        'nested.field': {
-          name: 'nested.field',
-          type: 'number',
-          searchable: true,
-          aggregatable: true,
-        },
-      },
+      id,
+      type,
+      version,
+      timeFieldName,
+      fields: JSON.parse(fields),
+      title,
+      runtimeFieldMap: {},
     },
-    fieldFormats: fieldFormats as any,
+    fieldFormats: fieldFormatsMock,
+    shortDotsEnable: false,
+    metaFields: ['_id', '_type', '_score', '_routing'],
   });
+}
 
-  // @ts-expect-error not full inteface
-  const response = {
-    hits: {
-      hits: [
+describe('tabify_docs', () => {
+  describe('flattenHit', () => {
+    let indexPattern: DataView;
+
+    // create an indexPattern instance for each test
+    beforeEach(() => {
+      indexPattern = create('test-pattern');
+    });
+
+    it('returns sorted object keys that combine _source, fields and metaFields in a defined order', () => {
+      const response = flattenHit(
         {
-          _id: 'hit-id-value',
-          _index: 'hit-index-value',
-          _type: 'hit-type-value',
-          _score: 77,
-          _source: { sourceTest: 123 },
-          fields: { fieldTest: 123, invalidMapping: 345, nested: [{ field: 123 }] },
+          _index: 'foobar',
+          _id: 'a',
+          _source: {
+            name: 'first',
+          },
+          fields: {
+            date: ['1'],
+            zzz: ['z'],
+            _abc: ['a'],
+          },
         },
-      ],
-    },
-  } as estypes.SearchResponse<unknown>;
-
-  it('converts fields by default', () => {
-    const table = tabifyDocs(response, index);
-    expect(table).toMatchSnapshot();
+        indexPattern
+      );
+      const expectedOrder = ['_abc', 'date', 'name', 'zzz', '_id', '_routing', '_score', '_type'];
+      expect(Object.keys(response)).toEqual(expectedOrder);
+      expect(Object.entries(response).map(([key]) => key)).toEqual(expectedOrder);
+    });
   });
 
-  it('converts source if option is set', () => {
-    const table = tabifyDocs(response, index, { source: true });
-    expect(table).toMatchSnapshot();
-  });
+  describe('tabifyDocs', () => {
+    const fieldFormats = {
+      getInstance: (id: string) => ({ toJSON: () => ({ id }) }),
+      getDefaultInstance: (id: string) => ({ toJSON: () => ({ id }) }),
+    };
 
-  it('skips nested fields if option is set', () => {
-    const table = tabifyDocs(response, index, { shallow: true });
-    expect(table).toMatchSnapshot();
-  });
+    const index = new IndexPattern({
+      spec: {
+        id: 'test-index',
+        fields: {
+          sourceTest: { name: 'sourceTest', type: 'number', searchable: true, aggregatable: true },
+          fieldTest: { name: 'fieldTest', type: 'number', searchable: true, aggregatable: true },
+          'nested.field': {
+            name: 'nested.field',
+            type: 'number',
+            searchable: true,
+            aggregatable: true,
+          },
+        },
+      },
+      metaFields: ['_id', '_index', '_score', '_type'],
+      fieldFormats: fieldFormats as any,
+    });
 
-  it('combines meta fields if meta option is set', () => {
-    const table = tabifyDocs(response, index, { meta: true });
-    expect(table).toMatchSnapshot();
-  });
+    // @ts-expect-error not full inteface
+    const response = {
+      hits: {
+        hits: [
+          {
+            _id: 'hit-id-value',
+            _index: 'hit-index-value',
+            _type: 'hit-type-value',
+            _score: 77,
+            _source: { sourceTest: 123 },
+            fields: { fieldTest: 123, invalidMapping: 345, nested: [{ field: 123 }] },
+          },
+        ],
+      },
+    } as estypes.SearchResponse<unknown>;
+
+    it('converts fields by default', () => {
+      const table = tabifyDocs(response, index);
+      expect(table).toMatchSnapshot();
+    });
+
+    it('converts source if option is set', () => {
+      const table = tabifyDocs(response, index, { source: true });
+      expect(table).toMatchSnapshot();
+    });
+
+    it('skips nested fields if option is set', () => {
+      const table = tabifyDocs(response, index, { shallow: true });
+      expect(table).toMatchSnapshot();
+    });
+
+    it('combines meta fields from index pattern', () => {
+      const table = tabifyDocs(response, index);
+      expect(table.columns.map((col) => col.id)).toEqual(
+        expect.arrayContaining(['_id', '_index', '_score', '_type'])
+      );
+    });
 
-  it('works without provided index pattern', () => {
-    const table = tabifyDocs(response);
-    expect(table).toMatchSnapshot();
+    it('works without provided index pattern', () => {
+      const table = tabifyDocs(response);
+      expect(table).toMatchSnapshot();
+    });
   });
 });
diff --git a/src/plugins/data/common/search/tabify/tabify_docs.ts b/src/plugins/data/common/search/tabify/tabify_docs.ts
index 8e628e7741df5..4259488771761 100644
--- a/src/plugins/data/common/search/tabify/tabify_docs.ts
+++ b/src/plugins/data/common/search/tabify/tabify_docs.ts
@@ -11,12 +11,60 @@ import { isPlainObject } from 'lodash';
 import { IndexPattern } from '../..';
 import { Datatable, DatatableColumn, DatatableColumnType } from '../../../../expressions/common';
 
+type ValidMetaFieldNames = keyof Pick<
+  estypes.SearchHit,
+  | '_id'
+  | '_ignored'
+  | '_index'
+  | '_node'
+  | '_primary_term'
+  | '_routing'
+  | '_score'
+  | '_seq_no'
+  | '_shard'
+  | '_source'
+  | '_type'
+  | '_version'
+>;
+const VALID_META_FIELD_NAMES: ValidMetaFieldNames[] = [
+  '_id',
+  '_ignored',
+  '_index',
+  '_node',
+  '_primary_term',
+  '_routing',
+  '_score',
+  '_seq_no',
+  '_shard',
+  '_source',
+  '_type',
+  '_version',
+];
+
+function isValidMetaFieldName(field: string): field is ValidMetaFieldNames {
+  // Since the array above is more narrowly typed than string[], we cannot use
+  // string to find a value in here. We manually cast it to wider string[] type
+  // so we're able to use `includes` on it.
+  return (VALID_META_FIELD_NAMES as string[]).includes(field);
+}
+
 export interface TabifyDocsOptions {
   shallow?: boolean;
+  /**
+   * If set to `false` the _source of the document, if requested, won't be
+   * merged into the flattened document.
+   */
   source?: boolean;
-  meta?: boolean;
 }
 
+/**
+ * Flattens an individual hit (from an ES response) into an object. This will
+ * create flattened field names, like `user.name`.
+ *
+ * @param hit The hit from an ES reponse's hits.hits[]
+ * @param indexPattern The index pattern for the requested index if available.
+ * @param params Parameters how to flatten the hit
+ */
 export function flattenHit(
   hit: estypes.SearchHit,
   indexPattern?: IndexPattern,
@@ -62,13 +110,36 @@ export function flattenHit(
   if (params?.source !== false && hit._source) {
     flatten(hit._source as Record<string, any>);
   }
-  if (params?.meta !== false) {
-    // combine the fields that Discover allows to add as columns
-    const { _id, _index, _type, _score } = hit;
-    flatten({ _id, _index, _score, _type });
-  }
 
-  return flat;
+  // Merge all valid meta fields into the flattened object
+  // expect for _source (in case that was specified as a meta field)
+  indexPattern?.metaFields?.forEach((metaFieldName) => {
+    if (!isValidMetaFieldName(metaFieldName) || metaFieldName === '_source') {
+      return;
+    }
+    flat[metaFieldName] = hit[metaFieldName];
+  });
+
+  // Use a proxy to make sure that keys are always returned in a specific order,
+  // so we have a guarantee on the flattened order of keys.
+  return new Proxy(flat, {
+    ownKeys: (target) => {
+      return Reflect.ownKeys(target).sort((a, b) => {
+        const aIsMeta = indexPattern?.metaFields?.includes(String(a));
+        const bIsMeta = indexPattern?.metaFields?.includes(String(b));
+        if (aIsMeta && bIsMeta) {
+          return String(a).localeCompare(String(b));
+        }
+        if (aIsMeta) {
+          return 1;
+        }
+        if (bIsMeta) {
+          return -1;
+        }
+        return String(a).localeCompare(String(b));
+      });
+    },
+  });
 }
 
 export const tabifyDocs = (
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 3ae98c083976e..4d51a7ae0ad77 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -52,7 +52,6 @@ import {
   ILLEGAL_CHARACTERS_VISIBLE,
   ILLEGAL_CHARACTERS,
   validateDataView,
-  flattenHitWrapper,
 } from './data_views';
 
 export type { IndexPatternsService } from './data_views';
@@ -69,7 +68,6 @@ export const indexPatterns = {
   getFieldSubtypeMulti,
   getFieldSubtypeNested,
   validate: validateDataView,
-  flattenHitWrapper,
 };
 
 export {
diff --git a/src/plugins/data_views/common/data_views/data_view.ts b/src/plugins/data_views/common/data_views/data_view.ts
index 5768ebe635729..57db127208dc3 100644
--- a/src/plugins/data_views/common/data_views/data_view.ts
+++ b/src/plugins/data_views/common/data_views/data_view.ts
@@ -72,6 +72,9 @@ export class DataView implements IIndexPattern {
     formatField: FormatFieldFn;
   };
   public formatField: FormatFieldFn;
+  /**
+   * @deprecated Use `flattenHit` utility method exported from data plugin instead.
+   */
   public flattenHit: (hit: Record<string, any>, deep?: boolean) => Record<string, any>;
   public metaFields: string[];
   /**
diff --git a/src/plugins/data_views/common/data_views/flatten_hit.ts b/src/plugins/data_views/common/data_views/flatten_hit.ts
index ddf484affa298..0a6388f0914b1 100644
--- a/src/plugins/data_views/common/data_views/flatten_hit.ts
+++ b/src/plugins/data_views/common/data_views/flatten_hit.ts
@@ -6,6 +6,11 @@
  * Side Public License, v 1.
  */
 
+// --------- DEPRECATED ---------
+// This implementation of flattenHit is deprecated and should no longer be used.
+// If you consider adding features to this, please don't but use the `flattenHit`
+// implementation from the data plugin.
+
 import _ from 'lodash';
 import { DataView } from './data_view';
 
@@ -114,15 +119,3 @@ export function flattenHitWrapper(dataView: DataView, metaFields = {}, cache = n
     return decorateFlattened(flattened);
   };
 }
-
-/**
- * This wraps `flattenHitWrapper` so one single cache can be provided for all uses of that
- * function. The returned value of this function is what is included in the index patterns
- * setup contract.
- *
- * @public
- */
-export function createFlattenHitWrapper() {
-  const cache = new WeakMap();
-  return _.partial(flattenHitWrapper, _, _, cache);
-}
diff --git a/src/plugins/data_views/public/index.ts b/src/plugins/data_views/public/index.ts
index 572806df11fa3..5c810ec1fd4c8 100644
--- a/src/plugins/data_views/public/index.ts
+++ b/src/plugins/data_views/public/index.ts
@@ -13,7 +13,7 @@ export {
   ILLEGAL_CHARACTERS,
   validateDataView,
 } from '../common/lib';
-export { flattenHitWrapper, formatHitProvider, onRedirectNoIndexPattern } from './data_views';
+export { formatHitProvider, onRedirectNoIndexPattern } from './data_views';
 
 export { IndexPatternField, IIndexPatternFieldList, TypeMeta } from '../common';
 
diff --git a/src/plugins/discover/public/__mocks__/index_pattern.ts b/src/plugins/discover/public/__mocks__/index_pattern.ts
index f9cc202f9063e..2acb512617a6b 100644
--- a/src/plugins/discover/public/__mocks__/index_pattern.ts
+++ b/src/plugins/discover/public/__mocks__/index_pattern.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { IIndexPatternFieldList } from '../../../data/common';
+import type { estypes } from '@elastic/elasticsearch';
+import { flattenHit, IIndexPatternFieldList } from '../../../data/common';
 import { IndexPattern } from '../../../data/common';
-import { indexPatterns } from '../../../data/public';
 
 const fields = [
   {
@@ -85,10 +85,11 @@ const indexPattern = {
   getFormatterForField: () => ({ convert: () => 'formatted' }),
 } as unknown as IndexPattern;
 
-indexPattern.flattenHit = indexPatterns.flattenHitWrapper(indexPattern, indexPattern.metaFields);
 indexPattern.isTimeBased = () => !!indexPattern.timeFieldName;
 indexPattern.formatField = (hit: Record<string, unknown>, fieldName: string) => {
-  return fieldName === '_source' ? hit._source : indexPattern.flattenHit(hit)[fieldName];
+  return fieldName === '_source'
+    ? hit._source
+    : flattenHit(hit as unknown as estypes.SearchHit, indexPattern)[fieldName];
 };
 
 export const indexPatternMock = indexPattern;
diff --git a/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts b/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts
index 0f64a6c67741d..6cf8e8b3485ff 100644
--- a/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts
+++ b/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { IIndexPatternFieldList } from '../../../data/common';
+import { flattenHit, IIndexPatternFieldList } from '../../../data/common';
 import { IndexPattern } from '../../../data/common';
-import { indexPatterns } from '../../../data/public';
+import type { estypes } from '@elastic/elasticsearch';
 
 const fields = [
   {
@@ -76,10 +76,11 @@ const indexPattern = {
   popularizeField: () => {},
 } as unknown as IndexPattern;
 
-indexPattern.flattenHit = indexPatterns.flattenHitWrapper(indexPattern, indexPattern.metaFields);
 indexPattern.isTimeBased = () => !!indexPattern.timeFieldName;
 indexPattern.formatField = (hit: Record<string, unknown>, fieldName: string) => {
-  return fieldName === '_source' ? hit._source : indexPattern.flattenHit(hit)[fieldName];
+  return fieldName === '_source'
+    ? hit._source
+    : flattenHit(hit as unknown as estypes.SearchHit, indexPattern)[fieldName];
 };
 
 export const indexPatternWithTimefieldMock = indexPattern;
diff --git a/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_row.tsx b/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_row.tsx
index 8d56f2adeaf65..d91735460af08 100644
--- a/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_row.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_row.tsx
@@ -10,6 +10,7 @@ import React, { Fragment, useCallback, useMemo, useState } from 'react';
 import classNames from 'classnames';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonEmpty, EuiIcon } from '@elastic/eui';
+import { flattenHit } from '../../../../../../../../data/common';
 import { DocViewer } from '../../../../../components/doc_viewer/doc_viewer';
 import { FilterManager, IndexPattern } from '../../../../../../../../data/public';
 import { TableCell } from './table_row/table_cell';
@@ -57,7 +58,7 @@ export const TableRow = ({
   });
   const anchorDocTableRowSubj = row.isAnchor ? ' docTableAnchorRow' : '';
 
-  const flattenedRow = useMemo(() => indexPattern.flattenHit(row), [indexPattern, row]);
+  const flattenedRow = useMemo(() => flattenHit(row, indexPattern), [indexPattern, row]);
   const mapping = useMemo(() => indexPattern.fields.getByName, [indexPattern]);
 
   // toggle display of the rows details, a full list of the fields from each row
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar.test.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar.test.tsx
index e53bf006e2b4e..a550dbd59b9fa 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar.test.tsx
@@ -15,7 +15,7 @@ import realHits from '../../../../../__fixtures__/real_hits.js';
 import { mountWithIntl } from '@kbn/test/jest';
 import React from 'react';
 import { DiscoverSidebarProps } from './discover_sidebar';
-import { IndexPatternAttributes } from '../../../../../../../data/common';
+import { flattenHit, IndexPatternAttributes } from '../../../../../../../data/common';
 import { SavedObject } from '../../../../../../../../core/types';
 import { getDefaultFieldFilter } from './lib/field_filter';
 import { DiscoverSidebarComponent as DiscoverSidebar } from './discover_sidebar';
@@ -44,7 +44,7 @@ function getCompProps(): DiscoverSidebarProps {
   const fieldCounts: Record<string, number> = {};
 
   for (const hit of hits) {
-    for (const key of Object.keys(indexPattern.flattenHit(hit))) {
+    for (const key of Object.keys(flattenHit(hit, indexPattern))) {
       fieldCounts[key] = (fieldCounts[key] || 0) + 1;
     }
   }
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.test.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.test.tsx
index 9d73f885c988d..ded7897d2a9e5 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.test.tsx
@@ -15,7 +15,7 @@ import realHits from '../../../../../__fixtures__/real_hits.js';
 import { act } from 'react-dom/test-utils';
 import { mountWithIntl } from '@kbn/test/jest';
 import React from 'react';
-import { IndexPatternAttributes } from '../../../../../../../data/common';
+import { flattenHit, IndexPatternAttributes } from '../../../../../../../data/common';
 import { SavedObject } from '../../../../../../../../core/types';
 import {
   DiscoverSidebarResponsive,
@@ -72,7 +72,7 @@ function getCompProps(): DiscoverSidebarResponsiveProps {
   const indexPattern = stubLogstashIndexPattern;
 
   // @ts-expect-error _.each() is passing additional args to flattenHit
-  const hits = each(cloneDeep(realHits), indexPattern.flattenHit) as Array<
+  const hits = each(cloneDeep(realHits), (hit) => flattenHit(hit, indexPattern)) as Array<
     Record<string, unknown>
   > as ElasticSearchHit[];
 
@@ -83,7 +83,7 @@ function getCompProps(): DiscoverSidebarResponsiveProps {
   ];
 
   for (const hit of hits) {
-    for (const key of Object.keys(indexPattern.flattenHit(hit))) {
+    for (const key of Object.keys(flattenHit(hit, indexPattern))) {
       mockfieldCounts[key] = (mockfieldCounts[key] || 0) + 1;
     }
   }
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.js b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.js
index 8f86cdad82cf7..be7e9c616273d 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.js
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.js
@@ -8,12 +8,12 @@
 
 import { map, sortBy, without, each, defaults, isObject } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { flattenHit } from '../../../../../../../../data/common';
 
 function getFieldValues(hits, field, indexPattern) {
   const name = field.name;
-  const flattenHit = indexPattern.flattenHit;
   return map(hits, function (hit) {
-    return flattenHit(hit)[name];
+    return flattenHit(hit, indexPattern)[name];
   });
 }
 
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.test.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.test.ts
index c3ff7970c5aac..d4bc41f36b2d4 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.test.ts
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.test.ts
@@ -13,6 +13,7 @@ import { keys, each, cloneDeep, clone, uniq, filter, map } from 'lodash';
 import realHits from '../../../../../../__fixtures__/real_hits.js';
 
 import { IndexPattern } from '../../../../../../../../data/public';
+import { flattenHit } from '../../../../../../../../data/common';
 
 // @ts-expect-error
 import { fieldCalculator } from './field_calculator';
@@ -120,7 +121,7 @@ describe('fieldCalculator', function () {
     let hits: any;
 
     beforeEach(function () {
-      hits = each(cloneDeep(realHits), (hit) => indexPattern.flattenHit(hit));
+      hits = each(cloneDeep(realHits), (hit) => flattenHit(hit, indexPattern));
     });
 
     it('Should return an array of values for _source fields', function () {
diff --git a/src/plugins/discover/public/application/apps/main/utils/calc_field_counts.ts b/src/plugins/discover/public/application/apps/main/utils/calc_field_counts.ts
index 1ce7023539be4..211c4e5c8b069 100644
--- a/src/plugins/discover/public/application/apps/main/utils/calc_field_counts.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/calc_field_counts.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { IndexPattern } from 'src/plugins/data/common';
+import { flattenHit, IndexPattern } from '../../../../../../data/common';
 import { ElasticSearchHit } from '../../../doc_views/doc_views_types';
 
 /**
@@ -22,7 +22,7 @@ export function calcFieldCounts(
     return {};
   }
   for (const hit of rows) {
-    const fields = Object.keys(indexPattern.flattenHit(hit));
+    const fields = Object.keys(flattenHit(hit, indexPattern));
     for (const fieldName of fields) {
       counts[fieldName] = (counts[fieldName] || 0) + 1;
     }
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid.tsx
index 0fe506b3b8537..11323080274a9 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid.tsx
@@ -21,7 +21,7 @@ import {
   EuiLoadingSpinner,
   EuiIcon,
 } from '@elastic/eui';
-import type { IndexPattern } from 'src/plugins/data/common';
+import { flattenHit, IndexPattern } from '../../../../../data/common';
 import { DocViewFilterFn, ElasticSearchHit } from '../../doc_views/doc_views_types';
 import { getSchemaDetectors } from './discover_grid_schema';
 import { DiscoverGridFlyout } from './discover_grid_flyout';
@@ -271,7 +271,7 @@ export const DiscoverGrid = ({
       getRenderCellValueFn(
         indexPattern,
         displayedRows,
-        displayedRows ? displayedRows.map((hit) => indexPattern.flattenHit(hit)) : [],
+        displayedRows ? displayedRows.map((hit) => flattenHit(hit, indexPattern)) : [],
         useNewFieldsApi,
         fieldsToShow,
         services.uiSettings.get(MAX_DOC_FIELDS_DISPLAYED)
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx
index b1823eb3d668c..a31b551821ddb 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx
@@ -9,7 +9,7 @@
 import React, { useContext } from 'react';
 import { EuiDataGridColumnCellActionProps } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { IndexPatternField } from '../../../../../data/common';
+import { flattenHit, IndexPatternField } from '../../../../../data/common';
 import { DiscoverGridContext } from './discover_grid_context';
 
 export const FilterInBtn = ({
@@ -27,7 +27,7 @@ export const FilterInBtn = ({
     <Component
       onClick={() => {
         const row = context.rows[rowIndex];
-        const flattened = context.indexPattern.flattenHit(row);
+        const flattened = flattenHit(row, context.indexPattern);
 
         if (flattened) {
           context.onFilter(columnId, flattened[columnId], '+');
@@ -60,7 +60,7 @@ export const FilterOutBtn = ({
     <Component
       onClick={() => {
         const row = context.rows[rowIndex];
-        const flattened = context.indexPattern.flattenHit(row);
+        const flattened = flattenHit(row, context.indexPattern);
 
         if (flattened) {
           context.onFilter(columnId, flattened[columnId], '-');
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_document_selection.test.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_document_selection.test.tsx
index 41cf3f5a68edb..e9b93e21553a2 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_document_selection.test.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_document_selection.test.tsx
@@ -17,6 +17,17 @@ import { esHits } from '../../../__mocks__/es_hits';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
 import { DiscoverGridContext } from './discover_grid_context';
 
+const baseContextMock = {
+  expanded: undefined,
+  setExpanded: jest.fn(),
+  rows: esHits,
+  onFilter: jest.fn(),
+  indexPattern: indexPatternMock,
+  isDarkMode: false,
+  selectedDocs: [],
+  setSelectedDocs: jest.fn(),
+};
+
 describe('document selection', () => {
   describe('getDocId', () => {
     test('doc with custom routing', () => {
@@ -39,14 +50,7 @@ describe('document selection', () => {
   describe('SelectButton', () => {
     test('is not checked', () => {
       const contextMock = {
-        expanded: undefined,
-        setExpanded: jest.fn(),
-        rows: esHits,
-        onFilter: jest.fn(),
-        indexPattern: indexPatternMock,
-        isDarkMode: false,
-        selectedDocs: [],
-        setSelectedDocs: jest.fn(),
+        ...baseContextMock,
       };
 
       const component = mountWithIntl(
@@ -68,14 +72,8 @@ describe('document selection', () => {
 
     test('is checked', () => {
       const contextMock = {
-        expanded: undefined,
-        setExpanded: jest.fn(),
-        rows: esHits,
-        onFilter: jest.fn(),
-        indexPattern: indexPatternMock,
-        isDarkMode: false,
+        ...baseContextMock,
         selectedDocs: ['i::1::'],
-        setSelectedDocs: jest.fn(),
       };
 
       const component = mountWithIntl(
@@ -97,14 +95,7 @@ describe('document selection', () => {
 
     test('adding a selection', () => {
       const contextMock = {
-        expanded: undefined,
-        setExpanded: jest.fn(),
-        rows: esHits,
-        onFilter: jest.fn(),
-        indexPattern: indexPatternMock,
-        isDarkMode: false,
-        selectedDocs: [],
-        setSelectedDocs: jest.fn(),
+        ...baseContextMock,
       };
 
       const component = mountWithIntl(
@@ -126,14 +117,8 @@ describe('document selection', () => {
     });
     test('removing a selection', () => {
       const contextMock = {
-        expanded: undefined,
-        setExpanded: jest.fn(),
-        rows: esHits,
-        onFilter: jest.fn(),
-        indexPattern: indexPatternMock,
-        isDarkMode: false,
+        ...baseContextMock,
         selectedDocs: ['i::1::'],
-        setSelectedDocs: jest.fn(),
       };
 
       const component = mountWithIntl(
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_expand_button.test.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_expand_button.test.tsx
index d1299b39a25b2..3f7cb70091cfa 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_expand_button.test.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_expand_button.test.tsx
@@ -14,17 +14,21 @@ import { DiscoverGridContext } from './discover_grid_context';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
 import { esHits } from '../../../__mocks__/es_hits';
 
+const baseContextMock = {
+  expanded: undefined,
+  setExpanded: jest.fn(),
+  rows: esHits,
+  onFilter: jest.fn(),
+  indexPattern: indexPatternMock,
+  isDarkMode: false,
+  selectedDocs: [],
+  setSelectedDocs: jest.fn(),
+};
+
 describe('Discover grid view button ', function () {
   it('when no document is expanded, setExpanded is called with current document', async () => {
     const contextMock = {
-      expanded: undefined,
-      setExpanded: jest.fn(),
-      rows: esHits,
-      onFilter: jest.fn(),
-      indexPattern: indexPatternMock,
-      isDarkMode: false,
-      selectedDocs: [],
-      setSelectedDocs: jest.fn(),
+      ...baseContextMock,
     };
 
     const component = mountWithIntl(
@@ -45,14 +49,8 @@ describe('Discover grid view button ', function () {
   });
   it('when the current document is expanded, setExpanded is called with undefined', async () => {
     const contextMock = {
+      ...baseContextMock,
       expanded: esHits[0],
-      setExpanded: jest.fn(),
-      rows: esHits,
-      onFilter: jest.fn(),
-      indexPattern: indexPatternMock,
-      isDarkMode: false,
-      selectedDocs: [],
-      setSelectedDocs: jest.fn(),
     };
 
     const component = mountWithIntl(
@@ -73,14 +71,8 @@ describe('Discover grid view button ', function () {
   });
   it('when another document is expanded, setExpanded is called with the current document', async () => {
     const contextMock = {
+      ...baseContextMock,
       expanded: esHits[0],
-      setExpanded: jest.fn(),
-      rows: esHits,
-      onFilter: jest.fn(),
-      indexPattern: indexPatternMock,
-      isDarkMode: false,
-      selectedDocs: [],
-      setSelectedDocs: jest.fn(),
     };
 
     const component = mountWithIntl(
diff --git a/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.test.tsx b/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.test.tsx
index 5aca237d46581..6556876217953 100644
--- a/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.test.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.test.tsx
@@ -11,6 +11,7 @@ import { ReactWrapper, shallow } from 'enzyme';
 import { getRenderCellValueFn } from './get_render_cell_value';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
 import { ElasticSearchHit } from '../../doc_views/doc_views_types';
+import { flattenHit } from 'src/plugins/data/common';
 
 jest.mock('../../../../../kibana_react/public', () => ({
   useUiSetting: () => true,
@@ -68,12 +69,16 @@ const rowsFieldsWithTopLevelObject: ElasticSearchHit[] = [
   },
 ];
 
+const flatten = (hit: ElasticSearchHit): Record<string, unknown> => {
+  return flattenHit(hit, indexPatternMock);
+};
+
 describe('Discover grid cell rendering', function () {
   it('renders bytes column correctly', () => {
     const DiscoverGridCellValue = getRenderCellValueFn(
       indexPatternMock,
       rowsSource,
-      rowsSource.map((row) => indexPatternMock.flattenHit(row)),
+      rowsSource.map(flatten),
       false,
       [],
       100
@@ -95,7 +100,7 @@ describe('Discover grid cell rendering', function () {
     const DiscoverGridCellValue = getRenderCellValueFn(
       indexPatternMock,
       rowsSource,
-      rowsSource.map((row) => indexPatternMock.flattenHit(row)),
+      rowsSource.map(flatten),
       false,
       [],
       100
@@ -146,7 +151,7 @@ describe('Discover grid cell rendering', function () {
     const DiscoverGridCellValue = getRenderCellValueFn(
       indexPatternMock,
       rowsSource,
-      rowsSource.map((row) => indexPatternMock.flattenHit(row)),
+      rowsSource.map(flatten),
       false,
       [],
       100
@@ -189,7 +194,7 @@ describe('Discover grid cell rendering', function () {
     const DiscoverGridCellValue = getRenderCellValueFn(
       indexPatternMock,
       rowsFields,
-      rowsFields.map((row) => indexPatternMock.flattenHit(row)),
+      rowsFields.map(flatten),
       true,
       [],
       100
@@ -244,7 +249,7 @@ describe('Discover grid cell rendering', function () {
     const DiscoverGridCellValue = getRenderCellValueFn(
       indexPatternMock,
       rowsFields,
-      rowsFields.map((row) => indexPatternMock.flattenHit(row)),
+      rowsFields.map(flatten),
       true,
       [],
       // this is the number of rendered items
@@ -287,7 +292,7 @@ describe('Discover grid cell rendering', function () {
     const DiscoverGridCellValue = getRenderCellValueFn(
       indexPatternMock,
       rowsFields,
-      rowsFields.map((row) => indexPatternMock.flattenHit(row)),
+      rowsFields.map(flatten),
       true,
       [],
       100
@@ -335,7 +340,7 @@ describe('Discover grid cell rendering', function () {
     const DiscoverGridCellValue = getRenderCellValueFn(
       indexPatternMock,
       rowsFieldsWithTopLevelObject,
-      rowsFieldsWithTopLevelObject.map((row) => indexPatternMock.flattenHit(row)),
+      rowsFieldsWithTopLevelObject.map(flatten),
       true,
       [],
       100
@@ -376,7 +381,7 @@ describe('Discover grid cell rendering', function () {
     const DiscoverGridCellValue = getRenderCellValueFn(
       indexPatternMock,
       rowsFieldsWithTopLevelObject,
-      rowsFieldsWithTopLevelObject.map((row) => indexPatternMock.flattenHit(row)),
+      rowsFieldsWithTopLevelObject.map(flatten),
       true,
       [],
       100
@@ -416,7 +421,7 @@ describe('Discover grid cell rendering', function () {
     const DiscoverGridCellValue = getRenderCellValueFn(
       indexPatternMock,
       rowsFieldsWithTopLevelObject,
-      rowsFieldsWithTopLevelObject.map((row) => indexPatternMock.flattenHit(row)),
+      rowsFieldsWithTopLevelObject.map(flatten),
       true,
       [],
       100
@@ -447,7 +452,7 @@ describe('Discover grid cell rendering', function () {
     const DiscoverGridCellValue = getRenderCellValueFn(
       indexPatternMock,
       rowsFieldsWithTopLevelObject,
-      rowsFieldsWithTopLevelObject.map((row) => indexPatternMock.flattenHit(row)),
+      rowsFieldsWithTopLevelObject.map(flatten),
       true,
       [],
       100
@@ -466,7 +471,9 @@ describe('Discover grid cell rendering', function () {
       <span
         dangerouslySetInnerHTML={
           Object {
-            "__html": 100,
+            "__html": Array [
+              100,
+            ],
           }
         }
       />
@@ -477,7 +484,7 @@ describe('Discover grid cell rendering', function () {
     const DiscoverGridCellValue = getRenderCellValueFn(
       indexPatternMock,
       rowsSource,
-      rowsSource.map((row) => indexPatternMock.flattenHit(row)),
+      rowsSource.map(flatten),
       false,
       [],
       100
@@ -499,7 +506,7 @@ describe('Discover grid cell rendering', function () {
     const DiscoverGridCellValue = getRenderCellValueFn(
       indexPatternMock,
       rowsSource,
-      rowsSource.map((row) => indexPatternMock.flattenHit(row)),
+      rowsSource.map(flatten),
       false,
       [],
       100
diff --git a/src/plugins/discover/public/application/components/table/table.test.tsx b/src/plugins/discover/public/application/components/table/table.test.tsx
index 3f010d9d07737..ce914edcec703 100644
--- a/src/plugins/discover/public/application/components/table/table.test.tsx
+++ b/src/plugins/discover/public/application/components/table/table.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test/jest';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { DocViewerTable, DocViewerTableProps } from './table';
-import { indexPatterns, IndexPattern } from '../../../../../data/public';
+import { IndexPattern } from '../../../../../data/public';
 import { ElasticSearchHit } from '../../doc_views/doc_views_types';
 
 jest.mock('../../../kibana_services', () => ({
@@ -65,7 +65,7 @@ const indexPattern = {
     ],
   },
   metaFields: ['_index', '_score'],
-  flattenHit: undefined,
+  flattenHit: jest.fn(),
   formatHit: jest.fn((hit) => hit._source),
 } as unknown as IndexPattern;
 
@@ -73,8 +73,6 @@ indexPattern.fields.getByName = (name: string) => {
   return indexPattern.fields.getAll().find((field) => field.name === name);
 };
 
-indexPattern.flattenHit = indexPatterns.flattenHitWrapper(indexPattern, indexPattern.metaFields);
-
 const mountComponent = (props: DocViewerTableProps) => {
   return mountWithIntl(<DocViewerTable {...props} />);
 };
diff --git a/src/plugins/discover/public/application/components/table/table.tsx b/src/plugins/discover/public/application/components/table/table.tsx
index eab3ba6e3d29a..7f597d846f88f 100644
--- a/src/plugins/discover/public/application/components/table/table.tsx
+++ b/src/plugins/discover/public/application/components/table/table.tsx
@@ -9,6 +9,7 @@
 import React, { useCallback, useMemo } from 'react';
 import { EuiInMemoryTable } from '@elastic/eui';
 import { IndexPattern, IndexPatternField } from '../../../../../data/public';
+import { flattenHit } from '../../../../../data/common';
 import { SHOW_MULTIFIELDS } from '../../../../common';
 import { getServices } from '../../../kibana_services';
 import { isNestedFieldParent } from '../../apps/main/utils/nested_fields';
@@ -95,7 +96,7 @@ export const DocViewerTable = ({
     return null;
   }
 
-  const flattened = indexPattern?.flattenHit(hit);
+  const flattened = flattenHit(hit, indexPattern, { source: true });
   const fieldsToShow = getFieldsToShow(Object.keys(flattened), indexPattern, showMultiFields);
 
   const items: FieldRecord[] = Object.keys(flattened)
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts
index f393661e4c490..1902c4ed0272e 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts
@@ -75,6 +75,7 @@ const mockSearchSourceGetFieldDefault = jest.fn().mockImplementation((key: strin
           getByName: jest.fn().mockImplementation(() => []),
           getByType: jest.fn().mockImplementation(() => []),
         },
+        metaFields: ['_id', '_index', '_type', '_score'],
         getFormatterForField: jest.fn(),
       };
   }
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
index c269677ae930d..6c2989d54309d 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
@@ -356,7 +356,7 @@ export class CsvGenerator {
 
         let table: Datatable | undefined;
         try {
-          table = tabifyDocs(results, index, { shallow: true, meta: true });
+          table = tabifyDocs(results, index, { shallow: true });
         } catch (err) {
           this.logger.error(err);
         }

From f52c718f112bdba3320ac4591a7d3098082f7014 Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Thu, 14 Oct 2021 09:07:22 -0400
Subject: [PATCH 069/117] fix cloudwatch category assignmet (#114928)

---
 src/plugins/home/server/tutorials/cloudwatch_logs/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/home/server/tutorials/cloudwatch_logs/index.ts b/src/plugins/home/server/tutorials/cloudwatch_logs/index.ts
index dd035a66c5ced..cf0c27ed9be73 100644
--- a/src/plugins/home/server/tutorials/cloudwatch_logs/index.ts
+++ b/src/plugins/home/server/tutorials/cloudwatch_logs/index.ts
@@ -53,6 +53,6 @@ export function cloudwatchLogsSpecProvider(context: TutorialContext): TutorialSc
     onPrem: onPremInstructions([], context),
     elasticCloud: cloudInstructions(),
     onPremElasticCloud: onPremCloudInstructions(),
-    integrationBrowserCategories: ['security', 'network', 'web'],
+    integrationBrowserCategories: ['aws', 'cloud', 'datastore', 'security', 'network'],
   };
 }

From 4db243703649d955500208a4ca89690b52e5fc23 Mon Sep 17 00:00:00 2001
From: Marco Liberati <dej611@users.noreply.github.com>
Date: Thu, 14 Oct 2021 15:28:40 +0200
Subject: [PATCH 070/117] [Lens] Thresholds: when computing default static
 value take into account all layer metrics (#113647)

* :sparkles: compute the default threshold based on data bounds

* :bug: Fix multi layer types issue

* :white_check_mark: Fix test

* :white_check_mark: Fix other test

* :bug: Fix computation bug for the initial static value

* :white_check_mark: Add new suite of test for static value computation

* :bug: Fix extents bug and refactor in a single function + tests

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../public/xy_visualization/expression.tsx    |  30 +-
 .../public/xy_visualization/state_helpers.ts  |   4 +
 .../threshold_helpers.test.ts                 | 569 ++++++++++++++++++
 .../xy_visualization/threshold_helpers.tsx    | 146 +++--
 4 files changed, 700 insertions(+), 49 deletions(-)
 create mode 100644 x-pack/plugins/lens/public/xy_visualization/threshold_helpers.test.ts

diff --git a/x-pack/plugins/lens/public/xy_visualization/expression.tsx b/x-pack/plugins/lens/public/xy_visualization/expression.tsx
index 87462e71f3cf6..7aee537ebbedd 100644
--- a/x-pack/plugins/lens/public/xy_visualization/expression.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/expression.tsx
@@ -67,6 +67,7 @@ import {
   getThresholdRequiredPaddings,
   ThresholdAnnotations,
 } from './expression_thresholds';
+import { computeOverallDataDomain } from './threshold_helpers';
 
 declare global {
   interface Window {
@@ -250,6 +251,10 @@ export function XYChart({
   const chartBaseTheme = chartsThemeService.useChartsBaseTheme();
   const darkMode = chartsThemeService.useDarkMode();
   const filteredLayers = getFilteredLayers(layers, data);
+  const layersById = filteredLayers.reduce((memo, layer) => {
+    memo[layer.layerId] = layer;
+    return memo;
+  }, {} as Record<string, LayerArgs>);
 
   const handleCursorUpdate = useActiveCursor(chartsActiveCursorService, chartRef, {
     datatables: Object.values(data.tables),
@@ -386,7 +391,7 @@ export function XYChart({
     const extent = axis.groupId === 'left' ? yLeftExtent : yRightExtent;
     const hasBarOrArea = Boolean(
       axis.series.some((series) => {
-        const seriesType = filteredLayers.find((l) => l.layerId === series.layer)?.seriesType;
+        const seriesType = layersById[series.layer]?.seriesType;
         return seriesType?.includes('bar') || seriesType?.includes('area');
       })
     );
@@ -406,20 +411,15 @@ export function XYChart({
       );
       if (!fit && axisHasThreshold) {
         // Remove this once the chart will support automatic annotation fit for other type of charts
-        for (const series of axis.series) {
-          const table = data.tables[series.layer];
-          for (const row of table.rows) {
-            for (const column of table.columns) {
-              if (column.id === series.accessor) {
-                const value = row[column.id];
-                if (typeof value === 'number') {
-                  // keep the 0 in view
-                  max = Math.max(value, max || 0, 0);
-                  min = Math.min(value, min || 0, 0);
-                }
-              }
-            }
-          }
+        const { min: computedMin, max: computedMax } = computeOverallDataDomain(
+          filteredLayers,
+          axis.series.map(({ accessor }) => accessor),
+          data.tables
+        );
+
+        if (computedMin != null && computedMax != null) {
+          max = Math.max(computedMax, max || 0);
+          min = Math.min(computedMin, min || 0);
         }
         for (const { layerId, yConfig } of thresholdLayers) {
           const table = data.tables[layerId];
diff --git a/x-pack/plugins/lens/public/xy_visualization/state_helpers.ts b/x-pack/plugins/lens/public/xy_visualization/state_helpers.ts
index 4edf7fdf5e512..14a82011cb526 100644
--- a/x-pack/plugins/lens/public/xy_visualization/state_helpers.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/state_helpers.ts
@@ -26,6 +26,10 @@ export function isPercentageSeries(seriesType: SeriesType) {
   );
 }
 
+export function isStackedChart(seriesType: SeriesType) {
+  return seriesType.includes('stacked');
+}
+
 export function isHorizontalChart(layers: Array<{ seriesType: SeriesType }>) {
   return layers.every((l) => isHorizontalSeries(l.seriesType));
 }
diff --git a/x-pack/plugins/lens/public/xy_visualization/threshold_helpers.test.ts b/x-pack/plugins/lens/public/xy_visualization/threshold_helpers.test.ts
new file mode 100644
index 0000000000000..d7286de0316d6
--- /dev/null
+++ b/x-pack/plugins/lens/public/xy_visualization/threshold_helpers.test.ts
@@ -0,0 +1,569 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { XYLayerConfig } from '../../common/expressions';
+import { FramePublicAPI } from '../types';
+import { computeOverallDataDomain, getStaticValue } from './threshold_helpers';
+
+function getActiveData(json: Array<{ id: string; rows: Array<Record<string, number | null>> }>) {
+  return json.reduce((memo, { id, rows }) => {
+    const columns = Object.keys(rows[0]).map((columnId) => ({
+      id: columnId,
+      name: columnId,
+      meta: { type: 'number' as const },
+    }));
+    memo[id] = {
+      type: 'datatable' as const,
+      columns,
+      rows,
+    };
+    return memo;
+  }, {} as NonNullable<FramePublicAPI['activeData']>);
+}
+
+describe('threshold helpers', () => {
+  describe('getStaticValue', () => {
+    const hasDateHistogram = () => false;
+    const hasAllNumberHistogram = () => true;
+
+    it('should return fallback value on missing data', () => {
+      expect(getStaticValue([], 'x', {}, hasAllNumberHistogram)).toBe(100);
+    });
+
+    it('should return fallback value on no-configuration/missing hit on current data', () => {
+      // no-config: missing layer
+      expect(
+        getStaticValue(
+          [],
+          'x',
+          {
+            activeData: getActiveData([
+              { id: 'id-a', rows: Array(3).fill({ a: 100, b: 100, c: 100 }) },
+            ]),
+          },
+          hasAllNumberHistogram
+        )
+      ).toBe(100);
+      // accessor id has no hit in data
+      expect(
+        getStaticValue(
+          [{ layerId: 'id-a', seriesType: 'area' } as XYLayerConfig], // missing xAccessor for groupId == x
+          'x',
+          {
+            activeData: getActiveData([
+              { id: 'id-a', rows: Array(3).fill({ a: 100, b: 100, c: 100 }) },
+            ]),
+          },
+          hasAllNumberHistogram
+        )
+      ).toBe(100);
+      expect(
+        getStaticValue(
+          [
+            {
+              layerId: 'id-a',
+              seriesType: 'area',
+              layerType: 'data',
+              accessors: ['d'],
+            } as XYLayerConfig,
+          ], // missing hit of accessor "d" in data
+          'yLeft',
+          {
+            activeData: getActiveData([
+              { id: 'id-a', rows: Array(3).fill({ a: 100, b: 100, c: 100 }) },
+            ]),
+          },
+          hasAllNumberHistogram
+        )
+      ).toBe(100);
+      expect(
+        getStaticValue(
+          [
+            {
+              layerId: 'id-a',
+              seriesType: 'area',
+              layerType: 'data',
+              accessors: ['a'],
+            } as XYLayerConfig,
+          ], // missing yConfig fallbacks to left axis, but the requested group is yRight
+          'yRight',
+          {
+            activeData: getActiveData([
+              { id: 'id-a', rows: Array(3).fill({ a: 100, b: 100, c: 100 }) },
+            ]),
+          },
+          hasAllNumberHistogram
+        )
+      ).toBe(100);
+      expect(
+        getStaticValue(
+          [
+            {
+              layerId: 'id-a',
+              seriesType: 'area',
+              layerType: 'data',
+              accessors: ['a'],
+            } as XYLayerConfig,
+          ], // same as above with x groupId
+          'x',
+          {
+            activeData: getActiveData([
+              { id: 'id-a', rows: Array(3).fill({ a: 100, b: 100, c: 100 }) },
+            ]),
+          },
+          hasAllNumberHistogram
+        )
+      ).toBe(100);
+    });
+
+    it('should work for no yConfig defined and fallback to left axis', () => {
+      expect(
+        getStaticValue(
+          [
+            {
+              layerId: 'id-a',
+              seriesType: 'area',
+              layerType: 'data',
+              accessors: ['a'],
+            } as XYLayerConfig,
+          ],
+          'yLeft',
+          {
+            activeData: getActiveData([
+              { id: 'id-a', rows: Array(3).fill({ a: 100, b: 100, c: 100 }) },
+            ]),
+          },
+          hasAllNumberHistogram
+        )
+      ).toBe(75); // 3/4 of "a" only
+    });
+
+    it('should extract axis side from yConfig', () => {
+      expect(
+        getStaticValue(
+          [
+            {
+              layerId: 'id-a',
+              seriesType: 'area',
+              layerType: 'data',
+              accessors: ['a'],
+              yConfig: [{ forAccessor: 'a', axisMode: 'right' }],
+            } as XYLayerConfig,
+          ],
+          'yRight',
+          {
+            activeData: getActiveData([
+              { id: 'id-a', rows: Array(3).fill({ a: 100, b: 100, c: 100 }) },
+            ]),
+          },
+          hasAllNumberHistogram
+        )
+      ).toBe(75); // 3/4 of "a" only
+    });
+
+    it('should correctly distribute axis on left and right with different formatters when in auto', () => {
+      const tables = getActiveData([
+        { id: 'id-a', rows: Array(3).fill({ a: 100, b: 200, c: 100 }) },
+      ]);
+      tables['id-a'].columns[0].meta.params = { id: 'number' }; // a: number formatter
+      tables['id-a'].columns[1].meta.params = { id: 'percent' }; // b: percent formatter
+      expect(
+        getStaticValue(
+          [
+            {
+              layerId: 'id-a',
+              seriesType: 'area',
+              layerType: 'data',
+              accessors: ['a', 'b'],
+            } as XYLayerConfig,
+          ],
+          'yLeft',
+          { activeData: tables },
+          hasAllNumberHistogram
+        )
+      ).toBe(75); // 3/4 of "a" only
+      expect(
+        getStaticValue(
+          [
+            {
+              layerId: 'id-a',
+              seriesType: 'area',
+              layerType: 'data',
+              accessors: ['a', 'b'],
+            } as XYLayerConfig,
+          ],
+          'yRight',
+          { activeData: tables },
+          hasAllNumberHistogram
+        )
+      ).toBe(150); // 3/4 of "b" only
+    });
+
+    it('should ignore hasHistogram for left or right axis', () => {
+      const tables = getActiveData([
+        { id: 'id-a', rows: Array(3).fill({ a: 100, b: 200, c: 100 }) },
+      ]);
+      tables['id-a'].columns[0].meta.params = { id: 'number' }; // a: number formatter
+      tables['id-a'].columns[1].meta.params = { id: 'percent' }; // b: percent formatter
+      expect(
+        getStaticValue(
+          [
+            {
+              layerId: 'id-a',
+              seriesType: 'area',
+              layerType: 'data',
+              accessors: ['a', 'b'],
+            } as XYLayerConfig,
+          ],
+          'yLeft',
+          { activeData: tables },
+          hasDateHistogram
+        )
+      ).toBe(75); // 3/4 of "a" only
+      expect(
+        getStaticValue(
+          [
+            {
+              layerId: 'id-a',
+              seriesType: 'area',
+              layerType: 'data',
+              accessors: ['a', 'b'],
+            } as XYLayerConfig,
+          ],
+          'yRight',
+          { activeData: tables },
+          hasDateHistogram
+        )
+      ).toBe(150); // 3/4 of "b" only
+    });
+
+    it('should early exit for x group if a date histogram is detected', () => {
+      expect(
+        getStaticValue(
+          [
+            {
+              layerId: 'id-a',
+              seriesType: 'area',
+              layerType: 'data',
+              xAccessor: 'a',
+              accessors: [],
+            } as XYLayerConfig,
+          ],
+          'x', // this is influenced by the callback
+          {
+            activeData: getActiveData([
+              { id: 'id-a', rows: Array(3).fill({ a: 100, b: 100, c: 100 }) },
+            ]),
+          },
+          hasDateHistogram
+        )
+      ).toBe(100);
+    });
+
+    it('should not force zero-based interval for x group', () => {
+      expect(
+        getStaticValue(
+          [
+            {
+              layerId: 'id-a',
+              seriesType: 'area',
+              layerType: 'data',
+              xAccessor: 'a',
+              accessors: [],
+            } as XYLayerConfig,
+          ],
+          'x',
+          {
+            activeData: getActiveData([
+              {
+                id: 'id-a',
+                rows: Array(3)
+                  .fill(1)
+                  .map((_, i) => ({ a: i % 2 ? 33 : 50 })),
+              },
+            ]),
+          },
+          hasAllNumberHistogram
+        )
+      ).toBe(45.75); // 33 (min) + (50 - 33) * 3/4
+    });
+  });
+
+  describe('computeOverallDataDomain', () => {
+    it('should compute the correct value for a single layer with stacked series', () => {
+      for (const seriesType of ['bar_stacked', 'bar_horizontal_stacked', 'area_stacked'])
+        expect(
+          computeOverallDataDomain(
+            [{ layerId: 'id-a', seriesType, accessors: ['a', 'b', 'c'] } as XYLayerConfig],
+            ['a', 'b', 'c'],
+            getActiveData([
+              {
+                id: 'id-a',
+                rows: Array(3)
+                  .fill(1)
+                  .map((_, i) => ({
+                    a: i === 0 ? 25 : null,
+                    b: i === 1 ? 50 : null,
+                    c: i === 2 ? 75 : null,
+                  })),
+              },
+            ])
+          )
+        ).toEqual({ min: 0, max: 150 }); // there's just one series with 150, so the lowerbound fallbacks to 0
+    });
+
+    it('should work for percentage series', () => {
+      for (const seriesType of [
+        'bar_percentage_stacked',
+        'bar_horizontal_percentage_stacked',
+        'area_percentage_stacked',
+      ])
+        expect(
+          computeOverallDataDomain(
+            [{ layerId: 'id-a', seriesType, accessors: ['a', 'b', 'c'] } as XYLayerConfig],
+            ['a', 'b', 'c'],
+            getActiveData([
+              {
+                id: 'id-a',
+                rows: Array(3)
+                  .fill(1)
+                  .map((_, i) => ({
+                    a: i === 0 ? 0.25 : null,
+                    b: i === 1 ? 0.25 : null,
+                    c: i === 2 ? 0.25 : null,
+                  })),
+              },
+            ])
+          )
+        ).toEqual({ min: 0, max: 0.75 });
+    });
+
+    it('should compute the correct value for multiple layers with stacked series', () => {
+      for (const seriesType of ['bar_stacked', 'bar_horizontal_stacked', 'area_stacked']) {
+        expect(
+          computeOverallDataDomain(
+            [
+              { layerId: 'id-a', seriesType, accessors: ['a', 'b', 'c'] },
+              { layerId: 'id-b', seriesType, accessors: ['d', 'e', 'f'] },
+            ] as XYLayerConfig[],
+            ['a', 'b', 'c', 'd', 'e', 'f'],
+            getActiveData([
+              { id: 'id-a', rows: [{ a: 25, b: 100, c: 100 }] },
+              { id: 'id-b', rows: [{ d: 50, e: 50, f: 50 }] },
+            ])
+          )
+        ).toEqual({ min: 0, max: 375 });
+        // same as before but spread on 3 rows with nulls
+        expect(
+          computeOverallDataDomain(
+            [
+              { layerId: 'id-a', seriesType, accessors: ['a', 'b', 'c'] },
+              { layerId: 'id-b', seriesType, accessors: ['d', 'e', 'f'] },
+            ] as XYLayerConfig[],
+            ['a', 'b', 'c', 'd', 'e', 'f'],
+            getActiveData([
+              {
+                id: 'id-a',
+                rows: Array(3)
+                  .fill(1)
+                  .map((_, i) => ({
+                    a: i === 0 ? 25 : null,
+                    b: i === 1 ? 100 : null,
+                    c: i === 2 ? 100 : null,
+                  })),
+              },
+              {
+                id: 'id-b',
+                rows: Array(3)
+                  .fill(1)
+                  .map((_, i) => ({
+                    d: i === 0 ? 50 : null,
+                    e: i === 1 ? 50 : null,
+                    f: i === 2 ? 50 : null,
+                  })),
+              },
+            ])
+          )
+        ).toEqual({ min: 0, max: 375 });
+      }
+    });
+
+    it('should compute the correct value for multiple layers with non-stacked series', () => {
+      for (const seriesType of ['bar', 'bar_horizontal', 'line', 'area'])
+        expect(
+          computeOverallDataDomain(
+            [
+              { layerId: 'id-a', seriesType, accessors: ['a', 'b', 'c'] },
+              { layerId: 'id-b', seriesType, accessors: ['d', 'e', 'f'] },
+            ] as XYLayerConfig[],
+            ['a', 'b', 'c', 'd', 'e', 'f'],
+            getActiveData([
+              { id: 'id-a', rows: Array(3).fill({ a: 100, b: 100, c: 100 }) },
+              { id: 'id-b', rows: Array(3).fill({ d: 50, e: 50, f: 50 }) },
+            ])
+          )
+        ).toEqual({ min: 50, max: 100 });
+    });
+
+    it('should compute the correct value for mixed series (stacked + non-stacked)', () => {
+      for (const nonStackedSeries of ['bar', 'bar_horizontal', 'line', 'area']) {
+        for (const stackedSeries of ['bar_stacked', 'bar_horizontal_stacked', 'area_stacked']) {
+          expect(
+            computeOverallDataDomain(
+              [
+                { layerId: 'id-a', seriesType: nonStackedSeries, accessors: ['a', 'b', 'c'] },
+                { layerId: 'id-b', seriesType: stackedSeries, accessors: ['d', 'e', 'f'] },
+              ] as XYLayerConfig[],
+              ['a', 'b', 'c', 'd', 'e', 'f'],
+              getActiveData([
+                { id: 'id-a', rows: [{ a: 100, b: 100, c: 100 }] },
+                { id: 'id-b', rows: [{ d: 50, e: 50, f: 50 }] },
+              ])
+            )
+          ).toEqual({
+            min: 0, // min is 0 as there is at least one stacked series
+            max: 150, // max is id-b layer accessor sum
+          });
+        }
+      }
+    });
+
+    it('should compute the correct value for a histogram stacked chart', () => {
+      for (const seriesType of ['bar_stacked', 'bar_horizontal_stacked', 'area_stacked'])
+        expect(
+          computeOverallDataDomain(
+            [
+              { layerId: 'id-a', seriesType, xAccessor: 'c', accessors: ['a', 'b'] },
+              { layerId: 'id-b', seriesType, xAccessor: 'f', accessors: ['d', 'e'] },
+            ] as XYLayerConfig[],
+            ['a', 'b', 'd', 'e'],
+            getActiveData([
+              {
+                id: 'id-a',
+                rows: Array(3)
+                  .fill(1)
+                  .map((_, i) => ({ a: 50 * i, b: 100 * i, c: i })),
+              },
+              {
+                id: 'id-b',
+                rows: Array(3)
+                  .fill(1)
+                  .map((_, i) => ({ d: 25 * (i + 1), e: i % 2 ? 100 : null, f: i })),
+              },
+            ])
+          )
+        ).toEqual({ min: 0, max: 375 });
+    });
+
+    it('should compute the correct value for a histogram non-stacked chart', () => {
+      for (const seriesType of ['bar', 'bar_horizontal', 'line', 'area'])
+        expect(
+          computeOverallDataDomain(
+            [
+              { layerId: 'id-a', seriesType, xAccessor: 'c', accessors: ['a', 'b'] },
+              { layerId: 'id-b', seriesType, xAccessor: 'f', accessors: ['d', 'e'] },
+            ] as XYLayerConfig[],
+            ['a', 'b', 'd', 'e'],
+            getActiveData([
+              {
+                id: 'id-a',
+                rows: Array(3)
+                  .fill(1)
+                  .map((_, i) => ({ a: 50 * i, b: 100 * i, c: i })),
+              },
+              {
+                id: 'id-b',
+                rows: Array(3)
+                  .fill(1)
+                  .map((_, i) => ({ d: 25 * (i + 1), e: i % 2 ? 100 : null, f: i })),
+              },
+            ])
+          )
+        ).toEqual({ min: 0, max: 200 });
+    });
+
+    it('should compute the result taking into consideration negative-based intervals too', () => {
+      // stacked
+      expect(
+        computeOverallDataDomain(
+          [
+            {
+              layerId: 'id-a',
+              seriesType: 'area_stacked',
+              accessors: ['a', 'b', 'c'],
+            } as XYLayerConfig,
+          ],
+          ['a', 'b', 'c'],
+          getActiveData([
+            {
+              id: 'id-a',
+              rows: Array(3)
+                .fill(1)
+                .map((_, i) => ({
+                  a: i === 0 ? -100 : null,
+                  b: i === 1 ? 200 : null,
+                  c: i === 2 ? 100 : null,
+                })),
+            },
+          ])
+        )
+      ).toEqual({ min: 0, max: 200 }); // it is stacked, so max is the sum and 0 is the fallback
+      expect(
+        computeOverallDataDomain(
+          [{ layerId: 'id-a', seriesType: 'area', accessors: ['a', 'b', 'c'] } as XYLayerConfig],
+          ['a', 'b', 'c'],
+          getActiveData([
+            {
+              id: 'id-a',
+              rows: Array(3)
+                .fill(1)
+                .map((_, i) => ({
+                  a: i === 0 ? -100 : null,
+                  b: i === 1 ? 200 : null,
+                  c: i === 2 ? 100 : null,
+                })),
+            },
+          ])
+        )
+      ).toEqual({ min: -100, max: 200 });
+    });
+
+    it('should return no result if no layers or accessors are passed', () => {
+      expect(
+        computeOverallDataDomain(
+          [],
+          ['a', 'b', 'c'],
+          getActiveData([{ id: 'id-a', rows: Array(3).fill({ a: 100, b: 100, c: 100 }) }])
+        )
+      ).toEqual({ min: undefined, max: undefined });
+    });
+
+    it('should return no result if data or table is not available', () => {
+      expect(
+        computeOverallDataDomain(
+          [
+            { layerId: 'id-a', seriesType: 'area', accessors: ['a', 'b', 'c'] },
+            { layerId: 'id-b', seriesType: 'line', accessors: ['d', 'e', 'f'] },
+          ] as XYLayerConfig[],
+          ['a', 'b'],
+          getActiveData([{ id: 'id-c', rows: [{ a: 100, b: 100 }] }]) // mind the layer id here
+        )
+      ).toEqual({ min: undefined, max: undefined });
+
+      expect(
+        computeOverallDataDomain(
+          [
+            { layerId: 'id-a', seriesType: 'bar', accessors: ['a', 'b', 'c'] },
+            { layerId: 'id-b', seriesType: 'bar_stacked' },
+          ] as XYLayerConfig[],
+          ['a', 'b'],
+          getActiveData([])
+        )
+      ).toEqual({ min: undefined, max: undefined });
+    });
+  });
+});
diff --git a/x-pack/plugins/lens/public/xy_visualization/threshold_helpers.tsx b/x-pack/plugins/lens/public/xy_visualization/threshold_helpers.tsx
index ec47350709473..8bf5f84b15bad 100644
--- a/x-pack/plugins/lens/public/xy_visualization/threshold_helpers.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/threshold_helpers.tsx
@@ -5,12 +5,13 @@
  * 2.0.
  */
 
+import { partition } from 'lodash';
 import { layerTypes } from '../../common';
 import type { XYLayerConfig, YConfig } from '../../common/expressions';
 import { Datatable } from '../../../../../src/plugins/expressions/public';
 import type { DatasourcePublicAPI, FramePublicAPI } from '../types';
 import { groupAxesByType } from './axes_configuration';
-import { isPercentageSeries } from './state_helpers';
+import { isPercentageSeries, isStackedChart } from './state_helpers';
 import type { XYState } from './types';
 import { checkScaleOperation } from './visualization_helpers';
 
@@ -91,14 +92,22 @@ export function getStaticValue(
 
   // filter and organize data dimensions into threshold groups
   // now pick the columnId in the active data
-  const { dataLayer, accessor } = getAccessorCriteriaForGroup(groupId, dataLayers, activeData);
-  if (groupId === 'x' && dataLayer && !layerHasNumberHistogram(dataLayer)) {
+  const {
+    dataLayers: filteredLayers,
+    untouchedDataLayers,
+    accessors,
+  } = getAccessorCriteriaForGroup(groupId, dataLayers, activeData);
+  if (
+    groupId === 'x' &&
+    filteredLayers.length &&
+    !untouchedDataLayers.some(layerHasNumberHistogram)
+  ) {
     return fallbackValue;
   }
   return (
     computeStaticValueForGroup(
-      dataLayer,
-      accessor,
+      filteredLayers,
+      accessors,
       activeData,
       groupId !== 'x' // histogram axis should compute the min based on the current data
     ) || fallbackValue
@@ -111,54 +120,123 @@ function getAccessorCriteriaForGroup(
   activeData: FramePublicAPI['activeData']
 ) {
   switch (groupId) {
-    case 'x':
-      const dataLayer = dataLayers.find(({ xAccessor }) => xAccessor);
+    case 'x': {
+      const filteredDataLayers = dataLayers.filter(({ xAccessor }) => xAccessor);
+      // need to reshape the dataLayers to match the other accessors format
       return {
-        dataLayer,
-        accessor: dataLayer?.xAccessor,
+        dataLayers: filteredDataLayers.map(({ accessors, xAccessor, ...rest }) => ({
+          ...rest,
+          accessors: [xAccessor] as string[],
+        })),
+        // need the untouched ones for some checks later on
+        untouchedDataLayers: filteredDataLayers,
+        accessors: filteredDataLayers.map(({ xAccessor }) => xAccessor) as string[],
       };
-    case 'yLeft':
+    }
+    case 'yLeft': {
       const { left } = groupAxesByType(dataLayers, activeData);
+      const leftIds = new Set(left.map(({ layer }) => layer));
+      const filteredDataLayers = dataLayers.filter(({ layerId }) => leftIds.has(layerId));
       return {
-        dataLayer: dataLayers.find(({ layerId }) => layerId === left[0]?.layer),
-        accessor: left[0]?.accessor,
+        dataLayers: filteredDataLayers,
+        untouchedDataLayers: filteredDataLayers,
+        accessors: left.map(({ accessor }) => accessor),
       };
-    case 'yRight':
+    }
+    case 'yRight': {
       const { right } = groupAxesByType(dataLayers, activeData);
+      const rightIds = new Set(right.map(({ layer }) => layer));
+      const filteredDataLayers = dataLayers.filter(({ layerId }) => rightIds.has(layerId));
       return {
-        dataLayer: dataLayers.find(({ layerId }) => layerId === right[0]?.layer),
-        accessor: right[0]?.accessor,
+        dataLayers: filteredDataLayers,
+        untouchedDataLayers: filteredDataLayers,
+        accessors: right.map(({ accessor }) => accessor),
       };
+    }
+  }
+}
+
+export function computeOverallDataDomain(
+  dataLayers: Array<Pick<XYLayerConfig, 'seriesType' | 'accessors' | 'xAccessor' | 'layerId'>>,
+  accessorIds: string[],
+  activeData: NonNullable<FramePublicAPI['activeData']>
+) {
+  const accessorMap = new Set(accessorIds);
+  let min: number | undefined;
+  let max: number | undefined;
+  const [stacked, unstacked] = partition(dataLayers, ({ seriesType }) =>
+    isStackedChart(seriesType)
+  );
+  for (const { layerId, accessors } of unstacked) {
+    const table = activeData[layerId];
+    if (table) {
+      for (const accessor of accessors) {
+        if (accessorMap.has(accessor)) {
+          for (const row of table.rows) {
+            const value = row[accessor];
+            if (typeof value === 'number') {
+              // when not stacked, do not keep the 0
+              max = max != null ? Math.max(value, max) : value;
+              min = min != null ? Math.min(value, min) : value;
+            }
+          }
+        }
+      }
+    }
+  }
+  // stacked can span multiple layers, so compute an overall max/min by bucket
+  const stackedResults: Record<string, number> = {};
+  for (const { layerId, accessors, xAccessor } of stacked) {
+    const table = activeData[layerId];
+    if (table) {
+      for (const accessor of accessors) {
+        if (accessorMap.has(accessor)) {
+          for (const row of table.rows) {
+            const value = row[accessor];
+            // start with a shared bucket
+            let bucket = 'shared';
+            // but if there's an xAccessor use it as new bucket system
+            if (xAccessor) {
+              bucket = row[xAccessor];
+            }
+            if (typeof value === 'number') {
+              stackedResults[bucket] = stackedResults[bucket] ?? 0;
+              stackedResults[bucket] += value;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  for (const value of Object.values(stackedResults)) {
+    // for stacked extents keep 0 in view
+    max = Math.max(value, max || 0, 0);
+    min = Math.min(value, min || 0, 0);
   }
+
+  return { min, max };
 }
 
 function computeStaticValueForGroup(
-  dataLayer: XYLayerConfig | undefined,
-  accessorId: string | undefined,
+  dataLayers: Array<Pick<XYLayerConfig, 'seriesType' | 'accessors' | 'xAccessor' | 'layerId'>>,
+  accessorIds: string[],
   activeData: NonNullable<FramePublicAPI['activeData']>,
-  minZeroBased: boolean
+  minZeroOrNegativeBase: boolean = true
 ) {
   const defaultThresholdFactor = 3 / 4;
 
-  if (dataLayer && accessorId) {
-    if (isPercentageSeries(dataLayer?.seriesType)) {
+  if (dataLayers.length && accessorIds.length) {
+    if (dataLayers.some(({ seriesType }) => isPercentageSeries(seriesType))) {
       return defaultThresholdFactor;
     }
-    const tableId = Object.keys(activeData).find((key) =>
-      activeData[key].columns.some(({ id }) => id === accessorId)
-    );
-    if (tableId) {
-      const columnMax = activeData[tableId].rows.reduce(
-        (max, row) => Math.max(row[accessorId], max),
-        -Infinity
-      );
-      const columnMin = activeData[tableId].rows.reduce(
-        (max, row) => Math.min(row[accessorId], max),
-        Infinity
-      );
+
+    const { min, max } = computeOverallDataDomain(dataLayers, accessorIds, activeData);
+
+    if (min != null && max != null && isFinite(min) && isFinite(max)) {
       // Custom axis bounds can go below 0, so consider also lower values than 0
-      const finalMinValue = minZeroBased ? Math.min(0, columnMin) : columnMin;
-      const interval = columnMax - finalMinValue;
+      const finalMinValue = minZeroOrNegativeBase ? Math.min(0, min) : min;
+      const interval = max - finalMinValue;
       return Number((finalMinValue + interval * defaultThresholdFactor).toFixed(2));
     }
   }

From 586682a0c480a37e04aa717aceb2dcfa39835495 Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Thu, 14 Oct 2021 15:49:35 +0200
Subject: [PATCH 071/117] [Discover] Rename default column in the advanced
 settings (#114100)

* [Discover] Rename default column in the advanced settings

* Fix eslint

* Rename default column to an empty string

* Fix typo

* Fix default column filtering

* Update comment

* Make an empty array a default columns

* Improve functional test

* Wording change

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../apps/main/utils/get_state_defaults.ts     | 11 +++++++--
 .../application/helpers/state_helpers.ts      |  7 +++++-
 src/plugins/discover/server/ui_settings.ts    |  5 ++--
 .../apps/discover/_discover_fields_api.ts     | 24 ++++++++++++++++++-
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts b/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts
index 11ebf0ecf9af4..f2f6e4a002aaf 100644
--- a/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts
@@ -6,9 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { cloneDeep } from 'lodash';
+import { cloneDeep, isEqual } from 'lodash';
 import { IUiSettingsClient } from 'kibana/public';
-import { DEFAULT_COLUMNS_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
+import {
+  DEFAULT_COLUMNS_SETTING,
+  SEARCH_FIELDS_FROM_SOURCE,
+  SORT_DEFAULT_ORDER_SETTING,
+} from '../../../../../common';
 import { SavedSearch } from '../../../../saved_searches';
 import { DataPublicPluginStart } from '../../../../../../data/public';
 
@@ -19,6 +23,9 @@ function getDefaultColumns(savedSearch: SavedSearch, config: IUiSettingsClient)
   if (savedSearch.columns && savedSearch.columns.length > 0) {
     return [...savedSearch.columns];
   }
+  if (config.get(SEARCH_FIELDS_FROM_SOURCE) && isEqual(config.get(DEFAULT_COLUMNS_SETTING), [])) {
+    return ['_source'];
+  }
   return [...config.get(DEFAULT_COLUMNS_SETTING)];
 }
 
diff --git a/src/plugins/discover/public/application/helpers/state_helpers.ts b/src/plugins/discover/public/application/helpers/state_helpers.ts
index fd17ec9516ab5..bb64f823d61a6 100644
--- a/src/plugins/discover/public/application/helpers/state_helpers.ts
+++ b/src/plugins/discover/public/application/helpers/state_helpers.ts
@@ -24,6 +24,7 @@ export function handleSourceColumnState<TState extends { columns?: string[] }>(
   }
   const useNewFieldsApi = !uiSettings.get(SEARCH_FIELDS_FROM_SOURCE);
   const defaultColumns = uiSettings.get(DEFAULT_COLUMNS_SETTING);
+
   if (useNewFieldsApi) {
     // if fields API is used, filter out the source column
     let cleanedColumns = state.columns.filter((column) => column !== '_source');
@@ -39,9 +40,13 @@ export function handleSourceColumnState<TState extends { columns?: string[] }>(
   } else if (state.columns.length === 0) {
     // if _source fetching is used and there are no column, switch back to default columns
     // this can happen if the fields API was previously used
+    const columns = defaultColumns;
+    if (columns.length === 0) {
+      columns.push('_source');
+    }
     return {
       ...state,
-      columns: [...defaultColumns],
+      columns: [...columns],
     };
   }
 
diff --git a/src/plugins/discover/server/ui_settings.ts b/src/plugins/discover/server/ui_settings.ts
index aa1b44da12bfc..82221fb8e8593 100644
--- a/src/plugins/discover/server/ui_settings.ts
+++ b/src/plugins/discover/server/ui_settings.ts
@@ -33,9 +33,10 @@ export const getUiSettings: () => Record<string, UiSettingsParams> = () => ({
     name: i18n.translate('discover.advancedSettings.defaultColumnsTitle', {
       defaultMessage: 'Default columns',
     }),
-    value: ['_source'],
+    value: [],
     description: i18n.translate('discover.advancedSettings.defaultColumnsText', {
-      defaultMessage: 'Columns displayed by default in the Discovery tab',
+      defaultMessage:
+        'Columns displayed by default in the Discover app. If empty, a summary of the document will be displayed.',
     }),
     category: ['discover'],
     schema: schema.arrayOf(schema.string()),
diff --git a/test/functional/apps/discover/_discover_fields_api.ts b/test/functional/apps/discover/_discover_fields_api.ts
index 42e2a94b36462..700c865031cd6 100644
--- a/test/functional/apps/discover/_discover_fields_api.ts
+++ b/test/functional/apps/discover/_discover_fields_api.ts
@@ -15,7 +15,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
-  const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']);
+  const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker', 'settings']);
   const defaultSettings = {
     defaultIndex: 'logstash-*',
     'discover:searchFieldsFromSource': false,
@@ -67,5 +67,27 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.discover.clickDocViewerTab(1);
       await PageObjects.discover.expectSourceViewerToExist();
     });
+
+    it('switches to _source column when fields API is no longer used', async function () {
+      await PageObjects.settings.navigateTo();
+      await PageObjects.settings.clickKibanaSettings();
+      await PageObjects.settings.toggleAdvancedSettingCheckbox('discover:searchFieldsFromSource');
+
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.timePicker.setDefaultAbsoluteRange();
+
+      expect(await PageObjects.discover.getDocHeader()).to.have.string('_source');
+    });
+
+    it('switches to Document column when fields API is used', async function () {
+      await PageObjects.settings.navigateTo();
+      await PageObjects.settings.clickKibanaSettings();
+      await PageObjects.settings.toggleAdvancedSettingCheckbox('discover:searchFieldsFromSource');
+
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.timePicker.setDefaultAbsoluteRange();
+
+      expect(await PageObjects.discover.getDocHeader()).to.have.string('Document');
+    });
   });
 }

From cdce98c8a363520e99f59f3f10c59a32586480a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ester=20Mart=C3=AD=20Vilaseca?=
 <ester.martivilaseca@elastic.co>
Date: Thu, 14 Oct 2021 15:57:27 +0200
Subject: [PATCH 072/117] [Stack monitoring] Fix clusters functional tests when
 react is enabled (#114982)

* Fix test subjects for overview page

* fix pathname matching
---
 .../public/application/pages/cluster/overview_page.tsx         | 2 +-
 x-pack/plugins/monitoring/public/application/route_init.tsx    | 2 +-
 x-pack/plugins/monitoring/public/directives/main/index.html    | 2 +-
 x-pack/test/functional/services/monitoring/cluster_overview.js | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx b/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
index b78df27cd12c4..04074762c8d22 100644
--- a/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
@@ -50,7 +50,7 @@ export const ClusterOverview: React.FC<{}> = () => {
       {
         id: 'clusterName',
         label: clusters[0].cluster_name,
-        testSubj: 'clusterName',
+        testSubj: 'overviewTabsclusterName',
         route: '/overview',
       },
     ];
diff --git a/x-pack/plugins/monitoring/public/application/route_init.tsx b/x-pack/plugins/monitoring/public/application/route_init.tsx
index c620229eb059a..52780aa280707 100644
--- a/x-pack/plugins/monitoring/public/application/route_init.tsx
+++ b/x-pack/plugins/monitoring/public/application/route_init.tsx
@@ -57,7 +57,7 @@ export const RouteInit: React.FC<RouteInitProps> = ({
 
     // check if we need to redirect because of attempt at unsupported multi-cluster monitoring
     const clusterSupported = cluster.isSupported || clusters.length === 1;
-    if (location.pathname !== 'home' && !clusterSupported) {
+    if (location.pathname !== '/home' && !clusterSupported) {
       return <Redirect to="/home" />;
     }
   }
diff --git a/x-pack/plugins/monitoring/public/directives/main/index.html b/x-pack/plugins/monitoring/public/directives/main/index.html
index c989c71d8c1d4..fd14120e1db2f 100644
--- a/x-pack/plugins/monitoring/public/directives/main/index.html
+++ b/x-pack/plugins/monitoring/public/directives/main/index.html
@@ -299,7 +299,7 @@ <h1 class="euiTitle euiTitle--xsmall">{{pageTitle || monitoringMain.instance}}</
     </div>
 
     <div ng-if="monitoringMain.inOverview" class="euiTabs" role="navigation">
-      <a class="euiTab" data-test-subj="clusterName">{{ pageData.cluster_name }}</a>
+      <a class="euiTab" data-test-subj="overviewTabsclusterName">{{ pageData.cluster_name }}</a>
     </div>
 
     <div ng-if="monitoringMain.inAlerts" class="euiTabs" role="navigation">
diff --git a/x-pack/test/functional/services/monitoring/cluster_overview.js b/x-pack/test/functional/services/monitoring/cluster_overview.js
index 7e888d6233ff7..215e92fa055be 100644
--- a/x-pack/test/functional/services/monitoring/cluster_overview.js
+++ b/x-pack/test/functional/services/monitoring/cluster_overview.js
@@ -12,8 +12,7 @@ export function MonitoringClusterOverviewProvider({ getService }) {
   const retry = getService('retry');
 
   const SUBJ_CLUSTER_ALERTS = `clusterAlertsContainer`;
-  const SUBJ_CLUSTER_OVERVIEW = 'clusterOverviewContainer';
-  const SUBJ_CLUSTER_NAME = `${SUBJ_CLUSTER_OVERVIEW} > clusterName`;
+  const SUBJ_CLUSTER_NAME = `overviewTabsclusterName`;
 
   const SUBJ_ES_PANEL = `clusterItemContainerElasticsearch`;
   const SUBJ_ES_STATUS = `${SUBJ_ES_PANEL} > statusIcon`;

From 56a2e788ca90c15c734cb0fe8eb37c321fdd5b45 Mon Sep 17 00:00:00 2001
From: Angela Chuang <6295984+angorayc@users.noreply.github.com>
Date: Thu, 14 Oct 2021 15:17:28 +0100
Subject: [PATCH 073/117] [Security Solution] tgrid cellActions enhancement
 (#113419)

* Alerts cellAction enhancement

* styling

* fix types

* expandable topN

* fix types

* styling for filters

* styling

* rm getDefaultCellActions

* styling

* globalFilters for topN

* rm unused i18n keys

* unit test

* add i18n

* rename component

* fix types

* update i18n keys

* unit tests

* styling for reason row renderer

* rename file

* fix Circular Dependencies

* update wording/icons for show top N

* cell value text overflow

* reason in grid-view

* unit test

* default selected option for topN

* lint error

* configurable paddingSize and showLegend for topN

* update snapshot

* rename reason title

* fix cypress

* fix cypress

* fix unit tests

* fix default cell actions

* fix page crashing

* unit test

* add unit tests

* code review

* fix missing props

* fix expand ip button

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../alert_summary_view.test.tsx.snap          |   4 +-
 .../table/use_action_cell_data_provider.ts    |   2 +-
 .../components/formatted_date/index.tsx       |  32 +--
 .../__snapshots__/index.test.tsx.snap         |   6 +-
 .../components/header_section/index.tsx       |   8 +-
 .../hover_actions/actions/show_top_n.tsx      |  67 ++++--
 .../common/components/links/helpers.tsx       |  71 +++++++
 .../public/common/components/links/index.tsx  | 192 ++++++++++--------
 .../components/matrix_histogram/index.tsx     |   7 +-
 .../components/matrix_histogram/types.ts      |   1 +
 .../public/common/components/page/index.tsx   |  59 +++++-
 .../public/common/components/top_n/index.tsx  |   6 +
 .../public/common/components/top_n/top_n.tsx  |   8 +
 .../default_cell_actions.test.tsx             |  92 +++++++++
 .../lib/cell_actions/default_cell_actions.tsx | 181 +++++++++--------
 .../expanded_cell_value_actions.test.tsx      |  49 +++++
 .../expanded_cell_value_actions.tsx           | 125 ++++++++++++
 .../public/common/lib/cell_actions/helpers.ts |  65 ++++++
 .../common/lib/cell_actions/translations.ts   |  71 +++++++
 .../alerts_histogram.tsx                      |   7 +-
 .../alerts_histogram_panel/index.tsx          |  16 +-
 .../components/alerts_table/index.tsx         |  10 +-
 .../render_cell_value.tsx                     |  20 +-
 .../navigation/events_query_tab_body.tsx      |   2 +-
 .../public/network/components/port/helpers.ts |  19 ++
 .../public/network/components/port/index.tsx  |  31 ++-
 .../source_destination/index.test.tsx         |   2 +-
 .../source_destination_ip.test.tsx            |   2 +-
 .../source_destination_ip.tsx                 |   3 +-
 .../components/events_by_dataset/index.tsx    |   6 +
 .../components/signals_by_category/index.tsx  |  14 +-
 .../components/formatted_ip/index.tsx         |  92 ++++++++-
 .../components/netflow/index.test.tsx         |   2 +-
 .../body/renderers/column_renderer.ts         |  23 ++-
 .../body/renderers/formatted_field.tsx        |  51 ++++-
 .../renderers/formatted_field_helpers.tsx     | 100 +++++++--
 .../timeline/body/renderers/host_name.tsx     |  21 +-
 .../timeline/body/renderers/netflow.tsx       |   2 +-
 .../netflow/netflow_row_renderer.tsx          |   2 +-
 .../body/renderers/plain_column_renderer.tsx  |  12 +-
 .../renderers/reason_column_renderer.test.tsx |  45 ++--
 .../body/renderers/reason_column_renderer.tsx | 115 +++++------
 .../timeline/body/renderers/translations.ts   |   4 +-
 .../default_cell_renderer.test.tsx            |  59 +++++-
 .../cell_rendering/default_cell_renderer.tsx  |  82 +++++---
 .../common/types/timeline/cells/index.ts      |  13 +-
 .../common/types/timeline/columns/index.tsx   |   9 +-
 .../actions/filter_for_value.tsx              |   9 +-
 .../actions/filter_out_value.tsx              |   9 +-
 .../components/hover_actions/actions/types.ts |   2 +
 .../components/t_grid/body/index.test.tsx     | 121 +++++++++++
 .../public/components/t_grid/body/index.tsx   |  42 ++--
 .../t_grid/event_rendered_view/index.tsx      |  18 +-
 .../translations/translations/ja-JP.json      |   3 -
 .../translations/translations/zh-CN.json      |   3 -
 55 files changed, 1540 insertions(+), 477 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/common/components/links/helpers.tsx
 create mode 100644 x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.tsx
 create mode 100644 x-pack/plugins/security_solution/public/common/lib/cell_actions/helpers.ts
 create mode 100644 x-pack/plugins/security_solution/public/common/lib/cell_actions/translations.ts
 create mode 100644 x-pack/plugins/security_solution/public/network/components/port/helpers.ts

diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/__snapshots__/alert_summary_view.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/event_details/__snapshots__/alert_summary_view.test.tsx.snap
index 2904d8184261e..d367c68586be1 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/__snapshots__/alert_summary_view.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/__snapshots__/alert_summary_view.test.tsx.snap
@@ -210,7 +210,7 @@ exports[`AlertSummaryView Behavior event code renders additional summary rows 1`
                   class="eventFieldsTable__fieldValue"
                 >
                   <span
-                    class="euiToolTipAnchor"
+                    class="euiToolTipAnchor eui-textTruncate eui-alignMiddle"
                   >
                     Nov 25, 2020 @ 15:42:39.417
                   </span>
@@ -872,7 +872,7 @@ exports[`AlertSummaryView Memory event code renders additional summary rows 1`]
                   class="eventFieldsTable__fieldValue"
                 >
                   <span
-                    class="euiToolTipAnchor"
+                    class="euiToolTipAnchor eui-textTruncate eui-alignMiddle"
                   >
                     Nov 25, 2020 @ 15:42:39.417
                   </span>
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts b/x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts
index 76ca5dfe53f4e..23acd90183af4 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts
@@ -25,7 +25,7 @@ import {
 } from '../../../../timelines/components/timeline/body/renderers/constants';
 import { BYTES_FORMAT } from '../../../../timelines/components/timeline/body/renderers/bytes';
 import { EVENT_DURATION_FIELD_NAME } from '../../../../timelines/components/duration';
-import { PORT_NAMES } from '../../../../network/components/port';
+import { PORT_NAMES } from '../../../../network/components/port/helpers';
 import { INDICATOR_REFERENCE } from '../../../../../common/cti/constants';
 import { BrowserField } from '../../../containers/source';
 import { DataProvider, IS_OPERATOR } from '../../../../../common/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/formatted_date/index.tsx b/x-pack/plugins/security_solution/public/common/components/formatted_date/index.tsx
index f6df6e132ebee..e525003660a85 100644
--- a/x-pack/plugins/security_solution/public/common/components/formatted_date/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/formatted_date/index.tsx
@@ -92,23 +92,27 @@ PreferenceFormattedP1DTDate.displayName = 'PreferenceFormattedP1DTDate';
  * - a long representation of the date that includes the day of the week (e.g. Thursday, March 21, 2019 6:47pm)
  * - the raw date value (e.g. 2019-03-22T00:47:46Z)
  */
-export const FormattedDate = React.memo<{
+
+interface FormattedDateProps {
+  className?: string;
   fieldName: string;
   value?: string | number | null;
-  className?: string;
-}>(({ value, fieldName, className = '' }): JSX.Element => {
-  if (value == null) {
-    return getOrEmptyTagFromValue(value);
+}
+export const FormattedDate = React.memo<FormattedDateProps>(
+  ({ value, fieldName, className = '' }): JSX.Element => {
+    if (value == null) {
+      return getOrEmptyTagFromValue(value);
+    }
+    const maybeDate = getMaybeDate(value);
+    return maybeDate.isValid() ? (
+      <LocalizedDateTooltip date={maybeDate.toDate()} fieldName={fieldName} className={className}>
+        <PreferenceFormattedDate value={maybeDate.toDate()} />
+      </LocalizedDateTooltip>
+    ) : (
+      getOrEmptyTagFromValue(value)
+    );
   }
-  const maybeDate = getMaybeDate(value);
-  return maybeDate.isValid() ? (
-    <LocalizedDateTooltip date={maybeDate.toDate()} fieldName={fieldName} className={className}>
-      <PreferenceFormattedDate value={maybeDate.toDate()} />
-    </LocalizedDateTooltip>
-  ) : (
-    getOrEmptyTagFromValue(value)
-  );
-});
+);
 
 FormattedDate.displayName = 'FormattedDate';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/header_section/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/header_section/__snapshots__/index.test.tsx.snap
index d3d20c7183570..fe589b1e253a9 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_section/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/header_section/__snapshots__/index.test.tsx.snap
@@ -6,23 +6,25 @@ exports[`HeaderSection it renders 1`] = `
 >
   <EuiFlexGroup
     alignItems="center"
+    gutterSize="none"
   >
     <EuiFlexItem
       grow={true}
     >
       <EuiFlexGroup
         alignItems="center"
+        gutterSize="none"
         responsive={false}
       >
         <EuiFlexItem>
           <EuiTitle
             size="m"
           >
-            <h2
+            <h4
               data-test-subj="header-section-title"
             >
               Test title
-            </h2>
+            </h4>
           </EuiTitle>
           <Subtitle
             data-test-subj="header-section-subtitle"
diff --git a/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx b/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx
index f733331bcd691..21a3c4dc614cc 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx
@@ -68,12 +68,12 @@ const HeaderSectionComponent: React.FC<HeaderSectionProps> = ({
   hideSubtitle = false,
 }) => (
   <Header data-test-subj="header-section" border={border} height={height}>
-    <EuiFlexGroup alignItems="center">
+    <EuiFlexGroup alignItems="center" gutterSize="none">
       <EuiFlexItem grow={growLeftSplit}>
-        <EuiFlexGroup alignItems="center" responsive={false}>
+        <EuiFlexGroup alignItems="center" responsive={false} gutterSize="none">
           <EuiFlexItem>
             <EuiTitle size={titleSize}>
-              <h2 data-test-subj="header-section-title">
+              <h4 data-test-subj="header-section-title">
                 {title}
                 {tooltip && (
                   <>
@@ -81,7 +81,7 @@ const HeaderSectionComponent: React.FC<HeaderSectionProps> = ({
                     <EuiIconTip color="subdued" content={tooltip} size="l" type="iInCircle" />
                   </>
                 )}
-              </h2>
+              </h4>
             </EuiTitle>
 
             {!hideSubtitle && (
diff --git a/x-pack/plugins/security_solution/public/common/components/hover_actions/actions/show_top_n.tsx b/x-pack/plugins/security_solution/public/common/components/hover_actions/actions/show_top_n.tsx
index e1546c5220e22..738103f02dcdf 100644
--- a/x-pack/plugins/security_solution/public/common/components/hover_actions/actions/show_top_n.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/hover_actions/actions/show_top_n.tsx
@@ -30,33 +30,49 @@ const SHOW_TOP = (fieldName: string) =>
   });
 
 interface Props {
+  className?: string;
   /** When `Component` is used with `EuiDataGrid`; the grid keeps a reference to `Component` for show / hide functionality.
    * When `Component` is used with `EuiContextMenu`, we pass EuiContextMenuItem to render the right style.
    */
   Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon | typeof EuiContextMenuItem;
   enablePopOver?: boolean;
   field: string;
+  flush?: 'left' | 'right' | 'both';
   globalFilters?: Filter[];
+  iconSide?: 'left' | 'right';
+  iconType?: string;
+  isExpandable?: boolean;
   onClick: () => void;
   onFilterAdded?: () => void;
   ownFocus: boolean;
+  paddingSize?: 's' | 'm' | 'l' | 'none';
   showTooltip?: boolean;
   showTopN: boolean;
+  showLegend?: boolean;
   timelineId?: string | null;
+  title?: string;
   value?: string[] | string | null;
 }
 
 export const ShowTopNButton: React.FC<Props> = React.memo(
   ({
+    className,
     Component,
     enablePopOver,
     field,
+    flush,
+    iconSide,
+    iconType,
+    isExpandable,
     onClick,
     onFilterAdded,
     ownFocus,
+    paddingSize,
+    showLegend,
     showTooltip = true,
     showTopN,
     timelineId,
+    title,
     value,
     globalFilters,
   }) => {
@@ -70,31 +86,36 @@ export const ShowTopNButton: React.FC<Props> = React.memo(
         ? SourcererScopeName.detections
         : SourcererScopeName.default;
     const { browserFields, indexPattern } = useSourcererScope(activeScope);
-
+    const icon = iconType ?? 'visBarVertical';
+    const side = iconSide ?? 'left';
+    const buttonTitle = title ?? SHOW_TOP(field);
     const basicButton = useMemo(
       () =>
         Component ? (
           <Component
-            aria-label={SHOW_TOP(field)}
+            aria-label={buttonTitle}
+            className={className}
             data-test-subj="show-top-field"
-            icon="visBarVertical"
-            iconType="visBarVertical"
+            icon={icon}
+            iconType={icon}
+            iconSide={side}
+            flush={flush}
             onClick={onClick}
-            title={SHOW_TOP(field)}
+            title={buttonTitle}
           >
-            {SHOW_TOP(field)}
+            {buttonTitle}
           </Component>
         ) : (
           <EuiButtonIcon
-            aria-label={SHOW_TOP(field)}
+            aria-label={buttonTitle}
             className="securitySolution__hoverActionButton"
             data-test-subj="show-top-field"
             iconSize="s"
-            iconType="visBarVertical"
+            iconType={icon}
             onClick={onClick}
           />
         ),
-      [Component, field, onClick]
+      [Component, buttonTitle, className, flush, icon, onClick, side]
     );
 
     const button = useMemo(
@@ -107,7 +128,7 @@ export const ShowTopNButton: React.FC<Props> = React.memo(
                   field,
                   value,
                 })}
-                content={SHOW_TOP(field)}
+                content={buttonTitle}
                 shortcut={SHOW_TOP_N_KEYBOARD_SHORTCUT}
                 showShortcut={ownFocus}
               />
@@ -118,7 +139,7 @@ export const ShowTopNButton: React.FC<Props> = React.memo(
         ) : (
           basicButton
         ),
-      [basicButton, field, ownFocus, showTooltip, showTopN, value]
+      [basicButton, buttonTitle, field, ownFocus, showTooltip, showTopN, value]
     );
 
     const topNPannel = useMemo(
@@ -128,15 +149,37 @@ export const ShowTopNButton: React.FC<Props> = React.memo(
           field={field}
           indexPattern={indexPattern}
           onFilterAdded={onFilterAdded}
+          paddingSize={paddingSize}
+          showLegend={showLegend}
           timelineId={timelineId ?? undefined}
           toggleTopN={onClick}
           value={value}
           globalFilters={globalFilters}
         />
       ),
-      [browserFields, field, indexPattern, onClick, onFilterAdded, timelineId, value, globalFilters]
+      [
+        browserFields,
+        field,
+        indexPattern,
+        onFilterAdded,
+        paddingSize,
+        showLegend,
+        timelineId,
+        onClick,
+        value,
+        globalFilters,
+      ]
     );
 
+    if (isExpandable) {
+      return (
+        <>
+          {basicButton}
+          {showTopN && topNPannel}
+        </>
+      );
+    }
+
     return showTopN ? (
       enablePopOver ? (
         <EuiPopover
diff --git a/x-pack/plugins/security_solution/public/common/components/links/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/links/helpers.tsx
new file mode 100644
index 0000000000000..0504a17904a75
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/links/helpers.tsx
@@ -0,0 +1,71 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React, { SyntheticEvent } from 'react';
+import {
+  EuiButton,
+  EuiButtonEmpty,
+  EuiButtonIcon,
+  EuiButtonProps,
+  EuiLink,
+  EuiLinkProps,
+  PropsForAnchor,
+  PropsForButton,
+} from '@elastic/eui';
+import styled from 'styled-components';
+
+export const LinkButton: React.FC<PropsForButton<EuiButtonProps> | PropsForAnchor<EuiButtonProps>> =
+  ({ children, ...props }) => <EuiButton {...props}>{children}</EuiButton>;
+
+export const LinkAnchor: React.FC<EuiLinkProps> = ({ children, ...props }) => (
+  <EuiLink {...props}>{children}</EuiLink>
+);
+
+export const Comma = styled('span')`
+  margin-right: 5px;
+  margin-left: 5px;
+  &::after {
+    content: ' ,';
+  }
+`;
+
+Comma.displayName = 'Comma';
+
+const GenericLinkButtonComponent: React.FC<{
+  children?: React.ReactNode;
+  /** `Component` is only used with `EuiDataGrid`; the grid keeps a reference to `Component` for show / hide functionality */
+  Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
+  dataTestSubj?: string;
+  href: string;
+  onClick?: (e: SyntheticEvent) => void;
+  title?: string;
+  iconType?: string;
+}> = ({ children, Component, dataTestSubj, href, onClick, title, iconType = 'expand' }) => {
+  return Component ? (
+    <Component
+      data-test-subj={dataTestSubj}
+      href={href}
+      iconType={iconType}
+      onClick={onClick}
+      title={title}
+    >
+      {title ?? children}
+    </Component>
+  ) : (
+    <LinkButton data-test-subj={dataTestSubj} href={href} onClick={onClick}>
+      {title ?? children}
+    </LinkButton>
+  );
+};
+
+export const GenericLinkButton = React.memo(GenericLinkButtonComponent);
+
+export const PortContainer = styled.div`
+  & svg {
+    position: relative;
+    top: -1px;
+  }
+`;
diff --git a/x-pack/plugins/security_solution/public/common/components/links/index.tsx b/x-pack/plugins/security_solution/public/common/components/links/index.tsx
index 7db6b0204b649..c74791b8b3aa7 100644
--- a/x-pack/plugins/security_solution/public/common/components/links/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/links/index.tsx
@@ -6,19 +6,15 @@
  */
 
 import {
-  EuiButton,
-  EuiButtonProps,
-  EuiLink,
-  EuiLinkProps,
-  EuiToolTip,
+  EuiButtonEmpty,
+  EuiButtonIcon,
   EuiFlexGroup,
   EuiFlexItem,
-  PropsForAnchor,
-  PropsForButton,
+  EuiLink,
+  EuiToolTip,
 } from '@elastic/eui';
 import React, { useMemo, useCallback, SyntheticEvent } from 'react';
 import { isNil } from 'lodash/fp';
-import styled from 'styled-components';
 
 import { IP_REPUTATION_LINKS_SETTING, APP_ID } from '../../../../common/constants';
 import {
@@ -43,22 +39,11 @@ import { isUrlInvalid } from '../../utils/validators';
 import * as i18n from './translations';
 import { SecurityPageName } from '../../../app/types';
 import { getUebaDetailsUrl } from '../link_to/redirect_to_ueba';
+import { LinkButton, LinkAnchor, GenericLinkButton, PortContainer, Comma } from './helpers';
 
-export const DEFAULT_NUMBER_OF_LINK = 5;
-
-export const LinkButton: React.FC<PropsForButton<EuiButtonProps> | PropsForAnchor<EuiButtonProps>> =
-  ({ children, ...props }) => <EuiButton {...props}>{children}</EuiButton>;
+export { LinkButton, LinkAnchor } from './helpers';
 
-export const LinkAnchor: React.FC<EuiLinkProps> = ({ children, ...props }) => (
-  <EuiLink {...props}>{children}</EuiLink>
-);
-
-export const PortContainer = styled.div`
-  & svg {
-    position: relative;
-    top: -1px;
-  }
-`;
+export const DEFAULT_NUMBER_OF_LINK = 5;
 
 // Internal Links
 const UebaDetailsLinkComponent: React.FC<{
@@ -102,10 +87,13 @@ export const UebaDetailsLink = React.memo(UebaDetailsLinkComponent);
 
 const HostDetailsLinkComponent: React.FC<{
   children?: React.ReactNode;
+  /** `Component` is only used with `EuiDataGrid`; the grid keeps a reference to `Component` for show / hide functionality */
+  Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
   hostName: string;
   isButton?: boolean;
   onClick?: (e: SyntheticEvent) => void;
-}> = ({ children, hostName, isButton, onClick }) => {
+  title?: string;
+}> = ({ children, Component, hostName, isButton, onClick, title }) => {
   const { formatUrl, search } = useFormatUrl(SecurityPageName.hosts);
   const { navigateToApp } = useKibana().services.application;
   const goToHostDetails = useCallback(
@@ -118,19 +106,25 @@ const HostDetailsLinkComponent: React.FC<{
     },
     [hostName, navigateToApp, search]
   );
-
+  const href = useMemo(
+    () => formatUrl(getHostDetailsUrl(encodeURIComponent(hostName))),
+    [formatUrl, hostName]
+  );
   return isButton ? (
-    <LinkButton
+    <GenericLinkButton
+      Component={Component}
+      dataTestSubj="data-grid-host-details"
+      href={href}
+      iconType="expand"
       onClick={onClick ?? goToHostDetails}
-      href={formatUrl(getHostDetailsUrl(encodeURIComponent(hostName)))}
-      data-test-subj="host-details-button"
+      title={title ?? hostName}
     >
-      {children ? children : hostName}
-    </LinkButton>
+      {children}
+    </GenericLinkButton>
   ) : (
     <LinkAnchor
       onClick={onClick ?? goToHostDetails}
-      href={formatUrl(getHostDetailsUrl(encodeURIComponent(hostName)))}
+      href={href}
       data-test-subj="host-details-button"
     >
       {children ? children : hostName}
@@ -176,11 +170,14 @@ ExternalLink.displayName = 'ExternalLink';
 
 const NetworkDetailsLinkComponent: React.FC<{
   children?: React.ReactNode;
+  /** `Component` is only used with `EuiDataGrid`; the grid keeps a reference to `Component` for show / hide functionality */
+  Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
   ip: string;
   flowTarget?: FlowTarget | FlowTargetSourceDest;
   isButton?: boolean;
   onClick?: (e: SyntheticEvent) => void | undefined;
-}> = ({ children, ip, flowTarget = FlowTarget.source, isButton, onClick }) => {
+  title?: string;
+}> = ({ Component, children, ip, flowTarget = FlowTarget.source, isButton, onClick, title }) => {
   const { formatUrl, search } = useFormatUrl(SecurityPageName.network);
   const { navigateToApp } = useKibana().services.application;
   const goToNetworkDetails = useCallback(
@@ -193,19 +190,25 @@ const NetworkDetailsLinkComponent: React.FC<{
     },
     [flowTarget, ip, navigateToApp, search]
   );
+  const href = useMemo(
+    () => formatUrl(getNetworkDetailsUrl(encodeURIComponent(encodeIpv6(ip)))),
+    [formatUrl, ip]
+  );
 
   return isButton ? (
-    <LinkButton
-      href={formatUrl(getNetworkDetailsUrl(encodeURIComponent(encodeIpv6(ip))))}
+    <GenericLinkButton
+      Component={Component}
+      dataTestSubj="data-grid-network-details"
       onClick={onClick ?? goToNetworkDetails}
-      data-test-subj="network-details"
+      href={href}
+      title={title ?? ip}
     >
-      {children ? children : ip}
-    </LinkButton>
+      {children}
+    </GenericLinkButton>
   ) : (
     <LinkAnchor
       onClick={onClick ?? goToNetworkDetails}
-      href={formatUrl(getNetworkDetailsUrl(encodeURIComponent(encodeIpv6(ip))))}
+      href={href}
       data-test-subj="network-details"
     >
       {children ? children : ip}
@@ -272,63 +275,84 @@ CreateCaseLink.displayName = 'CreateCaseLink';
 
 // External Links
 export const GoogleLink = React.memo<{ children?: React.ReactNode; link: string }>(
-  ({ children, link }) => (
-    <ExternalLink url={`https://www.google.com/search?q=${encodeURIComponent(link)}`}>
-      {children ? children : link}
-    </ExternalLink>
-  )
+  ({ children, link }) => {
+    const url = useMemo(
+      () => `https://www.google.com/search?q=${encodeURIComponent(link)}`,
+      [link]
+    );
+    return <ExternalLink url={url}>{children ? children : link}</ExternalLink>;
+  }
 );
 
 GoogleLink.displayName = 'GoogleLink';
 
 export const PortOrServiceNameLink = React.memo<{
   children?: React.ReactNode;
+  /** `Component` is only used with `EuiDataGrid`; the grid keeps a reference to `Component` for show / hide functionality */
+  Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
   portOrServiceName: number | string;
-}>(({ children, portOrServiceName }) => (
-  <PortContainer>
-    <EuiLink
-      data-test-subj="port-or-service-name-link"
-      href={`https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=${encodeURIComponent(
+  onClick?: (e: SyntheticEvent) => void | undefined;
+  title?: string;
+}>(({ Component, title, children, portOrServiceName }) => {
+  const href = useMemo(
+    () =>
+      `https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=${encodeURIComponent(
         String(portOrServiceName)
-      )}`}
-      target="_blank"
+      )}`,
+    [portOrServiceName]
+  );
+  return Component ? (
+    <Component
+      href={href}
+      data-test-subj="data-grid-port-or-service-name-link"
+      title={title}
+      iconType="link"
     >
-      {children ? children : portOrServiceName}
-    </EuiLink>
-  </PortContainer>
-));
+      {title ?? children ?? portOrServiceName}
+    </Component>
+  ) : (
+    <PortContainer>
+      <EuiLink data-test-subj="port-or-service-name-link" href={href} target="_blank">
+        {children ? children : portOrServiceName}
+      </EuiLink>
+    </PortContainer>
+  );
+});
 
 PortOrServiceNameLink.displayName = 'PortOrServiceNameLink';
 
 export const Ja3FingerprintLink = React.memo<{
   children?: React.ReactNode;
   ja3Fingerprint: string;
-}>(({ children, ja3Fingerprint }) => (
-  <EuiLink
-    data-test-subj="ja3-fingerprint-link"
-    href={`https://sslbl.abuse.ch/ja3-fingerprints/${encodeURIComponent(ja3Fingerprint)}`}
-    target="_blank"
-  >
-    {children ? children : ja3Fingerprint}
-  </EuiLink>
-));
+}>(({ children, ja3Fingerprint }) => {
+  const href = useMemo(
+    () => `https://sslbl.abuse.ch/ja3-fingerprints/${encodeURIComponent(ja3Fingerprint)}`,
+    [ja3Fingerprint]
+  );
+  return (
+    <EuiLink data-test-subj="ja3-fingerprint-link" href={href} target="_blank">
+      {children ? children : ja3Fingerprint}
+    </EuiLink>
+  );
+});
 
 Ja3FingerprintLink.displayName = 'Ja3FingerprintLink';
 
 export const CertificateFingerprintLink = React.memo<{
   children?: React.ReactNode;
   certificateFingerprint: string;
-}>(({ children, certificateFingerprint }) => (
-  <EuiLink
-    data-test-subj="certificate-fingerprint-link"
-    href={`https://sslbl.abuse.ch/ssl-certificates/sha1/${encodeURIComponent(
-      certificateFingerprint
-    )}`}
-    target="_blank"
-  >
-    {children ? children : certificateFingerprint}
-  </EuiLink>
-));
+}>(({ children, certificateFingerprint }) => {
+  const href = useMemo(
+    () =>
+      `https://sslbl.abuse.ch/ssl-certificates/sha1/${encodeURIComponent(certificateFingerprint)}`,
+    [certificateFingerprint]
+  );
+  return (
+    <EuiLink data-test-subj="certificate-fingerprint-link" href={href} target="_blank">
+      {children ? children : certificateFingerprint}
+    </EuiLink>
+  );
+});
 
 CertificateFingerprintLink.displayName = 'CertificateFingerprintLink';
 
@@ -354,16 +378,6 @@ const isReputationLink = (
   (rowItem as ReputationLinkSetting).url_template !== undefined &&
   (rowItem as ReputationLinkSetting).name !== undefined;
 
-export const Comma = styled('span')`
-  margin-right: 5px;
-  margin-left: 5px;
-  &::after {
-    content: ' ,';
-  }
-`;
-
-Comma.displayName = 'Comma';
-
 const defaultNameMapping: Record<DefaultReputationLink, string> = {
   [DefaultReputationLink['virustotal.com']]: i18n.VIEW_VIRUS_TOTAL,
   [DefaultReputationLink['talosIntelligence.com']]: i18n.VIEW_TALOS_INTELLIGENCE,
@@ -463,11 +477,13 @@ ReputationLinkComponent.displayName = 'ReputationLinkComponent';
 export const ReputationLink = React.memo(ReputationLinkComponent);
 
 export const WhoIsLink = React.memo<{ children?: React.ReactNode; domain: string }>(
-  ({ children, domain }) => (
-    <ExternalLink url={`https://www.iana.org/whois?q=${encodeURIComponent(domain)}`}>
-      {children ? children : domain}
-    </ExternalLink>
-  )
+  ({ children, domain }) => {
+    const url = useMemo(
+      () => `https://www.iana.org/whois?q=${encodeURIComponent(domain)}`,
+      [domain]
+    );
+    return <ExternalLink url={url}>{children ? children : domain}</ExternalLink>;
+  }
 );
 
 WhoIsLink.displayName = 'WhoIsLink';
diff --git a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx
index f25e8311ff8fe..7eac477741a5c 100644
--- a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx
@@ -79,6 +79,7 @@ export const MatrixHistogramComponent: React.FC<MatrixHistogramComponentProps> =
   legendPosition,
   mapping,
   onError,
+  paddingSize = 'm',
   panelHeight = DEFAULT_PANEL_HEIGHT,
   setAbsoluteRangeDatePickerTarget = 'global',
   setQuery,
@@ -200,7 +201,11 @@ export const MatrixHistogramComponent: React.FC<MatrixHistogramComponentProps> =
   return (
     <>
       <InspectButtonContainer show={!isInitialLoading}>
-        <HistogramPanel data-test-subj={`${id}Panel`} height={panelHeight}>
+        <HistogramPanel
+          data-test-subj={`${id}Panel`}
+          height={panelHeight}
+          paddingSize={paddingSize}
+        >
           {loading && !isInitialLoading && (
             <EuiProgress
               data-test-subj="initialLoadingPanelMatrixOverTime"
diff --git a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/types.ts b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/types.ts
index 7cb4144e1acba..b67505a66be44 100644
--- a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/types.ts
@@ -52,6 +52,7 @@ interface MatrixHistogramBasicProps {
   legendPosition?: Position;
   mapping?: MatrixHistogramMappingTypes;
   panelHeight?: number;
+  paddingSize?: 's' | 'm' | 'l' | 'none';
   setQuery: GlobalTimeArgs['setQuery'];
   startDate: GlobalTimeArgs['from'];
   stackByOptions: MatrixHistogramOption[];
diff --git a/x-pack/plugins/security_solution/public/common/components/page/index.tsx b/x-pack/plugins/security_solution/public/common/components/page/index.tsx
index fca49bd4539ec..9666a0837b046 100644
--- a/x-pack/plugins/security_solution/public/common/components/page/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/page/index.tsx
@@ -31,13 +31,58 @@ export const AppGlobalStyle = createGlobalStyle<{ theme: { eui: { euiColorPrimar
     z-index: 9950 !important;
   }
 
+  .euiDataGridRowCell__expandButton .euiDataGridRowCell__actionButtonIcon {
+    display: none;
+
+    &:first-child,
+    &:nth-child(2),
+    &:nth-child(3) {
+      display: inline-flex;
+    }
+
+  }
+
   /*
     overrides the default styling of EuiDataGrid expand popover footer to
     make it a column of actions instead of the default actions row
   */
-  .euiDataGridRowCell__popover .euiPopoverFooter .euiFlexGroup {
-    flex-direction: column;
-    align-items: flex-start;
+
+  .euiDataGridRowCell__popover {
+
+    max-width: 815px !important;
+    max-height: none !important;
+    overflow: hidden;
+
+
+    .expandable-top-value-button {
+      &.euiButtonEmpty--primary:enabled:focus,
+      .euiButtonEmpty--primary:focus {
+        background-color: transparent;
+      }
+    }
+
+
+    &.euiPopover__panel.euiPopover__panel-isOpen {
+      padding: 8px 0;
+      min-width: 65px;
+    }
+
+
+    .euiPopoverFooter {
+      border: 0;
+      .euiFlexGroup {
+        flex-direction: column;
+
+        .euiButtonEmpty .euiButtonContent {
+          justify-content: left;
+        }
+
+        .euiFlexItem:first-child,
+        .euiFlexItem:nth-child(2) {
+            display: none;
+        }
+      }
+    }
   }
 
   /*
@@ -54,10 +99,14 @@ export const AppGlobalStyle = createGlobalStyle<{ theme: { eui: { euiColorPrimar
   }
 
   /* hide open draggable popovers when a modal is being displayed to prevent them from covering the modal */
-  body.euiBody-hasOverlayMask .withHoverActions__popover.euiPopover__panel-isOpen{
-    visibility: hidden !important;
+  body.euiBody-hasOverlayMask {
+    .euiDataGridRowCell__popover.euiPopover__panel-isOpen,
+    .withHoverActions__popover.euiPopover__panel-isOpen {
+      visibility: hidden !important;
+    }
   }
 
+
   /* ensure elastic charts tooltips appear above open euiPopovers */
   .echTooltip {
     z-index: 9950;
diff --git a/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx b/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx
index 1556f2d0f3d13..1eef44d587ed0 100644
--- a/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx
@@ -81,6 +81,8 @@ export interface OwnProps {
   timelineId?: string;
   toggleTopN: () => void;
   onFilterAdded?: () => void;
+  paddingSize?: 's' | 'm' | 'l' | 'none';
+  showLegend?: boolean;
   value?: string[] | string | null;
   globalFilters?: Filter[];
 }
@@ -101,6 +103,8 @@ const StatefulTopNComponent: React.FC<Props> = ({
   globalQuery = EMPTY_QUERY,
   kqlMode,
   onFilterAdded,
+  paddingSize,
+  showLegend,
   timelineId,
   toggleTopN,
   value,
@@ -160,7 +164,9 @@ const StatefulTopNComponent: React.FC<Props> = ({
       from={timelineId === TimelineId.active ? activeTimelineFrom : from}
       indexPattern={indexPattern}
       options={options}
+      paddingSize={paddingSize}
       query={timelineId === TimelineId.active ? EMPTY_QUERY : globalQuery}
+      showLegend={showLegend}
       setAbsoluteRangeDatePickerTarget={timelineId === TimelineId.active ? 'timeline' : 'global'}
       setQuery={setQuery}
       timelineId={timelineId}
diff --git a/x-pack/plugins/security_solution/public/common/components/top_n/top_n.tsx b/x-pack/plugins/security_solution/public/common/components/top_n/top_n.tsx
index 7335d6203697f..f40ee8670171c 100644
--- a/x-pack/plugins/security_solution/public/common/components/top_n/top_n.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/top_n/top_n.tsx
@@ -55,8 +55,10 @@ export interface Props extends Pick<GlobalTimeArgs, 'from' | 'to' | 'deleteQuery
   filters: Filter[];
   indexPattern: IIndexPattern;
   options: TopNOption[];
+  paddingSize?: 's' | 'm' | 'l' | 'none';
   query: Query;
   setAbsoluteRangeDatePickerTarget: InputsModelId;
+  showLegend?: boolean;
   timelineId?: string;
   toggleTopN: () => void;
   onFilterAdded?: () => void;
@@ -72,7 +74,9 @@ const TopNComponent: React.FC<Props> = ({
   from,
   indexPattern,
   options,
+  paddingSize,
   query,
+  showLegend,
   setAbsoluteRangeDatePickerTarget,
   setQuery,
   timelineId,
@@ -127,7 +131,9 @@ const TopNComponent: React.FC<Props> = ({
             indexPattern={indexPattern}
             indexNames={view === 'raw' ? rawIndices : allIndices}
             onlyField={field}
+            paddingSize={paddingSize}
             query={query}
+            showLegend={showLegend}
             setAbsoluteRangeDatePickerTarget={setAbsoluteRangeDatePickerTarget}
             setQuery={setQuery}
             showSpacer={false}
@@ -141,7 +147,9 @@ const TopNComponent: React.FC<Props> = ({
             filters={filters}
             headerChildren={headerChildren}
             onlyField={field}
+            paddingSize={paddingSize}
             query={query}
+            showLegend={showLegend}
             setAbsoluteRangeDatePickerTarget={setAbsoluteRangeDatePickerTarget}
             timelineId={timelineId}
           />
diff --git a/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.test.tsx b/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.test.tsx
new file mode 100644
index 0000000000000..a4e6f0a66dfc9
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.test.tsx
@@ -0,0 +1,92 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { EuiDataGridColumn } from '@elastic/eui';
+import type {
+  BrowserFields,
+  TimelineNonEcsData,
+} from '../../../../../timelines/common/search_strategy';
+import { TGridCellAction } from '../../../../../timelines/common/types';
+import { Ecs } from '../../../../common/ecs';
+import { ColumnHeaderType } from '../../../timelines/store/timeline/model';
+
+import { defaultCellActions, EmptyComponent } from './default_cell_actions';
+import { COLUMNS_WITH_LINKS } from './helpers';
+
+describe('default cell actions', () => {
+  const browserFields: BrowserFields = {};
+  const data: TimelineNonEcsData[][] = [[]];
+  const ecsData: Ecs[] = [];
+  const timelineId = 'mockTimelineId';
+  const pageSize = 10;
+
+  test('columns without any link action (e.g.: signal.status) should return an empty component (not null or data grid would crash)', () => {
+    const columnHeaders = [
+      {
+        category: 'signal',
+        columnHeaderType: 'no-filtered' as ColumnHeaderType,
+        id: 'signal.status',
+        type: 'string',
+        aggregatable: true,
+        initialWidth: 105,
+      },
+    ];
+
+    const columnsWithCellActions: EuiDataGridColumn[] = columnHeaders.map((header) => {
+      const buildAction = (tGridCellAction: TGridCellAction) =>
+        tGridCellAction({
+          browserFields,
+          data,
+          ecsData,
+          header: columnHeaders.find((h) => h.id === header.id),
+          pageSize,
+          timelineId,
+        });
+
+      return {
+        ...header,
+        cellActions: defaultCellActions?.map(buildAction),
+      };
+    });
+
+    expect(columnsWithCellActions[0]?.cellActions?.length).toEqual(5);
+    expect(columnsWithCellActions[0]?.cellActions![4]).toEqual(EmptyComponent);
+  });
+
+  const columnHeadersToTest = COLUMNS_WITH_LINKS.map((c) => [
+    {
+      category: 'signal',
+      columnHeaderType: 'no-filtered' as ColumnHeaderType,
+      id: c.columnId,
+      type: c.fieldType,
+      aggregatable: true,
+      initialWidth: 105,
+    },
+  ]);
+  describe.each(columnHeadersToTest)('columns with a link action', (columnHeaders) => {
+    test(`${columnHeaders.id ?? columnHeaders.type}`, () => {
+      const columnsWithCellActions: EuiDataGridColumn[] = [columnHeaders].map((header) => {
+        const buildAction = (tGridCellAction: TGridCellAction) =>
+          tGridCellAction({
+            browserFields,
+            data,
+            ecsData,
+            header: [columnHeaders].find((h) => h.id === header.id),
+            pageSize,
+            timelineId,
+          });
+
+        return {
+          ...header,
+          cellActions: defaultCellActions?.map(buildAction),
+        };
+      });
+
+      expect(columnsWithCellActions[0]?.cellActions?.length).toEqual(5);
+      expect(columnsWithCellActions[0]?.cellActions![4]).not.toEqual(EmptyComponent);
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.tsx b/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.tsx
index 149a0c62b8b6a..012b84e06ed82 100644
--- a/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.tsx
+++ b/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.tsx
@@ -5,21 +5,28 @@
  * 2.0.
  */
 
-import React, { useCallback, useState, useMemo } from 'react';
-import { Filter } from '../../../../../../../src/plugins/data/public';
+import { EuiDataGridColumnCellActionProps } from '@elastic/eui';
+import { head, getOr, get, isEmpty } from 'lodash/fp';
+import React, { useMemo } from 'react';
 
 import type {
   BrowserFields,
   TimelineNonEcsData,
 } from '../../../../../timelines/common/search_strategy';
-import { DataProvider, TGridCellAction } from '../../../../../timelines/common/types';
+import {
+  ColumnHeaderOptions,
+  DataProvider,
+  TGridCellAction,
+} from '../../../../../timelines/common/types';
 import { getPageRowIndex } from '../../../../../timelines/public';
+import { Ecs } from '../../../../common/ecs';
 import { getMappedNonEcsValue } from '../../../timelines/components/timeline/body/data_driven_columns';
+import { FormattedFieldValue } from '../../../timelines/components/timeline/body/renderers/formatted_field';
+import { parseValue } from '../../../timelines/components/timeline/body/renderers/parse_value';
 import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider';
-import { allowTopN, escapeDataProviderId } from '../../components/drag_and_drop/helpers';
-import { ShowTopNButton } from '../../components/hover_actions/actions/show_top_n';
-import { getAllFieldsByName } from '../../containers/source';
+import { escapeDataProviderId } from '../../components/drag_and_drop/helpers';
 import { useKibana } from '../kibana';
+import { getLink } from './helpers';
 
 /** a noop required by the filter in / out buttons */
 const onFilterAdded = () => {};
@@ -36,15 +43,77 @@ const useKibanaServices = () => {
   return { timelines, filterManager };
 };
 
-/** the default actions shown in `EuiDataGrid` cells */
-export const defaultCellActions: TGridCellAction[] = [
+export const EmptyComponent = () => <></>;
+
+const cellActionLink = [
+  ({
+    browserFields,
+    data,
+    ecsData,
+    header,
+    timelineId,
+    pageSize,
+  }: {
+    browserFields: BrowserFields;
+    data: TimelineNonEcsData[][];
+    ecsData: Ecs[];
+    header?: ColumnHeaderOptions;
+    timelineId: string;
+    pageSize: number;
+  }) =>
+    getLink(header?.id, header?.type, header?.linkField)
+      ? ({ rowIndex, columnId, Component, closePopover }: EuiDataGridColumnCellActionProps) => {
+          const pageRowIndex = getPageRowIndex(rowIndex, pageSize);
+          const ecs = pageRowIndex < ecsData.length ? ecsData[pageRowIndex] : null;
+          const linkValues = header && getOr([], header.linkField ?? '', ecs);
+          const eventId = header && get('_id' ?? '', ecs);
+
+          if (pageRowIndex >= data.length) {
+            // data grid expects each cell action always return an element, it crashes if returns null
+            return <></>;
+          }
+
+          const values = getMappedNonEcsValue({
+            data: data[pageRowIndex],
+            fieldName: columnId,
+          });
+
+          const link = getLink(columnId, header?.type, header?.linkField);
+          const value = parseValue(head(values));
+
+          return link && eventId && values && !isEmpty(value) ? (
+            <FormattedFieldValue
+              Component={Component}
+              contextId={`expanded-value-${columnId}-row-${pageRowIndex}-${timelineId}`}
+              eventId={eventId}
+              fieldFormat={header?.format || ''}
+              fieldName={columnId}
+              fieldType={header?.type || ''}
+              isButton={true}
+              isDraggable={false}
+              value={value}
+              truncate={false}
+              title={values.length > 1 ? `${link?.label}: ${value}` : link?.label}
+              linkValue={head(linkValues)}
+              onClick={closePopover}
+            />
+          ) : (
+            // data grid expects each cell action always return an element, it crashes if returns null
+            <></>
+          );
+        }
+      : EmptyComponent,
+];
+
+export const cellActions: TGridCellAction[] = [
   ({ data, pageSize }: { data: TimelineNonEcsData[][]; pageSize: number }) =>
-    ({ rowIndex, columnId, Component }) => {
+    ({ rowIndex, columnId, Component }: EuiDataGridColumnCellActionProps) => {
       const { timelines, filterManager } = useKibanaServices();
 
       const pageRowIndex = getPageRowIndex(rowIndex, pageSize);
       if (pageRowIndex >= data.length) {
-        return null;
+        // data grid expects each cell action always return an element, it crashes if returns null
+        return <></>;
       }
 
       const value = getMappedNonEcsValue({
@@ -72,7 +141,8 @@ export const defaultCellActions: TGridCellAction[] = [
 
       const pageRowIndex = getPageRowIndex(rowIndex, pageSize);
       if (pageRowIndex >= data.length) {
-        return null;
+        // data grid expects each cell action always return an element, it crashes if returns null
+        return <></>;
       }
 
       const value = getMappedNonEcsValue({
@@ -100,34 +170,8 @@ export const defaultCellActions: TGridCellAction[] = [
 
       const pageRowIndex = getPageRowIndex(rowIndex, pageSize);
       if (pageRowIndex >= data.length) {
-        return null;
-      }
-
-      const value = getMappedNonEcsValue({
-        data: data[pageRowIndex],
-        fieldName: columnId,
-      });
-
-      return (
-        <>
-          {timelines.getHoverActions().getCopyButton({
-            Component,
-            field: columnId,
-            isHoverAction: false,
-            ownFocus: false,
-            showTooltip: false,
-            value,
-          })}
-        </>
-      );
-    },
-  ({ data, pageSize }: { data: TimelineNonEcsData[][]; pageSize: number }) =>
-    ({ rowIndex, columnId, Component }) => {
-      const { timelines } = useKibanaServices();
-
-      const pageRowIndex = getPageRowIndex(rowIndex, pageSize);
-      if (pageRowIndex >= data.length) {
-        return null;
+        // data grid expects each cell action always return an element, it crashes if returns null
+        return <></>;
       }
 
       const value = getMappedNonEcsValue({
@@ -165,26 +209,14 @@ export const defaultCellActions: TGridCellAction[] = [
         </>
       );
     },
-  ({
-      browserFields,
-      data,
-      globalFilters,
-      timelineId,
-      pageSize,
-    }: {
-      browserFields: BrowserFields;
-      data: TimelineNonEcsData[][];
-      globalFilters?: Filter[];
-      timelineId: string;
-      pageSize: number;
-    }) =>
+  ({ data, pageSize }: { data: TimelineNonEcsData[][]; pageSize: number }) =>
     ({ rowIndex, columnId, Component }) => {
-      const [showTopN, setShowTopN] = useState(false);
-      const onClick = useCallback(() => setShowTopN(!showTopN), [showTopN]);
+      const { timelines } = useKibanaServices();
 
       const pageRowIndex = getPageRowIndex(rowIndex, pageSize);
       if (pageRowIndex >= data.length) {
-        return null;
+        // data grid expects each cell action always return an element, it crashes if returns null
+        return <></>;
       }
 
       const value = getMappedNonEcsValue({
@@ -192,31 +224,20 @@ export const defaultCellActions: TGridCellAction[] = [
         fieldName: columnId,
       });
 
-      const showButton = useMemo(
-        () =>
-          allowTopN({
-            browserField: getAllFieldsByName(browserFields)[columnId],
-            fieldName: columnId,
-            hideTopN: false,
-          }),
-        [columnId]
+      return (
+        <>
+          {timelines.getHoverActions().getCopyButton({
+            Component,
+            field: columnId,
+            isHoverAction: false,
+            ownFocus: false,
+            showTooltip: false,
+            value,
+          })}
+        </>
       );
-
-      return showButton ? (
-        <ShowTopNButton
-          Component={Component}
-          enablePopOver
-          data-test-subj="hover-actions-show-top-n"
-          field={columnId}
-          globalFilters={globalFilters}
-          onClick={onClick}
-          onFilterAdded={onFilterAdded}
-          ownFocus={false}
-          showTopN={showTopN}
-          showTooltip={false}
-          timelineId={timelineId}
-          value={value}
-        />
-      ) : null;
     },
 ];
+
+/** the default actions shown in `EuiDataGrid` cells */
+export const defaultCellActions = [...cellActions, ...cellActionLink];
diff --git a/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.test.tsx b/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.test.tsx
new file mode 100644
index 0000000000000..c818b16ac1f4f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.test.tsx
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { shallow } from 'enzyme';
+import React from 'react';
+import { ExpandedCellValueActions } from './expanded_cell_value_actions';
+
+jest.mock('../kibana');
+
+describe('ExpandedCellValueActions', () => {
+  const props = {
+    browserFields: {
+      host: {
+        fields: {
+          'host.name': {
+            aggregatable: true,
+            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.',
+            type: 'string',
+            name: 'host.name',
+          },
+        },
+      },
+    },
+    field: 'host.name',
+    globalFilters: [],
+    onFilterAdded: () => {},
+    timelineId: 'mockTimelineId',
+    value: ['mock value'],
+  };
+  const wrapper = shallow(<ExpandedCellValueActions {...props} />);
+
+  test('renders show topN button', () => {
+    expect(wrapper.find('[data-test-subj="data-grid-expanded-show-top-n"]').exists()).toBeTruthy();
+  });
+
+  test('renders filter in button', () => {
+    expect(wrapper.find('EuiFlexItem').first().html()).toContain('Filter button');
+  });
+
+  test('renders filter out button', () => {
+    expect(wrapper.find('EuiFlexItem').last().html()).toContain('Filter out button');
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.tsx b/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.tsx
new file mode 100644
index 0000000000000..4b50fff48fe06
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.tsx
@@ -0,0 +1,125 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { noop } from 'lodash/fp';
+import React, { useMemo, useState, useCallback } from 'react';
+import styled from 'styled-components';
+import { Filter } from '../../../../../../../src/plugins/data/public';
+import { BrowserFields } from '../../../../../timelines/common/search_strategy';
+import { allowTopN } from '../../components/drag_and_drop/helpers';
+import { ShowTopNButton } from '../../components/hover_actions/actions/show_top_n';
+import { getAllFieldsByName } from '../../containers/source';
+import { useKibana } from '../kibana';
+import { SHOW_TOP_VALUES, HIDE_TOP_VALUES } from './translations';
+
+interface Props {
+  browserFields: BrowserFields;
+  field: string;
+  globalFilters?: Filter[];
+  timelineId: string;
+  value: string[] | undefined;
+  onFilterAdded?: () => void;
+}
+
+const StyledFlexGroup = styled(EuiFlexGroup)`
+  border-top: 1px solid #d3dae6;
+  border-bottom: 1px solid #d3dae6;
+  margin-top: 2px;
+`;
+
+export const StyledContent = styled.div<{ $isDetails: boolean }>`
+  padding: ${({ $isDetails }) => ($isDetails ? '0 8px' : undefined)};
+`;
+
+const ExpandedCellValueActionsComponent: React.FC<Props> = ({
+  browserFields,
+  field,
+  globalFilters,
+  onFilterAdded,
+  timelineId,
+  value,
+}) => {
+  const {
+    timelines,
+    data: {
+      query: { filterManager },
+    },
+  } = useKibana().services;
+  const showButton = useMemo(
+    () =>
+      allowTopN({
+        browserField: getAllFieldsByName(browserFields)[field],
+        fieldName: field,
+        hideTopN: false,
+      }),
+    [browserFields, field]
+  );
+
+  const [showTopN, setShowTopN] = useState(false);
+  const onClick = useCallback(() => setShowTopN(!showTopN), [showTopN]);
+
+  return (
+    <>
+      <StyledContent $isDetails data-test-subj="data-grid-expanded-cell-value-actions">
+        {showButton ? (
+          <ShowTopNButton
+            className="eui-displayBlock expandable-top-value-button"
+            Component={EuiButtonEmpty}
+            data-test-subj="data-grid-expanded-show-top-n"
+            field={field}
+            flush="both"
+            globalFilters={globalFilters}
+            iconSide="right"
+            iconType={showTopN ? 'arrowUp' : 'arrowDown'}
+            isExpandable
+            onClick={onClick}
+            onFilterAdded={onFilterAdded ?? noop}
+            ownFocus={false}
+            paddingSize="none"
+            showLegend
+            showTopN={showTopN}
+            showTooltip={false}
+            timelineId={timelineId}
+            title={showTopN ? HIDE_TOP_VALUES : SHOW_TOP_VALUES}
+            value={value}
+          />
+        ) : null}
+      </StyledContent>
+      <StyledFlexGroup gutterSize="s">
+        <EuiFlexItem>
+          {timelines.getHoverActions().getFilterForValueButton({
+            Component: EuiButtonEmpty,
+            field,
+            filterManager,
+            onFilterAdded,
+            ownFocus: false,
+            size: 's',
+            showTooltip: false,
+            value,
+          })}
+        </EuiFlexItem>
+        <EuiFlexItem>
+          {timelines.getHoverActions().getFilterOutValueButton({
+            Component: EuiButtonEmpty,
+            field,
+            filterManager,
+            onFilterAdded,
+            ownFocus: false,
+            size: 's',
+            showTooltip: false,
+            value,
+          })}
+        </EuiFlexItem>
+      </StyledFlexGroup>
+    </>
+  );
+};
+
+ExpandedCellValueActionsComponent.displayName = 'ExpandedCellValueActionsComponent';
+
+export const ExpandedCellValueActions = React.memo(ExpandedCellValueActionsComponent);
diff --git a/x-pack/plugins/security_solution/public/common/lib/cell_actions/helpers.ts b/x-pack/plugins/security_solution/public/common/lib/cell_actions/helpers.ts
new file mode 100644
index 0000000000000..1c40d8df48bfe
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/lib/cell_actions/helpers.ts
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import * as i18n from './translations';
+import {
+  EVENT_URL_FIELD_NAME,
+  HOST_NAME_FIELD_NAME,
+  REFERENCE_URL_FIELD_NAME,
+  RULE_REFERENCE_FIELD_NAME,
+  SIGNAL_RULE_NAME_FIELD_NAME,
+} from '../../../timelines/components/timeline/body/renderers/constants';
+import { INDICATOR_REFERENCE } from '../../../../common/cti/constants';
+import { IP_FIELD_TYPE } from '../../../network/components/ip';
+import { PORT_NAMES } from '../../../network/components/port/helpers';
+
+export const COLUMNS_WITH_LINKS = [
+  {
+    columnId: HOST_NAME_FIELD_NAME,
+    label: i18n.VIEW_HOST_SUMMARY,
+  },
+  {
+    columnId: 'source.ip',
+    fieldType: IP_FIELD_TYPE,
+    label: i18n.EXPAND_IP_DETAILS,
+  },
+  {
+    columnId: 'destination.ip',
+    fieldType: IP_FIELD_TYPE,
+    label: i18n.EXPAND_IP_DETAILS,
+  },
+  {
+    columnId: SIGNAL_RULE_NAME_FIELD_NAME,
+    label: i18n.VIEW_RULE_DETAILS,
+  },
+  ...PORT_NAMES.map((p) => ({
+    columnId: p,
+    label: i18n.VIEW_PORT_DETAILS,
+  })),
+  {
+    columnId: RULE_REFERENCE_FIELD_NAME,
+    label: i18n.VIEW_RULE_REFERENCE,
+  },
+  {
+    columnId: REFERENCE_URL_FIELD_NAME,
+    label: i18n.VIEW_RULE_REFERENCE,
+  },
+  {
+    columnId: EVENT_URL_FIELD_NAME,
+    label: i18n.VIEW_EVENT_REFERENCE,
+  },
+  {
+    columnId: INDICATOR_REFERENCE,
+    label: i18n.VIEW_INDICATOR_REFERENCE,
+  },
+];
+
+export const getLink = (cId?: string, fieldType?: string, linkField?: string) =>
+  cId &&
+  COLUMNS_WITH_LINKS.find(
+    (c) => c.columnId === cId || (c.fieldType && fieldType === c.fieldType && linkField != null)
+  );
diff --git a/x-pack/plugins/security_solution/public/common/lib/cell_actions/translations.ts b/x-pack/plugins/security_solution/public/common/lib/cell_actions/translations.ts
new file mode 100644
index 0000000000000..527cc14c323b2
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/lib/cell_actions/translations.ts
@@ -0,0 +1,71 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const SHOW_TOP_VALUES = i18n.translate(
+  'xpack.securitySolution.expandedValue.showTopN.showTopValues',
+  {
+    defaultMessage: 'Show top values',
+  }
+);
+
+export const HIDE_TOP_VALUES = i18n.translate(
+  'xpack.securitySolution.expandedValue.hideTopValues.HideTopValues',
+  {
+    defaultMessage: 'Hide top values',
+  }
+);
+
+export const VIEW_HOST_SUMMARY = i18n.translate(
+  'xpack.securitySolution.expandedValue.links.viewHostSummary',
+  {
+    defaultMessage: 'View host summary',
+  }
+);
+
+export const EXPAND_IP_DETAILS = i18n.translate(
+  'xpack.securitySolution.expandedValue.links.expandIpDetails',
+  {
+    defaultMessage: 'Expand ip details',
+  }
+);
+
+export const VIEW_RULE_DETAILS = i18n.translate(
+  'xpack.securitySolution.expandedValue.links.viewRuleDetails',
+  {
+    defaultMessage: 'View rule details',
+  }
+);
+
+export const VIEW_PORT_DETAILS = i18n.translate(
+  'xpack.securitySolution.expandedValue.links.viewPortDetails',
+  {
+    defaultMessage: 'View port details',
+  }
+);
+
+export const VIEW_RULE_REFERENCE = i18n.translate(
+  'xpack.securitySolution.expandedValue.links.viewRuleReference',
+  {
+    defaultMessage: 'View rule reference',
+  }
+);
+
+export const VIEW_EVENT_REFERENCE = i18n.translate(
+  'xpack.securitySolution.expandedValue.links.viewEventReference',
+  {
+    defaultMessage: 'View event reference',
+  }
+);
+
+export const VIEW_INDICATOR_REFERENCE = i18n.translate(
+  'xpack.securitySolution.expandedValue.links.viewIndicatorReference',
+  {
+    defaultMessage: 'View indicator reference',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/alerts_histogram.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/alerts_histogram.tsx
index 09d8d52271674..d09d33ce5aded 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/alerts_histogram.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/alerts_histogram.tsx
@@ -31,6 +31,7 @@ interface AlertsHistogramProps {
   legendItems: LegendItem[];
   legendPosition?: Position;
   loading: boolean;
+  showLegend?: boolean;
   to: string;
   data: HistogramData[];
   updateDateRange: UpdateDateRange;
@@ -43,6 +44,7 @@ export const AlertsHistogram = React.memo<AlertsHistogramProps>(
     legendItems,
     legendPosition = 'right',
     loading,
+    showLegend,
     to,
     updateDateRange,
   }) => {
@@ -73,8 +75,9 @@ export const AlertsHistogram = React.memo<AlertsHistogramProps>(
               <Settings
                 legendPosition={legendPosition}
                 onBrushEnd={updateDateRange}
-                showLegend={legendItems.length === 0}
-                showLegendExtra
+                // showLegend controls the default legend coming from Elastic chart, we show them when our customised legend items doesn't exist (but we still want to show legend).
+                showLegend={showLegend && legendItems.length === 0}
+                showLegendExtra={showLegend}
                 theme={theme}
               />
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.tsx
index 280b7f2926276..0613c619d89b9 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.tsx
@@ -63,10 +63,12 @@ interface AlertsHistogramPanelProps {
   headerChildren?: React.ReactNode;
   /** Override all defaults, and only display this field */
   onlyField?: AlertsStackByField;
+  paddingSize?: 's' | 'm' | 'l' | 'none';
   titleSize?: EuiTitleSize;
   query?: Query;
   legendPosition?: Position;
   signalIndexName: string | null;
+  showLegend?: boolean;
   showLinkToAlerts?: boolean;
   showTotalAlertsCount?: boolean;
   showStackBy?: boolean;
@@ -85,9 +87,11 @@ export const AlertsHistogramPanel = memo<AlertsHistogramPanelProps>(
     filters,
     headerChildren,
     onlyField,
+    paddingSize = 'm',
     query,
     legendPosition = 'right',
     signalIndexName,
+    showLegend = true,
     showLinkToAlerts = false,
     showTotalAlertsCount = false,
     showStackBy = true,
@@ -154,7 +158,7 @@ export const AlertsHistogramPanel = memo<AlertsHistogramPanelProps>(
 
     const legendItems: LegendItem[] = useMemo(
       () =>
-        alertsData?.aggregations?.alertsByGrouping?.buckets != null
+        showLegend && alertsData?.aggregations?.alertsByGrouping?.buckets != null
           ? alertsData.aggregations.alertsByGrouping.buckets.map((bucket, i) => ({
               color: i < defaultLegendColors.length ? defaultLegendColors[i] : undefined,
               dataProviderId: escapeDataProviderId(
@@ -165,7 +169,12 @@ export const AlertsHistogramPanel = memo<AlertsHistogramPanelProps>(
               value: bucket.key,
             }))
           : NO_LEGEND_DATA,
-      [alertsData, selectedStackByOption, timelineId]
+      [
+        alertsData?.aggregations?.alertsByGrouping.buckets,
+        selectedStackByOption,
+        showLegend,
+        timelineId,
+      ]
     );
 
     useEffect(() => {
@@ -254,7 +263,7 @@ export const AlertsHistogramPanel = memo<AlertsHistogramPanelProps>(
 
     return (
       <InspectButtonContainer data-test-subj="alerts-histogram-panel" show={!isInitialLoading}>
-        <KpiPanel height={PANEL_HEIGHT} hasBorder>
+        <KpiPanel height={PANEL_HEIGHT} hasBorder paddingSize={paddingSize}>
           <HeaderSection
             id={uniqueQueryId}
             title={titleText}
@@ -288,6 +297,7 @@ export const AlertsHistogramPanel = memo<AlertsHistogramPanelProps>(
               legendPosition={legendPosition}
               loading={isLoadingAlerts}
               to={to}
+              showLegend={showLegend}
               updateDateRange={updateDateRange}
             />
           )}
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 89d0fd2e4dbd0..d7c48c4f18bc8 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
@@ -375,21 +375,21 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
 
   return (
     <StatefulEventsViewer
-      pageFilters={defaultFiltersMemo}
+      additionalFilters={additionalFiltersComponent}
+      currentFilter={filterGroup}
       defaultCellActions={defaultCellActions}
       defaultModel={defaultTimelineModel}
-      entityType="events"
       end={to}
-      currentFilter={filterGroup}
+      entityType="events"
+      hasAlertsCrud={hasIndexWrite && hasIndexMaintenance}
       id={timelineId}
       onRuleChange={onRuleChange}
+      pageFilters={defaultFiltersMemo}
       renderCellValue={RenderCellValue}
       rowRenderers={defaultRowRenderers}
       scopeId={SourcererScopeName.detections}
       start={from}
       utilityBar={utilityBarCallback}
-      additionalFilters={additionalFiltersComponent}
-      hasAlertsCrud={hasIndexWrite && hasIndexMaintenance}
     />
   );
 };
diff --git a/x-pack/plugins/security_solution/public/detections/configurations/security_solution_detections/render_cell_value.tsx b/x-pack/plugins/security_solution/public/detections/configurations/security_solution_detections/render_cell_value.tsx
index d9cdc4e0d0912..54cd26e9cdc54 100644
--- a/x-pack/plugins/security_solution/public/detections/configurations/security_solution_detections/render_cell_value.tsx
+++ b/x-pack/plugins/security_solution/public/detections/configurations/security_solution_detections/render_cell_value.tsx
@@ -18,37 +18,41 @@ import { DefaultCellRenderer } from '../../../timelines/components/timeline/cell
  */
 export const RenderCellValue: React.FC<EuiDataGridCellValueElementProps & CellValueElementProps> =
   ({
+    browserFields,
     columnId,
     data,
+    ecsData,
     eventId,
-    isDraggable,
+    globalFilters,
     header,
     isDetails,
+    isDraggable,
     isExpandable,
     isExpanded,
     linkValues,
     rowIndex,
+    rowRenderers,
     setCellProps,
     timelineId,
-    ecsData,
-    rowRenderers,
-    browserFields,
+    truncate,
   }) => (
     <DefaultCellRenderer
+      browserFields={browserFields}
       columnId={columnId}
       data={data}
+      ecsData={ecsData}
       eventId={eventId}
-      isDraggable={isDraggable}
+      globalFilters={globalFilters}
       header={header}
       isDetails={isDetails}
+      isDraggable={isDraggable}
       isExpandable={isExpandable}
       isExpanded={isExpanded}
       linkValues={linkValues}
       rowIndex={rowIndex}
+      rowRenderers={rowRenderers}
       setCellProps={setCellProps}
       timelineId={timelineId}
-      ecsData={ecsData}
-      rowRenderers={rowRenderers}
-      browserFields={browserFields}
+      truncate={truncate}
     />
   );
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/navigation/events_query_tab_body.tsx b/x-pack/plugins/security_solution/public/hosts/pages/navigation/events_query_tab_body.tsx
index fb3e22260bd84..3a27f8c2f3ba6 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/navigation/events_query_tab_body.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/navigation/events_query_tab_body.tsx
@@ -115,11 +115,11 @@ const EventsQueryTabBodyComponent: React.FC<HostsComponentsQueryProps> = ({
         end={endDate}
         entityType="events"
         id={TimelineId.hostsPageEvents}
+        pageFilters={pageFilters}
         renderCellValue={DefaultCellRenderer}
         rowRenderers={defaultRowRenderers}
         scopeId={SourcererScopeName.default}
         start={startDate}
-        pageFilters={pageFilters}
         unit={unit}
       />
     </>
diff --git a/x-pack/plugins/security_solution/public/network/components/port/helpers.ts b/x-pack/plugins/security_solution/public/network/components/port/helpers.ts
new file mode 100644
index 0000000000000..e162fb3f90968
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/network/components/port/helpers.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+export const CLIENT_PORT_FIELD_NAME = 'client.port';
+export const DESTINATION_PORT_FIELD_NAME = 'destination.port';
+export const SERVER_PORT_FIELD_NAME = 'server.port';
+export const SOURCE_PORT_FIELD_NAME = 'source.port';
+export const URL_PORT_FIELD_NAME = 'url.port';
+
+export const PORT_NAMES = [
+  CLIENT_PORT_FIELD_NAME,
+  DESTINATION_PORT_FIELD_NAME,
+  SERVER_PORT_FIELD_NAME,
+  SOURCE_PORT_FIELD_NAME,
+  URL_PORT_FIELD_NAME,
+];
diff --git a/x-pack/plugins/security_solution/public/network/components/port/index.tsx b/x-pack/plugins/security_solution/public/network/components/port/index.tsx
index 4afd9bc7b892a..769aa7300d138 100644
--- a/x-pack/plugins/security_solution/public/network/components/port/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/port/index.tsx
@@ -5,33 +5,22 @@
  * 2.0.
  */
 
+import { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
 import React from 'react';
 
 import { DefaultDraggable } from '../../../common/components/draggables';
 import { getEmptyValue } from '../../../common/components/empty_value';
 import { PortOrServiceNameLink } from '../../../common/components/links';
 
-export const CLIENT_PORT_FIELD_NAME = 'client.port';
-export const DESTINATION_PORT_FIELD_NAME = 'destination.port';
-export const SERVER_PORT_FIELD_NAME = 'server.port';
-export const SOURCE_PORT_FIELD_NAME = 'source.port';
-export const URL_PORT_FIELD_NAME = 'url.port';
-
-export const PORT_NAMES = [
-  CLIENT_PORT_FIELD_NAME,
-  DESTINATION_PORT_FIELD_NAME,
-  SERVER_PORT_FIELD_NAME,
-  SOURCE_PORT_FIELD_NAME,
-  URL_PORT_FIELD_NAME,
-];
-
 export const Port = React.memo<{
   contextId: string;
+  Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
   eventId: string;
   fieldName: string;
   isDraggable?: boolean;
+  title?: string;
   value: string | undefined | null;
-}>(({ contextId, eventId, fieldName, isDraggable, value }) =>
+}>(({ Component, contextId, eventId, fieldName, isDraggable, title, value }) =>
   isDraggable ? (
     <DefaultDraggable
       data-test-subj="port"
@@ -41,10 +30,18 @@ export const Port = React.memo<{
       tooltipContent={fieldName}
       value={value}
     >
-      <PortOrServiceNameLink portOrServiceName={value || getEmptyValue()} />
+      <PortOrServiceNameLink
+        portOrServiceName={value || getEmptyValue()}
+        Component={Component}
+        title={title}
+      />
     </DefaultDraggable>
   ) : (
-    <PortOrServiceNameLink portOrServiceName={value || getEmptyValue()} />
+    <PortOrServiceNameLink
+      portOrServiceName={value || getEmptyValue()}
+      Component={Component}
+      title={title}
+    />
   )
 );
 
diff --git a/x-pack/plugins/security_solution/public/network/components/source_destination/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/source_destination/index.test.tsx
index 3da5ec6d4b218..3332111d14f8b 100644
--- a/x-pack/plugins/security_solution/public/network/components/source_destination/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/source_destination/index.test.tsx
@@ -18,7 +18,7 @@ import { TestProviders } from '../../../common/mock/test_providers';
 import { ID_FIELD_NAME } from '../../../common/components/event_details/event_id';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
 import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../ip';
-import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME } from '../port';
+import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME } from '../port/helpers';
 import {
   DESTINATION_BYTES_FIELD_NAME,
   DESTINATION_PACKETS_FIELD_NAME,
diff --git a/x-pack/plugins/security_solution/public/network/components/source_destination/source_destination_ip.test.tsx b/x-pack/plugins/security_solution/public/network/components/source_destination/source_destination_ip.test.tsx
index 824b9fd11f242..f16cd7dbb109f 100644
--- a/x-pack/plugins/security_solution/public/network/components/source_destination/source_destination_ip.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/source_destination/source_destination_ip.test.tsx
@@ -15,7 +15,7 @@ import '../../../common/mock/match_media';
 import { TestProviders } from '../../../common/mock/test_providers';
 import { ID_FIELD_NAME } from '../../../common/components/event_details/event_id';
 import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../ip';
-import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME } from '../port';
+import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME } from '../port/helpers';
 import * as i18n from '../../../timelines/components/timeline/body/renderers/translations';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
 
diff --git a/x-pack/plugins/security_solution/public/network/components/source_destination/source_destination_ip.tsx b/x-pack/plugins/security_solution/public/network/components/source_destination/source_destination_ip.tsx
index 31bae6880fcbe..2be1c5f50406f 100644
--- a/x-pack/plugins/security_solution/public/network/components/source_destination/source_destination_ip.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/source_destination/source_destination_ip.tsx
@@ -11,7 +11,8 @@ import React from 'react';
 import deepEqual from 'fast-deep-equal';
 
 import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../ip';
-import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME, Port } from '../port';
+import { Port } from '../port';
+import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME } from '../port/helpers';
 import * as i18n from '../../../timelines/components/timeline/body/renderers/translations';
 
 import { GeoFields } from './geo_fields';
diff --git a/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx b/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
index 5cea3fa98eeb7..7de1d9d9f40c1 100644
--- a/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
@@ -49,8 +49,10 @@ interface Props extends Pick<GlobalTimeArgs, 'from' | 'to' | 'deleteQuery' | 'se
   indexPattern: IIndexPattern;
   indexNames: string[];
   onlyField?: string;
+  paddingSize?: 's' | 'm' | 'l' | 'none';
   query: Query;
   setAbsoluteRangeDatePickerTarget?: InputsModelId;
+  showLegend?: boolean;
   showSpacer?: boolean;
   timelineId?: string;
   toggleTopN?: () => void;
@@ -70,9 +72,11 @@ const EventsByDatasetComponent: React.FC<Props> = ({
   indexPattern,
   indexNames,
   onlyField,
+  paddingSize,
   query,
   setAbsoluteRangeDatePickerTarget,
   setQuery,
+  showLegend,
   showSpacer = true,
   timelineId,
   to,
@@ -177,9 +181,11 @@ const EventsByDatasetComponent: React.FC<Props> = ({
       id={uniqueQueryId}
       indexNames={indexNames}
       onError={toggleTopN}
+      paddingSize={paddingSize}
       setAbsoluteRangeDatePickerTarget={setAbsoluteRangeDatePickerTarget}
       setQuery={setQuery}
       showSpacer={showSpacer}
+      showLegend={showLegend}
       skip={filterQuery === undefined}
       startDate={from}
       timelineId={timelineId}
diff --git a/x-pack/plugins/security_solution/public/overview/components/signals_by_category/index.tsx b/x-pack/plugins/security_solution/public/overview/components/signals_by_category/index.tsx
index 76116f2261118..321e6d00b5301 100644
--- a/x-pack/plugins/security_solution/public/overview/components/signals_by_category/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/signals_by_category/index.tsx
@@ -23,8 +23,10 @@ interface Props {
   headerChildren?: React.ReactNode;
   /** Override all defaults, and only display this field */
   onlyField?: AlertsStackByField;
+  paddingSize?: 's' | 'm' | 'l' | 'none';
   query?: Query;
   setAbsoluteRangeDatePickerTarget?: InputsModelId;
+  showLegend?: boolean;
   timelineId?: string;
 }
 
@@ -33,7 +35,9 @@ const SignalsByCategoryComponent: React.FC<Props> = ({
   filters,
   headerChildren,
   onlyField,
+  paddingSize,
   query,
+  showLegend,
   setAbsoluteRangeDatePickerTarget = 'global',
   timelineId,
 }) => {
@@ -61,16 +65,18 @@ const SignalsByCategoryComponent: React.FC<Props> = ({
       combinedQueries={combinedQueries}
       filters={filters}
       headerChildren={headerChildren}
+      legendPosition={'right'}
       onlyField={onlyField}
-      titleSize={onlyField == null ? 'm' : 's'}
+      paddingSize={paddingSize}
       query={query}
-      signalIndexName={signalIndexName}
-      showTotalAlertsCount={true}
+      showLegend={showLegend}
       showLinkToAlerts={onlyField == null ? true : false}
       showStackBy={onlyField == null}
-      legendPosition={'right'}
+      showTotalAlertsCount={true}
+      signalIndexName={signalIndexName}
       timelineId={timelineId}
       title={i18n.ALERT_COUNT}
+      titleSize={onlyField == null ? 'm' : 's'}
       updateDateRange={updateDateRangeCallback}
     />
   );
diff --git a/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx
index 913a0f7ed200b..e1f0954683e04 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx
@@ -10,6 +10,7 @@ import React, { useCallback, useMemo, useContext } from 'react';
 import { useDispatch } from 'react-redux';
 import deepEqual from 'fast-deep-equal';
 
+import { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
 import { FlowTarget } from '../../../../common/search_strategy/security_solution/network';
 import {
   DragEffects,
@@ -145,11 +146,15 @@ interface AddressLinksItemProps extends Omit<AddressLinksProps, 'addresses'> {
 
 const AddressLinksItemComponent: React.FC<AddressLinksItemProps> = ({
   address,
+  Component,
   contextId,
   eventId,
   fieldName,
+  isButton,
   isDraggable,
+  onClick,
   truncate,
+  title,
 }) => {
   const key = `address-links-draggable-wrapper-${getUniqueId({
     contextId,
@@ -171,6 +176,10 @@ const AddressLinksItemComponent: React.FC<AddressLinksItemProps> = ({
   const openNetworkDetailsSidePanel = useCallback(
     (e) => {
       e.preventDefault();
+      if (onClick) {
+        onClick();
+      }
+
       if (eventContext && isInTimelineContext) {
         const { tabType, timelineID } = eventContext;
         const updatedExpandedDetail: TimelineExpandedDetailType = {
@@ -196,22 +205,41 @@ const AddressLinksItemComponent: React.FC<AddressLinksItemProps> = ({
         }
       }
     },
-    [eventContext, isInTimelineContext, address, fieldName, dispatch]
+    [onClick, eventContext, isInTimelineContext, address, fieldName, dispatch]
   );
 
   // The below is explicitly defined this way as the onClick takes precedence when it and the href are both defined
   // When this component is used outside of timeline/alerts table (i.e. in the flyout) we would still like it to link to the IP Overview page
   const content = useMemo(
-    () => (
-      <Content field={fieldName} tooltipContent={fieldName}>
+    () =>
+      Component ? (
         <NetworkDetailsLink
+          Component={Component}
           ip={address}
-          isButton={false}
+          isButton={isButton}
           onClick={isInTimelineContext ? openNetworkDetailsSidePanel : undefined}
+          title={title}
         />
-      </Content>
-    ),
-    [address, fieldName, isInTimelineContext, openNetworkDetailsSidePanel]
+      ) : (
+        <Content field={fieldName} tooltipContent={fieldName}>
+          <NetworkDetailsLink
+            Component={Component}
+            ip={address}
+            isButton={isButton}
+            onClick={isInTimelineContext ? openNetworkDetailsSidePanel : undefined}
+            title={title}
+          />
+        </Content>
+      ),
+    [
+      Component,
+      address,
+      fieldName,
+      isButton,
+      isInTimelineContext,
+      openNetworkDetailsSidePanel,
+      title,
+    ]
   );
 
   const render = useCallback(
@@ -245,20 +273,28 @@ const AddressLinksItem = React.memo(AddressLinksItemComponent);
 
 interface AddressLinksProps {
   addresses: string[];
+  Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
   contextId: string;
   eventId: string;
   fieldName: string;
+  isButton?: boolean;
   isDraggable: boolean;
+  onClick?: () => void;
   truncate?: boolean;
+  title?: string;
 }
 
 const AddressLinksComponent: React.FC<AddressLinksProps> = ({
   addresses,
+  Component,
   contextId,
   eventId,
   fieldName,
+  isButton,
   isDraggable,
+  onClick,
   truncate,
+  title,
 }) => {
   const uniqAddresses = useMemo(() => uniq(addresses), [addresses]);
 
@@ -268,14 +304,29 @@ const AddressLinksComponent: React.FC<AddressLinksProps> = ({
         <AddressLinksItem
           key={address}
           address={address}
+          Component={Component}
           contextId={contextId}
           eventId={eventId}
           fieldName={fieldName}
+          isButton={isButton}
           isDraggable={isDraggable}
+          onClick={onClick}
           truncate={truncate}
+          title={title}
         />
       )),
-    [contextId, eventId, fieldName, isDraggable, truncate, uniqAddresses]
+    [
+      Component,
+      contextId,
+      eventId,
+      fieldName,
+      isButton,
+      isDraggable,
+      onClick,
+      title,
+      truncate,
+      uniqAddresses,
+    ]
   );
 
   return <>{content}</>;
@@ -293,13 +344,28 @@ const AddressLinks = React.memo(
 );
 
 const FormattedIpComponent: React.FC<{
+  Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
   contextId: string;
   eventId: string;
   fieldName: string;
+  isButton?: boolean;
   isDraggable: boolean;
+  onClick?: () => void;
+  title?: string;
   truncate?: boolean;
   value: string | object | null | undefined;
-}> = ({ contextId, eventId, fieldName, isDraggable, truncate, value }) => {
+}> = ({
+  Component,
+  contextId,
+  eventId,
+  fieldName,
+  isDraggable,
+  isButton,
+  onClick,
+  title,
+  truncate,
+  value,
+}) => {
   if (isString(value) && !isEmpty(value)) {
     try {
       const addresses = JSON.parse(value);
@@ -307,10 +373,14 @@ const FormattedIpComponent: React.FC<{
         return (
           <AddressLinks
             addresses={addresses}
+            Component={Component}
             contextId={contextId}
             eventId={eventId}
             fieldName={fieldName}
+            isButton={isButton}
             isDraggable={isDraggable}
+            onClick={onClick}
+            title={title}
             truncate={truncate}
           />
         );
@@ -323,11 +393,15 @@ const FormattedIpComponent: React.FC<{
     return (
       <AddressLinks
         addresses={[value]}
+        Component={Component}
         contextId={contextId}
         eventId={eventId}
+        isButton={isButton}
         isDraggable={isDraggable}
+        onClick={onClick}
         fieldName={fieldName}
         truncate={truncate}
+        title={title}
       />
     );
   } else {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/netflow/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/netflow/index.test.tsx
index 5392b382d6c82..23a52b878472f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/netflow/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/netflow/index.test.tsx
@@ -25,7 +25,7 @@ import { JA3_HASH_FIELD_NAME } from '../ja3_fingerprint';
 import {
   DESTINATION_PORT_FIELD_NAME,
   SOURCE_PORT_FIELD_NAME,
-} from '../../../network/components/port';
+} from '../../../network/components/port/helpers';
 import {
   DESTINATION_GEO_CITY_NAME_FIELD_NAME,
   DESTINATION_GEO_CONTINENT_NAME_FIELD_NAME,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/column_renderer.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/column_renderer.ts
index 1e6f613999ece..0ec974f876894 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/column_renderer.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/column_renderer.ts
@@ -6,33 +6,44 @@
  */
 
 import type React from 'react';
+import { Filter } from '../../../../../../../../../src/plugins/data/public';
+import { BrowserFields } from '../../../../../../../timelines/common/search_strategy';
 
-import { BrowserFields, ColumnHeaderOptions, RowRenderer } from '../../../../../../common';
+import { ColumnHeaderOptions, RowRenderer } from '../../../../../../common';
 import { Ecs } from '../../../../../../common/ecs';
 import { TimelineNonEcsData } from '../../../../../../common/search_strategy/timeline';
 
 export interface ColumnRenderer {
   isInstance: (columnName: string, data: TimelineNonEcsData[]) => boolean;
   renderColumn: ({
+    browserFields,
+    className,
     columnName,
     eventId,
     field,
+    globalFilters,
+    isDetails,
     isDraggable,
+    linkValues,
+    rowRenderers,
     timelineId,
     truncate,
     values,
-    linkValues,
   }: {
+    asPlainText?: boolean;
+    browserFields?: BrowserFields;
+    className?: string;
     columnName: string;
+    ecsData?: Ecs;
     eventId: string;
     field: ColumnHeaderOptions;
+    globalFilters?: Filter[];
+    isDetails?: boolean;
     isDraggable?: boolean;
+    linkValues?: string[] | null | undefined;
+    rowRenderers?: RowRenderer[];
     timelineId: string;
     truncate?: boolean;
     values: string[] | null | undefined;
-    linkValues?: string[] | null | undefined;
-    ecsData?: Ecs;
-    rowRenderers?: RowRenderer[];
-    browserFields?: BrowserFields;
   }) => React.ReactNode;
 }
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
index 5eec4ef66f39c..63e7e164854df 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
@@ -7,7 +7,7 @@
 
 /* eslint-disable complexity */
 
-import { EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
+import { EuiButtonEmpty, EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { isNumber, isEmpty } from 'lodash/fp';
 import React from 'react';
 
@@ -19,7 +19,8 @@ import { getOrEmptyTagFromValue } from '../../../../../common/components/empty_v
 import { FormattedDate } from '../../../../../common/components/formatted_date';
 import { FormattedIp } from '../../../../components/formatted_ip';
 
-import { Port, PORT_NAMES } from '../../../../../network/components/port';
+import { Port } from '../../../../../network/components/port';
+import { PORT_NAMES } from '../../../../../network/components/port/helpers';
 import { TruncatableText } from '../../../../../common/components/truncatable_text';
 import {
   DATE_FIELD_TYPE,
@@ -44,44 +45,60 @@ import { AgentStatuses } from './agent_statuses';
 const columnNamesNotDraggable = [MESSAGE_FIELD_NAME];
 
 const FormattedFieldValueComponent: React.FC<{
+  asPlainText?: boolean;
+  /** `Component` is only used with `EuiDataGrid`; the grid keeps a reference to `Component` for show / hide functionality */
+  Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
   contextId: string;
   eventId: string;
   isObjectArray?: boolean;
   fieldFormat?: string;
   fieldName: string;
   fieldType?: string;
+  isButton?: boolean;
   isDraggable?: boolean;
+  onClick?: () => void;
+  title?: string;
   truncate?: boolean;
   value: string | number | undefined | null;
   linkValue?: string | null | undefined;
 }> = ({
+  asPlainText,
+  Component,
   contextId,
   eventId,
   fieldFormat,
   fieldName,
   fieldType,
+  isButton,
   isObjectArray = false,
   isDraggable = true,
-  truncate,
+  onClick,
+  title,
+  truncate = true,
   value,
   linkValue,
 }) => {
-  if (isObjectArray) {
-    return <>{value}</>;
+  if (isObjectArray || asPlainText) {
+    return <span data-test-subj={`formatted-field-${fieldName}`}>{value}</span>;
   } else if (fieldType === IP_FIELD_TYPE) {
     return (
       <FormattedIp
+        Component={Component}
         eventId={eventId}
         contextId={contextId}
         fieldName={fieldName}
+        isButton={isButton}
         isDraggable={isDraggable}
         value={!isNumber(value) ? value : String(value)}
+        onClick={onClick}
+        title={title}
         truncate={truncate}
       />
     );
   } else if (fieldType === GEO_FIELD_TYPE) {
     return <>{value}</>;
   } else if (fieldType === DATE_FIELD_TYPE) {
+    const classNames = truncate ? 'eui-textTruncate eui-alignMiddle' : undefined;
     return isDraggable ? (
       <DefaultDraggable
         field={fieldName}
@@ -90,18 +107,20 @@ const FormattedFieldValueComponent: React.FC<{
         tooltipContent={null}
         value={`${value}`}
       >
-        <FormattedDate fieldName={fieldName} value={value} />
+        <FormattedDate className={classNames} fieldName={fieldName} value={value} />
       </DefaultDraggable>
     ) : (
-      <FormattedDate fieldName={fieldName} value={value} />
+      <FormattedDate className={classNames} fieldName={fieldName} value={value} />
     );
   } else if (PORT_NAMES.some((portName) => fieldName === portName)) {
     return (
       <Port
+        Component={Component}
         contextId={contextId}
         eventId={eventId}
         fieldName={fieldName}
         isDraggable={isDraggable}
+        title={title}
         value={`${value}`}
       />
     );
@@ -118,10 +137,14 @@ const FormattedFieldValueComponent: React.FC<{
   } else if (fieldName === HOST_NAME_FIELD_NAME) {
     return (
       <HostName
+        Component={Component}
         contextId={contextId}
         eventId={eventId}
         fieldName={fieldName}
         isDraggable={isDraggable}
+        isButton={isButton}
+        onClick={onClick}
+        title={title}
         value={value}
       />
     );
@@ -138,11 +161,13 @@ const FormattedFieldValueComponent: React.FC<{
   } else if (fieldName === SIGNAL_RULE_NAME_FIELD_NAME) {
     return (
       <RenderRuleName
+        Component={Component}
         contextId={contextId}
         eventId={eventId}
         fieldName={fieldName}
         isDraggable={isDraggable}
         linkValue={linkValue}
+        title={title}
         truncate={truncate}
         value={value}
       />
@@ -185,7 +210,17 @@ const FormattedFieldValueComponent: React.FC<{
       INDICATOR_REFERENCE,
     ].includes(fieldName)
   ) {
-    return renderUrl({ contextId, eventId, fieldName, linkValue, isDraggable, truncate, value });
+    return renderUrl({
+      contextId,
+      Component,
+      eventId,
+      fieldName,
+      linkValue,
+      isDraggable,
+      truncate,
+      title,
+      value,
+    });
   } else if (columnNamesNotDraggable.includes(fieldName) || !isDraggable) {
     return truncate && !isEmpty(value) ? (
       <TruncatableText data-test-subj="truncatable-message">
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_helpers.tsx
index 3343882e0071a..cda196fd79634 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_helpers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_helpers.tsx
@@ -5,9 +5,17 @@
  * 2.0.
  */
 
-import { EuiLink, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiToolTip } from '@elastic/eui';
+import {
+  EuiButtonEmpty,
+  EuiButtonIcon,
+  EuiLink,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
+  EuiToolTip,
+} from '@elastic/eui';
 import { isString, isEmpty } from 'lodash/fp';
-import React, { useCallback } from 'react';
+import React, { SyntheticEvent, useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 
 import { DefaultDraggable } from '../../../../../common/components/draggables';
@@ -30,22 +38,26 @@ const EventModuleFlexItem = styled(EuiFlexItem)`
 `;
 
 interface RenderRuleNameProps {
+  Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
   contextId: string;
   eventId: string;
   fieldName: string;
   isDraggable: boolean;
   linkValue: string | null | undefined;
   truncate?: boolean;
+  title?: string;
   value: string | number | null | undefined;
 }
 
 export const RenderRuleName: React.FC<RenderRuleNameProps> = ({
+  Component,
   contextId,
   eventId,
   fieldName,
   isDraggable,
   linkValue,
   truncate,
+  title,
   value,
 }) => {
   const ruleName = `${value}`;
@@ -69,15 +81,29 @@ export const RenderRuleName: React.FC<RenderRuleNameProps> = ({
     [navigateToApp, ruleId, search]
   );
 
+  const href = useMemo(
+    () =>
+      getUrlForApp(APP_ID, {
+        deepLinkId: SecurityPageName.rules,
+        path: getRuleDetailsUrl(ruleId ?? '', search),
+      }),
+    [getUrlForApp, ruleId, search]
+  );
+  const id = `event-details-value-default-draggable-${contextId}-${eventId}-${fieldName}-${value}-${ruleId}`;
+
   if (isString(value) && ruleName.length > 0 && ruleId != null) {
-    const link = (
-      <LinkAnchor
+    const link = Component ? (
+      <Component
+        aria-label={title}
+        data-test-subj={`view-${fieldName}`}
+        iconType="link"
         onClick={goToRuleDetails}
-        href={getUrlForApp(APP_ID, {
-          deepLinkId: SecurityPageName.rules,
-          path: getRuleDetailsUrl(ruleId, search),
-        })}
+        title={title}
       >
+        {title ?? value}
+      </Component>
+    ) : (
+      <LinkAnchor onClick={goToRuleDetails} href={href}>
         {content}
       </LinkAnchor>
     );
@@ -85,7 +111,7 @@ export const RenderRuleName: React.FC<RenderRuleNameProps> = ({
     return isDraggable ? (
       <DefaultDraggable
         field={fieldName}
-        id={`event-details-value-default-draggable-${contextId}-${eventId}-${fieldName}-${value}-${ruleId}`}
+        id={id}
         isDraggable={isDraggable}
         tooltipContent={value}
         value={value}
@@ -99,7 +125,7 @@ export const RenderRuleName: React.FC<RenderRuleNameProps> = ({
     return isDraggable ? (
       <DefaultDraggable
         field={fieldName}
-        id={`event-details-value-default-draggable-${contextId}-${eventId}-${fieldName}-${value}-${ruleId}`}
+        id={id}
         isDraggable={isDraggable}
         tooltipContent={value}
         value={`${value}`}
@@ -189,35 +215,71 @@ export const renderEventModule = ({
   );
 };
 
+const GenericLinkComponent: React.FC<{
+  children?: React.ReactNode;
+  /** `Component` is only used with `EuiDataGrid`; the grid keeps a reference to `Component` for show / hide functionality */
+  Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
+  dataTestSubj?: string;
+  href: string;
+  onClick?: (e: SyntheticEvent) => void;
+  title?: string;
+  iconType?: string;
+}> = ({ children, Component, dataTestSubj, href, onClick, title, iconType = 'link' }) => {
+  return Component ? (
+    <Component
+      data-test-subj={dataTestSubj}
+      href={href}
+      iconType={iconType}
+      onClick={onClick}
+      title={title}
+    >
+      {title ?? children}
+    </Component>
+  ) : (
+    <EuiLink data-test-subj={dataTestSubj} target="_blank" href={href}>
+      {title ?? children}
+    </EuiLink>
+  );
+};
+
+const GenericLink = React.memo(GenericLinkComponent);
+
 export const renderUrl = ({
   contextId,
+  Component,
   eventId,
   fieldName,
   isDraggable,
   linkValue,
   truncate,
+  title,
   value,
 }: {
   contextId: string;
+  /** `Component` is only used with `EuiDataGrid`; the grid keeps a reference to `Component` for show / hide functionality */
+  Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
   eventId: string;
   fieldName: string;
   isDraggable: boolean;
   linkValue: string | null | undefined;
   truncate?: boolean;
+  title?: string;
   value: string | number | null | undefined;
 }) => {
   const urlName = `${value}`;
+  const isUrlValid = !isUrlInvalid(urlName);
 
   const formattedValue = truncate ? <TruncatableText>{value}</TruncatableText> : value;
-  const content = (
-    <>
-      {!isUrlInvalid(urlName) && (
-        <EuiLink target="_blank" href={urlName}>
-          {formattedValue}
-        </EuiLink>
-      )}
-      {isUrlInvalid(urlName) && <>{formattedValue}</>}
-    </>
+  const content = isUrlValid ? (
+    <GenericLink
+      Component={Component}
+      href={urlName}
+      dataTestSubj="ata-grid-url"
+      title={title}
+      iconType="link"
+    />
+  ) : (
+    <>{formattedValue}</>
   );
 
   return isString(value) && urlName.length > 0 ? (
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx
index c183d71212540..5864e144a681e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx
@@ -6,6 +6,7 @@
  */
 
 import React, { useCallback, useContext, useMemo } from 'react';
+import { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
 import { useDispatch } from 'react-redux';
 import { isString } from 'lodash/fp';
 import { HostDetailsLink } from '../../../../../common/components/links';
@@ -23,17 +24,25 @@ import { StatefulEventContext } from '../../../../../../../timelines/public';
 
 interface Props {
   contextId: string;
+  Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
   eventId: string;
   fieldName: string;
   isDraggable: boolean;
+  isButton?: boolean;
+  onClick?: () => void;
   value: string | number | undefined | null;
+  title?: string;
 }
 
 const HostNameComponent: React.FC<Props> = ({
   fieldName,
+  Component,
   contextId,
   eventId,
   isDraggable,
+  isButton,
+  onClick,
+  title,
   value,
 }) => {
   const dispatch = useDispatch();
@@ -44,6 +53,10 @@ const HostNameComponent: React.FC<Props> = ({
   const openHostDetailsSidePanel = useCallback(
     (e) => {
       e.preventDefault();
+
+      if (onClick) {
+        onClick();
+      }
       if (eventContext && isInTimelineContext) {
         const { timelineID, tabType } = eventContext;
         const updatedExpandedDetail: TimelineExpandedDetailType = {
@@ -66,7 +79,7 @@ const HostNameComponent: React.FC<Props> = ({
         }
       }
     },
-    [dispatch, eventContext, isInTimelineContext, hostName]
+    [onClick, eventContext, isInTimelineContext, hostName, dispatch]
   );
 
   // The below is explicitly defined this way as the onClick takes precedence when it and the href are both defined
@@ -74,14 +87,16 @@ const HostNameComponent: React.FC<Props> = ({
   const content = useMemo(
     () => (
       <HostDetailsLink
+        Component={Component}
         hostName={hostName}
-        isButton={false}
+        isButton={isButton}
         onClick={isInTimelineContext ? openHostDetailsSidePanel : undefined}
+        title={title}
       >
         <TruncatableText data-test-subj="draggable-truncatable-content">{hostName}</TruncatableText>
       </HostDetailsLink>
     ),
-    [hostName, isInTimelineContext, openHostDetailsSidePanel]
+    [Component, hostName, isButton, isInTimelineContext, openHostDetailsSidePanel, title]
   );
 
   return isString(value) && hostName.length > 0 ? (
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow.tsx
index d6ea939c966ac..acc88ef3ee111 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow.tsx
@@ -29,7 +29,7 @@ import {
 import {
   DESTINATION_PORT_FIELD_NAME,
   SOURCE_PORT_FIELD_NAME,
-} from '../../../../../network/components/port';
+} from '../../../../../network/components/port/helpers';
 import {
   DESTINATION_GEO_CITY_NAME_FIELD_NAME,
   DESTINATION_GEO_CONTINENT_NAME_FIELD_NAME,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx
index f38304e718675..e36e347fc0cc3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx
@@ -34,7 +34,7 @@ import {
 import {
   DESTINATION_PORT_FIELD_NAME,
   SOURCE_PORT_FIELD_NAME,
-} from '../../../../../../network/components/port';
+} from '../../../../../../network/components/port/helpers';
 import {
   NETWORK_BYTES_FIELD_NAME,
   NETWORK_COMMUNITY_ID_FIELD_NAME,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/plain_column_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/plain_column_renderer.tsx
index 8509e7be0d22b..2f0653826d11b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/plain_column_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/plain_column_renderer.tsx
@@ -7,6 +7,7 @@
 
 import { head } from 'lodash/fp';
 import React from 'react';
+import { Filter } from '../../../../../../../../../src/plugins/data/public';
 
 import { ColumnHeaderOptions } from '../../../../../../common';
 import { TimelineNonEcsData } from '../../../../../../common/search_strategy/timeline';
@@ -21,8 +22,8 @@ export const dataExistsAtColumn = (columnName: string, data: TimelineNonEcsData[
 export const plainColumnRenderer: ColumnRenderer = {
   isInstance: (columnName: string, data: TimelineNonEcsData[]) =>
     dataExistsAtColumn(columnName, data),
-
   renderColumn: ({
+    asPlainText,
     columnName,
     eventId,
     field,
@@ -32,9 +33,11 @@ export const plainColumnRenderer: ColumnRenderer = {
     values,
     linkValues,
   }: {
+    asPlainText?: boolean;
     columnName: string;
     eventId: string;
     field: ColumnHeaderOptions;
+    globalFilters?: Filter[];
     isDraggable?: boolean;
     timelineId: string;
     truncate?: boolean;
@@ -44,16 +47,17 @@ export const plainColumnRenderer: ColumnRenderer = {
     values != null
       ? values.map((value, i) => (
           <FormattedFieldValue
-            key={`plain-column-renderer-formatted-field-value-${timelineId}-${columnName}-${eventId}-${field.id}-${value}-${i}`}
+            asPlainText={asPlainText}
             contextId={`plain-column-renderer-formatted-field-value-${timelineId}`}
             eventId={eventId}
             fieldFormat={field.format || ''}
             fieldName={columnName}
             fieldType={field.type || ''}
             isDraggable={isDraggable}
-            value={parseValue(value)}
-            truncate={truncate}
+            key={`plain-column-renderer-formatted-field-value-${timelineId}-${columnName}-${eventId}-${field.id}-${value}-${i}`}
             linkValue={head(linkValues)}
+            truncate={truncate}
+            value={parseValue(value)}
           />
         ))
       : getEmptyTagValue(),
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.test.tsx
index 9d711b9593622..8fdd6483a14f8 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.test.tsx
@@ -19,7 +19,7 @@ import {
   RowRenderer,
   RowRendererId,
 } from '../../../../../../common';
-import { fireEvent, render } from '@testing-library/react';
+import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../../../../timelines/public/mock';
 import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '../../../../../../../timelines/public/components';
 import { cloneDeep } from 'lodash';
@@ -92,9 +92,10 @@ describe('reasonColumnRenderer', () => {
       expect(plainColumnRenderer.renderColumn).toBeCalledTimes(1);
     });
 
-    it("doesn't call `plainColumnRenderer.renderColumn` when ecsData, rowRenderers or browserFields fields are not empty", () => {
+    it("doesn't call `plainColumnRenderer.renderColumn` in expanded value when ecsData, rowRenderers or browserFields fields are not empty", () => {
       reasonColumnRenderer.renderColumn({
         ...defaultProps,
+        isDetails: true,
         ecsData: invalidEcs,
         rowRenderers,
         browserFields,
@@ -103,50 +104,36 @@ describe('reasonColumnRenderer', () => {
       expect(plainColumnRenderer.renderColumn).toBeCalledTimes(0);
     });
 
-    it("doesn't render popover button when getRowRenderer doesn't find a rowRenderer", () => {
-      const renderedColumn = reasonColumnRenderer.renderColumn({
+    it('call `plainColumnRenderer.renderColumn` in cell value', () => {
+      reasonColumnRenderer.renderColumn({
         ...defaultProps,
+        isDetails: false,
         ecsData: invalidEcs,
         rowRenderers,
         browserFields,
       });
 
-      const wrapper = render(<TestProviders>{renderedColumn}</TestProviders>);
-
-      expect(wrapper.queryByTestId('reason-cell-button')).not.toBeInTheDocument();
-    });
-
-    it('render popover button when getRowRenderer finds a rowRenderer', () => {
-      const renderedColumn = reasonColumnRenderer.renderColumn({
-        ...defaultProps,
-        ecsData: validEcs,
-        rowRenderers,
-        browserFields,
-      });
-
-      const wrapper = render(<TestProviders>{renderedColumn}</TestProviders>);
-
-      expect(wrapper.queryByTestId('reason-cell-button')).toBeInTheDocument();
+      expect(plainColumnRenderer.renderColumn).toBeCalledTimes(1);
     });
 
-    it('render rowRender inside a popover when reson field button is clicked', () => {
+    it("doesn't render reason renderers button when getRowRenderer doesn't find a rowRenderer", () => {
       const renderedColumn = reasonColumnRenderer.renderColumn({
         ...defaultProps,
-        ecsData: validEcs,
+        isDetails: true,
+        ecsData: invalidEcs,
         rowRenderers,
         browserFields,
       });
 
       const wrapper = render(<TestProviders>{renderedColumn}</TestProviders>);
 
-      fireEvent.click(wrapper.getByTestId('reason-cell-button'));
-
-      expect(wrapper.queryByTestId('test-row-render')).toBeInTheDocument();
+      expect(wrapper.queryByTestId('reason-cell-button')).not.toBeInTheDocument();
     });
 
-    it('the popover always contains a class that hides it when an overlay (e.g. the inspect modal) is displayed', () => {
+    it('render reason renderers when getRowRenderer finds a rowRenderer', () => {
       const renderedColumn = reasonColumnRenderer.renderColumn({
         ...defaultProps,
+        isDetails: true,
         ecsData: validEcs,
         rowRenderers,
         browserFields,
@@ -154,11 +141,7 @@ describe('reasonColumnRenderer', () => {
 
       const wrapper = render(<TestProviders>{renderedColumn}</TestProviders>);
 
-      fireEvent.click(wrapper.getByTestId('reason-cell-button'));
-
-      expect(wrapper.getByRole('dialog')).toHaveClass(
-        'euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPopover__panel euiPopover__panel--right withHoverActions__popover'
-      );
+      expect(wrapper.queryByTestId('reason-cell-renderer')).toBeInTheDocument();
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.tsx
index 52483b4853cbc..b3f145beb886b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.tsx
@@ -5,11 +5,10 @@
  * 2.0.
  */
 
-import { EuiButtonEmpty, EuiPopover, EuiPopoverTitle } from '@elastic/eui';
+import { EuiSpacer, EuiPanel } from '@elastic/eui';
 import { isEqual } from 'lodash/fp';
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useMemo } from 'react';
 
-import styled from 'styled-components';
 import { BrowserFields, ColumnHeaderOptions, RowRenderer } from '../../../../../../common';
 import { Ecs } from '../../../../../../common/ecs';
 import { eventRendererNames } from '../../../row_renderers_browser/catalog/constants';
@@ -23,58 +22,59 @@ export const reasonColumnRenderer: ColumnRenderer = {
   isInstance: isEqual(REASON_FIELD_NAME),
 
   renderColumn: ({
+    browserFields,
     columnName,
+    ecsData,
     eventId,
     field,
+    isDetails,
     isDraggable = true,
+    linkValues,
+    rowRenderers = [],
     timelineId,
     truncate,
     values,
-    linkValues,
-    ecsData,
-    rowRenderers = [],
-    browserFields,
   }: {
+    browserFields?: BrowserFields;
     columnName: string;
+    ecsData?: Ecs;
     eventId: string;
     field: ColumnHeaderOptions;
+    isDetails?: boolean;
     isDraggable?: boolean;
+    linkValues?: string[] | null | undefined;
+    rowRenderers?: RowRenderer[];
     timelineId: string;
     truncate?: boolean;
     values: string[] | undefined | null;
-    linkValues?: string[] | null | undefined;
-
-    ecsData?: Ecs;
-    rowRenderers?: RowRenderer[];
-    browserFields?: BrowserFields;
-  }) =>
-    values != null && ecsData && rowRenderers?.length > 0 && browserFields
-      ? values.map((value, i) => (
-          <ReasonCell
-            key={`reason-column-renderer-value-${timelineId}-${columnName}-${eventId}-${field.id}-${value}-${i}`}
-            timelineId={timelineId}
-            value={value}
-            ecsData={ecsData}
-            rowRenderers={rowRenderers}
-            browserFields={browserFields}
-          />
-        ))
-      : plainColumnRenderer.renderColumn({
-          columnName,
-          eventId,
-          field,
-          isDraggable,
-          timelineId,
-          truncate,
-          values,
-          linkValues,
-        }),
+  }) => {
+    if (isDetails && values && ecsData && rowRenderers && browserFields) {
+      return values.map((value, i) => (
+        <ReasonCell
+          browserFields={browserFields}
+          ecsData={ecsData}
+          key={`reason-column-renderer-value-${timelineId}-${columnName}-${eventId}-${field.id}-${value}-${i}`}
+          rowRenderers={rowRenderers}
+          timelineId={timelineId}
+          value={value}
+        />
+      ));
+    } else {
+      return plainColumnRenderer.renderColumn({
+        columnName,
+        eventId,
+        field,
+        isDetails,
+        isDraggable,
+        linkValues,
+        timelineId,
+        truncate,
+        values,
+      });
+    }
+  },
 };
 
-const StyledEuiButtonEmpty = styled(EuiButtonEmpty)`
-  font-weight: ${(props) => props.theme.eui.euiFontWeightRegular};
-`;
-
 const ReasonCell: React.FC<{
   value: string | number | undefined | null;
   timelineId: string;
@@ -82,8 +82,6 @@ const ReasonCell: React.FC<{
   rowRenderers: RowRenderer[];
   browserFields: BrowserFields;
 }> = ({ ecsData, rowRenderers, browserFields, timelineId, value }) => {
-  const [isOpen, setIsOpen] = useState(false);
-
   const rowRenderer = useMemo(() => getRowRenderer(ecsData, rowRenderers), [ecsData, rowRenderers]);
 
   const rowRender = useMemo(() => {
@@ -98,38 +96,17 @@ const ReasonCell: React.FC<{
     );
   }, [rowRenderer, browserFields, ecsData, timelineId]);
 
-  const handleTogglePopOver = useCallback(() => setIsOpen(!isOpen), [setIsOpen, isOpen]);
-  const handleClosePopOver = useCallback(() => setIsOpen(false), [setIsOpen]);
-
-  const button = useMemo(
-    () => (
-      <StyledEuiButtonEmpty
-        data-test-subj="reason-cell-button"
-        size="xs"
-        flush="left"
-        onClick={handleTogglePopOver}
-      >
-        {value}
-      </StyledEuiButtonEmpty>
-    ),
-    [value, handleTogglePopOver]
-  );
-
   return (
     <>
       {rowRenderer && rowRender ? (
-        <EuiPopover
-          isOpen={isOpen}
-          anchorPosition="rightCenter"
-          closePopover={handleClosePopOver}
-          panelClassName="withHoverActions__popover"
-          button={button}
-        >
-          <EuiPopoverTitle paddingSize="s">
-            {i18n.EVENT_RENDERER_POPOVER_TITLE(eventRendererNames[rowRenderer.id] ?? '')}
-          </EuiPopoverTitle>
-          {rowRender}
-        </EuiPopover>
+        <>
+          {value}
+          <h4>{i18n.REASON_RENDERER_TITLE(eventRendererNames[rowRenderer.id] ?? '')}</h4>
+          <EuiSpacer size="xs" />
+          <EuiPanel color="subdued" className="eui-xScroll" data-test-subj="reason-cell-renderer">
+            <div className="eui-displayInlineBlock">{rowRender}</div>
+          </EuiPanel>
+        </>
       ) : (
         value
       )}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/translations.ts
index a703c7afdaf7b..53cffa7d3708d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/translations.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/translations.ts
@@ -52,8 +52,8 @@ export const EMPTY_STATUS = i18n.translate(
   }
 );
 
-export const EVENT_RENDERER_POPOVER_TITLE = (eventRendererName: string) =>
-  i18n.translate('xpack.securitySolution.event.reason.eventRenderPopoverTitle', {
+export const REASON_RENDERER_TITLE = (eventRendererName: string) =>
+  i18n.translate('xpack.securitySolution.event.reason.reasonRendererTitle', {
     values: { eventRendererName },
     defaultMessage: 'Event renderer: {eventRendererName} ',
   });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx
index 5282276f8bb51..ef8fa01a63465 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx
@@ -16,6 +16,8 @@ import { DroppableWrapper } from '../../../../common/components/drag_and_drop/dr
 import { mockBrowserFields } from '../../../../common/containers/source/mock';
 import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../common/mock';
 import { DefaultCellRenderer } from './default_cell_renderer';
+import { BrowserFields } from '../../../../../../timelines/common/search_strategy';
+import { Ecs } from '../../../../../common/ecs';
 
 jest.mock('../../../../common/lib/kibana');
 
@@ -26,15 +28,16 @@ const mockImplementation = {
 };
 
 describe('DefaultCellRenderer', () => {
-  const columnId = 'signal.rule.risk_score';
+  const columnId = '@timestamp';
   const eventId = '_id-123';
-  const isDetails = true;
   const isExpandable = true;
   const isExpanded = true;
   const linkValues = ['foo', 'bar', '@baz'];
   const rowIndex = 3;
   const setCellProps = jest.fn();
   const timelineId = 'test';
+  const ecsData = {} as Ecs;
+  const browserFields = {} as BrowserFields;
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -44,14 +47,17 @@ describe('DefaultCellRenderer', () => {
   test('it invokes `getColumnRenderer` with the expected arguments', () => {
     const data = cloneDeep(mockTimelineData[0].data);
     const header = cloneDeep(defaultHeaders[0]);
+    const isDetails = true;
 
     mount(
       <TestProviders>
         <DragDropContextWrapper browserFields={mockBrowserFields}>
           <DroppableWrapper droppableId="testing">
             <DefaultCellRenderer
+              browserFields={browserFields}
               columnId={columnId}
               data={data}
+              ecsData={ecsData}
               eventId={eventId}
               header={header}
               isDetails={isDetails}
@@ -71,17 +77,21 @@ describe('DefaultCellRenderer', () => {
     expect(getColumnRenderer).toBeCalledWith(header.id, columnRenderers, data);
   });
 
-  test('it invokes `renderColumn` with the expected arguments', () => {
+  test('if in tgrid expanded value, it invokes `renderColumn` with the expected arguments', () => {
     const data = cloneDeep(mockTimelineData[0].data);
     const header = cloneDeep(defaultHeaders[0]);
+    const isDetails = true;
+    const truncate = isDetails ? false : true;
 
     mount(
       <TestProviders>
         <DragDropContextWrapper browserFields={mockBrowserFields}>
           <DroppableWrapper droppableId="testing">
             <DefaultCellRenderer
+              browserFields={browserFields}
               columnId={columnId}
               data={data}
+              ecsData={ecsData}
               eventId={eventId}
               header={header}
               isDetails={isDetails}
@@ -92,6 +102,7 @@ describe('DefaultCellRenderer', () => {
               rowIndex={rowIndex}
               setCellProps={setCellProps}
               timelineId={timelineId}
+              truncate={truncate}
             />
           </DroppableWrapper>
         </DragDropContextWrapper>
@@ -99,14 +110,54 @@ describe('DefaultCellRenderer', () => {
     );
 
     expect(mockImplementation.renderColumn).toBeCalledWith({
+      asPlainText: false,
+      browserFields,
       columnName: header.id,
+      ecsData,
       eventId,
       field: header,
+      isDetails,
       isDraggable: true,
       linkValues,
+      rowRenderers: undefined,
       timelineId,
-      truncate: true,
+      truncate,
       values: ['2018-11-05T19:03:25.937Z'],
     });
   });
+
+  test('if in tgrid expanded value, it renders ExpandedCellValueActions', () => {
+    const data = cloneDeep(mockTimelineData[0].data);
+    const header = cloneDeep(defaultHeaders[1]);
+    const isDetails = true;
+    const id = 'event.severity';
+    const wrapper = mount(
+      <TestProviders>
+        <DragDropContextWrapper browserFields={mockBrowserFields}>
+          <DroppableWrapper droppableId="testing">
+            <DefaultCellRenderer
+              browserFields={browserFields}
+              columnId={id}
+              ecsData={ecsData}
+              data={data}
+              eventId={eventId}
+              header={header}
+              isDetails={isDetails}
+              isDraggable={true}
+              isExpandable={isExpandable}
+              isExpanded={isExpanded}
+              linkValues={linkValues}
+              rowIndex={rowIndex}
+              setCellProps={setCellProps}
+              timelineId={timelineId}
+            />
+          </DroppableWrapper>
+        </DragDropContextWrapper>
+      </TestProviders>
+    );
+
+    expect(
+      wrapper.find('[data-test-subj="data-grid-expanded-cell-value-actions"]').exists()
+    ).toBeTruthy();
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.tsx
index d45c8103d1cca..5b9fee621b417 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.tsx
@@ -12,36 +12,70 @@ import { columnRenderers } from '../body/renderers';
 import { getColumnRenderer } from '../body/renderers/get_column_renderer';
 
 import { CellValueElementProps } from '.';
+import { getLink } from '../../../../common/lib/cell_actions/helpers';
+import {
+  ExpandedCellValueActions,
+  StyledContent,
+} from '../../../../common/lib/cell_actions/expanded_cell_value_actions';
+
+const FIELDS_WITHOUT_CELL_ACTIONS = ['@timestamp', 'signal.rule.risk_score', 'signal.reason'];
+const hasCellActions = (columnId?: string) => {
+  return columnId && FIELDS_WITHOUT_CELL_ACTIONS.indexOf(columnId) < 0;
+};
 
 export const DefaultCellRenderer: React.FC<CellValueElementProps> = ({
-  columnId,
+  browserFields,
   data,
+  ecsData,
   eventId,
+  globalFilters,
   header,
+  isDetails,
   isDraggable,
   linkValues,
+  rowRenderers,
   setCellProps,
   timelineId,
-  rowRenderers,
-  browserFields,
-  ecsData,
-}) => (
-  <>
-    {getColumnRenderer(header.id, columnRenderers, data).renderColumn({
-      columnName: header.id,
-      eventId,
-      field: header,
-      isDraggable,
-      linkValues,
-      timelineId,
-      truncate: true,
-      values: getMappedNonEcsValue({
-        data,
-        fieldName: header.id,
-      }),
-      rowRenderers,
-      browserFields,
-      ecsData,
-    })}
-  </>
-);
+  truncate,
+}) => {
+  const values = getMappedNonEcsValue({
+    data,
+    fieldName: header.id,
+  });
+  const styledContentClassName = isDetails
+    ? 'eui-textBreakWord'
+    : 'eui-displayInlineBlock eui-textTruncate';
+  return (
+    <>
+      <StyledContent className={styledContentClassName} $isDetails={isDetails}>
+        {getColumnRenderer(header.id, columnRenderers, data).renderColumn({
+          asPlainText: !!getLink(header.id, header.type), // we want to render value with links as plain text but keep other formatters like badge.
+          browserFields,
+          columnName: header.id,
+          ecsData,
+          eventId,
+          field: header,
+          isDetails,
+          isDraggable,
+          linkValues,
+          rowRenderers,
+          timelineId,
+          truncate,
+          values: getMappedNonEcsValue({
+            data,
+            fieldName: header.id,
+          }),
+        })}
+      </StyledContent>
+      {isDetails && browserFields && hasCellActions(header.id) && (
+        <ExpandedCellValueActions
+          browserFields={browserFields}
+          field={header.id}
+          globalFilters={globalFilters}
+          timelineId={timelineId}
+          value={values}
+        />
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/timelines/common/types/timeline/cells/index.ts b/x-pack/plugins/timelines/common/types/timeline/cells/index.ts
index 354a8b45e914d..ce22d87c0a59a 100644
--- a/x-pack/plugins/timelines/common/types/timeline/cells/index.ts
+++ b/x-pack/plugins/timelines/common/types/timeline/cells/index.ts
@@ -7,21 +7,26 @@
 
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
 import { RowRenderer } from '../../..';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { Filter } from '../../../../../../../src/plugins/data/public';
 import { Ecs } from '../../../ecs';
 import { BrowserFields, TimelineNonEcsData } from '../../../search_strategy';
 import { ColumnHeaderOptions } from '../columns';
 
 /** The following props are provided to the function called by `renderCellValue` */
 export type CellValueElementProps = EuiDataGridCellValueElementProps & {
+  asPlainText?: boolean;
+  browserFields?: BrowserFields;
   data: TimelineNonEcsData[];
+  ecsData?: Ecs;
   eventId: string; // _id
+  globalFilters?: Filter[];
   header: ColumnHeaderOptions;
   isDraggable: boolean;
   linkValues: string[] | undefined;
-  timelineId: string;
+  rowRenderers?: RowRenderer[];
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   setFlyoutAlert?: (data: any) => void;
-  ecsData?: Ecs;
-  rowRenderers?: RowRenderer[];
-  browserFields?: BrowserFields;
+  timelineId: string;
+  truncate?: boolean;
 };
diff --git a/x-pack/plugins/timelines/common/types/timeline/columns/index.tsx b/x-pack/plugins/timelines/common/types/timeline/columns/index.tsx
index 644b38d551337..bd4cd2d7192df 100644
--- a/x-pack/plugins/timelines/common/types/timeline/columns/index.tsx
+++ b/x-pack/plugins/timelines/common/types/timeline/columns/index.tsx
@@ -8,9 +8,10 @@
 import { ReactNode } from 'react';
 
 import { EuiDataGridColumn, EuiDataGridColumnCellActionProps } from '@elastic/eui';
-import { Filter, IFieldSubType } from '../../../../../../../src/plugins/data/common';
+import { IFieldSubType } from '../../../../../../../src/plugins/data/common';
 import { BrowserFields } from '../../../search_strategy/index_fields';
 import { TimelineNonEcsData } from '../../../search_strategy/timeline';
+import { Ecs } from '../../../ecs';
 
 export type ColumnHeaderType = 'not-filtered' | 'text-filter';
 
@@ -45,14 +46,16 @@ export type ColumnId = string;
 export type TGridCellAction = ({
   browserFields,
   data,
-  globalFilters,
+  ecsData,
+  header,
   pageSize,
   timelineId,
 }: {
   browserFields: BrowserFields;
   /** each row of data is represented as one TimelineNonEcsData[] */
   data: TimelineNonEcsData[][];
-  globalFilters?: Filter[];
+  ecsData: Ecs[];
+  header?: ColumnHeaderOptions;
   pageSize: number;
   timelineId: string;
 }) => (props: EuiDataGridColumnCellActionProps) => ReactNode;
diff --git a/x-pack/plugins/timelines/public/components/hover_actions/actions/filter_for_value.tsx b/x-pack/plugins/timelines/public/components/hover_actions/actions/filter_for_value.tsx
index 549c2da0d7672..7b8ecdb0f582f 100644
--- a/x-pack/plugins/timelines/public/components/hover_actions/actions/filter_for_value.tsx
+++ b/x-pack/plugins/timelines/public/components/hover_actions/actions/filter_for_value.tsx
@@ -14,8 +14,8 @@ import { TooltipWithKeyboardShortcut } from '../../tooltip_with_keyboard_shortcu
 import { createFilter, getAdditionalScreenReaderOnlyContext } from '../utils';
 import { HoverActionComponentProps, FilterValueFnArgs } from './types';
 
-export const FILTER_FOR_VALUE = i18n.translate('xpack.timelines.hoverActions.filterForValue', {
-  defaultMessage: 'Filter for value',
+export const FILTER_FOR_VALUE = i18n.translate('xpack.timelines.hoverActions.filterIn', {
+  defaultMessage: 'Filter In',
 });
 export const FILTER_FOR_VALUE_KEYBOARD_SHORTCUT = 'f';
 
@@ -31,6 +31,7 @@ const FilterForValueButton: React.FC<FilterForValueProps> = React.memo(
     onFilterAdded,
     ownFocus,
     onClick,
+    size,
     showTooltip = false,
     value,
   }) => {
@@ -74,6 +75,7 @@ const FilterForValueButton: React.FC<FilterForValueProps> = React.memo(
             data-test-subj="filter-for-value"
             iconType="plusInCircle"
             onClick={filterForValueFn}
+            size={size}
             title={FILTER_FOR_VALUE}
           >
             {FILTER_FOR_VALUE}
@@ -87,9 +89,10 @@ const FilterForValueButton: React.FC<FilterForValueProps> = React.memo(
             iconSize="s"
             iconType="plusInCircle"
             onClick={filterForValueFn}
+            size={size}
           />
         ),
-      [Component, defaultFocusedButtonRef, filterForValueFn]
+      [Component, defaultFocusedButtonRef, filterForValueFn, size]
     );
 
     return showTooltip ? (
diff --git a/x-pack/plugins/timelines/public/components/hover_actions/actions/filter_out_value.tsx b/x-pack/plugins/timelines/public/components/hover_actions/actions/filter_out_value.tsx
index 51f2943ff051e..04fbbab76d850 100644
--- a/x-pack/plugins/timelines/public/components/hover_actions/actions/filter_out_value.tsx
+++ b/x-pack/plugins/timelines/public/components/hover_actions/actions/filter_out_value.tsx
@@ -14,8 +14,8 @@ import { TooltipWithKeyboardShortcut } from '../../tooltip_with_keyboard_shortcu
 import { createFilter, getAdditionalScreenReaderOnlyContext } from '../utils';
 import { HoverActionComponentProps, FilterValueFnArgs } from './types';
 
-export const FILTER_OUT_VALUE = i18n.translate('xpack.timelines.hoverActions.filterOutValue', {
-  defaultMessage: 'Filter out value',
+export const FILTER_OUT_VALUE = i18n.translate('xpack.timelines.hoverActions.filterOut', {
+  defaultMessage: 'Filter Out',
 });
 
 export const FILTER_OUT_VALUE_KEYBOARD_SHORTCUT = 'o';
@@ -30,6 +30,7 @@ const FilterOutValueButton: React.FC<HoverActionComponentProps & FilterValueFnAr
     onFilterAdded,
     ownFocus,
     onClick,
+    size,
     showTooltip = false,
     value,
   }) => {
@@ -74,6 +75,7 @@ const FilterOutValueButton: React.FC<HoverActionComponentProps & FilterValueFnAr
             data-test-subj="filter-out-value"
             iconType="minusInCircle"
             onClick={filterOutValueFn}
+            size={size}
             title={FILTER_OUT_VALUE}
           >
             {FILTER_OUT_VALUE}
@@ -87,9 +89,10 @@ const FilterOutValueButton: React.FC<HoverActionComponentProps & FilterValueFnAr
             iconSize="s"
             iconType="minusInCircle"
             onClick={filterOutValueFn}
+            size={size}
           />
         ),
-      [Component, defaultFocusedButtonRef, filterOutValueFn]
+      [Component, defaultFocusedButtonRef, filterOutValueFn, size]
     );
 
     return showTooltip ? (
diff --git a/x-pack/plugins/timelines/public/components/hover_actions/actions/types.ts b/x-pack/plugins/timelines/public/components/hover_actions/actions/types.ts
index 5be8fd8904f1a..b6c9e794625e4 100644
--- a/x-pack/plugins/timelines/public/components/hover_actions/actions/types.ts
+++ b/x-pack/plugins/timelines/public/components/hover_actions/actions/types.ts
@@ -18,11 +18,13 @@ export interface FilterValueFnArgs {
 }
 
 export interface HoverActionComponentProps {
+  className?: string;
   defaultFocusedButtonRef?: EuiButtonIconPropsForButton['buttonRef'];
   field: string;
   keyboardEvent?: React.KeyboardEvent;
   ownFocus: boolean;
   onClick?: () => void;
+  size?: 'xs' | 's' | 'm';
   showTooltip?: boolean;
   value?: string[] | string | null;
 }
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/index.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/index.test.tsx
index 8fbb7f0e62b9c..50764af3c7f2f 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/index.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/index.test.tsx
@@ -15,6 +15,8 @@ import { defaultHeaders, mockBrowserFields, mockTimelineData, TestProviders } fr
 import { TimelineTabs } from '../../../../common/types/timeline';
 import { TestCellRenderer } from '../../../mock/cell_renderer';
 import { mockGlobalState } from '../../../mock/global_state';
+import { EuiDataGridColumn } from '@elastic/eui';
+import { defaultColumnHeaderType } from '../../../store/t_grid/defaults';
 
 const mockSort: Sort[] = [
   {
@@ -151,5 +153,124 @@ describe('Body', () => {
           .text()
       ).toEqual(mockTimelineData[0].ecs.timestamp);
     });
+
+    test("timestamp column doesn't render cell actions", () => {
+      const headersJustTimestamp = defaultHeaders.filter((h) => h.id === '@timestamp');
+      const testProps = {
+        ...props,
+        columnHeaders: headersJustTimestamp,
+        data: mockTimelineData.slice(0, 1),
+      };
+      const wrapper = mount(
+        <TestProviders>
+          <BodyComponent {...testProps} />
+        </TestProviders>
+      );
+      wrapper.update();
+
+      expect(
+        wrapper
+          .find('[data-test-subj="body-data-grid"]')
+          .first()
+          .prop<EuiDataGridColumn[]>('columns')
+          .find((c) => c.id === '@timestamp')?.cellActions
+      ).toBeUndefined();
+    });
+
+    test("signal.rule.risk_score column doesn't render cell actions", () => {
+      const columnHeaders = [
+        {
+          category: 'signal',
+          columnHeaderType: defaultColumnHeaderType,
+          id: 'signal.rule.risk_score',
+          type: 'number',
+          aggregatable: true,
+          initialWidth: 105,
+        },
+      ];
+      const testProps = {
+        ...props,
+        columnHeaders,
+        data: mockTimelineData.slice(0, 1),
+      };
+      const wrapper = mount(
+        <TestProviders>
+          <BodyComponent {...testProps} />
+        </TestProviders>
+      );
+      wrapper.update();
+
+      expect(
+        wrapper
+          .find('[data-test-subj="body-data-grid"]')
+          .first()
+          .prop<EuiDataGridColumn[]>('columns')
+          .find((c) => c.id === 'signal.rule.risk_score')?.cellActions
+      ).toBeUndefined();
+    });
+
+    test("signal.reason column doesn't render cell actions", () => {
+      const columnHeaders = [
+        {
+          category: 'signal',
+          columnHeaderType: defaultColumnHeaderType,
+          id: 'signal.reason',
+          type: 'string',
+          aggregatable: true,
+          initialWidth: 450,
+        },
+      ];
+      const testProps = {
+        ...props,
+        columnHeaders,
+        data: mockTimelineData.slice(0, 1),
+      };
+      const wrapper = mount(
+        <TestProviders>
+          <BodyComponent {...testProps} />
+        </TestProviders>
+      );
+      wrapper.update();
+
+      expect(
+        wrapper
+          .find('[data-test-subj="body-data-grid"]')
+          .first()
+          .prop<EuiDataGridColumn[]>('columns')
+          .find((c) => c.id === 'signal.reason')?.cellActions
+      ).toBeUndefined();
+    });
+  });
+
+  test("signal.rule.risk_score column doesn't render cell actions", () => {
+    const columnHeaders = [
+      {
+        category: 'signal',
+        columnHeaderType: defaultColumnHeaderType,
+        id: 'signal.rule.risk_score',
+        type: 'number',
+        aggregatable: true,
+        initialWidth: 105,
+      },
+    ];
+    const testProps = {
+      ...props,
+      columnHeaders,
+      data: mockTimelineData.slice(0, 1),
+    };
+    const wrapper = mount(
+      <TestProviders>
+        <BodyComponent {...testProps} />
+      </TestProviders>
+    );
+    wrapper.update();
+
+    expect(
+      wrapper
+        .find('[data-test-subj="body-data-grid"]')
+        .first()
+        .prop<EuiDataGridColumn[]>('columns')
+        .find((c) => c.id === 'signal.rule.risk_score')?.cellActions
+    ).toBeUndefined();
   });
 });
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
index 83079e0cdc2fe..619571a0c8e81 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
@@ -145,6 +145,9 @@ const EuiDataGridContainer = styled.div<{ hideLastPage: boolean }>`
   }
 `;
 
+const FIELDS_WITHOUT_CELL_ACTIONS = ['@timestamp', 'signal.rule.risk_score', 'signal.reason'];
+const hasCellActions = (columnId?: string) =>
+  columnId && FIELDS_WITHOUT_CELL_ACTIONS.indexOf(columnId) < 0;
 const transformControlColumns = ({
   actionColumnsWidth,
   columnHeaders,
@@ -636,7 +639,6 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
       setEventsDeleted,
       hasAlertsCrudPermissions,
     ]);
-
     const columnsWithCellActions: EuiDataGridColumn[] = useMemo(
       () =>
         columnHeaders.map((header) => {
@@ -644,18 +646,24 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
             tGridCellAction({
               browserFields,
               data: data.map((row) => row.data),
-              globalFilters: filters,
+              ecsData: data.map((row) => row.ecs),
+              header: columnHeaders.find((h) => h.id === header.id),
               pageSize,
               timelineId: id,
             });
 
           return {
             ...header,
-            cellActions:
-              header.tGridCellActions?.map(buildAction) ?? defaultCellActions?.map(buildAction),
+            ...(hasCellActions(header.id)
+              ? {
+                  cellActions:
+                    header.tGridCellActions?.map(buildAction) ??
+                    defaultCellActions?.map(buildAction),
+                }
+              : {}),
           };
         }),
-      [browserFields, columnHeaders, data, defaultCellActions, id, pageSize, filters]
+      [columnHeaders, defaultCellActions, browserFields, data, pageSize, id]
     );
 
     const renderTGridCellValue = useMemo(() => {
@@ -663,9 +671,9 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
         columnId,
         rowIndex,
         setCellProps,
+        isDetails,
       }): React.ReactElement | null => {
         const pageRowIndex = getPageRowIndex(rowIndex, pageSize);
-
         const rowData = pageRowIndex < data.length ? data[pageRowIndex].data : null;
         const header = columnHeaders.find((h) => h.id === columnId);
         const eventId = pageRowIndex < data.length ? data[pageRowIndex]._id : null;
@@ -687,34 +695,36 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
         }
 
         return renderCellValue({
+          browserFields,
           columnId: header.id,
-          eventId,
           data: rowData,
+          ecsData: ecs,
+          eventId,
+          globalFilters: filters,
           header,
+          isDetails,
           isDraggable: false,
           isExpandable: true,
           isExpanded: false,
-          isDetails: false,
           linkValues: getOr([], header.linkField ?? '', ecs),
           rowIndex,
-          setCellProps,
-          timelineId: tabType != null ? `${id}-${tabType}` : id,
-          ecsData: ecs,
-          browserFields,
           rowRenderers,
+          setCellProps,
+          timelineId: id,
+          truncate: isDetails ? false : true,
         }) as React.ReactElement;
       };
       return Cell;
     }, [
+      browserFields,
       columnHeaders,
       data,
+      filters,
       id,
+      pageSize,
       renderCellValue,
-      tabType,
-      theme,
-      browserFields,
       rowRenderers,
-      pageSize,
+      theme,
     ]);
 
     const onChangeItemsPerPage = useCallback(
diff --git a/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx
index 6f69c54233858..91bb6ad1dac0b 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx
@@ -180,19 +180,21 @@ const EventRenderedViewComponent = ({
             rowRenderer.isInstance(ecsData)
           );
           return (
-            <EuiFlexGroup gutterSize="none" direction="column">
+            <EuiFlexGroup gutterSize="none" direction="column" className="eui-fullWidth">
               {reason && <EuiFlexItem>{reason}</EuiFlexItem>}
               {rowRenderersValid.length > 0 &&
                 rowRenderersValid.map((rowRenderer) => (
                   <>
                     <EuiHorizontalRule size="half" margin="xs" />
-                    <EventRenderedFlexItem>
-                      {rowRenderer.renderRow({
-                        browserFields,
-                        data: ecsData,
-                        isDraggable: false,
-                        timelineId: 'NONE',
-                      })}
+                    <EventRenderedFlexItem className="eui-xScroll">
+                      <div className="eui-displayInlineBlock">
+                        {rowRenderer.renderRow({
+                          browserFields,
+                          data: ecsData,
+                          isDraggable: false,
+                          timelineId: 'NONE',
+                        })}
+                      </div>
                     </EventRenderedFlexItem>
                   </>
                 ))}
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 482a493865a47..9652e016f73a5 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -22164,7 +22164,6 @@
     "xpack.securitySolution.enpdoint.resolver.panelutils.invaliddate": "無効な日付",
     "xpack.securitySolution.enpdoint.resolver.panelutils.noTimestampRetrieved": "タイムスタンプが取得されていません",
     "xpack.securitySolution.event.module.linkToElasticEndpointSecurityDescription": "Endpoint Securityで開く",
-    "xpack.securitySolution.event.reason.eventRenderPopoverTitle": "イベントレンダラー：{eventRendererName} ",
     "xpack.securitySolution.eventDetails.blank": " ",
     "xpack.securitySolution.eventDetails.copyToClipboard": "クリップボードにコピー",
     "xpack.securitySolution.eventDetails.copyToClipboardTooltip": "クリップボードにコピー",
@@ -24427,8 +24426,6 @@
     "xpack.timelines.hoverActions.addToTimeline.addedFieldMessage": "{fieldOrValue}をタイムラインに追加しました",
     "xpack.timelines.hoverActions.columnToggleLabel": "表の{field}列を切り替える",
     "xpack.timelines.hoverActions.fieldLabel": "フィールド",
-    "xpack.timelines.hoverActions.filterForValue": "値でフィルター",
-    "xpack.timelines.hoverActions.filterOutValue": "値を除外",
     "xpack.timelines.hoverActions.moreActions": "さらにアクションを表示",
     "xpack.timelines.hoverActions.nestedColumnToggleLabel": "{field}フィールドはオブジェクトであり、列として追加できるネストされたフィールドに分解されます",
     "xpack.timelines.hoverActions.tooltipWithKeyboardShortcut.pressTooltipLabel": "プレス",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 2322f6213149f..404ef9ad673b7 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -22512,7 +22512,6 @@
     "xpack.securitySolution.enpdoint.resolver.panelutils.invaliddate": "日期无效",
     "xpack.securitySolution.enpdoint.resolver.panelutils.noTimestampRetrieved": "未检索时间戳",
     "xpack.securitySolution.event.module.linkToElasticEndpointSecurityDescription": "在 Endpoint Security 中打开",
-    "xpack.securitySolution.event.reason.eventRenderPopoverTitle": "事件渲染器：{eventRendererName} ",
     "xpack.securitySolution.eventDetails.blank": " ",
     "xpack.securitySolution.eventDetails.copyToClipboard": "复制到剪贴板",
     "xpack.securitySolution.eventDetails.copyToClipboardTooltip": "复制到剪贴板",
@@ -24840,8 +24839,6 @@
     "xpack.timelines.hoverActions.addToTimeline.addedFieldMessage": "已将 {fieldOrValue} 添加到时间线",
     "xpack.timelines.hoverActions.columnToggleLabel": "在表中切换 {field} 列",
     "xpack.timelines.hoverActions.fieldLabel": "字段",
-    "xpack.timelines.hoverActions.filterForValue": "筛留值",
-    "xpack.timelines.hoverActions.filterOutValue": "筛除值",
     "xpack.timelines.hoverActions.moreActions": "更多操作",
     "xpack.timelines.hoverActions.nestedColumnToggleLabel": "{field} 字段是对象，并分解为可以添加为列的嵌套字段",
     "xpack.timelines.hoverActions.tooltipWithKeyboardShortcut.pressTooltipLabel": "按",

From 864e6f1a74f7594b545b5a53ccbb9d8407b67c84 Mon Sep 17 00:00:00 2001
From: Clint Andrew Hall <clint.hall@elastic.co>
Date: Thu, 14 Oct 2021 09:18:01 -0500
Subject: [PATCH 074/117] [fleet] Adjust unified integration view to have
 better UI controls (#114692)

* [fleet] Adjust Package Cards to horizontal layout

* Fix responsive shifting

* Addressing feedback

* cleanup layout for integrations view

* i18n

* Fix type errors

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Dave Snider <dave.snider@gmail.com>
Co-authored-by: Josh Dover <1813008+joshdover@users.noreply.github.com>
---
 src/core/public/rendering/_base.scss          |   6 +
 .../integrations/layouts/default.tsx          |  57 +------
 .../epm/components/package_card.stories.tsx   |   2 +-
 .../sections/epm/components/package_card.tsx  |  34 +++--
 .../epm/components/package_list_grid.tsx      | 142 ++++++++++--------
 .../epm/screens/home/available_packages.tsx   |  38 +++--
 .../epm/screens/home/category_facets.tsx      |   2 +-
 .../fleet/public/components/package_icon.tsx  |   4 +-
 .../translations/translations/ja-JP.json      |   4 -
 .../translations/translations/zh-CN.json      |   4 -
 10 files changed, 132 insertions(+), 161 deletions(-)

diff --git a/src/core/public/rendering/_base.scss b/src/core/public/rendering/_base.scss
index 18e564abf822f..32a297a4066d9 100644
--- a/src/core/public/rendering/_base.scss
+++ b/src/core/public/rendering/_base.scss
@@ -42,6 +42,12 @@
   #app-fixed-viewport {
     top: $headerHeight;
   }
+
+  .kbnStickyMenu {
+    position: sticky;
+    max-height: calc(100vh - #{$headerHeight + $euiSize});
+    top: $headerHeight + $euiSize;
+  }
 }
 
 .kbnBody {
diff --git a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
index 8ced172e696aa..0c46e1af301cf 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
@@ -5,20 +5,12 @@
  * 2.0.
  */
 import React, { memo } from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiImage, EuiSpacer, EuiText, EuiLink } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { i18n } from '@kbn/i18n';
-
-import styled, { useTheme } from 'styled-components';
-
-import type { EuiTheme } from 'src/plugins/kibana_react/common';
-
 import { useLink } from '../../../hooks';
 import type { Section } from '../sections';
 
-import { useLinks, useStartServices } from '../hooks';
-
 import { WithHeaderLayout } from './';
 
 interface Props {
@@ -26,45 +18,11 @@ interface Props {
   children?: React.ReactNode;
 }
 
-const Illustration = styled(EuiImage)`
-  margin-bottom: -77px;
-  position: relative;
-  top: -16px;
-  width: 395px;
-`;
-
-const Hero = styled.div`
-  text-align: right;
-`;
-
-const HeroImage = memo(() => {
-  const { toSharedAssets } = useLinks();
-  const theme = useTheme() as EuiTheme;
-  const IS_DARK_THEME = theme.darkMode;
-
-  return (
-    <Hero>
-      <Illustration
-        alt={i18n.translate('xpack.fleet.epm.illustrationAltText', {
-          defaultMessage: 'Illustration of an integration',
-        })}
-        url={
-          IS_DARK_THEME
-            ? toSharedAssets('illustration_integrations_darkmode.svg')
-            : toSharedAssets('illustration_integrations_lightmode.svg')
-        }
-      />
-    </Hero>
-  );
-});
-
 export const DefaultLayout: React.FunctionComponent<Props> = memo(({ section, children }) => {
   const { getHref } = useLink();
-  const { docLinks } = useStartServices();
 
   return (
     <WithHeaderLayout
-      rightColumn={<HeroImage />}
       leftColumn={
         <EuiFlexGroup direction="column" gutterSize="none" justifyContent="center">
           <EuiText>
@@ -79,20 +37,11 @@ export const DefaultLayout: React.FunctionComponent<Props> = memo(({ section, ch
           <EuiSpacer size="s" />
 
           <EuiFlexItem grow={false}>
-            <EuiText size="m" color="subdued">
+            <EuiText size="s" color="subdued">
               <p>
                 <FormattedMessage
                   id="xpack.fleet.epm.pageSubtitle"
-                  defaultMessage="Collect data from popular applications and services.  To learn more about Integrations, view {link}"
-                  values={{
-                    link: (
-                      <EuiLink target="_blank" href={docLinks.links.elasticStackGetStarted}>
-                        {i18n.translate('xpack.fleet.epm.pageSubtitleLinkText', {
-                          defaultMessage: 'Getting started with Elastic Stack',
-                        })}
-                      </EuiLink>
-                    ),
-                  }}
+                  defaultMessage="Choose an integration to start collecting and analyzing your data"
                 />
               </p>
             </EuiText>
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx
index 94370587ddec8..86bac94bc50cd 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx
@@ -22,7 +22,7 @@ export default {
 type Args = Omit<PackageCardProps, 'status'> & { width: number };
 
 const args: Args = {
-  width: 250,
+  width: 280,
   title: 'Title',
   description: 'Description',
   name: 'beats',
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
index a68499dbd8dd0..091eb4c97183d 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import { EuiCard } from '@elastic/eui';
+import { EuiCard, EuiFlexItem, EuiBadge, EuiToolTip, EuiSpacer } from '@elastic/eui';
 
 import { CardIcon } from '../../../../../components/package_icon';
 import type { IntegrationCardItem } from '../../../../../../common/types/models/epm';
@@ -16,10 +16,10 @@ import { RELEASE_BADGE_DESCRIPTION, RELEASE_BADGE_LABEL } from './release_badge'
 
 export type PackageCardProps = IntegrationCardItem;
 
-// adding the `href` causes EuiCard to use a `a` instead of a `button`
-// `a` tags use `euiLinkColor` which results in blueish Badge text
+// Min-height is roughly 3 lines of content.
+// This keeps the cards from looking overly unbalanced because of content differences.
 const Card = styled(EuiCard)`
-  color: inherit;
+  min-height: 127px;
 `;
 
 export function PackageCard({
@@ -32,14 +32,28 @@ export function PackageCard({
   url,
   release,
 }: PackageCardProps) {
-  const betaBadgeLabel = release && release !== 'ga' ? RELEASE_BADGE_LABEL[release] : undefined;
-  const betaBadgeLabelTooltipContent =
-    release && release !== 'ga' ? RELEASE_BADGE_DESCRIPTION[release] : undefined;
+  let releaseBadge: React.ReactNode | null = null;
+
+  if (release && release !== 'ga') {
+    releaseBadge = (
+      <EuiFlexItem grow={false}>
+        <EuiSpacer size="xs" />
+        <span>
+          <EuiToolTip display="inlineBlock" content={RELEASE_BADGE_DESCRIPTION[release]}>
+            <EuiBadge color="hollow">{RELEASE_BADGE_LABEL[release]}</EuiBadge>
+          </EuiToolTip>
+        </span>
+      </EuiFlexItem>
+    );
+  }
 
   return (
     <Card
+      layout="horizontal"
       title={title || ''}
+      titleSize="xs"
       description={description}
+      hasBorder
       icon={
         <CardIcon
           icons={icons}
@@ -50,9 +64,9 @@ export function PackageCard({
         />
       }
       href={url}
-      betaBadgeLabel={betaBadgeLabel}
-      betaBadgeTooltipContent={betaBadgeLabelTooltipContent}
       target={url.startsWith('http') || url.startsWith('https') ? '_blank' : undefined}
-    />
+    >
+      {releaseBadge}
+    </Card>
   );
 }
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_list_grid.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_list_grid.tsx
index 2a4cb84f1e6ce..00adb2a7b4ffb 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_list_grid.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_list_grid.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { ReactNode } from 'react';
-import React, { Fragment, useCallback, useState } from 'react';
+import type { ReactNode, FunctionComponent } from 'react';
+import React, { useCallback, useState, useRef, useEffect } from 'react';
 import {
   EuiFlexGrid,
   EuiFlexGroup,
@@ -20,7 +20,6 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { useStartServices } from '../../../../../hooks';
 import { Loading } from '../../../components';
 import { useLocalSearch, searchIdField } from '../../../hooks';
 
@@ -31,7 +30,7 @@ import { PackageCard } from './package_card';
 export interface Props {
   isLoading?: boolean;
   controls?: ReactNode | ReactNode[];
-  title: string;
+  title?: string;
   list: IntegrationCardItem[];
   initialSearch?: string;
   setSelectedCategory: (category: string) => void;
@@ -40,7 +39,7 @@ export interface Props {
   callout?: JSX.Element | null;
 }
 
-export function PackageListGrid({
+export const PackageListGrid: FunctionComponent<Props> = ({
   isLoading,
   controls,
   title,
@@ -50,9 +49,23 @@ export function PackageListGrid({
   setSelectedCategory,
   showMissingIntegrationMessage = false,
   callout,
-}: Props) {
+}) => {
   const [searchTerm, setSearchTerm] = useState(initialSearch || '');
   const localSearchRef = useLocalSearch(list);
+  const menuRef = useRef<HTMLDivElement>(null);
+  const [isSticky, setIsSticky] = useState(false);
+  const [windowScrollY] = useState(window.scrollY);
+
+  useEffect(() => {
+    const menuRefCurrent = menuRef.current;
+    const onScroll = () => {
+      if (menuRefCurrent) {
+        setIsSticky(menuRefCurrent?.getBoundingClientRect().top < 110);
+      }
+    };
+    window.addEventListener('scroll', onScroll);
+    return () => window.removeEventListener('scroll', onScroll);
+  }, [windowScrollY, isSticky]);
 
   const onQueryChange = ({
     queryText: userInput,
@@ -71,7 +84,7 @@ export function PackageListGrid({
     setSearchTerm('');
   };
 
-  const controlsContent = <ControlsColumn title={title} controls={controls} />;
+  const controlsContent = <ControlsColumn title={title} controls={controls} sticky={isSticky} />;
   let gridContent: JSX.Element;
 
   if (isLoading || !localSearchRef.current) {
@@ -93,58 +106,68 @@ export function PackageListGrid({
   }
 
   return (
-    <EuiFlexGroup alignItems="flexStart">
-      <EuiFlexItem grow={1}>{controlsContent}</EuiFlexItem>
-      <EuiFlexItem grow={3}>
-        <EuiSearchBar
-          query={searchTerm || undefined}
-          box={{
-            placeholder: i18n.translate('xpack.fleet.epmList.searchPackagesPlaceholder', {
-              defaultMessage: 'Search for integrations',
-            }),
-            incremental: true,
-          }}
-          onChange={onQueryChange}
-        />
-        {callout ? (
-          <>
-            <EuiSpacer />
-            {callout}
-          </>
-        ) : null}
-        <EuiSpacer />
-        {gridContent}
-        {showMissingIntegrationMessage && (
-          <>
-            <EuiSpacer size="xxl" />
-            <MissingIntegrationContent
-              resetQuery={resetQuery}
-              setSelectedCategory={setSelectedCategory}
-            />
-          </>
-        )}
-      </EuiFlexItem>
-    </EuiFlexGroup>
+    <div ref={menuRef}>
+      <EuiFlexGroup alignItems="flexStart" gutterSize="xl">
+        <EuiFlexItem grow={1} className={isSticky ? 'kbnStickyMenu' : ''}>
+          {controlsContent}
+        </EuiFlexItem>
+        <EuiFlexItem grow={5}>
+          <EuiSearchBar
+            query={searchTerm || undefined}
+            box={{
+              placeholder: i18n.translate('xpack.fleet.epmList.searchPackagesPlaceholder', {
+                defaultMessage: 'Search for integrations',
+              }),
+              incremental: true,
+            }}
+            onChange={onQueryChange}
+          />
+          {callout ? (
+            <>
+              <EuiSpacer />
+              {callout}
+            </>
+          ) : null}
+          <EuiSpacer />
+          {gridContent}
+          {showMissingIntegrationMessage && (
+            <>
+              <EuiSpacer />
+              <MissingIntegrationContent
+                resetQuery={resetQuery}
+                setSelectedCategory={setSelectedCategory}
+              />
+            </>
+          )}
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
   );
-}
+};
 
 interface ControlsColumnProps {
   controls: ReactNode;
-  title: string;
+  title: string | undefined;
+  sticky: boolean;
 }
 
-function ControlsColumn({ controls, title }: ControlsColumnProps) {
+function ControlsColumn({ controls, title, sticky }: ControlsColumnProps) {
+  let titleContent;
+  if (title) {
+    titleContent = (
+      <>
+        <EuiTitle size="s">
+          <h2>{title}</h2>
+        </EuiTitle>
+        <EuiSpacer size="l" />
+      </>
+    );
+  }
   return (
-    <Fragment>
-      <EuiTitle size="s">
-        <h2>{title}</h2>
-      </EuiTitle>
-      <EuiSpacer size="l" />
-      <EuiFlexGroup>
-        <EuiFlexItem grow={4}>{controls}</EuiFlexItem>
-        <EuiFlexItem grow={1} />
-      </EuiFlexGroup>
-    </Fragment>
+    <EuiFlexGroup direction="column" className={sticky ? 'kbnStickyMenu' : ''} gutterSize="none">
+      {titleContent}
+      {controls}
+    </EuiFlexGroup>
   );
 }
 
@@ -196,20 +219,17 @@ function MissingIntegrationContent({
   resetQuery,
   setSelectedCategory,
 }: MissingIntegrationContentProps) {
-  const {
-    application: { getUrlForApp },
-  } = useStartServices();
   const handleCustomInputsLinkClick = useCallback(() => {
     resetQuery();
     setSelectedCategory('custom');
   }, [resetQuery, setSelectedCategory]);
 
   return (
-    <EuiText>
+    <EuiText size="s" color="subdued">
       <p>
         <FormattedMessage
           id="xpack.fleet.integrations.missing"
-          defaultMessage="Don't see an integration? Collect any logs or metrics using our {customInputsLink}, or add data using {beatsTutorialLink}. Request new integrations using our {discussForumLink}."
+          defaultMessage="Don't see an integration? Collect any logs or metrics using our {customInputsLink}. Request new integrations using our {discussForumLink}."
           values={{
             customInputsLink: (
               <EuiLink onClick={handleCustomInputsLinkClick}>
@@ -227,14 +247,6 @@ function MissingIntegrationContent({
                 />
               </EuiLink>
             ),
-            beatsTutorialLink: (
-              <EuiLink href={getUrlForApp('home', { path: '#/tutorial_directory' })}>
-                <FormattedMessage
-                  id="xpack.fleet.integrations.beatsModulesLink"
-                  defaultMessage="Beats modules"
-                />
-              </EuiLink>
-            ),
           }}
         />
       </p>
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx
index 40f89346c25bf..91b557d0db5b6 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx
@@ -7,9 +7,8 @@
 
 import React, { memo, useMemo, useState } from 'react';
 import { useLocation, useHistory, useParams } from 'react-router-dom';
-import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
-import { EuiHorizontalRule } from '@elastic/eui';
+import { EuiHorizontalRule, EuiFlexItem } from '@elastic/eui';
 
 import { pagePathGetters } from '../../../../constants';
 import {
@@ -93,10 +92,6 @@ const packageListToIntegrationsList = (packages: PackageList): PackageList => {
   }, []);
 };
 
-const title = i18n.translate('xpack.fleet.epmList.allTitle', {
-  defaultMessage: 'Browse by category',
-});
-
 // TODO: clintandrewhall - this component is hard to test due to the hooks, particularly those that use `http`
 // or `location` to load data.  Ideally, we'll split this into "connected" and "pure" components.
 export const AvailablePackages: React.FC = memo(() => {
@@ -121,9 +116,7 @@ export const AvailablePackages: React.FC = memo(() => {
 
   function setSearchTerm(search: string) {
     // Use .replace so the browser's back button is not tied to single keystroke
-    history.replace(
-      pagePathGetters.integrations_all({ category: selectedCategory, searchTerm: search })[1]
-    );
+    history.replace(pagePathGetters.integrations_all({ searchTerm: search })[1]);
   }
 
   const { data: eprPackages, isLoading: isLoadingAllPackages } = useGetPackages({
@@ -186,20 +179,26 @@ export const AvailablePackages: React.FC = memo(() => {
   }
 
   let controls = [
-    <EuiHorizontalRule />,
-    <IntegrationPreference initialType={preference} onChange={setPreference} />,
+    <EuiFlexItem grow={false}>
+      <EuiHorizontalRule margin="m" />
+      <IntegrationPreference initialType={preference} onChange={setPreference} />,
+    </EuiFlexItem>,
   ];
 
   if (categories) {
     controls = [
-      <CategoryFacets
-        isLoading={isLoadingCategories || isLoadingAllPackages || isLoadingAppendCustomIntegrations}
-        categories={categories}
-        selectedCategory={selectedCategory}
-        onCategoryChange={({ id }) => {
-          setSelectedCategory(id);
-        }}
-      />,
+      <EuiFlexItem className="eui-yScrollWithShadows">
+        <CategoryFacets
+          isLoading={
+            isLoadingCategories || isLoadingAllPackages || isLoadingAppendCustomIntegrations
+          }
+          categories={categories}
+          selectedCategory={selectedCategory}
+          onCategoryChange={({ id }) => {
+            setSelectedCategory(id);
+          }}
+        />
+      </EuiFlexItem>,
       ...controls,
     ];
   }
@@ -214,7 +213,6 @@ export const AvailablePackages: React.FC = memo(() => {
   return (
     <PackageListGrid
       isLoading={isLoadingAllPackages}
-      title={title}
       controls={controls}
       initialSearch={searchParam}
       list={filteredCards}
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/category_facets.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/category_facets.tsx
index 9407e243c7ab5..0b17d17e19343 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/category_facets.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/category_facets.tsx
@@ -21,7 +21,7 @@ export interface CategoryFacet {
 export const ALL_CATEGORY = {
   id: '',
   title: i18n.translate('xpack.fleet.epmList.allPackagesFilterLinkText', {
-    defaultMessage: 'All',
+    defaultMessage: 'All categories',
   }),
 };
 
diff --git a/x-pack/plugins/fleet/public/components/package_icon.tsx b/x-pack/plugins/fleet/public/components/package_icon.tsx
index 7a2a9f1091301..b77a7bd082d9a 100644
--- a/x-pack/plugins/fleet/public/components/package_icon.tsx
+++ b/x-pack/plugins/fleet/public/components/package_icon.tsx
@@ -23,9 +23,9 @@ export const CardIcon: React.FunctionComponent<UsePackageIconType & Omit<EuiIcon
 ) => {
   const { icons } = props;
   if (icons && icons.length === 1 && icons[0].type === 'eui') {
-    return <EuiIcon size={'xl'} type={icons[0].src} />;
+    return <EuiIcon size={'xl'} type={icons[0].src} {...props} />;
   } else if (icons && icons.length === 1 && icons[0].type === 'svg') {
-    return <EuiIcon size={'xl'} type={icons[0].src} />;
+    return <EuiIcon size={'xl'} type={icons[0].src} {...props} />;
   } else {
     return <PackageIcon {...props} />;
   }
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 9652e016f73a5..ab62d33fce5f5 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -10720,7 +10720,6 @@
     "xpack.fleet.epm.detailsTitle": "詳細",
     "xpack.fleet.epm.errorLoadingNotice": "NOTICE.txtの読み込みエラー",
     "xpack.fleet.epm.featuresLabel": "機能",
-    "xpack.fleet.epm.illustrationAltText": "統合の例",
     "xpack.fleet.epm.install.packageInstallError": "{pkgName} {pkgVersion}のインストールエラー",
     "xpack.fleet.epm.install.packageUpdateError": "{pkgName} {pkgVersion}の更新エラー",
     "xpack.fleet.epm.licenseLabel": "ライセンス",
@@ -10755,7 +10754,6 @@
     "xpack.fleet.epm.usedByLabel": "エージェントポリシー",
     "xpack.fleet.epm.versionLabel": "バージョン",
     "xpack.fleet.epmList.allPackagesFilterLinkText": "すべて",
-    "xpack.fleet.epmList.allTitle": "カテゴリで参照",
     "xpack.fleet.epmList.installedTitle": "インストールされている統合",
     "xpack.fleet.epmList.missingIntegrationPlaceholder": "検索用語と一致する統合が見つかりませんでした。別のキーワードを試すか、左側のカテゴリを使用して参照してください。",
     "xpack.fleet.epmList.noPackagesFoundPlaceholder": "パッケージが見つかりません",
@@ -10829,12 +10827,10 @@
     "xpack.fleet.homeIntegration.tutorialModule.noticeText.notePrefix": "注：",
     "xpack.fleet.hostsInput.addRow": "行の追加",
     "xpack.fleet.initializationErrorMessageTitle": "Fleet を初期化できません",
-    "xpack.fleet.integrations.beatsModulesLink": "Beatsモジュール",
     "xpack.fleet.integrations.customInputsLink": "カスタム入力",
     "xpack.fleet.integrations.discussForumLink": "ディスカッションフォーラム",
     "xpack.fleet.integrations.installPackage.installingPackageButtonLabel": "{title} アセットをインストールしています",
     "xpack.fleet.integrations.installPackage.installPackageButtonLabel": "{title}アセットをインストール",
-    "xpack.fleet.integrations.missing": "統合が表示されない場合{customInputsLink}を使用してログまたはメトリックを収集するか、{beatsTutorialLink}を使用してデータを追加してください。{discussForumLink}を使用して新しい統合を要求してください。",
     "xpack.fleet.integrations.packageInstallErrorDescription": "このパッケージのインストール中に問題が発生しました。しばらくたってから再試行してください。",
     "xpack.fleet.integrations.packageInstallErrorTitle": "{title}パッケージをインストールできませんでした",
     "xpack.fleet.integrations.packageInstallSuccessDescription": "正常に{title}をインストールしました",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 404ef9ad673b7..1271e3a32a0d3 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -10834,7 +10834,6 @@
     "xpack.fleet.epm.detailsTitle": "详情",
     "xpack.fleet.epm.errorLoadingNotice": "加载 NOTICE.txt 时出错",
     "xpack.fleet.epm.featuresLabel": "功能",
-    "xpack.fleet.epm.illustrationAltText": "集成的图示",
     "xpack.fleet.epm.install.packageInstallError": "安装 {pkgName} {pkgVersion} 时出错",
     "xpack.fleet.epm.install.packageUpdateError": "将 {pkgName} 更新到 {pkgVersion} 时出错",
     "xpack.fleet.epm.licenseLabel": "许可证",
@@ -10869,7 +10868,6 @@
     "xpack.fleet.epm.usedByLabel": "代理策略",
     "xpack.fleet.epm.versionLabel": "版本",
     "xpack.fleet.epmList.allPackagesFilterLinkText": "全部",
-    "xpack.fleet.epmList.allTitle": "按类别浏览",
     "xpack.fleet.epmList.installedTitle": "已安装集成",
     "xpack.fleet.epmList.missingIntegrationPlaceholder": "我们未找到任何匹配搜索词的集成。请重试其他关键字，或使用左侧的类别浏览。",
     "xpack.fleet.epmList.noPackagesFoundPlaceholder": "未找到任何软件包",
@@ -10943,12 +10941,10 @@
     "xpack.fleet.homeIntegration.tutorialModule.noticeText.notePrefix": "注意：",
     "xpack.fleet.hostsInput.addRow": "添加行",
     "xpack.fleet.initializationErrorMessageTitle": "无法初始化 Fleet",
-    "xpack.fleet.integrations.beatsModulesLink": "Beats 模板",
     "xpack.fleet.integrations.customInputsLink": "定制输入",
     "xpack.fleet.integrations.discussForumLink": "讨论论坛",
     "xpack.fleet.integrations.installPackage.installingPackageButtonLabel": "正在安装 {title} 资产",
     "xpack.fleet.integrations.installPackage.installPackageButtonLabel": "安装 {title} 资产",
-    "xpack.fleet.integrations.missing": "未看到集成？使用我们的{customInputsLink}收集任何日志或指标或使用 {beatsTutorialLink} 添加数据。使用{discussForumLink}请求新的集成。",
     "xpack.fleet.integrations.packageInstallErrorDescription": "尝试安装此软件包时出现问题。请稍后重试。",
     "xpack.fleet.integrations.packageInstallErrorTitle": "无法安装 {title} 软件包",
     "xpack.fleet.integrations.packageInstallSuccessDescription": "已成功安装 {title}",

From 55a444b17a935094375e9fffb30d5b63bb705066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20S=C3=A1nchez?= <davidsansol92@gmail.com>
Date: Thu, 14 Oct 2021 16:25:17 +0200
Subject: [PATCH 075/117] Small adjustments in policy page (#114957)

---
 .../trusted_apps/flyout/policy_trusted_apps_flyout.tsx    | 2 +-
 .../view/components/trusted_apps_grid/index.tsx           | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx
index 63c7d5375476c..8728104aee637 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx
@@ -249,7 +249,7 @@ export const PolicyTrustedAppsFlyout = React.memo(() => {
             >
               <FormattedMessage
                 id="xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.confirm"
-                defaultMessage="Assing to {policyName}"
+                defaultMessage="Assign to {policyName}"
                 values={{
                   policyName,
                 }}
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.tsx
index 948b454f9cc00..6967c07db20b1 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.tsx
@@ -54,7 +54,7 @@ const RootWrapper = styled.div`
 
 const BACK_TO_TRUSTED_APPS_LABEL = i18n.translate(
   'xpack.securitySolution.trustedapps.grid.policyDetailsLinkBackLabel',
-  { defaultMessage: 'Back to trusted Applications' }
+  { defaultMessage: 'Back to trusted applications' }
 );
 
 const EDIT_TRUSTED_APP_ACTION_LABEL = i18n.translate(
@@ -120,6 +120,12 @@ export const TrustedAppsGrid = memo(() => {
               ],
               href: getAppUrl({ path: currentPagePath }),
             },
+            onCancelNavigateTo: [
+              APP_ID,
+              {
+                path: currentPagePath,
+              },
+            ],
           };
 
           policyToNavOptionsMap[policyId] = {

From c5e23b6a5b32beb23b509248c66f3aff5a23f48f Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Thu, 14 Oct 2021 07:37:15 -0700
Subject: [PATCH 076/117] [Reporting] Functional test structure & improvements
 (#114298)

* [Reporting] Functional test structure & improvements

* show the error of the report generation failure in the test failure

* update snapshot

* remove import to non-existent functional app test

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 vars/kibanaPipeline.groovy                    |  1 -
 .../__snapshots__/stream_handler.test.ts.snap |  1 +
 .../reporting/public/notifier/job_failure.tsx |  1 +
 .../test/functional/apps/reporting/README.md  | 18 ++++++
 .../test/functional/apps/reporting/index.ts   | 14 -----
 .../functional/apps/reporting/reporting.ts    | 55 -------------------
 x-pack/test/functional/config.js              |  1 -
 .../functional/page_objects/reporting_page.ts | 25 ++++++---
 8 files changed, 36 insertions(+), 80 deletions(-)
 create mode 100644 x-pack/test/functional/apps/reporting/README.md
 delete mode 100644 x-pack/test/functional/apps/reporting/index.ts
 delete mode 100644 x-pack/test/functional/apps/reporting/reporting.ts

diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index 21e41ce55781f..daf6ca7a8e993 100644
--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -203,7 +203,6 @@ def withGcsArtifactUpload(workerName, closure) {
     'x-pack/test/**/screenshots/diff/*.png',
     'x-pack/test/**/screenshots/failure/*.png',
     'x-pack/test/**/screenshots/session/*.png',
-    'x-pack/test/functional/apps/reporting/reports/session/*.pdf',
     'x-pack/test/functional/failure_debug/html/*.html',
     '.es/**/*.hprof'
   ]
diff --git a/x-pack/plugins/reporting/public/lib/__snapshots__/stream_handler.test.ts.snap b/x-pack/plugins/reporting/public/lib/__snapshots__/stream_handler.test.ts.snap
index 3d49e8e695f9b..9c72de2bf0ed8 100644
--- a/x-pack/plugins/reporting/public/lib/__snapshots__/stream_handler.test.ts.snap
+++ b/x-pack/plugins/reporting/public/lib/__snapshots__/stream_handler.test.ts.snap
@@ -82,6 +82,7 @@ Array [
       "reactNode": <React.Fragment>
         <EuiCallOut
           color="danger"
+          data-test-errorText="this is the failed report error"
           iconType="alert"
           size="m"
           title="The reporting job failed"
diff --git a/x-pack/plugins/reporting/public/notifier/job_failure.tsx b/x-pack/plugins/reporting/public/notifier/job_failure.tsx
index e892a1f93a7c2..7775afc4d9f82 100644
--- a/x-pack/plugins/reporting/public/notifier/job_failure.tsx
+++ b/x-pack/plugins/reporting/public/notifier/job_failure.tsx
@@ -35,6 +35,7 @@ export const getFailureToast = (
           })}
           color="danger"
           iconType="alert"
+          data-test-errorText={errorText}
         >
           {errorText}
         </EuiCallOut>
diff --git a/x-pack/test/functional/apps/reporting/README.md b/x-pack/test/functional/apps/reporting/README.md
new file mode 100644
index 0000000000000..ec9bba8b88341
--- /dev/null
+++ b/x-pack/test/functional/apps/reporting/README.md
@@ -0,0 +1,18 @@
+## Reporting functional tests
+
+Functional tests on report generation are under the applications that use reporting.
+
+**PDF/PNG Report testing:**
+ - `x-pack/test/functional/apps/canvas/reports.ts`
+ - `x-pack/test/functional/apps/dashboard/reporting/screenshots.ts`
+ - `x-pack/test/functional/apps/lens/lens_reporting.ts`
+ - `x-pack/test/functional/apps/visualize/reporting.ts`
+
+**CSV Report testing:**
+ - `x-pack/test/functional/apps/dashboard/reporting/download_csv.ts`
+ - `x-pack/test/functional/apps/discover/reporting.ts`
+
+Reporting Management app tests are in `functional/apps/reporting_management`.
+
+**Manage reports testing:**
+ - `x-pack/test/functional/apps/reporting_management` 
diff --git a/x-pack/test/functional/apps/reporting/index.ts b/x-pack/test/functional/apps/reporting/index.ts
deleted file mode 100644
index 286693f01ac52..0000000000000
--- a/x-pack/test/functional/apps/reporting/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function ({ loadTestFile }: FtrProviderContext) {
-  describe('Reporting', function () {
-    loadTestFile(require.resolve('./reporting'));
-  });
-}
diff --git a/x-pack/test/functional/apps/reporting/reporting.ts b/x-pack/test/functional/apps/reporting/reporting.ts
deleted file mode 100644
index 0d8034f046e02..0000000000000
--- a/x-pack/test/functional/apps/reporting/reporting.ts
+++ /dev/null
@@ -1,55 +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(['dashboard', 'common', 'reporting']);
-  const es = getService('es');
-  const kibanaServer = getService('kibanaServer');
-
-  const retry = getService('retry');
-
-  describe('Reporting', function () {
-    this.tags(['smoke', 'ciGroup2']);
-    before(async () => {
-      await kibanaServer.importExport.load(
-        'x-pack/test/functional/fixtures/kbn_archiver/packaging'
-      );
-    });
-
-    after(async () => {
-      await kibanaServer.importExport.unload(
-        'x-pack/test/functional/fixtures/kbn_archiver/packaging'
-      );
-      await es.deleteByQuery({
-        index: '.reporting-*',
-        refresh: true,
-        body: { query: { match_all: {} } },
-      });
-    });
-
-    it('downloaded PDF has OK status', async function () {
-      this.timeout(180000);
-
-      await pageObjects.common.navigateToApp('dashboards');
-      await retry.waitFor('dashboard landing page', async () => {
-        return await pageObjects.dashboard.onDashboardLandingPage();
-      });
-      await pageObjects.dashboard.loadSavedDashboard('dashboard');
-      await pageObjects.reporting.openPdfReportingPanel();
-      await pageObjects.reporting.clickGenerateReportButton();
-
-      const url = await pageObjects.reporting.getReportURL(60000);
-      const res = await pageObjects.reporting.getResponse(url);
-
-      expect(res.status).to.equal(200);
-      expect(res.get('content-type')).to.equal('application/pdf');
-    });
-  });
-}
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
index 04622c5f21fac..2abd91fd0433a 100644
--- a/x-pack/test/functional/config.js
+++ b/x-pack/test/functional/config.js
@@ -56,7 +56,6 @@ export default async function ({ readConfigFile }) {
       resolve(__dirname, './apps/transform'),
       resolve(__dirname, './apps/reporting_management'),
       resolve(__dirname, './apps/management'),
-      resolve(__dirname, './apps/reporting'),
       resolve(__dirname, './apps/lens'), // smokescreen tests cause flakiness in other tests
 
       // This license_management file must be last because it is destructive.
diff --git a/x-pack/test/functional/page_objects/reporting_page.ts b/x-pack/test/functional/page_objects/reporting_page.ts
index 552d2c9c831bd..039f4ff0fbc57 100644
--- a/x-pack/test/functional/page_objects/reporting_page.ts
+++ b/x-pack/test/functional/page_objects/reporting_page.ts
@@ -19,6 +19,7 @@ export class ReportingPageObject extends FtrService {
   private readonly retry = this.ctx.getService('retry');
   private readonly security = this.ctx.getService('security');
   private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly find = this.ctx.getService('find');
   private readonly share = this.ctx.getPageObject('share');
   private readonly timePicker = this.ctx.getPageObject('timePicker');
 
@@ -33,15 +34,21 @@ export class ReportingPageObject extends FtrService {
   async getReportURL(timeout: number) {
     this.log.debug('getReportURL');
 
-    const url = await this.testSubjects.getAttribute(
-      'downloadCompletedReportButton',
-      'href',
-      timeout
-    );
-
-    this.log.debug(`getReportURL got url: ${url}`);
-
-    return url;
+    try {
+      const url = await this.testSubjects.getAttribute(
+        'downloadCompletedReportButton',
+        'href',
+        timeout
+      );
+      this.log.debug(`getReportURL got url: ${url}`);
+
+      return url;
+    } catch (err) {
+      const errorTextEl = await this.find.byCssSelector('[data-test-errorText]');
+      const errorText = await errorTextEl.getAttribute('data-test-errorText');
+      const newError = new Error(`Test report failed: ${errorText}: ${err}`);
+      throw newError;
+    }
   }
 
   async removeForceSharedItemsContainerSize() {

From 3899046313dfed73c406aea78531ada9caabba78 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@budzenski.me>
Date: Thu, 14 Oct 2021 09:51:46 -0500
Subject: [PATCH 077/117] skip flaky suite.  #113890

---
 .../functional/apps/transform/creation_runtime_mappings.ts    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts b/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts
index 5fe9d02c58dc7..e244c907a76d6 100644
--- a/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts
+++ b/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts
@@ -33,7 +33,9 @@ export default function ({ getService }: FtrProviderContext) {
       script: "emit(doc['responsetime'].value * 2.0)",
     },
   };
-  describe('creation with runtime mappings', function () {
+
+  // FLAKY https://github.com/elastic/kibana/issues/113890
+  describe.skip('creation with runtime mappings', function () {
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await transform.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');

From 0b2012a90864abb72f1fca6f39eba68b6c31efed Mon Sep 17 00:00:00 2001
From: ymao1 <ying.mao@elastic.co>
Date: Thu, 14 Oct 2021 11:34:52 -0400
Subject: [PATCH 078/117] Setting displayname for alerting sos (#114916)

---
 x-pack/plugins/actions/server/saved_objects/index.ts  | 1 +
 x-pack/plugins/alerting/server/saved_objects/index.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/x-pack/plugins/actions/server/saved_objects/index.ts b/x-pack/plugins/actions/server/saved_objects/index.ts
index 14b425d20af13..c3598df809bcf 100644
--- a/x-pack/plugins/actions/server/saved_objects/index.ts
+++ b/x-pack/plugins/actions/server/saved_objects/index.ts
@@ -40,6 +40,7 @@ export function setupSavedObjects(
     mappings: mappings.action as SavedObjectsTypeMappingDefinition,
     migrations: getActionsMigrations(encryptedSavedObjects),
     management: {
+      displayName: 'connector',
       defaultSearchField: 'name',
       importableAndExportable: true,
       getTitle(savedObject: SavedObject<RawAction>) {
diff --git a/x-pack/plugins/alerting/server/saved_objects/index.ts b/x-pack/plugins/alerting/server/saved_objects/index.ts
index f1afba147a2f7..eb561b3c285f8 100644
--- a/x-pack/plugins/alerting/server/saved_objects/index.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/index.ts
@@ -58,6 +58,7 @@ export function setupSavedObjects(
     migrations: getMigrations(encryptedSavedObjects, isPreconfigured),
     mappings: mappings.alert as SavedObjectsTypeMappingDefinition,
     management: {
+      displayName: 'rule',
       importableAndExportable: true,
       getTitle(ruleSavedObject: SavedObject<RawAlert>) {
         return `Rule: [${ruleSavedObject.attributes.name}]`;

From b304c1ca0b3ed77f7cb382dac1060e91904c48ae Mon Sep 17 00:00:00 2001
From: Georgii Gorbachev <georgii.gorbachev@elastic.co>
Date: Thu, 14 Oct 2021 17:40:23 +0200
Subject: [PATCH 079/117] [Security Solution][Detections] Truncate
 lastFailureMessage for siem-detection-engine-rule-status documents (#112257)

**Ticket:** https://github.com/elastic/kibana/issues/109815

## Summary

**Background:** `siem-detection-engine-rule-status` documents stores the `lastFailureMessage` a string which is indexed as `type: "text"` but some failure messages are so large that these documents are up to 26MB. These large documents cause migrations to fail because a batch of 1000 documents easily exceed Elasticsearch's `http.max_content_length` which defaults to 100mb.

This PR truncates `lastFailureMessage` and `lastSuccessMessage` in the following cases:

1. When we write new or update existing status SOs:
    - The lists of errors/warnings are deduped -> truncated to max `20` items -> joined to a string
    - The resulting strings are truncated to max `10240` characters
2. When we migrate `siem-detection-engine-rule-status` SOs to 7.15.2:
    - The two message fields are truncated to max `10240` characters

### Checklist

Delete any items that are not applicable to this PR.

- [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
---
 .../rule_execution_log/index.ts               | 10 ++++++
 .../rule_execution_log_client.ts              | 18 ++++++++--
 .../rule_execution_log/utils/normalization.ts | 34 +++++++++++++++++++
 .../create_security_rule_type_wrapper.ts      |  8 +++--
 .../rules/saved_object_mappings.ts            | 20 ++++++++++-
 .../signals/signal_rule_alert_type.ts         |  8 +++--
 6 files changed, 89 insertions(+), 9 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/index.ts
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/utils/normalization.ts

diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/index.ts
new file mode 100644
index 0000000000000..5c7d9a875056a
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/index.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './rule_execution_log_client';
+export * from './types';
+export * from './utils/normalization';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/rule_execution_log_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/rule_execution_log_client.ts
index 2d773fc35cce0..7ae2f179f9692 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/rule_execution_log_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/rule_execution_log_client.ts
@@ -18,6 +18,7 @@ import {
   UpdateExecutionLogArgs,
   UnderlyingLogClient,
 } from './types';
+import { truncateMessage } from './utils/normalization';
 
 export interface RuleExecutionLogClientArgs {
   savedObjectsClient: SavedObjectsClientContract;
@@ -52,7 +53,16 @@ export class RuleExecutionLogClient implements IRuleExecutionLogClient {
   }
 
   public async update(args: UpdateExecutionLogArgs) {
-    return this.client.update(args);
+    const { lastFailureMessage, lastSuccessMessage, ...restAttributes } = args.attributes;
+
+    return this.client.update({
+      ...args,
+      attributes: {
+        lastFailureMessage: truncateMessage(lastFailureMessage),
+        lastSuccessMessage: truncateMessage(lastSuccessMessage),
+        ...restAttributes,
+      },
+    });
   }
 
   public async delete(id: string) {
@@ -64,6 +74,10 @@ export class RuleExecutionLogClient implements IRuleExecutionLogClient {
   }
 
   public async logStatusChange(args: LogStatusChangeArgs) {
-    return this.client.logStatusChange(args);
+    const message = args.message ? truncateMessage(args.message) : args.message;
+    return this.client.logStatusChange({
+      ...args,
+      message,
+    });
   }
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/utils/normalization.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/utils/normalization.ts
new file mode 100644
index 0000000000000..baaee9446eee3
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/utils/normalization.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 { take, toString, truncate, uniq } from 'lodash';
+
+// When we write rule execution status updates to `siem-detection-engine-rule-status` saved objects
+// or to event log, we write success and failure messages as well. Those messages are built from
+// N errors collected during the "big loop" in the Detection Engine, where N can be very large.
+// When N is large the resulting message strings are so large that these documents are up to 26MB.
+// These large documents may cause migrations to fail because a batch of 1000 documents easily
+// exceed Elasticsearch's `http.max_content_length` which defaults to 100mb.
+// In order to fix that, we need to truncate those messages to an adequate MAX length.
+// https://github.com/elastic/kibana/pull/112257
+
+const MAX_MESSAGE_LENGTH = 10240;
+const MAX_LIST_LENGTH = 20;
+
+export const truncateMessage = (value: unknown): string | undefined => {
+  if (value === undefined) {
+    return value;
+  }
+
+  const str = toString(value);
+  return truncate(str, { length: MAX_MESSAGE_LENGTH });
+};
+
+export const truncateMessageList = (list: string[]): string[] => {
+  const deduplicatedList = uniq(list);
+  return take(deduplicatedList, MAX_LIST_LENGTH);
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
index b037e572f21b7..77981d92b2ba7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
@@ -38,7 +38,7 @@ import {
 import { getNotificationResultsLink } from '../notifications/utils';
 import { createResultObject } from './utils';
 import { bulkCreateFactory, wrapHitsFactory, wrapSequencesFactory } from './factories';
-import { RuleExecutionLogClient } from '../rule_execution_log/rule_execution_log_client';
+import { RuleExecutionLogClient, truncateMessageList } from '../rule_execution_log';
 import { RuleExecutionStatus } from '../../../../common/detection_engine/schemas/common/schemas';
 import { scheduleThrottledNotificationActions } from '../notifications/schedule_throttle_notification_actions';
 import { AlertAttributes } from '../signals/types';
@@ -282,7 +282,9 @@ export const createSecurityRuleTypeWrapper: CreateSecurityRuleTypeWrapper =
           }
 
           if (result.warningMessages.length) {
-            const warningMessage = buildRuleMessage(result.warningMessages.join());
+            const warningMessage = buildRuleMessage(
+              truncateMessageList(result.warningMessages).join()
+            );
             await ruleStatusClient.logStatusChange({
               ...basicLogArguments,
               newStatus: RuleExecutionStatus['partial failure'],
@@ -372,7 +374,7 @@ export const createSecurityRuleTypeWrapper: CreateSecurityRuleTypeWrapper =
           } else {
             const errorMessage = buildRuleMessage(
               'Bulk Indexing of signals failed:',
-              result.errors.join()
+              truncateMessageList(result.errors).join()
             );
             logger.error(errorMessage);
             await ruleStatusClient.logStatusChange({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/saved_object_mappings.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/saved_object_mappings.ts
index 813e800f34ce2..d347fccf6b77b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/saved_object_mappings.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/saved_object_mappings.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../src/core/server';
+import { SavedObjectsType, SavedObjectMigrationFn } from 'kibana/server';
+import { truncateMessage } from '../rule_execution_log';
 
 export const ruleStatusSavedObjectType = 'siem-detection-engine-rule-status';
 
@@ -47,11 +48,28 @@ export const ruleStatusSavedObjectMappings: SavedObjectsType['mappings'] = {
   },
 };
 
+const truncateMessageFields: SavedObjectMigrationFn<Record<string, unknown>> = (doc) => {
+  const { lastFailureMessage, lastSuccessMessage, ...restAttributes } = doc.attributes;
+
+  return {
+    ...doc,
+    attributes: {
+      lastFailureMessage: truncateMessage(lastFailureMessage),
+      lastSuccessMessage: truncateMessage(lastSuccessMessage),
+      ...restAttributes,
+    },
+    references: doc.references ?? [],
+  };
+};
+
 export const type: SavedObjectsType = {
   name: ruleStatusSavedObjectType,
   hidden: false,
   namespaceType: 'single',
   mappings: ruleStatusSavedObjectMappings,
+  migrations: {
+    '7.15.2': truncateMessageFields,
+  },
 };
 
 export const ruleAssetSavedObjectType = 'security-rule';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
index 1e3a8a513c4a1..2094264cbf15f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
@@ -69,7 +69,7 @@ import { wrapSequencesFactory } from './wrap_sequences_factory';
 import { ConfigType } from '../../../config';
 import { ExperimentalFeatures } from '../../../../common/experimental_features';
 import { injectReferences, extractReferences } from './saved_object_references';
-import { RuleExecutionLogClient } from '../rule_execution_log/rule_execution_log_client';
+import { RuleExecutionLogClient, truncateMessageList } from '../rule_execution_log';
 import { RuleExecutionStatus } from '../../../../common/detection_engine/schemas/common/schemas';
 import { scheduleThrottledNotificationActions } from '../notifications/schedule_throttle_notification_actions';
 import { IEventLogService } from '../../../../../event_log/server';
@@ -384,7 +384,9 @@ export const signalRulesAlertType = ({
           throw new Error(`unknown rule type ${type}`);
         }
         if (result.warningMessages.length) {
-          const warningMessage = buildRuleMessage(result.warningMessages.join());
+          const warningMessage = buildRuleMessage(
+            truncateMessageList(result.warningMessages).join()
+          );
           await ruleStatusClient.logStatusChange({
             ...basicLogArguments,
             newStatus: RuleExecutionStatus['partial failure'],
@@ -471,7 +473,7 @@ export const signalRulesAlertType = ({
         } else {
           const errorMessage = buildRuleMessage(
             'Bulk Indexing of signals failed:',
-            result.errors.join()
+            truncateMessageList(result.errors).join()
           );
           logger.error(errorMessage);
           await ruleStatusClient.logStatusChange({

From 1155640779201d3d217390f944d455a3408264ef Mon Sep 17 00:00:00 2001
From: Chenhui Wang <54903978+wangch079@users.noreply.github.com>
Date: Thu, 14 Oct 2021 23:44:47 +0800
Subject: [PATCH 080/117] Add comments in the GitHub content source UI
 (#114766)

---
 .../public/applications/workplace_search/constants.ts         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
index 2cec9f617cd27..a43fb6f293457 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
@@ -253,12 +253,12 @@ export const SOURCE_OBJ_TYPES = {
     defaultMessage: 'Bugs',
   }),
   ISSUES: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.objTypes.issues', {
-    defaultMessage: 'Issues',
+    defaultMessage: 'Issues (including comments)',
   }),
   PULL_REQUESTS: i18n.translate(
     'xpack.enterpriseSearch.workplaceSearch.sources.objTypes.pullRequests',
     {
-      defaultMessage: 'Pull Requests',
+      defaultMessage: 'Pull Requests (including comments)',
     }
   ),
   REPOSITORY_LIST: i18n.translate(

From f2d70d89968222303009a30d5fb71f911097479d Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Thu, 14 Oct 2021 08:52:11 -0700
Subject: [PATCH 081/117] [renovate] Configure Cypress (#114880)

On `ci:all-cypress-suites` label, run all Cypress suites on Buildkite

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 .buildkite/scripts/pipelines/pull_request/pipeline.js | 4 ++--
 renovate.json5                                        | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.js b/.buildkite/scripts/pipelines/pull_request/pipeline.js
index 068de9917c213..78dc6e1b29b6d 100644
--- a/.buildkite/scripts/pipelines/pull_request/pipeline.js
+++ b/.buildkite/scripts/pipelines/pull_request/pipeline.js
@@ -60,7 +60,7 @@ const uploadPipeline = (pipelineContent) => {
         /^x-pack\/test\/security_solution_cypress/,
         /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/sections\/action_connector_form/,
         /^x-pack\/plugins\/triggers_actions_ui\/public\/application\/context\/actions_connectors_context\.tsx/,
-      ])
+      ]) || process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
     ) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/security_solution.yml'));
     }
@@ -69,7 +69,7 @@ const uploadPipeline = (pipelineContent) => {
     // if (
     //   await doAnyChangesMatch([
     //     /^x-pack\/plugins\/apm/,
-    //   ])
+    //   ]) || process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
     // ) {
     //   pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
     // }
diff --git a/renovate.json5 b/renovate.json5
index b08d7e0bcec1e..76923f01daba0 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -93,6 +93,15 @@
         labels: ['Feature:Vega', 'Team:VisEditors'],
         enabled: true,
       },
+      {
+        groupName: 'cypress',
+        packageNames: ['eslint-plugin-cypress'],
+        matchPackagePatterns: ["^cypress"],
+        reviewers: ['Team:apm', 'Team: SecuritySolution'],
+        matchBaseBranches: ['master'],
+        labels: ['buildkite-ci', 'ci:all-cypress-suites'],
+        enabled: true,
+      }
       {
         groupName: 'platform security modules',
         packageNames: [

From 45e9d51a444875e396c9e44942cf97ec324c6ead Mon Sep 17 00:00:00 2001
From: Stacey Gammon <gammon@elastic.co>
Date: Thu, 14 Oct 2021 11:54:35 -0400
Subject: [PATCH 082/117] Add pluginTeam to plugin API ci stats  (#115007)

* Add pluginTeam to ci stats for easier higher level groupings

* Updated docs
---
 api_docs/actions.json                         |   18 +-
 api_docs/alerting.json                        |  153 +-
 api_docs/alerting.mdx                         |    2 +-
 api_docs/apm.json                             |  166 +-
 api_docs/apm.mdx                              |    5 +-
 api_docs/apm_oss.json                         |  109 -
 api_docs/apm_oss.mdx                          |   38 -
 api_docs/bfetch.json                          |  393 +--
 api_docs/bfetch.mdx                           |    5 +-
 api_docs/cases.json                           |   30 +-
 api_docs/cases.mdx                            |    2 +-
 api_docs/charts.json                          |    2 +-
 api_docs/core.json                            |  112 +-
 api_docs/core.mdx                             |    2 +-
 api_docs/core_application.mdx                 |    2 +-
 api_docs/core_chrome.json                     |    2 +-
 api_docs/core_chrome.mdx                      |    2 +-
 api_docs/core_http.json                       |   30 +-
 api_docs/core_http.mdx                        |    2 +-
 api_docs/core_saved_objects.json              |  356 +--
 api_docs/core_saved_objects.mdx               |    2 +-
 api_docs/custom_integrations.json             |  209 +-
 api_docs/custom_integrations.mdx              |    2 +-
 api_docs/dashboard.json                       |   12 +-
 api_docs/data.json                            | 2829 +++--------------
 api_docs/data.mdx                             |    2 +-
 api_docs/data_autocomplete.mdx                |    2 +-
 api_docs/data_query.json                      |    4 +-
 api_docs/data_query.mdx                       |    2 +-
 api_docs/data_search.json                     |  234 +-
 api_docs/data_search.mdx                      |    2 +-
 api_docs/data_ui.mdx                          |    2 +-
 api_docs/data_views.json                      | 1846 +++--------
 api_docs/data_views.mdx                       |    2 +-
 api_docs/data_visualizer.json                 |    4 +-
 api_docs/deprecations_by_api.mdx              |   41 +-
 api_docs/deprecations_by_plugin.mdx           |   56 +-
 api_docs/discover.json                        | 1006 +++++-
 api_docs/discover.mdx                         |    5 +-
 api_docs/elastic_apm_generator.json           |   45 +-
 api_docs/elastic_apm_generator.mdx            |    2 +-
 api_docs/es_ui_shared.json                    |    2 +-
 api_docs/event_log.json                       |   22 +-
 api_docs/expressions.json                     |  205 +-
 api_docs/expressions.mdx                      |    2 +-
 api_docs/fleet.json                           |  303 +-
 api_docs/fleet.mdx                            |    2 +-
 api_docs/global_search.json                   |    2 +-
 api_docs/home.json                            |   12 +-
 api_docs/kbn_dev_utils.json                   |  750 ++++-
 api_docs/kbn_dev_utils.mdx                    |    2 +-
 api_docs/kbn_logging.json                     |    4 +-
 api_docs/kbn_monaco.json                      |    4 +-
 .../kbn_securitysolution_autocomplete.json    |    6 +-
 api_docs/kbn_securitysolution_es_utils.json   |  136 +-
 ...kbn_securitysolution_io_ts_list_types.json |   80 +-
 api_docs/kbn_securitysolution_list_api.json   |   16 +-
 api_docs/kbn_securitysolution_list_hooks.json |   40 +-
 api_docs/kbn_securitysolution_list_utils.json |   26 +-
 api_docs/kbn_securitysolution_utils.json      |   31 +
 api_docs/kbn_securitysolution_utils.mdx       |    2 +-
 api_docs/kibana_react.json                    |   26 +-
 api_docs/kibana_utils.json                    |    4 +-
 api_docs/lens.json                            |   46 +-
 api_docs/lists.json                           |  104 +-
 api_docs/maps_ems.json                        |    2 +-
 api_docs/metrics_entities.json                |    2 +-
 api_docs/ml.json                              |    6 +-
 api_docs/monitoring.json                      |    2 +-
 api_docs/observability.json                   |   34 +-
 api_docs/plugin_directory.mdx                 |   39 +-
 api_docs/presentation_util.json               |   30 +-
 api_docs/presentation_util.mdx                |    2 +-
 api_docs/reporting.json                       |   12 +-
 api_docs/rule_registry.json                   |  251 +-
 api_docs/rule_registry.mdx                    |    2 +-
 api_docs/runtime_fields.json                  |    6 +-
 api_docs/saved_objects.json                   |  152 +-
 api_docs/saved_objects_management.json        |    4 +-
 api_docs/security_solution.json               |   26 +-
 api_docs/spaces.json                          |    2 +-
 api_docs/task_manager.json                    |    2 +-
 api_docs/telemetry_collection_manager.json    |   42 +-
 api_docs/timelines.json                       |    8 +-
 api_docs/triggers_actions_ui.json             |   30 +-
 api_docs/triggers_actions_ui.mdx              |    2 +-
 api_docs/usage_collection.json                |    8 +-
 api_docs/vis_type_pie.json                    |    4 +-
 api_docs/visualizations.json                  |   92 +-
 api_docs/visualize.json                       |    8 +-
 .../src/api_docs/build_api_docs_cli.ts        |    6 +
 91 files changed, 4225 insertions(+), 6116 deletions(-)
 delete mode 100644 api_docs/apm_oss.json
 delete mode 100644 api_docs/apm_oss.mdx

diff --git a/api_docs/actions.json b/api_docs/actions.json
index 5094a7cadefe3..532128e65d926 100644
--- a/api_docs/actions.json
+++ b/api_docs/actions.json
@@ -695,7 +695,7 @@
         "label": "ActionParamsType",
         "description": [],
         "signature": [
-          "{ readonly source?: string | undefined; readonly summary?: string | undefined; readonly timestamp?: string | undefined; readonly eventAction?: \"resolve\" | \"trigger\" | \"acknowledge\" | undefined; readonly dedupKey?: string | undefined; readonly severity?: \"warning\" | \"error\" | \"info\" | \"critical\" | undefined; readonly component?: string | undefined; readonly group?: string | undefined; readonly class?: string | undefined; }"
+          "{ readonly source?: string | undefined; readonly summary?: string | undefined; readonly timestamp?: string | undefined; readonly eventAction?: \"resolve\" | \"trigger\" | \"acknowledge\" | undefined; readonly dedupKey?: string | undefined; readonly severity?: \"error\" | \"info\" | \"warning\" | \"critical\" | undefined; readonly component?: string | undefined; readonly group?: string | undefined; readonly class?: string | undefined; }"
         ],
         "path": "x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts",
         "deprecated": false,
@@ -751,7 +751,7 @@
         "label": "ActionParamsType",
         "description": [],
         "signature": [
-          "Readonly<{} & { subAction: \"getFields\"; subActionParams: Readonly<{} & {}>; }> | Readonly<{} & { subAction: \"getIncident\"; subActionParams: Readonly<{} & { externalId: string; }>; }> | Readonly<{} & { subAction: \"handshake\"; subActionParams: Readonly<{} & {}>; }> | Readonly<{} & { subAction: \"pushToService\"; subActionParams: Readonly<{} & { incident: Readonly<{} & { description: string | null; category: string | null; severity: string | null; externalId: string | null; urgency: string | null; impact: string | null; short_description: string; subcategory: string | null; }>; comments: Readonly<{} & { comment: string; commentId: string; }>[] | null; }>; }> | Readonly<{} & { subAction: \"getChoices\"; subActionParams: Readonly<{} & { fields: string[]; }>; }> | Readonly<{} & { subAction: \"getFields\"; subActionParams: Readonly<{} & {}>; }> | Readonly<{} & { subAction: \"getIncident\"; subActionParams: Readonly<{} & { externalId: string; }>; }> | Readonly<{} & { subAction: \"handshake\"; subActionParams: Readonly<{} & {}>; }> | Readonly<{} & { subAction: \"pushToService\"; subActionParams: Readonly<{} & { incident: Readonly<{} & { description: string | null; category: string | null; externalId: string | null; short_description: string; subcategory: string | null; dest_ip: string | null; malware_hash: string | null; malware_url: string | null; source_ip: string | null; priority: string | null; }>; comments: Readonly<{} & { comment: string; commentId: string; }>[] | null; }>; }> | Readonly<{} & { subAction: \"getChoices\"; subActionParams: Readonly<{} & { fields: string[]; }>; }>"
+          "Readonly<{} & { subAction: \"getFields\"; subActionParams: Readonly<{} & {}>; }> | Readonly<{} & { subAction: \"getIncident\"; subActionParams: Readonly<{} & { externalId: string; }>; }> | Readonly<{} & { subAction: \"handshake\"; subActionParams: Readonly<{} & {}>; }> | Readonly<{} & { subAction: \"pushToService\"; subActionParams: Readonly<{} & { incident: Readonly<{} & { description: string | null; category: string | null; severity: string | null; externalId: string | null; urgency: string | null; impact: string | null; short_description: string; subcategory: string | null; correlation_id: string | null; correlation_display: string | null; }>; comments: Readonly<{} & { comment: string; commentId: string; }>[] | null; }>; }> | Readonly<{} & { subAction: \"getChoices\"; subActionParams: Readonly<{} & { fields: string[]; }>; }> | Readonly<{} & { subAction: \"getFields\"; subActionParams: Readonly<{} & {}>; }> | Readonly<{} & { subAction: \"getIncident\"; subActionParams: Readonly<{} & { externalId: string; }>; }> | Readonly<{} & { subAction: \"handshake\"; subActionParams: Readonly<{} & {}>; }> | Readonly<{} & { subAction: \"pushToService\"; subActionParams: Readonly<{} & { incident: Readonly<{} & { description: string | null; category: string | null; externalId: string | null; short_description: string; subcategory: string | null; correlation_id: string | null; correlation_display: string | null; dest_ip: string | string[] | null; malware_hash: string | string[] | null; malware_url: string | string[] | null; source_ip: string | string[] | null; priority: string | null; }>; comments: Readonly<{} & { comment: string; commentId: string; }>[] | null; }>; }> | Readonly<{} & { subAction: \"getChoices\"; subActionParams: Readonly<{} & { fields: string[]; }>; }>"
         ],
         "path": "x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts",
         "deprecated": false,
@@ -821,7 +821,9 @@
         "label": "ActionsClient",
         "description": [],
         "signature": [
-          "{ get: ({ id }: { id: string; }) => Promise<",
+          "{ create: ({ action: { actionTypeId, name, config, secrets }, }: ",
+          "CreateOptions",
+          ") => Promise<",
           {
             "pluginId": "actions",
             "scope": "server",
@@ -829,9 +831,7 @@
             "section": "def-server.ActionResult",
             "text": "ActionResult"
           },
-          "<Record<string, unknown>>>; delete: ({ id }: { id: string; }) => Promise<{}>; create: ({ action: { actionTypeId, name, config, secrets }, }: ",
-          "CreateOptions",
-          ") => Promise<",
+          "<Record<string, unknown>>>; delete: ({ id }: { id: string; }) => Promise<{}>; get: ({ id }: { id: string; }) => Promise<",
           {
             "pluginId": "actions",
             "scope": "server",
@@ -1031,7 +1031,7 @@
         "signature": [
           "\".servicenow\""
         ],
-        "path": "x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts",
+        "path": "x-pack/plugins/actions/server/builtin_action_types/servicenow/config.ts",
         "deprecated": false,
         "initialIsOpen": false
       },
@@ -1045,7 +1045,7 @@
         "signature": [
           "\".servicenow-sir\""
         ],
-        "path": "x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts",
+        "path": "x-pack/plugins/actions/server/builtin_action_types/servicenow/config.ts",
         "deprecated": false,
         "initialIsOpen": false
       }
@@ -1292,7 +1292,7 @@
               "section": "def-server.ActionsClient",
               "text": "ActionsClient"
             },
-            ", \"get\" | \"delete\" | \"create\" | \"update\" | \"execute\" | \"getAll\" | \"getBulk\" | \"enqueueExecution\" | \"ephemeralEnqueuedExecution\" | \"listTypes\" | \"isActionTypeEnabled\" | \"isPreconfigured\">>"
+            ", \"create\" | \"delete\" | \"get\" | \"update\" | \"execute\" | \"getAll\" | \"getBulk\" | \"enqueueExecution\" | \"ephemeralEnqueuedExecution\" | \"listTypes\" | \"isActionTypeEnabled\" | \"isPreconfigured\">>"
           ],
           "path": "x-pack/plugins/actions/server/plugin.ts",
           "deprecated": false,
diff --git a/api_docs/alerting.json b/api_docs/alerting.json
index caf8894c3c8a5..ed62c8ffcfe10 100644
--- a/api_docs/alerting.json
+++ b/api_docs/alerting.json
@@ -24,7 +24,7 @@
             "section": "def-common.Alert",
             "text": "Alert"
           },
-          "<never>, \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">) => string | ",
+          "<never>, \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">) => string | ",
           {
             "pluginId": "@kbn/utility-types",
             "scope": "server",
@@ -47,7 +47,7 @@
             "label": "alert",
             "description": [],
             "signature": [
-              "{ enabled: boolean; id: string; name: string; tags: string[]; params: never; actions: ",
+              "{ id: string; name: string; tags: string[]; enabled: boolean; params: never; actions: ",
               {
                 "pluginId": "alerting",
                 "scope": "common",
@@ -1038,7 +1038,7 @@
                 "section": "def-common.Alert",
                 "text": "Alert"
               },
-              "<never>, \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"tags\" | \"actions\" | \"throttle\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
+              "<never>, \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">, \"name\" | \"tags\" | \"enabled\" | \"actions\" | \"throttle\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
             ],
             "path": "x-pack/plugins/alerting/server/types.ts",
             "deprecated": false
@@ -1568,6 +1568,32 @@
             "path": "x-pack/plugins/alerting/server/types.ts",
             "deprecated": false
           },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-server.AlertType.defaultScheduleInterval",
+            "type": "string",
+            "tags": [],
+            "label": "defaultScheduleInterval",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "x-pack/plugins/alerting/server/types.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-server.AlertType.minimumScheduleInterval",
+            "type": "string",
+            "tags": [],
+            "label": "minimumScheduleInterval",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "x-pack/plugins/alerting/server/types.ts",
+            "deprecated": false
+          },
           {
             "parentPluginId": "alerting",
             "id": "def-server.AlertType.ruleTaskTimeout",
@@ -1650,7 +1676,7 @@
                 "section": "def-common.Alert",
                 "text": "Alert"
               },
-              "<Params>, \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[]"
+              "<Params>, \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[]"
             ],
             "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
             "deprecated": false
@@ -1767,7 +1793,7 @@
                 "section": "def-server.RulesClient",
                 "text": "RulesClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"find\" | \"resolve\" | \"update\" | \"aggregate\" | \"enable\" | \"disable\" | \"muteAll\" | \"getAlertState\" | \"getAlertInstanceSummary\" | \"updateApiKey\" | \"unmuteAll\" | \"muteInstance\" | \"unmuteInstance\" | \"listAlertTypes\" | \"getSpaceId\">"
+              ", \"create\" | \"delete\" | \"find\" | \"get\" | \"resolve\" | \"update\" | \"aggregate\" | \"enable\" | \"disable\" | \"muteAll\" | \"getAlertState\" | \"getAlertInstanceSummary\" | \"updateApiKey\" | \"unmuteAll\" | \"muteInstance\" | \"unmuteInstance\" | \"listAlertTypes\" | \"getSpaceId\">"
             ],
             "path": "x-pack/plugins/alerting/server/plugin.ts",
             "deprecated": false,
@@ -2111,7 +2137,7 @@
             "section": "def-common.Alert",
             "text": "Alert"
           },
-          "<Params>, \"enabled\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"apiKey\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">>"
+          "<Params>, \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"apiKey\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">>"
         ],
         "path": "x-pack/plugins/alerting/server/types.ts",
         "deprecated": false,
@@ -2145,17 +2171,7 @@
         "label": "RulesClient",
         "description": [],
         "signature": [
-          "{ get: <Params extends Record<string, unknown> = never>({ id, includeLegacyId, }: { id: string; includeLegacyId?: boolean | undefined; }) => Promise<Pick<",
-          {
-            "pluginId": "alerting",
-            "scope": "common",
-            "docId": "kibAlertingPluginApi",
-            "section": "def-common.Alert",
-            "text": "Alert"
-          },
-          "<Params>, \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\"> | Pick<",
-          "AlertWithLegacyId",
-          "<Params>, \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\" | \"legacyId\">>; delete: ({ id }: { id: string; }) => Promise<{}>; create: <Params extends Record<string, unknown> = never>({ data, options, }: ",
+          "{ create: <Params extends Record<string, unknown> = never>({ data, options, }: ",
           "CreateOptions",
           "<Params>) => Promise<Pick<",
           {
@@ -2165,7 +2181,7 @@
             "section": "def-common.Alert",
             "text": "Alert"
           },
-          "<Params>, \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">>; find: <Params extends Record<string, unknown> = never>({ options: { fields, ...options }, }?: { options?: ",
+          "<Params>, \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">>; delete: ({ id }: { id: string; }) => Promise<{}>; find: <Params extends Record<string, unknown> = never>({ options: { fields, ...options }, }?: { options?: ",
           "FindOptions",
           " | undefined; }) => Promise<",
           {
@@ -2175,7 +2191,17 @@
             "section": "def-server.FindResult",
             "text": "FindResult"
           },
-          "<Params>>; resolve: <Params extends Record<string, unknown> = never>({ id, }: { id: string; }) => Promise<",
+          "<Params>>; get: <Params extends Record<string, unknown> = never>({ id, includeLegacyId, }: { id: string; includeLegacyId?: boolean | undefined; }) => Promise<Pick<",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.Alert",
+            "text": "Alert"
+          },
+          "<Params>, \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\"> | Pick<",
+          "AlertWithLegacyId",
+          "<Params>, \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\" | \"legacyId\">>; resolve: <Params extends Record<string, unknown> = never>({ id, }: { id: string; }) => Promise<",
           {
             "pluginId": "alerting",
             "scope": "common",
@@ -2225,6 +2251,37 @@
   "common": {
     "classes": [],
     "functions": [
+      {
+        "parentPluginId": "alerting",
+        "id": "def-common.formatDuration",
+        "type": "Function",
+        "tags": [],
+        "label": "formatDuration",
+        "description": [],
+        "signature": [
+          "(duration: string) => string"
+        ],
+        "path": "x-pack/plugins/alerting/common/parse_duration.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "alerting",
+            "id": "def-common.formatDuration.$1",
+            "type": "string",
+            "tags": [],
+            "label": "duration",
+            "description": [],
+            "signature": [
+              "string"
+            ],
+            "path": "x-pack/plugins/alerting/common/parse_duration.ts",
+            "deprecated": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "alerting",
         "id": "def-common.getBuiltinActionGroups",
@@ -3009,6 +3066,19 @@
             "path": "x-pack/plugins/alerting/common/alert.ts",
             "deprecated": false
           },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-common.AlertExecutionStatus.lastDuration",
+            "type": "number",
+            "tags": [],
+            "label": "lastDuration",
+            "description": [],
+            "signature": [
+              "number | undefined"
+            ],
+            "path": "x-pack/plugins/alerting/common/alert.ts",
+            "deprecated": false
+          },
           {
             "parentPluginId": "alerting",
             "id": "def-common.AlertExecutionStatus.error",
@@ -3585,6 +3655,45 @@
             "description": [],
             "path": "x-pack/plugins/alerting/common/alert_type.ts",
             "deprecated": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-common.AlertType.ruleTaskTimeout",
+            "type": "string",
+            "tags": [],
+            "label": "ruleTaskTimeout",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "x-pack/plugins/alerting/common/alert_type.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-common.AlertType.defaultScheduleInterval",
+            "type": "string",
+            "tags": [],
+            "label": "defaultScheduleInterval",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "x-pack/plugins/alerting/common/alert_type.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-common.AlertType.minimumScheduleInterval",
+            "type": "string",
+            "tags": [],
+            "label": "minimumScheduleInterval",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "x-pack/plugins/alerting/common/alert_type.ts",
+            "deprecated": false
           }
         ],
         "initialIsOpen": false
@@ -4044,7 +4153,7 @@
             "section": "def-common.Alert",
             "text": "Alert"
           },
-          "<Params>, \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\"> & Pick<",
+          "<Params>, \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\"> & Pick<",
           {
             "pluginId": "core",
             "scope": "server",
@@ -4066,7 +4175,7 @@
         "label": "SanitizedAlert",
         "description": [],
         "signature": [
-          "{ enabled: boolean; id: string; name: string; tags: string[]; params: Params; actions: ",
+          "{ id: string; name: string; tags: string[]; enabled: boolean; params: Params; actions: ",
           {
             "pluginId": "alerting",
             "scope": "common",
@@ -4112,7 +4221,7 @@
             "section": "def-common.Alert",
             "text": "Alert"
           },
-          "<never>, \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"tags\" | \"actions\" | \"throttle\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
+          "<never>, \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">, \"name\" | \"tags\" | \"enabled\" | \"actions\" | \"throttle\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
         ],
         "path": "x-pack/plugins/alerting/common/alert.ts",
         "deprecated": false,
diff --git a/api_docs/alerting.mdx b/api_docs/alerting.mdx
index 32a9195f2fd1d..333c524db5e24 100644
--- a/api_docs/alerting.mdx
+++ b/api_docs/alerting.mdx
@@ -18,7 +18,7 @@ Contact [Kibana Alerting](https://github.com/orgs/elastic/teams/kibana-alerting-
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 249 | 0 | 241 | 17 |
+| 257 | 0 | 249 | 17 |
 
 ## Client
 
diff --git a/api_docs/apm.json b/api_docs/apm.json
index 8b43370097091..f0c84d9974c31 100644
--- a/api_docs/apm.json
+++ b/api_docs/apm.json
@@ -184,11 +184,11 @@
               "APMPluginStartDependencies",
               ", unknown>, plugins: Pick<",
               "APMPluginSetupDependencies",
-              ", \"data\" | \"cloud\" | \"security\" | \"home\" | \"features\" | \"fleet\" | \"ml\" | \"actions\" | \"usageCollection\" | \"spaces\" | \"apmOss\" | \"licensing\" | \"observability\" | \"ruleRegistry\" | \"taskManager\" | \"alerting\">) => { config$: ",
+              ", \"data\" | \"cloud\" | \"security\" | \"home\" | \"features\" | \"fleet\" | \"ml\" | \"spaces\" | \"actions\" | \"usageCollection\" | \"licensing\" | \"observability\" | \"ruleRegistry\" | \"taskManager\" | \"alerting\">) => { config$: ",
               "Observable",
-              "<{ 'apm_oss.transactionIndices': string; 'apm_oss.spanIndices': string; 'apm_oss.errorIndices': string; 'apm_oss.metricsIndices': string; 'apm_oss.sourcemapIndices': string; 'apm_oss.onboardingIndices': string; 'xpack.apm.serviceMapEnabled': boolean; 'xpack.apm.serviceMapFingerprintBucketSize': number; 'xpack.apm.serviceMapTraceIdBucketSize': number; 'xpack.apm.serviceMapFingerprintGlobalBucketSize': number; 'xpack.apm.serviceMapTraceIdGlobalBucketSize': number; 'xpack.apm.serviceMapMaxTracesPerRequest': number; 'xpack.apm.ui.enabled': boolean; 'xpack.apm.ui.maxTraceItems': number; 'xpack.apm.ui.transactionGroupBucketSize': number; 'xpack.apm.autocreateApmIndexPattern': boolean; 'xpack.apm.telemetryCollectionEnabled': boolean; 'xpack.apm.searchAggregatedTransactions': ",
+              "<Readonly<{} & { enabled: boolean; indices: Readonly<{} & { error: string; metric: string; span: string; transaction: string; sourcemap: string; onboarding: string; }>; serviceMapEnabled: boolean; serviceMapFingerprintBucketSize: number; serviceMapTraceIdBucketSize: number; serviceMapFingerprintGlobalBucketSize: number; serviceMapTraceIdGlobalBucketSize: number; serviceMapMaxTracesPerRequest: number; autocreateApmIndexPattern: boolean; ui: Readonly<{} & { enabled: boolean; transactionGroupBucketSize: number; maxTraceItems: number; }>; searchAggregatedTransactions: ",
               "SearchAggregatedTransactionSetting",
-              "; 'xpack.apm.metricsInterval': number; 'xpack.apm.agent.migrations.enabled': boolean; }>; getApmIndices: () => Promise<",
+              "; telemetryCollectionEnabled: boolean; metricsInterval: number; profilingEnabled: boolean; agent: Readonly<{} & { migrations: Readonly<{} & { enabled: boolean; }>; }>; }>>; getApmIndices: () => Promise<",
               "ApmIndicesConfig",
               ">; createApmEventClient: ({ request, context, debug, }: { debug?: boolean | undefined; request: ",
               {
@@ -248,7 +248,7 @@
                 "signature": [
                   "Pick<",
                   "APMPluginSetupDependencies",
-                  ", \"data\" | \"cloud\" | \"security\" | \"home\" | \"features\" | \"fleet\" | \"ml\" | \"actions\" | \"usageCollection\" | \"spaces\" | \"apmOss\" | \"licensing\" | \"observability\" | \"ruleRegistry\" | \"taskManager\" | \"alerting\">"
+                  ", \"data\" | \"cloud\" | \"security\" | \"home\" | \"features\" | \"fleet\" | \"ml\" | \"spaces\" | \"actions\" | \"usageCollection\" | \"licensing\" | \"observability\" | \"ruleRegistry\" | \"taskManager\" | \"alerting\">"
                 ],
                 "path": "x-pack/plugins/apm/server/plugin.ts",
                 "deprecated": false,
@@ -320,59 +320,7 @@
         "initialIsOpen": false
       }
     ],
-    "functions": [
-      {
-        "parentPluginId": "apm",
-        "id": "def-server.mergeConfigs",
-        "type": "Function",
-        "tags": [],
-        "label": "mergeConfigs",
-        "description": [],
-        "signature": [
-          "(apmOssConfig: Readonly<{} & { enabled: boolean; transactionIndices: string; spanIndices: string; errorIndices: string; metricsIndices: string; sourcemapIndices: string; onboardingIndices: string; indexPattern: string; fleetMode: boolean; }>, apmConfig: Readonly<{} & { enabled: boolean; serviceMapEnabled: boolean; serviceMapFingerprintBucketSize: number; serviceMapTraceIdBucketSize: number; serviceMapFingerprintGlobalBucketSize: number; serviceMapTraceIdGlobalBucketSize: number; serviceMapMaxTracesPerRequest: number; autocreateApmIndexPattern: boolean; ui: Readonly<{} & { enabled: boolean; transactionGroupBucketSize: number; maxTraceItems: number; }>; searchAggregatedTransactions: ",
-          "SearchAggregatedTransactionSetting",
-          "; telemetryCollectionEnabled: boolean; metricsInterval: number; profilingEnabled: boolean; agent: Readonly<{} & { migrations: Readonly<{} & { enabled: boolean; }>; }>; }>) => { 'apm_oss.transactionIndices': string; 'apm_oss.spanIndices': string; 'apm_oss.errorIndices': string; 'apm_oss.metricsIndices': string; 'apm_oss.sourcemapIndices': string; 'apm_oss.onboardingIndices': string; 'xpack.apm.serviceMapEnabled': boolean; 'xpack.apm.serviceMapFingerprintBucketSize': number; 'xpack.apm.serviceMapTraceIdBucketSize': number; 'xpack.apm.serviceMapFingerprintGlobalBucketSize': number; 'xpack.apm.serviceMapTraceIdGlobalBucketSize': number; 'xpack.apm.serviceMapMaxTracesPerRequest': number; 'xpack.apm.ui.enabled': boolean; 'xpack.apm.ui.maxTraceItems': number; 'xpack.apm.ui.transactionGroupBucketSize': number; 'xpack.apm.autocreateApmIndexPattern': boolean; 'xpack.apm.telemetryCollectionEnabled': boolean; 'xpack.apm.searchAggregatedTransactions': ",
-          "SearchAggregatedTransactionSetting",
-          "; 'xpack.apm.metricsInterval': number; 'xpack.apm.agent.migrations.enabled': boolean; }"
-        ],
-        "path": "x-pack/plugins/apm/server/index.ts",
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "apm",
-            "id": "def-server.mergeConfigs.$1",
-            "type": "Object",
-            "tags": [],
-            "label": "apmOssConfig",
-            "description": [],
-            "signature": [
-              "Readonly<{} & { enabled: boolean; transactionIndices: string; spanIndices: string; errorIndices: string; metricsIndices: string; sourcemapIndices: string; onboardingIndices: string; indexPattern: string; fleetMode: boolean; }>"
-            ],
-            "path": "x-pack/plugins/apm/server/index.ts",
-            "deprecated": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "apm",
-            "id": "def-server.mergeConfigs.$2",
-            "type": "Object",
-            "tags": [],
-            "label": "apmConfig",
-            "description": [],
-            "signature": [
-              "Readonly<{} & { enabled: boolean; serviceMapEnabled: boolean; serviceMapFingerprintBucketSize: number; serviceMapTraceIdBucketSize: number; serviceMapFingerprintGlobalBucketSize: number; serviceMapTraceIdGlobalBucketSize: number; serviceMapMaxTracesPerRequest: number; autocreateApmIndexPattern: boolean; ui: Readonly<{} & { enabled: boolean; transactionGroupBucketSize: number; maxTraceItems: number; }>; searchAggregatedTransactions: ",
-              "SearchAggregatedTransactionSetting",
-              "; telemetryCollectionEnabled: boolean; metricsInterval: number; profilingEnabled: boolean; agent: Readonly<{} & { migrations: Readonly<{} & { enabled: boolean; }>; }>; }>"
-            ],
-            "path": "x-pack/plugins/apm/server/index.ts",
-            "deprecated": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      }
-    ],
+    "functions": [],
     "interfaces": [
       {
         "parentPluginId": "apm",
@@ -440,9 +388,9 @@
             "label": "config",
             "description": [],
             "signature": [
-              "{ 'apm_oss.transactionIndices': string; 'apm_oss.spanIndices': string; 'apm_oss.errorIndices': string; 'apm_oss.metricsIndices': string; 'apm_oss.sourcemapIndices': string; 'apm_oss.onboardingIndices': string; 'xpack.apm.serviceMapEnabled': boolean; 'xpack.apm.serviceMapFingerprintBucketSize': number; 'xpack.apm.serviceMapTraceIdBucketSize': number; 'xpack.apm.serviceMapFingerprintGlobalBucketSize': number; 'xpack.apm.serviceMapTraceIdGlobalBucketSize': number; 'xpack.apm.serviceMapMaxTracesPerRequest': number; 'xpack.apm.ui.enabled': boolean; 'xpack.apm.ui.maxTraceItems': number; 'xpack.apm.ui.transactionGroupBucketSize': number; 'xpack.apm.autocreateApmIndexPattern': boolean; 'xpack.apm.telemetryCollectionEnabled': boolean; 'xpack.apm.searchAggregatedTransactions': ",
+              "{ readonly enabled: boolean; readonly indices: Readonly<{} & { error: string; metric: string; span: string; transaction: string; sourcemap: string; onboarding: string; }>; readonly serviceMapEnabled: boolean; readonly serviceMapFingerprintBucketSize: number; readonly serviceMapTraceIdBucketSize: number; readonly serviceMapFingerprintGlobalBucketSize: number; readonly serviceMapTraceIdGlobalBucketSize: number; readonly serviceMapMaxTracesPerRequest: number; readonly autocreateApmIndexPattern: boolean; readonly ui: Readonly<{} & { enabled: boolean; transactionGroupBucketSize: number; maxTraceItems: number; }>; readonly searchAggregatedTransactions: ",
               "SearchAggregatedTransactionSetting",
-              "; 'xpack.apm.metricsInterval': number; 'xpack.apm.agent.migrations.enabled': boolean; }"
+              "; readonly telemetryCollectionEnabled: boolean; readonly metricsInterval: number; readonly profilingEnabled: boolean; readonly agent: Readonly<{} & { migrations: Readonly<{} & { enabled: boolean; }>; }>; }"
             ],
             "path": "x-pack/plugins/apm/server/routes/typings.ts",
             "deprecated": false
@@ -535,15 +483,7 @@
                 "section": "def-server.PluginStartContract",
                 "text": "PluginStartContract"
               },
-              ">; }; apmOss: { setup: ",
-              {
-                "pluginId": "apmOss",
-                "scope": "server",
-                "docId": "kibApmOssPluginApi",
-                "section": "def-server.APMOSSPluginSetup",
-                "text": "APMOSSPluginSetup"
-              },
-              "; start: () => Promise<undefined>; }; licensing: { setup: ",
+              ">; }; licensing: { setup: ",
               {
                 "pluginId": "licensing",
                 "scope": "server",
@@ -655,7 +595,23 @@
               },
               ">; } | undefined; ml?: { setup: ",
               "SharedServices",
-              "; start: () => Promise<void>; } | undefined; actions?: { setup: ",
+              "; start: () => Promise<void>; } | undefined; spaces?: { setup: ",
+              {
+                "pluginId": "spaces",
+                "scope": "server",
+                "docId": "kibSpacesPluginApi",
+                "section": "def-server.SpacesPluginSetup",
+                "text": "SpacesPluginSetup"
+              },
+              "; start: () => Promise<",
+              {
+                "pluginId": "spaces",
+                "scope": "server",
+                "docId": "kibSpacesPluginApi",
+                "section": "def-server.SpacesPluginStart",
+                "text": "SpacesPluginStart"
+              },
+              ">; } | undefined; actions?: { setup: ",
               {
                 "pluginId": "actions",
                 "scope": "server",
@@ -679,23 +635,7 @@
                 "section": "def-server.UsageCollectionSetup",
                 "text": "UsageCollectionSetup"
               },
-              "; start: () => Promise<undefined>; } | undefined; spaces?: { setup: ",
-              {
-                "pluginId": "spaces",
-                "scope": "server",
-                "docId": "kibSpacesPluginApi",
-                "section": "def-server.SpacesPluginSetup",
-                "text": "SpacesPluginSetup"
-              },
-              "; start: () => Promise<",
-              {
-                "pluginId": "spaces",
-                "scope": "server",
-                "docId": "kibSpacesPluginApi",
-                "section": "def-server.SpacesPluginStart",
-                "text": "SpacesPluginStart"
-              },
-              ">; } | undefined; taskManager?: { setup: ",
+              "; start: () => Promise<undefined>; } | undefined; taskManager?: { setup: ",
               {
                 "pluginId": "taskManager",
                 "scope": "server",
@@ -825,9 +765,23 @@
         "label": "APMConfig",
         "description": [],
         "signature": [
-          "{ 'apm_oss.transactionIndices': string; 'apm_oss.spanIndices': string; 'apm_oss.errorIndices': string; 'apm_oss.metricsIndices': string; 'apm_oss.sourcemapIndices': string; 'apm_oss.onboardingIndices': string; 'xpack.apm.serviceMapEnabled': boolean; 'xpack.apm.serviceMapFingerprintBucketSize': number; 'xpack.apm.serviceMapTraceIdBucketSize': number; 'xpack.apm.serviceMapFingerprintGlobalBucketSize': number; 'xpack.apm.serviceMapTraceIdGlobalBucketSize': number; 'xpack.apm.serviceMapMaxTracesPerRequest': number; 'xpack.apm.ui.enabled': boolean; 'xpack.apm.ui.maxTraceItems': number; 'xpack.apm.ui.transactionGroupBucketSize': number; 'xpack.apm.autocreateApmIndexPattern': boolean; 'xpack.apm.telemetryCollectionEnabled': boolean; 'xpack.apm.searchAggregatedTransactions': ",
+          "{ readonly enabled: boolean; readonly indices: Readonly<{} & { error: string; metric: string; span: string; transaction: string; sourcemap: string; onboarding: string; }>; readonly serviceMapEnabled: boolean; readonly serviceMapFingerprintBucketSize: number; readonly serviceMapTraceIdBucketSize: number; readonly serviceMapFingerprintGlobalBucketSize: number; readonly serviceMapTraceIdGlobalBucketSize: number; readonly serviceMapMaxTracesPerRequest: number; readonly autocreateApmIndexPattern: boolean; readonly ui: Readonly<{} & { enabled: boolean; transactionGroupBucketSize: number; maxTraceItems: number; }>; readonly searchAggregatedTransactions: ",
           "SearchAggregatedTransactionSetting",
-          "; 'xpack.apm.metricsInterval': number; 'xpack.apm.agent.migrations.enabled': boolean; }"
+          "; readonly telemetryCollectionEnabled: boolean; readonly metricsInterval: number; readonly profilingEnabled: boolean; readonly agent: Readonly<{} & { migrations: Readonly<{} & { enabled: boolean; }>; }>; }"
+        ],
+        "path": "x-pack/plugins/apm/server/index.ts",
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "apm",
+        "id": "def-server.ApmIndicesConfigName",
+        "type": "Type",
+        "tags": [],
+        "label": "ApmIndicesConfigName",
+        "description": [],
+        "signature": [
+          "\"error\" | \"metric\" | \"span\" | \"transaction\" | \"sourcemap\" | \"onboarding\""
         ],
         "path": "x-pack/plugins/apm/server/index.ts",
         "deprecated": false,
@@ -4046,7 +4000,7 @@
             "section": "def-server.APMRouteHandlerResources",
             "text": "APMRouteHandlerResources"
           },
-          ", { apmIndexSettings: { configurationName: \"apm_oss.sourcemapIndices\" | \"apm_oss.errorIndices\" | \"apm_oss.onboardingIndices\" | \"apm_oss.spanIndices\" | \"apm_oss.transactionIndices\" | \"apm_oss.metricsIndices\" | \"apmAgentConfigurationIndex\" | \"apmCustomLinkIndex\"; defaultValue: string; savedValue: string | undefined; }[]; }, ",
+          ", { apmIndexSettings: { configurationName: \"error\" | \"metric\" | \"span\" | \"transaction\" | \"sourcemap\" | \"onboarding\"; defaultValue: string; savedValue: string | undefined; }[]; }, ",
           "APMRouteCreateOptions",
           ">; } & { \"GET /internal/apm/settings/apm-indices\": ",
           {
@@ -4080,19 +4034,7 @@
           "TypeC",
           "<{ body: ",
           "PartialC",
-          "<{ 'apm_oss.sourcemapIndices': ",
-          "StringC",
-          "; 'apm_oss.errorIndices': ",
-          "StringC",
-          "; 'apm_oss.onboardingIndices': ",
-          "StringC",
-          "; 'apm_oss.spanIndices': ",
-          "StringC",
-          "; 'apm_oss.transactionIndices': ",
-          "StringC",
-          "; 'apm_oss.metricsIndices': ",
-          "StringC",
-          "; }>; }>, ",
+          "<SaveApmIndicesBodySchema>; }>, ",
           {
             "pluginId": "apm",
             "scope": "server",
@@ -4959,22 +4901,6 @@
         "path": "x-pack/plugins/apm/server/routes/get_global_apm_server_route_repository.ts",
         "deprecated": false,
         "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "apm",
-        "id": "def-server.APMXPackConfig",
-        "type": "Type",
-        "tags": [],
-        "label": "APMXPackConfig",
-        "description": [],
-        "signature": [
-          "{ readonly enabled: boolean; readonly serviceMapEnabled: boolean; readonly serviceMapFingerprintBucketSize: number; readonly serviceMapTraceIdBucketSize: number; readonly serviceMapFingerprintGlobalBucketSize: number; readonly serviceMapTraceIdGlobalBucketSize: number; readonly serviceMapMaxTracesPerRequest: number; readonly autocreateApmIndexPattern: boolean; readonly ui: Readonly<{} & { enabled: boolean; transactionGroupBucketSize: number; maxTraceItems: number; }>; readonly searchAggregatedTransactions: ",
-          "SearchAggregatedTransactionSetting",
-          "; readonly telemetryCollectionEnabled: boolean; readonly metricsInterval: number; readonly profilingEnabled: boolean; readonly agent: Readonly<{} & { migrations: Readonly<{} & { enabled: boolean; }>; }>; }"
-        ],
-        "path": "x-pack/plugins/apm/server/index.ts",
-        "deprecated": false,
-        "initialIsOpen": false
       }
     ],
     "objects": [],
@@ -4997,9 +4923,9 @@
           "description": [],
           "signature": [
             "Observable",
-            "<{ 'apm_oss.transactionIndices': string; 'apm_oss.spanIndices': string; 'apm_oss.errorIndices': string; 'apm_oss.metricsIndices': string; 'apm_oss.sourcemapIndices': string; 'apm_oss.onboardingIndices': string; 'xpack.apm.serviceMapEnabled': boolean; 'xpack.apm.serviceMapFingerprintBucketSize': number; 'xpack.apm.serviceMapTraceIdBucketSize': number; 'xpack.apm.serviceMapFingerprintGlobalBucketSize': number; 'xpack.apm.serviceMapTraceIdGlobalBucketSize': number; 'xpack.apm.serviceMapMaxTracesPerRequest': number; 'xpack.apm.ui.enabled': boolean; 'xpack.apm.ui.maxTraceItems': number; 'xpack.apm.ui.transactionGroupBucketSize': number; 'xpack.apm.autocreateApmIndexPattern': boolean; 'xpack.apm.telemetryCollectionEnabled': boolean; 'xpack.apm.searchAggregatedTransactions': ",
+            "<Readonly<{} & { enabled: boolean; indices: Readonly<{} & { error: string; metric: string; span: string; transaction: string; sourcemap: string; onboarding: string; }>; serviceMapEnabled: boolean; serviceMapFingerprintBucketSize: number; serviceMapTraceIdBucketSize: number; serviceMapFingerprintGlobalBucketSize: number; serviceMapTraceIdGlobalBucketSize: number; serviceMapMaxTracesPerRequest: number; autocreateApmIndexPattern: boolean; ui: Readonly<{} & { enabled: boolean; transactionGroupBucketSize: number; maxTraceItems: number; }>; searchAggregatedTransactions: ",
             "SearchAggregatedTransactionSetting",
-            "; 'xpack.apm.metricsInterval': number; 'xpack.apm.agent.migrations.enabled': boolean; }>"
+            "; telemetryCollectionEnabled: boolean; metricsInterval: number; profilingEnabled: boolean; agent: Readonly<{} & { migrations: Readonly<{} & { enabled: boolean; }>; }>; }>>"
           ],
           "path": "x-pack/plugins/apm/server/types.ts",
           "deprecated": false
diff --git a/api_docs/apm.mdx b/api_docs/apm.mdx
index d9e53e6ec9df8..5daa09e8df84c 100644
--- a/api_docs/apm.mdx
+++ b/api_docs/apm.mdx
@@ -18,7 +18,7 @@ Contact [APM UI](https://github.com/orgs/elastic/teams/apm-ui) for questions reg
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 42 | 0 | 42 | 37 |
+| 39 | 0 | 39 | 37 |
 
 ## Client
 
@@ -36,9 +36,6 @@ Contact [APM UI](https://github.com/orgs/elastic/teams/apm-ui) for questions reg
 ### Setup
 <DocDefinitionList data={[apmObj.server.setup]}/>
 
-### Functions
-<DocDefinitionList data={apmObj.server.functions}/>
-
 ### Classes
 <DocDefinitionList data={apmObj.server.classes}/>
 
diff --git a/api_docs/apm_oss.json b/api_docs/apm_oss.json
deleted file mode 100644
index adcf164f39450..0000000000000
--- a/api_docs/apm_oss.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "id": "apmOss",
-  "client": {
-    "classes": [],
-    "functions": [],
-    "interfaces": [],
-    "enums": [],
-    "misc": [],
-    "objects": [],
-    "setup": {
-      "parentPluginId": "apmOss",
-      "id": "def-public.ApmOssPluginSetup",
-      "type": "Interface",
-      "tags": [],
-      "label": "ApmOssPluginSetup",
-      "description": [],
-      "path": "src/plugins/apm_oss/public/types.ts",
-      "deprecated": false,
-      "children": [],
-      "lifecycle": "setup",
-      "initialIsOpen": true
-    },
-    "start": {
-      "parentPluginId": "apmOss",
-      "id": "def-public.ApmOssPluginStart",
-      "type": "Interface",
-      "tags": [],
-      "label": "ApmOssPluginStart",
-      "description": [],
-      "path": "src/plugins/apm_oss/public/types.ts",
-      "deprecated": false,
-      "children": [],
-      "lifecycle": "start",
-      "initialIsOpen": true
-    }
-  },
-  "server": {
-    "classes": [],
-    "functions": [],
-    "interfaces": [],
-    "enums": [],
-    "misc": [
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-server.APMOSSConfig",
-        "type": "Type",
-        "tags": [],
-        "label": "APMOSSConfig",
-        "description": [],
-        "signature": [
-          "{ readonly enabled: boolean; readonly transactionIndices: string; readonly spanIndices: string; readonly errorIndices: string; readonly metricsIndices: string; readonly sourcemapIndices: string; readonly onboardingIndices: string; readonly indexPattern: string; readonly fleetMode: boolean; }"
-        ],
-        "path": "src/plugins/apm_oss/server/index.ts",
-        "deprecated": false,
-        "initialIsOpen": false
-      }
-    ],
-    "objects": [],
-    "setup": {
-      "parentPluginId": "apmOss",
-      "id": "def-server.APMOSSPluginSetup",
-      "type": "Interface",
-      "tags": [],
-      "label": "APMOSSPluginSetup",
-      "description": [],
-      "path": "src/plugins/apm_oss/server/plugin.ts",
-      "deprecated": false,
-      "children": [
-        {
-          "parentPluginId": "apmOss",
-          "id": "def-server.APMOSSPluginSetup.config",
-          "type": "Object",
-          "tags": [],
-          "label": "config",
-          "description": [],
-          "signature": [
-            "{ readonly enabled: boolean; readonly transactionIndices: string; readonly spanIndices: string; readonly errorIndices: string; readonly metricsIndices: string; readonly sourcemapIndices: string; readonly onboardingIndices: string; readonly indexPattern: string; readonly fleetMode: boolean; }"
-          ],
-          "path": "src/plugins/apm_oss/server/plugin.ts",
-          "deprecated": false
-        },
-        {
-          "parentPluginId": "apmOss",
-          "id": "def-server.APMOSSPluginSetup.config$",
-          "type": "Object",
-          "tags": [],
-          "label": "config$",
-          "description": [],
-          "signature": [
-            "Observable",
-            "<Readonly<{} & { enabled: boolean; transactionIndices: string; spanIndices: string; errorIndices: string; metricsIndices: string; sourcemapIndices: string; onboardingIndices: string; indexPattern: string; fleetMode: boolean; }>>"
-          ],
-          "path": "src/plugins/apm_oss/server/plugin.ts",
-          "deprecated": false
-        }
-      ],
-      "lifecycle": "setup",
-      "initialIsOpen": true
-    }
-  },
-  "common": {
-    "classes": [],
-    "functions": [],
-    "interfaces": [],
-    "enums": [],
-    "misc": [],
-    "objects": []
-  }
-}
\ No newline at end of file
diff --git a/api_docs/apm_oss.mdx b/api_docs/apm_oss.mdx
deleted file mode 100644
index 214147f9f4690..0000000000000
--- a/api_docs/apm_oss.mdx
+++ /dev/null
@@ -1,38 +0,0 @@
----
-id: kibApmOssPluginApi
-slug: /kibana-dev-docs/api/apmOss
-title: "apmOss"
-image: https://source.unsplash.com/400x175/?github
-summary: API docs for the apmOss plugin
-date: 2020-11-16
-tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apmOss']
-warning: 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.
----
-import apmOssObj from './apm_oss.json';
-
-
-
-Contact [APM UI](https://github.com/orgs/elastic/teams/apm-ui) 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={[apmOssObj.client.setup]}/>
-
-### Start
-<DocDefinitionList data={[apmOssObj.client.start]}/>
-
-## Server
-
-### Setup
-<DocDefinitionList data={[apmOssObj.server.setup]}/>
-
-### Consts, variables and types
-<DocDefinitionList data={apmOssObj.server.misc}/>
-
diff --git a/api_docs/bfetch.json b/api_docs/bfetch.json
index c274b6a6d1ced..4f9f7a33ebd3f 100644
--- a/api_docs/bfetch.json
+++ b/api_docs/bfetch.json
@@ -238,86 +238,7 @@
       }
     ],
     "enums": [],
-    "misc": [
-      {
-        "parentPluginId": "bfetch",
-        "id": "def-server.StreamingRequestHandler",
-        "type": "Type",
-        "tags": [],
-        "label": "StreamingRequestHandler",
-        "description": [
-          "\nRequest handler modified to allow to return an observable.\n\nSee {@link BfetchServerSetup.createStreamingRequestHandler} for usage example."
-        ],
-        "signature": [
-          "(context: ",
-          {
-            "pluginId": "core",
-            "scope": "server",
-            "docId": "kibCorePluginApi",
-            "section": "def-server.RequestHandlerContext",
-            "text": "RequestHandlerContext"
-          },
-          ", request: ",
-          {
-            "pluginId": "core",
-            "scope": "server",
-            "docId": "kibCoreHttpPluginApi",
-            "section": "def-server.KibanaRequest",
-            "text": "KibanaRequest"
-          },
-          "<P, Q, B, Method>) => ",
-          "Observable",
-          "<Response> | Promise<",
-          "Observable",
-          "<Response>>"
-        ],
-        "path": "src/plugins/bfetch/server/types.ts",
-        "deprecated": false,
-        "returnComment": [],
-        "children": [
-          {
-            "parentPluginId": "bfetch",
-            "id": "def-server.StreamingRequestHandler.$1",
-            "type": "Object",
-            "tags": [],
-            "label": "context",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCorePluginApi",
-                "section": "def-server.RequestHandlerContext",
-                "text": "RequestHandlerContext"
-              }
-            ],
-            "path": "src/plugins/bfetch/server/types.ts",
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "bfetch",
-            "id": "def-server.StreamingRequestHandler.$2",
-            "type": "Object",
-            "tags": [],
-            "label": "request",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreHttpPluginApi",
-                "section": "def-server.KibanaRequest",
-                "text": "KibanaRequest"
-              },
-              "<P, Q, B, Method>"
-            ],
-            "path": "src/plugins/bfetch/server/types.ts",
-            "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
-      }
-    ],
+    "misc": [],
     "objects": [],
     "setup": {
       "parentPluginId": "bfetch",
@@ -480,259 +401,6 @@
             }
           ],
           "returnComment": []
-        },
-        {
-          "parentPluginId": "bfetch",
-          "id": "def-server.BfetchServerSetup.createStreamingRequestHandler",
-          "type": "Function",
-          "tags": [],
-          "label": "createStreamingRequestHandler",
-          "description": [
-            "\nCreate a streaming request handler to be able to use an Observable to return chunked content to the client.\nThis is meant to be used with the `fetchStreaming` API of the `bfetch` client-side plugin.\n"
-          ],
-          "signature": [
-            "<Response, P, Q, B, Context extends ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCorePluginApi",
-              "section": "def-server.RequestHandlerContext",
-              "text": "RequestHandlerContext"
-            },
-            " = ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCorePluginApi",
-              "section": "def-server.RequestHandlerContext",
-              "text": "RequestHandlerContext"
-            },
-            ", Method extends ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.RouteMethod",
-              "text": "RouteMethod"
-            },
-            " = any>(streamHandler: ",
-            {
-              "pluginId": "bfetch",
-              "scope": "server",
-              "docId": "kibBfetchPluginApi",
-              "section": "def-server.StreamingRequestHandler",
-              "text": "StreamingRequestHandler"
-            },
-            "<Response, P, Q, B, Method>) => ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.RequestHandler",
-              "text": "RequestHandler"
-            },
-            "<P, Q, B, Context, Method, { custom: <T extends string | Record<string, any> | Error | { message: string | Error; attributes?: Record<string, any> | undefined; } | Buffer | ",
-            "Stream",
-            " | undefined>(options: ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.CustomHttpResponseOptions",
-              "text": "CustomHttpResponseOptions"
-            },
-            "<T>) => ",
-            "KibanaResponse",
-            "<T>; badRequest: (options?: ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.ErrorHttpResponseOptions",
-              "text": "ErrorHttpResponseOptions"
-            },
-            ") => ",
-            "KibanaResponse",
-            "<",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.ResponseError",
-              "text": "ResponseError"
-            },
-            ">; unauthorized: (options?: ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.ErrorHttpResponseOptions",
-              "text": "ErrorHttpResponseOptions"
-            },
-            ") => ",
-            "KibanaResponse",
-            "<",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.ResponseError",
-              "text": "ResponseError"
-            },
-            ">; forbidden: (options?: ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.ErrorHttpResponseOptions",
-              "text": "ErrorHttpResponseOptions"
-            },
-            ") => ",
-            "KibanaResponse",
-            "<",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.ResponseError",
-              "text": "ResponseError"
-            },
-            ">; notFound: (options?: ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.ErrorHttpResponseOptions",
-              "text": "ErrorHttpResponseOptions"
-            },
-            ") => ",
-            "KibanaResponse",
-            "<",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.ResponseError",
-              "text": "ResponseError"
-            },
-            ">; conflict: (options?: ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.ErrorHttpResponseOptions",
-              "text": "ErrorHttpResponseOptions"
-            },
-            ") => ",
-            "KibanaResponse",
-            "<",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.ResponseError",
-              "text": "ResponseError"
-            },
-            ">; customError: (options: ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.CustomHttpResponseOptions",
-              "text": "CustomHttpResponseOptions"
-            },
-            "<",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.ResponseError",
-              "text": "ResponseError"
-            },
-            ">) => ",
-            "KibanaResponse",
-            "<",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.ResponseError",
-              "text": "ResponseError"
-            },
-            ">; redirected: (options: ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.RedirectResponseOptions",
-              "text": "RedirectResponseOptions"
-            },
-            ") => ",
-            "KibanaResponse",
-            "<string | Record<string, any> | Buffer | ",
-            "Stream",
-            ">; ok: (options?: ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.HttpResponseOptions",
-              "text": "HttpResponseOptions"
-            },
-            ") => ",
-            "KibanaResponse",
-            "<string | Record<string, any> | Buffer | ",
-            "Stream",
-            ">; accepted: (options?: ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.HttpResponseOptions",
-              "text": "HttpResponseOptions"
-            },
-            ") => ",
-            "KibanaResponse",
-            "<string | Record<string, any> | Buffer | ",
-            "Stream",
-            ">; noContent: (options?: ",
-            {
-              "pluginId": "core",
-              "scope": "server",
-              "docId": "kibCoreHttpPluginApi",
-              "section": "def-server.HttpResponseOptions",
-              "text": "HttpResponseOptions"
-            },
-            ") => ",
-            "KibanaResponse",
-            "<undefined>; }>"
-          ],
-          "path": "src/plugins/bfetch/server/plugin.ts",
-          "deprecated": false,
-          "children": [
-            {
-              "parentPluginId": "bfetch",
-              "id": "def-server.BfetchServerSetup.createStreamingRequestHandler.$1",
-              "type": "Function",
-              "tags": [],
-              "label": "streamHandler",
-              "description": [],
-              "signature": [
-                {
-                  "pluginId": "bfetch",
-                  "scope": "server",
-                  "docId": "kibBfetchPluginApi",
-                  "section": "def-server.StreamingRequestHandler",
-                  "text": "StreamingRequestHandler"
-                },
-                "<Response, P, Q, B, Method>"
-              ],
-              "path": "src/plugins/bfetch/server/plugin.ts",
-              "deprecated": false,
-              "isRequired": true
-            }
-          ],
-          "returnComment": []
         }
       ],
       "lifecycle": "setup",
@@ -1024,6 +692,65 @@
       }
     ],
     "functions": [
+      {
+        "parentPluginId": "bfetch",
+        "id": "def-common.appendQueryParam",
+        "type": "Function",
+        "tags": [],
+        "label": "appendQueryParam",
+        "description": [],
+        "signature": [
+          "(url: string, key: string, value: string) => string"
+        ],
+        "path": "src/plugins/bfetch/common/util/query_params.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "bfetch",
+            "id": "def-common.appendQueryParam.$1",
+            "type": "string",
+            "tags": [],
+            "label": "url",
+            "description": [],
+            "signature": [
+              "string"
+            ],
+            "path": "src/plugins/bfetch/common/util/query_params.ts",
+            "deprecated": false,
+            "isRequired": true
+          },
+          {
+            "parentPluginId": "bfetch",
+            "id": "def-common.appendQueryParam.$2",
+            "type": "string",
+            "tags": [],
+            "label": "key",
+            "description": [],
+            "signature": [
+              "string"
+            ],
+            "path": "src/plugins/bfetch/common/util/query_params.ts",
+            "deprecated": false,
+            "isRequired": true
+          },
+          {
+            "parentPluginId": "bfetch",
+            "id": "def-common.appendQueryParam.$3",
+            "type": "string",
+            "tags": [],
+            "label": "value",
+            "description": [],
+            "signature": [
+              "string"
+            ],
+            "path": "src/plugins/bfetch/common/util/query_params.ts",
+            "deprecated": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "bfetch",
         "id": "def-common.createBatchedFunction",
diff --git a/api_docs/bfetch.mdx b/api_docs/bfetch.mdx
index 25e77b7731790..ca32afc24e166 100644
--- a/api_docs/bfetch.mdx
+++ b/api_docs/bfetch.mdx
@@ -18,7 +18,7 @@ Contact [App Services](https://github.com/orgs/elastic/teams/kibana-app-services
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 77 | 1 | 66 | 2 |
+| 76 | 1 | 67 | 2 |
 
 ## Client
 
@@ -42,9 +42,6 @@ Contact [App Services](https://github.com/orgs/elastic/teams/kibana-app-services
 ### Interfaces
 <DocDefinitionList data={bfetchObj.server.interfaces}/>
 
-### Consts, variables and types
-<DocDefinitionList data={bfetchObj.server.misc}/>
-
 ## Common
 
 ### Functions
diff --git a/api_docs/cases.json b/api_docs/cases.json
index 062235d8ed679..c35220cda3c66 100644
--- a/api_docs/cases.json
+++ b/api_docs/cases.json
@@ -2948,7 +2948,7 @@
             "label": "action",
             "description": [],
             "signature": [
-              "\"add\" | \"delete\" | \"create\" | \"update\" | \"push-to-service\""
+              "\"add\" | \"create\" | \"delete\" | \"update\" | \"push-to-service\""
             ],
             "path": "x-pack/plugins/cases/common/ui/types.ts",
             "deprecated": false
@@ -4964,6 +4964,26 @@
         "deprecated": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CaseActionConnector",
+        "type": "Type",
+        "tags": [],
+        "label": "CaseActionConnector",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "actions",
+            "scope": "common",
+            "docId": "kibActionsPluginApi",
+            "section": "def-common.ActionResult",
+            "text": "ActionResult"
+          }
+        ],
+        "path": "x-pack/plugins/cases/common/ui/types.ts",
+        "deprecated": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "cases",
         "id": "def-common.CaseAttributes",
@@ -6776,7 +6796,7 @@
         "label": "CaseUserActionAttributes",
         "description": [],
         "signature": [
-          "{ action_field: (\"status\" | \"title\" | \"description\" | \"tags\" | \"comment\" | \"settings\" | \"owner\" | \"connector\" | \"pushed\" | \"sub_case\")[]; action: \"add\" | \"delete\" | \"create\" | \"update\" | \"push-to-service\"; action_at: string; action_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; new_value: string | null; old_value: string | null; owner: string; }"
+          "{ action_field: (\"status\" | \"title\" | \"description\" | \"tags\" | \"comment\" | \"settings\" | \"owner\" | \"connector\" | \"pushed\" | \"sub_case\")[]; action: \"add\" | \"create\" | \"delete\" | \"update\" | \"push-to-service\"; action_at: string; action_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; new_value: string | null; old_value: string | null; owner: string; }"
         ],
         "path": "x-pack/plugins/cases/common/api/cases/user_actions.ts",
         "deprecated": false,
@@ -6852,7 +6872,7 @@
         "label": "CaseUserActionResponse",
         "description": [],
         "signature": [
-          "{ action_field: (\"status\" | \"title\" | \"description\" | \"tags\" | \"comment\" | \"settings\" | \"owner\" | \"connector\" | \"pushed\" | \"sub_case\")[]; action: \"add\" | \"delete\" | \"create\" | \"update\" | \"push-to-service\"; action_at: string; action_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; new_value: string | null; old_value: string | null; owner: string; } & { action_id: string; case_id: string; comment_id: string | null; new_val_connector_id: string | null; old_val_connector_id: string | null; } & { sub_case_id?: string | undefined; }"
+          "{ action_field: (\"status\" | \"title\" | \"description\" | \"tags\" | \"comment\" | \"settings\" | \"owner\" | \"connector\" | \"pushed\" | \"sub_case\")[]; action: \"add\" | \"create\" | \"delete\" | \"update\" | \"push-to-service\"; action_at: string; action_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; new_value: string | null; old_value: string | null; owner: string; } & { action_id: string; case_id: string; comment_id: string | null; new_val_connector_id: string | null; old_val_connector_id: string | null; } & { sub_case_id?: string | undefined; }"
         ],
         "path": "x-pack/plugins/cases/common/api/cases/user_actions.ts",
         "deprecated": false,
@@ -6866,7 +6886,7 @@
         "label": "CaseUserActionsResponse",
         "description": [],
         "signature": [
-          "({ action_field: (\"status\" | \"title\" | \"description\" | \"tags\" | \"comment\" | \"settings\" | \"owner\" | \"connector\" | \"pushed\" | \"sub_case\")[]; action: \"add\" | \"delete\" | \"create\" | \"update\" | \"push-to-service\"; action_at: string; action_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; new_value: string | null; old_value: string | null; owner: string; } & { action_id: string; case_id: string; comment_id: string | null; new_val_connector_id: string | null; old_val_connector_id: string | null; } & { sub_case_id?: string | undefined; })[]"
+          "({ action_field: (\"status\" | \"title\" | \"description\" | \"tags\" | \"comment\" | \"settings\" | \"owner\" | \"connector\" | \"pushed\" | \"sub_case\")[]; action: \"add\" | \"create\" | \"delete\" | \"update\" | \"push-to-service\"; action_at: string; action_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; new_value: string | null; old_value: string | null; owner: string; } & { action_id: string; case_id: string; comment_id: string | null; new_val_connector_id: string | null; old_val_connector_id: string | null; } & { sub_case_id?: string | undefined; })[]"
         ],
         "path": "x-pack/plugins/cases/common/api/cases/user_actions.ts",
         "deprecated": false,
@@ -8573,7 +8593,7 @@
         "label": "UserAction",
         "description": [],
         "signature": [
-          "\"add\" | \"delete\" | \"create\" | \"update\" | \"push-to-service\""
+          "\"add\" | \"create\" | \"delete\" | \"update\" | \"push-to-service\""
         ],
         "path": "x-pack/plugins/cases/common/api/cases/user_actions.ts",
         "deprecated": false,
diff --git a/api_docs/cases.mdx b/api_docs/cases.mdx
index 4d2c96b89917f..9400133d89bda 100644
--- a/api_docs/cases.mdx
+++ b/api_docs/cases.mdx
@@ -18,7 +18,7 @@ Contact [Security Solution Threat Hunting](https://github.com/orgs/elastic/teams
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 475 | 0 | 431 | 14 |
+| 476 | 0 | 432 | 14 |
 
 ## Client
 
diff --git a/api_docs/charts.json b/api_docs/charts.json
index 83a2a93df42a1..d6ad087ad1601 100644
--- a/api_docs/charts.json
+++ b/api_docs/charts.json
@@ -4266,4 +4266,4 @@
       }
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/api_docs/core.json b/api_docs/core.json
index c288037b4486d..e09641530635e 100644
--- a/api_docs/core.json
+++ b/api_docs/core.json
@@ -1603,7 +1603,7 @@
             "label": "links",
             "description": [],
             "signature": [
-              "{ readonly settings: string; readonly apm: { readonly kibanaSettings: string; readonly supportedServiceMaps: string; readonly customLinks: string; readonly droppedTransactionSpans: string; readonly upgrading: string; readonly metaData: string; }; readonly canvas: { readonly guide: string; }; readonly dashboard: { readonly guide: string; readonly drilldowns: string; readonly drilldownsTriggerPicker: string; readonly urlDrilldownTemplateSyntax: string; readonly urlDrilldownVariables: string; }; readonly discover: Record<string, string>; readonly filebeat: { readonly base: string; readonly installation: string; readonly configuration: string; readonly elasticsearchOutput: string; readonly elasticsearchModule: string; readonly startup: string; readonly exportedFields: string; readonly suricataModule: string; readonly zeekModule: string; }; readonly auditbeat: { readonly base: string; readonly auditdModule: string; readonly systemModule: string; }; readonly metricbeat: { readonly base: string; readonly configure: string; readonly httpEndpoint: string; readonly install: string; readonly start: string; }; readonly enterpriseSearch: { readonly base: string; readonly appSearchBase: string; readonly workplaceSearchBase: string; }; readonly heartbeat: { readonly base: string; }; readonly libbeat: { readonly getStarted: string; }; readonly logstash: { readonly base: string; }; readonly functionbeat: { readonly base: string; }; readonly winlogbeat: { readonly base: string; }; readonly aggs: { readonly composite: string; readonly composite_missing_bucket: string; readonly date_histogram: string; readonly date_range: string; readonly date_format_pattern: string; readonly filter: string; readonly filters: string; readonly geohash_grid: string; readonly histogram: string; readonly ip_range: string; readonly range: string; readonly significant_terms: string; readonly terms: string; readonly avg: string; readonly avg_bucket: string; readonly max_bucket: string; readonly min_bucket: string; readonly sum_bucket: string; readonly cardinality: string; readonly count: string; readonly cumulative_sum: string; readonly derivative: string; readonly geo_bounds: string; readonly geo_centroid: string; readonly max: string; readonly median: string; readonly min: string; readonly moving_avg: string; readonly percentile_ranks: string; readonly serial_diff: string; readonly std_dev: string; readonly sum: string; readonly top_hits: string; }; readonly runtimeFields: { readonly overview: string; readonly mapping: string; }; readonly scriptedFields: { readonly scriptFields: string; readonly scriptAggs: string; readonly painless: string; readonly painlessApi: string; readonly painlessLangSpec: string; readonly painlessSyntax: string; readonly painlessWalkthrough: string; readonly luceneExpressions: string; }; readonly search: { readonly sessions: string; readonly sessionLimits: string; }; readonly indexPatterns: { readonly introduction: string; readonly fieldFormattersNumber: string; readonly fieldFormattersString: string; readonly runtimeFields: string; }; readonly addData: string; readonly kibana: string; readonly upgradeAssistant: string; readonly rollupJobs: string; readonly elasticsearch: Record<string, string>; readonly siem: { readonly privileges: string; readonly guide: string; readonly gettingStarted: string; readonly ml: string; readonly ruleChangeLog: string; readonly detectionsReq: string; readonly networkMap: string; readonly troubleshootGaps: string; }; readonly query: { readonly eql: string; readonly kueryQuerySyntax: string; readonly luceneQuerySyntax: string; readonly percolate: string; readonly queryDsl: string; readonly autocompleteChanges: string; }; readonly date: { readonly dateMath: string; readonly dateMathIndexNames: string; }; readonly management: Record<string, string>; readonly ml: Record<string, string>; readonly transforms: Record<string, string>; readonly visualize: Record<string, string>; readonly apis: Readonly<{ bulkIndexAlias: string; byteSizeUnits: string; createAutoFollowPattern: string; createFollower: string; createIndex: string; createSnapshotLifecyclePolicy: string; createRoleMapping: string; createRoleMappingTemplates: string; createRollupJobsRequest: string; createApiKey: string; createPipeline: string; createTransformRequest: string; cronExpressions: string; executeWatchActionModes: string; indexExists: string; openIndex: string; putComponentTemplate: string; painlessExecute: string; painlessExecuteAPIContexts: string; putComponentTemplateMetadata: string; putSnapshotLifecyclePolicy: string; putIndexTemplateV1: string; putWatch: string; simulatePipeline: string; timeUnits: string; updateTransform: string; }>; readonly observability: Readonly<{ guide: string; infrastructureThreshold: string; logsThreshold: string; metricsThreshold: string; monitorStatus: string; monitorUptime: string; tlsCertificate: string; uptimeDurationAnomaly: string; }>; readonly alerting: Record<string, string>; readonly maps: Record<string, string>; readonly monitoring: Record<string, string>; readonly security: Readonly<{ apiKeyServiceSettings: string; clusterPrivileges: string; elasticsearchSettings: string; elasticsearchEnableSecurity: string; indicesPrivileges: string; kibanaTLS: string; kibanaPrivileges: string; mappingRoles: string; mappingRolesFieldRules: string; runAsPrivilege: string; }>; readonly spaces: Readonly<{ kibanaLegacyUrlAliases: string; kibanaDisableLegacyUrlAliasesApi: string; }>; readonly watcher: Record<string, string>; readonly ccs: Record<string, string>; readonly plugins: Record<string, string>; readonly snapshotRestore: Record<string, string>; readonly ingest: Record<string, string>; readonly fleet: Readonly<{ guide: string; fleetServer: string; fleetServerAddFleetServer: string; settings: string; settingsFleetServerHostSettings: string; troubleshooting: string; elasticAgent: string; datastreams: string; datastreamsNamingScheme: string; upgradeElasticAgent: string; upgradeElasticAgent712lower: string; learnMoreBlog: string; }>; readonly ecs: { readonly guide: string; }; readonly clients: { readonly guide: string; readonly goOverview: string; readonly javaIndex: string; readonly jsIntro: string; readonly netGuide: string; readonly perlGuide: string; readonly phpGuide: string; readonly pythonGuide: string; readonly rubyOverview: string; readonly rustGuide: string; }; }"
+              "{ readonly settings: string; readonly elasticStackGetStarted: string; readonly apm: { readonly kibanaSettings: string; readonly supportedServiceMaps: string; readonly customLinks: string; readonly droppedTransactionSpans: string; readonly upgrading: string; readonly metaData: string; }; readonly canvas: { readonly guide: string; }; readonly dashboard: { readonly guide: string; readonly drilldowns: string; readonly drilldownsTriggerPicker: string; readonly urlDrilldownTemplateSyntax: string; readonly urlDrilldownVariables: string; }; readonly discover: Record<string, string>; readonly filebeat: { readonly base: string; readonly installation: string; readonly configuration: string; readonly elasticsearchOutput: string; readonly elasticsearchModule: string; readonly startup: string; readonly exportedFields: string; readonly suricataModule: string; readonly zeekModule: string; }; readonly auditbeat: { readonly base: string; readonly auditdModule: string; readonly systemModule: string; }; readonly metricbeat: { readonly base: string; readonly configure: string; readonly httpEndpoint: string; readonly install: string; readonly start: string; }; readonly enterpriseSearch: { readonly base: string; readonly appSearchBase: string; readonly workplaceSearchBase: string; }; readonly heartbeat: { readonly base: string; }; readonly libbeat: { readonly getStarted: string; }; readonly logstash: { readonly base: string; }; readonly functionbeat: { readonly base: string; }; readonly winlogbeat: { readonly base: string; }; readonly aggs: { readonly composite: string; readonly composite_missing_bucket: string; readonly date_histogram: string; readonly date_range: string; readonly date_format_pattern: string; readonly filter: string; readonly filters: string; readonly geohash_grid: string; readonly histogram: string; readonly ip_range: string; readonly range: string; readonly significant_terms: string; readonly terms: string; readonly avg: string; readonly avg_bucket: string; readonly max_bucket: string; readonly min_bucket: string; readonly sum_bucket: string; readonly cardinality: string; readonly count: string; readonly cumulative_sum: string; readonly derivative: string; readonly geo_bounds: string; readonly geo_centroid: string; readonly max: string; readonly median: string; readonly min: string; readonly moving_avg: string; readonly percentile_ranks: string; readonly serial_diff: string; readonly std_dev: string; readonly sum: string; readonly top_hits: string; }; readonly runtimeFields: { readonly overview: string; readonly mapping: string; }; readonly scriptedFields: { readonly scriptFields: string; readonly scriptAggs: string; readonly painless: string; readonly painlessApi: string; readonly painlessLangSpec: string; readonly painlessSyntax: string; readonly painlessWalkthrough: string; readonly luceneExpressions: string; }; readonly search: { readonly sessions: string; readonly sessionLimits: string; }; readonly indexPatterns: { readonly introduction: string; readonly fieldFormattersNumber: string; readonly fieldFormattersString: string; readonly runtimeFields: string; }; readonly addData: string; readonly kibana: string; readonly upgradeAssistant: string; readonly rollupJobs: string; readonly elasticsearch: Record<string, string>; readonly siem: { readonly privileges: string; readonly guide: string; readonly gettingStarted: string; readonly ml: string; readonly ruleChangeLog: string; readonly detectionsReq: string; readonly networkMap: string; readonly troubleshootGaps: string; }; readonly securitySolution: { readonly trustedApps: string; }; readonly query: { readonly eql: string; readonly kueryQuerySyntax: string; readonly luceneQuerySyntax: string; readonly percolate: string; readonly queryDsl: string; readonly autocompleteChanges: string; }; readonly date: { readonly dateMath: string; readonly dateMathIndexNames: string; }; readonly management: Record<string, string>; readonly ml: Record<string, string>; readonly transforms: Record<string, string>; readonly visualize: Record<string, string>; readonly apis: Readonly<{ bulkIndexAlias: string; byteSizeUnits: string; createAutoFollowPattern: string; createFollower: string; createIndex: string; createSnapshotLifecyclePolicy: string; createRoleMapping: string; createRoleMappingTemplates: string; createRollupJobsRequest: string; createApiKey: string; createPipeline: string; createTransformRequest: string; cronExpressions: string; executeWatchActionModes: string; indexExists: string; openIndex: string; putComponentTemplate: string; painlessExecute: string; painlessExecuteAPIContexts: string; putComponentTemplateMetadata: string; putSnapshotLifecyclePolicy: string; putIndexTemplateV1: string; putWatch: string; simulatePipeline: string; timeUnits: string; updateTransform: string; }>; readonly observability: Readonly<{ guide: string; infrastructureThreshold: string; logsThreshold: string; metricsThreshold: string; monitorStatus: string; monitorUptime: string; tlsCertificate: string; uptimeDurationAnomaly: string; }>; readonly alerting: Record<string, string>; readonly maps: Record<string, string>; readonly monitoring: Record<string, string>; readonly security: Readonly<{ apiKeyServiceSettings: string; clusterPrivileges: string; elasticsearchSettings: string; elasticsearchEnableSecurity: string; indicesPrivileges: string; kibanaTLS: string; kibanaPrivileges: string; mappingRoles: string; mappingRolesFieldRules: string; runAsPrivilege: string; }>; readonly spaces: Readonly<{ kibanaLegacyUrlAliases: string; kibanaDisableLegacyUrlAliasesApi: string; }>; readonly watcher: Record<string, string>; readonly ccs: Record<string, string>; readonly plugins: Record<string, string>; readonly snapshotRestore: Record<string, string>; readonly ingest: Record<string, string>; readonly fleet: Readonly<{ guide: string; fleetServer: string; fleetServerAddFleetServer: string; settings: string; settingsFleetServerHostSettings: string; troubleshooting: string; elasticAgent: string; datastreams: string; datastreamsNamingScheme: string; upgradeElasticAgent: string; upgradeElasticAgent712lower: string; learnMoreBlog: string; apiKeysLearnMore: string; }>; readonly ecs: { readonly guide: string; }; readonly clients: { readonly guide: string; readonly goOverview: string; readonly javaIndex: string; readonly jsIntro: string; readonly netGuide: string; readonly perlGuide: string; readonly phpGuide: string; readonly pythonGuide: string; readonly rubyOverview: string; readonly rustGuide: string; }; }"
             ],
             "path": "src/core/public/doc_links/doc_links_service.ts",
             "deprecated": false
@@ -2079,7 +2079,7 @@
             "signature": [
               "() => Readonly<Record<string, Pick<",
               "UiSettingsParams",
-              "<unknown>, \"type\" | \"options\" | \"description\" | \"name\" | \"order\" | \"value\" | \"category\" | \"optionLabels\" | \"requiresPageReload\" | \"readonly\" | \"sensitive\" | \"deprecation\" | \"metric\"> & ",
+              "<unknown>, \"type\" | \"description\" | \"name\" | \"options\" | \"order\" | \"value\" | \"category\" | \"optionLabels\" | \"requiresPageReload\" | \"readonly\" | \"sensitive\" | \"deprecation\" | \"metric\"> & ",
               "UserProvidedValues",
               "<any>>>"
             ],
@@ -3265,7 +3265,7 @@
             "label": "buttonColor",
             "description": [],
             "signature": [
-              "\"warning\" | \"text\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"secondary\" | \"ghost\" | undefined"
+              "\"text\" | \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"secondary\" | \"ghost\" | undefined"
             ],
             "path": "src/core/public/overlays/modal/modal_service.tsx",
             "deprecated": false
@@ -6622,7 +6622,7 @@
           "\nA sub-set of {@link UiSettingsParams} exposed to the client-side."
         ],
         "signature": [
-          "{ type?: \"string\" | \"number\" | \"boolean\" | \"undefined\" | \"color\" | \"json\" | \"image\" | \"markdown\" | \"select\" | \"array\" | undefined; options?: string[] | undefined; description?: string | undefined; name?: string | undefined; order?: number | undefined; value?: unknown; category?: string[] | undefined; optionLabels?: Record<string, string> | undefined; requiresPageReload?: boolean | undefined; readonly?: boolean | undefined; sensitive?: boolean | undefined; deprecation?: ",
+          "{ type?: \"string\" | \"number\" | \"boolean\" | \"undefined\" | \"color\" | \"json\" | \"image\" | \"markdown\" | \"select\" | \"array\" | undefined; description?: string | undefined; name?: string | undefined; options?: string[] | undefined; order?: number | undefined; value?: unknown; category?: string[] | undefined; optionLabels?: Record<string, string> | undefined; requiresPageReload?: boolean | undefined; readonly?: boolean | undefined; sensitive?: boolean | undefined; deprecation?: ",
           "DeprecationSettings",
           " | undefined; metric?: { type: ",
           {
@@ -7291,19 +7291,6 @@
             "path": "src/core/server/csp/csp_config.ts",
             "deprecated": false
           },
-          {
-            "parentPluginId": "core",
-            "id": "def-server.CspConfig.rules",
-            "type": "Array",
-            "tags": [],
-            "label": "rules",
-            "description": [],
-            "signature": [
-              "string[]"
-            ],
-            "path": "src/core/server/csp/csp_config.ts",
-            "deprecated": false
-          },
           {
             "parentPluginId": "core",
             "id": "def-server.CspConfig.strict",
@@ -9627,7 +9614,7 @@
               "corrective action needed to fix this deprecation."
             ],
             "signature": [
-              "{ api?: { path: string; method: \"PUT\" | \"POST\"; body?: { [key: string]: any; } | undefined; } | undefined; manualSteps: string[]; }"
+              "{ api?: { path: string; method: \"PUT\" | \"POST\"; body?: { [key: string]: any; } | undefined; omitContextFromBody?: boolean | undefined; } | undefined; manualSteps: string[]; }"
             ],
             "path": "src/core/server/deprecations/types.ts",
             "deprecated": false
@@ -10345,7 +10332,7 @@
               "Headers used for authentication against Elasticsearch"
             ],
             "signature": [
-              "{ 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; date?: string | string[] | undefined; expect?: string | string[] | undefined; expires?: string | string[] | undefined; forwarded?: string | string[] | undefined; from?: 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; location?: 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; warning?: string | string[] | undefined; \"www-authenticate\"?: string | string[] | undefined; } & { [header: string]: string | string[] | undefined; }"
+              "{ from?: string | string[] | undefined; date?: string | string[] | undefined; origin?: string | string[] | undefined; range?: string | string[] | undefined; warning?: string | string[] | undefined; location?: string | string[] | undefined; allow?: 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; \"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; 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; }"
             ],
             "path": "src/core/server/elasticsearch/types.ts",
             "deprecated": false
@@ -10390,25 +10377,7 @@
             "label": "savedObjectsClient",
             "description": [],
             "signature": [
-              "{ get: <T = unknown>(type: string, id: string, options?: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsBaseOptions",
-                "text": "SavedObjectsBaseOptions"
-              },
-              ") => Promise<",
-              "SavedObject",
-              "<T>>; delete: (type: string, id: string, options?: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsDeleteOptions",
-                "text": "SavedObjectsDeleteOptions"
-              },
-              ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+              "{ create: <T = unknown>(type: string, attributes: T, options?: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -10466,7 +10435,15 @@
                 "section": "def-server.SavedObjectsCheckConflictsResponse",
                 "text": "SavedObjectsCheckConflictsResponse"
               },
-              ">; find: <T = unknown, A = unknown>(options: ",
+              ">; delete: (type: string, id: string, options?: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-server.SavedObjectsDeleteOptions",
+                "text": "SavedObjectsDeleteOptions"
+              },
+              ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -10530,6 +10507,16 @@
                 "section": "def-server.SavedObjectsBulkResolveResponse",
                 "text": "SavedObjectsBulkResolveResponse"
               },
+              "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-server.SavedObjectsBaseOptions",
+                "text": "SavedObjectsBaseOptions"
+              },
+              ") => Promise<",
+              "SavedObject",
               "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
               {
                 "pluginId": "core",
@@ -11334,7 +11321,7 @@
               "\nHTTP Headers with additional information about response."
             ],
             "signature": [
-              "Record<\"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\" | \"date\" | \"expect\" | \"expires\" | \"forwarded\" | \"from\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"location\" | \"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\" | \"warning\" | \"www-authenticate\", string | string[]> | Record<string, string | string[]> | undefined"
+              "Record<\"from\" | \"date\" | \"origin\" | \"range\" | \"warning\" | \"location\" | \"allow\" | \"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\" | \"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\" | \"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[]> | undefined"
             ],
             "path": "src/core/server/http_resources/types.ts",
             "deprecated": false
@@ -11646,7 +11633,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
               "TransportRequestParams",
               ", options?: ",
               "TransportRequestOptions",
@@ -12454,21 +12441,6 @@
         "path": "src/core/server/csp/csp_config.ts",
         "deprecated": false,
         "children": [
-          {
-            "parentPluginId": "core",
-            "id": "def-server.ICspConfig.rules",
-            "type": "Array",
-            "tags": [],
-            "label": "rules",
-            "description": [
-              "\nThe CSP rules used for Kibana."
-            ],
-            "signature": [
-              "string[]"
-            ],
-            "path": "src/core/server/csp/csp_config.ts",
-            "deprecated": false
-          },
           {
             "parentPluginId": "core",
             "id": "def-server.ICspConfig.strict",
@@ -12500,7 +12472,7 @@
             "tags": [],
             "label": "disableEmbedding",
             "description": [
-              "\nWhether or not embedding (using iframes) should be allowed by the CSP. If embedding is disabled *and* no custom rules have been\ndefined, a restrictive 'frame-ancestors' rule will be added to the default CSP rules."
+              "\nWhether or not embedding (using iframes) should be allowed by the CSP. If embedding is disabled, a restrictive 'frame-ancestors' rule will be added to the default CSP rules."
             ],
             "path": "src/core/server/csp/csp_config.ts",
             "deprecated": false
@@ -12858,7 +12830,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
               "TransportRequestParams",
               ", options?: ",
               "TransportRequestOptions",
@@ -12883,7 +12855,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
               "TransportRequestParams",
               ", options?: ",
               "TransportRequestOptions",
@@ -12923,7 +12895,7 @@
             "signature": [
               "() => Readonly<Record<string, Pick<",
               "UiSettingsParams",
-              "<unknown>, \"type\" | \"options\" | \"description\" | \"name\" | \"order\" | \"value\" | \"category\" | \"optionLabels\" | \"requiresPageReload\" | \"readonly\" | \"sensitive\" | \"deprecation\" | \"metric\">>>"
+              "<unknown>, \"type\" | \"description\" | \"name\" | \"options\" | \"order\" | \"value\" | \"category\" | \"optionLabels\" | \"requiresPageReload\" | \"readonly\" | \"sensitive\" | \"deprecation\" | \"metric\">>>"
             ],
             "path": "src/core/server/ui_settings/types.ts",
             "deprecated": false,
@@ -15382,7 +15354,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; typeRegistry: Pick<",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; typeRegistry: Pick<",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -15406,7 +15378,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; getExporter: (client: Pick<",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; getExporter: (client: Pick<",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -15414,7 +15386,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => Pick<",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => Pick<",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -15430,7 +15402,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => Pick<",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => Pick<",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -16611,7 +16583,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => ",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -16639,7 +16611,7 @@
                     "section": "def-server.SavedObjectsClient",
                     "text": "SavedObjectsClient"
                   },
-                  ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
+                  ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
                 ],
                 "path": "src/core/server/ui_settings/types.ts",
                 "deprecated": false,
@@ -17157,7 +17129,7 @@
         "label": "EcsEventCategory",
         "description": [],
         "signature": [
-          "\"host\" | \"network\" | \"web\" | \"database\" | \"package\" | \"session\" | \"file\" | \"registry\" | \"process\" | \"authentication\" | \"configuration\" | \"driver\" | \"iam\" | \"intrusion_detection\" | \"malware\""
+          "\"network\" | \"web\" | \"database\" | \"package\" | \"host\" | \"session\" | \"file\" | \"registry\" | \"process\" | \"authentication\" | \"configuration\" | \"driver\" | \"iam\" | \"intrusion_detection\" | \"malware\""
         ],
         "path": "node_modules/@kbn/logging/target_types/ecs/event.d.ts",
         "deprecated": false,
@@ -17199,7 +17171,7 @@
         "label": "EcsEventType",
         "description": [],
         "signature": [
-          "\"start\" | \"connection\" | \"end\" | \"user\" | \"error\" | \"info\" | \"group\" | \"protocol\" | \"access\" | \"admin\" | \"allowed\" | \"change\" | \"creation\" | \"deletion\" | \"denied\" | \"installation\""
+          "\"start\" | \"end\" | \"user\" | \"error\" | \"info\" | \"connection\" | \"group\" | \"protocol\" | \"access\" | \"admin\" | \"allowed\" | \"change\" | \"creation\" | \"deletion\" | \"denied\" | \"installation\""
         ],
         "path": "node_modules/@kbn/logging/target_types/ecs/event.d.ts",
         "deprecated": false,
@@ -17217,7 +17189,7 @@
         "signature": [
           "Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
           "TransportRequestParams",
           ", options?: ",
           "TransportRequestOptions",
@@ -18364,7 +18336,7 @@
           "\nA sub-set of {@link UiSettingsParams} exposed to the client-side."
         ],
         "signature": [
-          "{ type?: \"string\" | \"number\" | \"boolean\" | \"undefined\" | \"color\" | \"json\" | \"image\" | \"markdown\" | \"select\" | \"array\" | undefined; options?: string[] | undefined; description?: string | undefined; name?: string | undefined; order?: number | undefined; value?: unknown; category?: string[] | undefined; optionLabels?: Record<string, string> | undefined; requiresPageReload?: boolean | undefined; readonly?: boolean | undefined; sensitive?: boolean | undefined; deprecation?: ",
+          "{ type?: \"string\" | \"number\" | \"boolean\" | \"undefined\" | \"color\" | \"json\" | \"image\" | \"markdown\" | \"select\" | \"array\" | undefined; description?: string | undefined; name?: string | undefined; options?: string[] | undefined; order?: number | undefined; value?: unknown; category?: string[] | undefined; optionLabels?: Record<string, string> | undefined; requiresPageReload?: boolean | undefined; readonly?: boolean | undefined; sensitive?: boolean | undefined; deprecation?: ",
           "DeprecationSettings",
           " | undefined; metric?: { type: ",
           {
diff --git a/api_docs/core.mdx b/api_docs/core.mdx
index 018a9f1beda6c..11a95ef59976f 100644
--- a/api_docs/core.mdx
+++ b/api_docs/core.mdx
@@ -18,7 +18,7 @@ Contact [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) for que
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 2300 | 27 | 1019 | 29 |
+| 2298 | 27 | 1018 | 29 |
 
 ## Client
 
diff --git a/api_docs/core_application.mdx b/api_docs/core_application.mdx
index 1c01073421f69..78431e5a91867 100644
--- a/api_docs/core_application.mdx
+++ b/api_docs/core_application.mdx
@@ -18,7 +18,7 @@ Contact [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) for que
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 2300 | 27 | 1019 | 29 |
+| 2298 | 27 | 1018 | 29 |
 
 ## Client
 
diff --git a/api_docs/core_chrome.json b/api_docs/core_chrome.json
index e2404c6b386fc..604ce27aa3abe 100644
--- a/api_docs/core_chrome.json
+++ b/api_docs/core_chrome.json
@@ -1934,7 +1934,7 @@
         "description": [],
         "signature": [
           "CommonProps",
-          " & { text: React.ReactNode; href?: string | undefined; onClick?: ((event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => void) | undefined; truncate?: boolean | undefined; 'aria-current'?: boolean | \"date\" | \"location\" | \"page\" | \"time\" | \"true\" | \"false\" | \"step\" | undefined; }"
+          " & { text: React.ReactNode; href?: string | undefined; onClick?: ((event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => void) | undefined; truncate?: boolean | undefined; 'aria-current'?: boolean | \"date\" | \"page\" | \"time\" | \"true\" | \"false\" | \"step\" | \"location\" | undefined; }"
         ],
         "path": "src/core/public/chrome/types.ts",
         "deprecated": false,
diff --git a/api_docs/core_chrome.mdx b/api_docs/core_chrome.mdx
index 18244445385ca..305f1041a0923 100644
--- a/api_docs/core_chrome.mdx
+++ b/api_docs/core_chrome.mdx
@@ -18,7 +18,7 @@ Contact [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) for que
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 2300 | 27 | 1019 | 29 |
+| 2298 | 27 | 1018 | 29 |
 
 ## Client
 
diff --git a/api_docs/core_http.json b/api_docs/core_http.json
index 94ee961f265b7..285e246099952 100644
--- a/api_docs/core_http.json
+++ b/api_docs/core_http.json
@@ -2286,7 +2286,7 @@
               "\nReadonly copy of incoming request headers."
             ],
             "signature": [
-              "{ 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; date?: string | string[] | undefined; expect?: string | string[] | undefined; expires?: string | string[] | undefined; forwarded?: string | string[] | undefined; from?: 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; location?: 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; warning?: string | string[] | undefined; \"www-authenticate\"?: string | string[] | undefined; } & { [header: string]: string | string[] | undefined; }"
+              "{ from?: string | string[] | undefined; date?: string | string[] | undefined; origin?: string | string[] | undefined; range?: string | string[] | undefined; warning?: string | string[] | undefined; location?: string | string[] | undefined; allow?: 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; \"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; 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; }"
             ],
             "path": "src/core/server/http/router/request.ts",
             "deprecated": false
@@ -2697,7 +2697,7 @@
               "\nHeaders to attach for auth redirect.\nMust include \"location\" header"
             ],
             "signature": [
-              "({ location: string; } & Record<\"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\" | \"date\" | \"expect\" | \"expires\" | \"forwarded\" | \"from\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"location\" | \"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\" | \"warning\" | \"www-authenticate\", string | string[]>) | ({ location: string; } & Record<string, string | string[]>)"
+              "({ location: string; } & Record<\"from\" | \"date\" | \"origin\" | \"range\" | \"warning\" | \"location\" | \"allow\" | \"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\" | \"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\" | \"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[]>) | ({ location: string; } & Record<string, string | string[]>)"
             ],
             "path": "src/core/server/http/lifecycle/auth.ts",
             "deprecated": false
@@ -2863,7 +2863,7 @@
               "\nRedirects user to another location to complete authentication when authRequired: true\nAllows user to access a resource without redirection when authRequired: 'optional'"
             ],
             "signature": [
-              "(headers: ({ location: string; } & Record<\"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\" | \"date\" | \"expect\" | \"expires\" | \"forwarded\" | \"from\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"location\" | \"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\" | \"warning\" | \"www-authenticate\", string | string[]>) | ({ location: string; } & Record<string, string | string[]>)) => ",
+              "(headers: ({ location: string; } & Record<\"from\" | \"date\" | \"origin\" | \"range\" | \"warning\" | \"location\" | \"allow\" | \"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\" | \"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\" | \"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[]>) | ({ location: string; } & Record<string, string | string[]>)) => ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -2883,7 +2883,7 @@
                 "label": "headers",
                 "description": [],
                 "signature": [
-                  "({ location: string; } & Record<\"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\" | \"date\" | \"expect\" | \"expires\" | \"forwarded\" | \"from\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"location\" | \"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\" | \"warning\" | \"www-authenticate\", string | string[]>) | ({ location: string; } & Record<string, string | string[]>)"
+                  "({ location: string; } & Record<\"from\" | \"date\" | \"origin\" | \"range\" | \"warning\" | \"location\" | \"allow\" | \"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\" | \"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\" | \"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[]>) | ({ location: string; } & Record<string, string | string[]>)"
                 ],
                 "path": "src/core/server/http/lifecycle/auth.ts",
                 "deprecated": false,
@@ -2942,7 +2942,7 @@
               "HTTP Headers with additional information about response"
             ],
             "signature": [
-              "Record<\"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\" | \"date\" | \"expect\" | \"expires\" | \"forwarded\" | \"from\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"location\" | \"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\" | \"warning\" | \"www-authenticate\", string | string[]> | Record<string, string | string[]> | undefined"
+              "Record<\"from\" | \"date\" | \"origin\" | \"range\" | \"warning\" | \"location\" | \"allow\" | \"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\" | \"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\" | \"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[]> | undefined"
             ],
             "path": "src/core/server/http/router/response.ts",
             "deprecated": false
@@ -3012,7 +3012,7 @@
               "HTTP Headers with additional information about response"
             ],
             "signature": [
-              "Record<\"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\" | \"date\" | \"expect\" | \"expires\" | \"forwarded\" | \"from\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"location\" | \"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\" | \"warning\" | \"www-authenticate\", string | string[]> | Record<string, string | string[]> | undefined"
+              "Record<\"from\" | \"date\" | \"origin\" | \"range\" | \"warning\" | \"location\" | \"allow\" | \"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\" | \"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\" | \"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[]> | undefined"
             ],
             "path": "src/core/server/http/router/response.ts",
             "deprecated": false
@@ -3172,7 +3172,7 @@
               "HTTP Headers with additional information about response"
             ],
             "signature": [
-              "Record<\"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\" | \"date\" | \"expect\" | \"expires\" | \"forwarded\" | \"from\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"location\" | \"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\" | \"warning\" | \"www-authenticate\", string | string[]> | Record<string, string | string[]> | undefined"
+              "Record<\"from\" | \"date\" | \"origin\" | \"range\" | \"warning\" | \"location\" | \"allow\" | \"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\" | \"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\" | \"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[]> | undefined"
             ],
             "path": "src/core/server/http/router/response.ts",
             "deprecated": false
@@ -7505,7 +7505,7 @@
               "additional headers to attach to the response"
             ],
             "signature": [
-              "Record<\"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\" | \"date\" | \"expect\" | \"expires\" | \"forwarded\" | \"from\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"location\" | \"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\" | \"warning\" | \"www-authenticate\", string | string[]> | Record<string, string | string[]> | undefined"
+              "Record<\"from\" | \"date\" | \"origin\" | \"range\" | \"warning\" | \"location\" | \"allow\" | \"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\" | \"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\" | \"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[]> | undefined"
             ],
             "path": "src/core/server/http/lifecycle/on_pre_response.ts",
             "deprecated": false
@@ -7560,7 +7560,7 @@
               "additional headers to attach to the response"
             ],
             "signature": [
-              "Record<\"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\" | \"date\" | \"expect\" | \"expires\" | \"forwarded\" | \"from\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"location\" | \"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\" | \"warning\" | \"www-authenticate\", string | string[]> | Record<string, string | string[]> | undefined"
+              "Record<\"from\" | \"date\" | \"origin\" | \"range\" | \"warning\" | \"location\" | \"allow\" | \"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\" | \"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\" | \"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[]> | undefined"
             ],
             "path": "src/core/server/http/lifecycle/on_pre_response.ts",
             "deprecated": false
@@ -9130,7 +9130,7 @@
           "\nSet of HTTP methods changing the state of the server."
         ],
         "signature": [
-          "\"post\" | \"put\" | \"delete\" | \"patch\""
+          "\"delete\" | \"post\" | \"put\" | \"patch\""
         ],
         "path": "src/core/server/http/router/route.ts",
         "deprecated": false,
@@ -9252,7 +9252,7 @@
           "\nHttp request headers to read."
         ],
         "signature": [
-          "{ 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; date?: string | string[] | undefined; expect?: string | string[] | undefined; expires?: string | string[] | undefined; forwarded?: string | string[] | undefined; from?: 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; location?: 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; warning?: string | string[] | undefined; \"www-authenticate\"?: string | string[] | undefined; } & { [header: string]: string | string[] | undefined; }"
+          "{ from?: string | string[] | undefined; date?: string | string[] | undefined; origin?: string | string[] | undefined; range?: string | string[] | undefined; warning?: string | string[] | undefined; location?: string | string[] | undefined; allow?: 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; \"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; 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; }"
         ],
         "path": "src/core/server/http/router/headers.ts",
         "deprecated": false,
@@ -9595,7 +9595,7 @@
           "\nSet of well-known HTTP headers."
         ],
         "signature": [
-          "\"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\" | \"date\" | \"expect\" | \"expires\" | \"forwarded\" | \"from\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"location\" | \"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\" | \"warning\" | \"www-authenticate\""
+          "\"from\" | \"date\" | \"origin\" | \"range\" | \"warning\" | \"location\" | \"allow\" | \"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\" | \"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\" | \"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\""
         ],
         "path": "src/core/server/http/router/headers.ts",
         "deprecated": false,
@@ -11965,7 +11965,7 @@
           "\nHttp response headers to set."
         ],
         "signature": [
-          "Record<\"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\" | \"date\" | \"expect\" | \"expires\" | \"forwarded\" | \"from\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"location\" | \"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\" | \"warning\" | \"www-authenticate\", string | string[]> | Record<string, string | string[]>"
+          "Record<\"from\" | \"date\" | \"origin\" | \"range\" | \"warning\" | \"location\" | \"allow\" | \"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\" | \"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\" | \"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[]>"
         ],
         "path": "src/core/server/http/router/headers.ts",
         "deprecated": false,
@@ -11997,7 +11997,7 @@
           "\nThe set of common HTTP methods supported by Kibana routing."
         ],
         "signature": [
-          "\"get\" | \"options\" | \"post\" | \"put\" | \"delete\" | \"patch\""
+          "\"options\" | \"delete\" | \"get\" | \"post\" | \"put\" | \"patch\""
         ],
         "path": "src/core/server/http/router/route.ts",
         "deprecated": false,
@@ -12638,7 +12638,7 @@
           "\nSet of HTTP methods not changing the state of the server."
         ],
         "signature": [
-          "\"get\" | \"options\""
+          "\"options\" | \"get\""
         ],
         "path": "src/core/server/http/router/route.ts",
         "deprecated": false,
diff --git a/api_docs/core_http.mdx b/api_docs/core_http.mdx
index ae5747c711b97..d0f9967052fba 100644
--- a/api_docs/core_http.mdx
+++ b/api_docs/core_http.mdx
@@ -18,7 +18,7 @@ Contact [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) for que
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 2300 | 27 | 1019 | 29 |
+| 2298 | 27 | 1018 | 29 |
 
 ## Client
 
diff --git a/api_docs/core_saved_objects.json b/api_docs/core_saved_objects.json
index 91af1d2465c3d..9fbd488168085 100644
--- a/api_docs/core_saved_objects.json
+++ b/api_docs/core_saved_objects.json
@@ -847,7 +847,7 @@
                     "section": "def-public.SavedObjectsClient",
                     "text": "SavedObjectsClient"
                   },
-                  ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"bulkUpdate\">"
+                  ", \"create\" | \"bulkCreate\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"bulkUpdate\">"
                 ],
                 "path": "src/core/public/saved_objects/simple_saved_object.ts",
                 "deprecated": false,
@@ -1513,17 +1513,7 @@
               "{@link SavedObjectsClient}"
             ],
             "signature": [
-              "{ get: <T = unknown>(type: string, id: string) => Promise<",
-              {
-                "pluginId": "core",
-                "scope": "public",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-public.SimpleSavedObject",
-                "text": "SimpleSavedObject"
-              },
-              "<T>>; delete: (type: string, id: string, options?: ",
-              "SavedObjectsDeleteOptions",
-              " | undefined) => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+              "{ create: <T = unknown>(type: string, attributes: T, options?: ",
               {
                 "pluginId": "core",
                 "scope": "public",
@@ -1563,7 +1553,9 @@
                 "section": "def-public.SavedObjectsBatchResponse",
                 "text": "SavedObjectsBatchResponse"
               },
-              "<unknown>>; find: <T = unknown, A = unknown>(options: Pick<",
+              "<unknown>>; delete: (type: string, id: string, options?: ",
+              "SavedObjectsDeleteOptions",
+              " | undefined) => Promise<{}>; find: <T = unknown, A = unknown>(options: Pick<",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -1595,7 +1587,15 @@
                 "section": "def-public.ResolvedSimpleSavedObject",
                 "text": "ResolvedSimpleSavedObject"
               },
-              "<T>[]; }>; resolve: <T = unknown>(type: string, id: string) => Promise<",
+              "<T>[]; }>; get: <T = unknown>(type: string, id: string) => Promise<",
+              {
+                "pluginId": "core",
+                "scope": "public",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-public.SimpleSavedObject",
+                "text": "SimpleSavedObject"
+              },
+              "<T>>; resolve: <T = unknown>(type: string, id: string) => Promise<",
               {
                 "pluginId": "core",
                 "scope": "public",
@@ -1719,17 +1719,7 @@
           "\nSavedObjectsClientContract as implemented by the {@link SavedObjectsClient}\n"
         ],
         "signature": [
-          "{ get: <T = unknown>(type: string, id: string) => Promise<",
-          {
-            "pluginId": "core",
-            "scope": "public",
-            "docId": "kibCoreSavedObjectsPluginApi",
-            "section": "def-public.SimpleSavedObject",
-            "text": "SimpleSavedObject"
-          },
-          "<T>>; delete: (type: string, id: string, options?: ",
-          "SavedObjectsDeleteOptions",
-          " | undefined) => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+          "{ create: <T = unknown>(type: string, attributes: T, options?: ",
           {
             "pluginId": "core",
             "scope": "public",
@@ -1769,7 +1759,9 @@
             "section": "def-public.SavedObjectsBatchResponse",
             "text": "SavedObjectsBatchResponse"
           },
-          "<unknown>>; find: <T = unknown, A = unknown>(options: Pick<",
+          "<unknown>>; delete: (type: string, id: string, options?: ",
+          "SavedObjectsDeleteOptions",
+          " | undefined) => Promise<{}>; find: <T = unknown, A = unknown>(options: Pick<",
           {
             "pluginId": "core",
             "scope": "server",
@@ -1801,7 +1793,15 @@
             "section": "def-public.ResolvedSimpleSavedObject",
             "text": "ResolvedSimpleSavedObject"
           },
-          "<T>[]; }>; resolve: <T = unknown>(type: string, id: string) => Promise<",
+          "<T>[]; }>; get: <T = unknown>(type: string, id: string) => Promise<",
+          {
+            "pluginId": "core",
+            "scope": "public",
+            "docId": "kibCoreSavedObjectsPluginApi",
+            "section": "def-public.SimpleSavedObject",
+            "text": "SimpleSavedObject"
+          },
+          "<T>>; resolve: <T = unknown>(type: string, id: string) => Promise<",
           {
             "pluginId": "core",
             "scope": "public",
@@ -4493,25 +4493,7 @@
             "label": "#savedObjectsClient",
             "description": [],
             "signature": [
-              "{ get: <T = unknown>(type: string, id: string, options?: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsBaseOptions",
-                "text": "SavedObjectsBaseOptions"
-              },
-              ") => Promise<",
-              "SavedObject",
-              "<T>>; delete: (type: string, id: string, options?: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsDeleteOptions",
-                "text": "SavedObjectsDeleteOptions"
-              },
-              ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+              "{ create: <T = unknown>(type: string, attributes: T, options?: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -4569,7 +4551,15 @@
                 "section": "def-server.SavedObjectsCheckConflictsResponse",
                 "text": "SavedObjectsCheckConflictsResponse"
               },
-              ">; find: <T = unknown, A = unknown>(options: ",
+              ">; delete: (type: string, id: string, options?: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-server.SavedObjectsDeleteOptions",
+                "text": "SavedObjectsDeleteOptions"
+              },
+              ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -4633,6 +4623,16 @@
                 "section": "def-server.SavedObjectsBulkResolveResponse",
                 "text": "SavedObjectsBulkResolveResponse"
               },
+              "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-server.SavedObjectsBaseOptions",
+                "text": "SavedObjectsBaseOptions"
+              },
+              ") => Promise<",
+              "SavedObject",
               "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
               {
                 "pluginId": "core",
@@ -4927,25 +4927,7 @@
                     "label": "savedObjectsClient",
                     "description": [],
                     "signature": [
-                      "{ get: <T = unknown>(type: string, id: string, options?: ",
-                      {
-                        "pluginId": "core",
-                        "scope": "server",
-                        "docId": "kibCoreSavedObjectsPluginApi",
-                        "section": "def-server.SavedObjectsBaseOptions",
-                        "text": "SavedObjectsBaseOptions"
-                      },
-                      ") => Promise<",
-                      "SavedObject",
-                      "<T>>; delete: (type: string, id: string, options?: ",
-                      {
-                        "pluginId": "core",
-                        "scope": "server",
-                        "docId": "kibCoreSavedObjectsPluginApi",
-                        "section": "def-server.SavedObjectsDeleteOptions",
-                        "text": "SavedObjectsDeleteOptions"
-                      },
-                      ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+                      "{ create: <T = unknown>(type: string, attributes: T, options?: ",
                       {
                         "pluginId": "core",
                         "scope": "server",
@@ -5003,7 +4985,15 @@
                         "section": "def-server.SavedObjectsCheckConflictsResponse",
                         "text": "SavedObjectsCheckConflictsResponse"
                       },
-                      ">; find: <T = unknown, A = unknown>(options: ",
+                      ">; delete: (type: string, id: string, options?: ",
+                      {
+                        "pluginId": "core",
+                        "scope": "server",
+                        "docId": "kibCoreSavedObjectsPluginApi",
+                        "section": "def-server.SavedObjectsDeleteOptions",
+                        "text": "SavedObjectsDeleteOptions"
+                      },
+                      ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
                       {
                         "pluginId": "core",
                         "scope": "server",
@@ -5067,6 +5057,16 @@
                         "section": "def-server.SavedObjectsBulkResolveResponse",
                         "text": "SavedObjectsBulkResolveResponse"
                       },
+                      "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+                      {
+                        "pluginId": "core",
+                        "scope": "server",
+                        "docId": "kibCoreSavedObjectsPluginApi",
+                        "section": "def-server.SavedObjectsBaseOptions",
+                        "text": "SavedObjectsBaseOptions"
+                      },
+                      ") => Promise<",
+                      "SavedObject",
                       "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
                       {
                         "pluginId": "core",
@@ -5709,25 +5709,7 @@
             "label": "#savedObjectsClient",
             "description": [],
             "signature": [
-              "{ get: <T = unknown>(type: string, id: string, options?: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsBaseOptions",
-                "text": "SavedObjectsBaseOptions"
-              },
-              ") => Promise<",
-              "SavedObject",
-              "<T>>; delete: (type: string, id: string, options?: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsDeleteOptions",
-                "text": "SavedObjectsDeleteOptions"
-              },
-              ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+              "{ create: <T = unknown>(type: string, attributes: T, options?: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -5785,7 +5767,15 @@
                 "section": "def-server.SavedObjectsCheckConflictsResponse",
                 "text": "SavedObjectsCheckConflictsResponse"
               },
-              ">; find: <T = unknown, A = unknown>(options: ",
+              ">; delete: (type: string, id: string, options?: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-server.SavedObjectsDeleteOptions",
+                "text": "SavedObjectsDeleteOptions"
+              },
+              ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -5849,6 +5839,16 @@
                 "section": "def-server.SavedObjectsBulkResolveResponse",
                 "text": "SavedObjectsBulkResolveResponse"
               },
+              "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-server.SavedObjectsBaseOptions",
+                "text": "SavedObjectsBaseOptions"
+              },
+              ") => Promise<",
+              "SavedObject",
               "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
               {
                 "pluginId": "core",
@@ -6145,25 +6145,7 @@
                     "label": "savedObjectsClient",
                     "description": [],
                     "signature": [
-                      "{ get: <T = unknown>(type: string, id: string, options?: ",
-                      {
-                        "pluginId": "core",
-                        "scope": "server",
-                        "docId": "kibCoreSavedObjectsPluginApi",
-                        "section": "def-server.SavedObjectsBaseOptions",
-                        "text": "SavedObjectsBaseOptions"
-                      },
-                      ") => Promise<",
-                      "SavedObject",
-                      "<T>>; delete: (type: string, id: string, options?: ",
-                      {
-                        "pluginId": "core",
-                        "scope": "server",
-                        "docId": "kibCoreSavedObjectsPluginApi",
-                        "section": "def-server.SavedObjectsDeleteOptions",
-                        "text": "SavedObjectsDeleteOptions"
-                      },
-                      ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+                      "{ create: <T = unknown>(type: string, attributes: T, options?: ",
                       {
                         "pluginId": "core",
                         "scope": "server",
@@ -6221,7 +6203,15 @@
                         "section": "def-server.SavedObjectsCheckConflictsResponse",
                         "text": "SavedObjectsCheckConflictsResponse"
                       },
-                      ">; find: <T = unknown, A = unknown>(options: ",
+                      ">; delete: (type: string, id: string, options?: ",
+                      {
+                        "pluginId": "core",
+                        "scope": "server",
+                        "docId": "kibCoreSavedObjectsPluginApi",
+                        "section": "def-server.SavedObjectsDeleteOptions",
+                        "text": "SavedObjectsDeleteOptions"
+                      },
+                      ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
                       {
                         "pluginId": "core",
                         "scope": "server",
@@ -6285,6 +6275,16 @@
                         "section": "def-server.SavedObjectsBulkResolveResponse",
                         "text": "SavedObjectsBulkResolveResponse"
                       },
+                      "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+                      {
+                        "pluginId": "core",
+                        "scope": "server",
+                        "docId": "kibCoreSavedObjectsPluginApi",
+                        "section": "def-server.SavedObjectsBaseOptions",
+                        "text": "SavedObjectsBaseOptions"
+                      },
+                      ") => Promise<",
+                      "SavedObject",
                       "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
                       {
                         "pluginId": "core",
@@ -10596,25 +10596,7 @@
             "label": "client",
             "description": [],
             "signature": [
-              "{ get: <T = unknown>(type: string, id: string, options?: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsBaseOptions",
-                "text": "SavedObjectsBaseOptions"
-              },
-              ") => Promise<",
-              "SavedObject",
-              "<T>>; delete: (type: string, id: string, options?: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsDeleteOptions",
-                "text": "SavedObjectsDeleteOptions"
-              },
-              ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+              "{ create: <T = unknown>(type: string, attributes: T, options?: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -10672,7 +10654,15 @@
                 "section": "def-server.SavedObjectsCheckConflictsResponse",
                 "text": "SavedObjectsCheckConflictsResponse"
               },
-              ">; find: <T = unknown, A = unknown>(options: ",
+              ">; delete: (type: string, id: string, options?: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-server.SavedObjectsDeleteOptions",
+                "text": "SavedObjectsDeleteOptions"
+              },
+              ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -10736,6 +10726,16 @@
                 "section": "def-server.SavedObjectsBulkResolveResponse",
                 "text": "SavedObjectsBulkResolveResponse"
               },
+              "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-server.SavedObjectsBaseOptions",
+                "text": "SavedObjectsBaseOptions"
+              },
+              ") => Promise<",
+              "SavedObject",
               "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
               {
                 "pluginId": "core",
@@ -13862,7 +13862,7 @@
                 "section": "def-server.SavedObjectsRepository",
                 "text": "SavedObjectsRepository"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">"
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">"
             ],
             "path": "src/core/server/saved_objects/saved_objects_service.ts",
             "deprecated": false,
@@ -13925,7 +13925,7 @@
                 "section": "def-server.SavedObjectsRepository",
                 "text": "SavedObjectsRepository"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">"
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">"
             ],
             "path": "src/core/server/saved_objects/saved_objects_service.ts",
             "deprecated": false,
@@ -14330,7 +14330,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
             ],
             "path": "src/core/server/saved_objects/saved_objects_service.ts",
             "deprecated": false,
@@ -14406,7 +14406,7 @@
                 "section": "def-server.SavedObjectsRepository",
                 "text": "SavedObjectsRepository"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">"
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">"
             ],
             "path": "src/core/server/saved_objects/saved_objects_service.ts",
             "deprecated": false,
@@ -14471,7 +14471,7 @@
                 "section": "def-server.SavedObjectsRepository",
                 "text": "SavedObjectsRepository"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">"
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">"
             ],
             "path": "src/core/server/saved_objects/saved_objects_service.ts",
             "deprecated": false,
@@ -14537,7 +14537,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => Pick<",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => Pick<",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -14566,7 +14566,7 @@
                     "section": "def-server.SavedObjectsClient",
                     "text": "SavedObjectsClient"
                   },
-                  ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
+                  ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
                 ],
                 "path": "src/core/server/saved_objects/saved_objects_service.ts",
                 "deprecated": false,
@@ -14593,7 +14593,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => Pick<",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => Pick<",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -14622,7 +14622,7 @@
                     "section": "def-server.SavedObjectsClient",
                     "text": "SavedObjectsClient"
                   },
-                  ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
+                  ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
                 ],
                 "path": "src/core/server/saved_objects/saved_objects_service.ts",
                 "deprecated": false,
@@ -15638,25 +15638,7 @@
           "\nSee {@link SavedObjectsRepository}\n"
         ],
         "signature": [
-          "{ get: <T = unknown>(type: string, id: string, options?: ",
-          {
-            "pluginId": "core",
-            "scope": "server",
-            "docId": "kibCoreSavedObjectsPluginApi",
-            "section": "def-server.SavedObjectsBaseOptions",
-            "text": "SavedObjectsBaseOptions"
-          },
-          ") => Promise<",
-          "SavedObject",
-          "<T>>; delete: (type: string, id: string, options?: ",
-          {
-            "pluginId": "core",
-            "scope": "server",
-            "docId": "kibCoreSavedObjectsPluginApi",
-            "section": "def-server.SavedObjectsDeleteOptions",
-            "text": "SavedObjectsDeleteOptions"
-          },
-          ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+          "{ create: <T = unknown>(type: string, attributes: T, options?: ",
           {
             "pluginId": "core",
             "scope": "server",
@@ -15714,7 +15696,15 @@
             "section": "def-server.SavedObjectsCheckConflictsResponse",
             "text": "SavedObjectsCheckConflictsResponse"
           },
-          ">; deleteByNamespace: (namespace: string, options?: ",
+          ">; delete: (type: string, id: string, options?: ",
+          {
+            "pluginId": "core",
+            "scope": "server",
+            "docId": "kibCoreSavedObjectsPluginApi",
+            "section": "def-server.SavedObjectsDeleteOptions",
+            "text": "SavedObjectsDeleteOptions"
+          },
+          ") => Promise<{}>; deleteByNamespace: (namespace: string, options?: ",
           {
             "pluginId": "core",
             "scope": "server",
@@ -15786,6 +15776,16 @@
             "section": "def-server.SavedObjectsBulkResolveResponse",
             "text": "SavedObjectsBulkResolveResponse"
           },
+          "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+          {
+            "pluginId": "core",
+            "scope": "server",
+            "docId": "kibCoreSavedObjectsPluginApi",
+            "section": "def-server.SavedObjectsBaseOptions",
+            "text": "SavedObjectsBaseOptions"
+          },
+          ") => Promise<",
+          "SavedObject",
           "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
           {
             "pluginId": "core",
@@ -16151,25 +16151,7 @@
           "\nSaved Objects is Kibana's data persisentence mechanism allowing plugins to\nuse Elasticsearch for storing plugin state.\n\n## SavedObjectsClient errors\n\nSince the SavedObjectsClient has its hands in everything we\nare a little paranoid about the way we present errors back to\nto application code. Ideally, all errors will be either:\n\n  1. Caused by bad implementation (ie. undefined is not a function) and\n     as such unpredictable\n  2. An error that has been classified and decorated appropriately\n     by the decorators in {@link SavedObjectsErrorHelpers}\n\nType 1 errors are inevitable, but since all expected/handle-able errors\nshould be Type 2 the `isXYZError()` helpers exposed at\n`SavedObjectsErrorHelpers` should be used to understand and manage error\nresponses from the `SavedObjectsClient`.\n\nType 2 errors are decorated versions of the source error, so if\nthe elasticsearch client threw an error it will be decorated based\non its type. That means that rather than looking for `error.body.error.type` or\ndoing substring checks on `error.body.error.reason`, just use the helpers to\nunderstand the meaning of the error:\n\n  ```js\n  if (SavedObjectsErrorHelpers.isNotFoundError(error)) {\n     // handle 404\n  }\n\n  if (SavedObjectsErrorHelpers.isNotAuthorizedError(error)) {\n     // 401 handling should be automatic, but in case you wanted to know\n  }\n\n  // always rethrow the error unless you handle it\n  throw error;\n  ```\n\n### 404s from missing index\n\nFrom the perspective of application code and APIs the SavedObjectsClient is\na black box that persists objects. One of the internal details that users have\nno control over is that we use an elasticsearch index for persistence and that\nindex might be missing.\n\nAt the time of writing we are in the process of transitioning away from the\noperating assumption that the SavedObjects index is always available. Part of\nthis transition is handling errors resulting from an index missing. These used\nto trigger a 500 error in most cases, and in others cause 404s with different\nerror messages.\n\nFrom my (Spencer) perspective, a 404 from the SavedObjectsApi is a 404; The\nobject the request/call was targeting could not be found. This is why #14141\ntakes special care to ensure that 404 errors are generic and don't distinguish\nbetween index missing or document missing.\n\nSee {@link SavedObjectsClient}\nSee {@link SavedObjectsErrorHelpers}\n"
         ],
         "signature": [
-          "{ get: <T = unknown>(type: string, id: string, options?: ",
-          {
-            "pluginId": "core",
-            "scope": "server",
-            "docId": "kibCoreSavedObjectsPluginApi",
-            "section": "def-server.SavedObjectsBaseOptions",
-            "text": "SavedObjectsBaseOptions"
-          },
-          ") => Promise<",
-          "SavedObject",
-          "<T>>; delete: (type: string, id: string, options?: ",
-          {
-            "pluginId": "core",
-            "scope": "server",
-            "docId": "kibCoreSavedObjectsPluginApi",
-            "section": "def-server.SavedObjectsDeleteOptions",
-            "text": "SavedObjectsDeleteOptions"
-          },
-          ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+          "{ create: <T = unknown>(type: string, attributes: T, options?: ",
           {
             "pluginId": "core",
             "scope": "server",
@@ -16227,7 +16209,15 @@
             "section": "def-server.SavedObjectsCheckConflictsResponse",
             "text": "SavedObjectsCheckConflictsResponse"
           },
-          ">; find: <T = unknown, A = unknown>(options: ",
+          ">; delete: (type: string, id: string, options?: ",
+          {
+            "pluginId": "core",
+            "scope": "server",
+            "docId": "kibCoreSavedObjectsPluginApi",
+            "section": "def-server.SavedObjectsDeleteOptions",
+            "text": "SavedObjectsDeleteOptions"
+          },
+          ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
           {
             "pluginId": "core",
             "scope": "server",
@@ -16291,6 +16281,16 @@
             "section": "def-server.SavedObjectsBulkResolveResponse",
             "text": "SavedObjectsBulkResolveResponse"
           },
+          "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+          {
+            "pluginId": "core",
+            "scope": "server",
+            "docId": "kibCoreSavedObjectsPluginApi",
+            "section": "def-server.SavedObjectsBaseOptions",
+            "text": "SavedObjectsBaseOptions"
+          },
+          ") => Promise<",
+          "SavedObject",
           "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
           {
             "pluginId": "core",
@@ -16507,7 +16507,7 @@
             "section": "def-server.SavedObjectsClient",
             "text": "SavedObjectsClient"
           },
-          ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
+          ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
         ],
         "path": "src/core/server/saved_objects/service/lib/scoped_client_provider.ts",
         "deprecated": false,
@@ -16616,7 +16616,7 @@
             "section": "def-server.SavedObjectsClient",
             "text": "SavedObjectsClient"
           },
-          ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
+          ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
         ],
         "path": "src/core/server/saved_objects/service/lib/scoped_client_provider.ts",
         "deprecated": false,
diff --git a/api_docs/core_saved_objects.mdx b/api_docs/core_saved_objects.mdx
index 5fc7bc63466b1..3d2d82e9f1821 100644
--- a/api_docs/core_saved_objects.mdx
+++ b/api_docs/core_saved_objects.mdx
@@ -18,7 +18,7 @@ Contact [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) for que
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 2300 | 27 | 1019 | 29 |
+| 2298 | 27 | 1018 | 29 |
 
 ## Client
 
diff --git a/api_docs/custom_integrations.json b/api_docs/custom_integrations.json
index 7cf82e84cfafc..3a693af2b696a 100644
--- a/api_docs/custom_integrations.json
+++ b/api_docs/custom_integrations.json
@@ -290,7 +290,9 @@
         "type": "Interface",
         "tags": [],
         "label": "CustomIntegration",
-        "description": [],
+        "description": [
+          "\nA definition of a dataintegration, which can be registered with Kibana."
+        ],
         "path": "src/plugins/custom_integrations/common/index.ts",
         "deprecated": false,
         "children": [
@@ -385,7 +387,7 @@
             "label": "categories",
             "description": [],
             "signature": [
-              "(\"custom\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"sample_data\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | \"upload_file\" | \"language_client\" | \"updates_available\")[]"
+              "(\"custom\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | \"upload_file\" | \"language_client\")[]"
             ],
             "path": "src/plugins/custom_integrations/common/index.ts",
             "deprecated": false
@@ -393,10 +395,13 @@
           {
             "parentPluginId": "customIntegrations",
             "id": "def-server.CustomIntegration.shipper",
-            "type": "string",
+            "type": "CompoundType",
             "tags": [],
             "label": "shipper",
             "description": [],
+            "signature": [
+              "\"beats\" | \"language_clients\" | \"other\" | \"sample_data\" | \"tests\" | \"tutorial\""
+            ],
             "path": "src/plugins/custom_integrations/common/index.ts",
             "deprecated": false
           },
@@ -415,42 +420,6 @@
           }
         ],
         "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "customIntegrations",
-        "id": "def-server.IntegrationCategoryCount",
-        "type": "Interface",
-        "tags": [],
-        "label": "IntegrationCategoryCount",
-        "description": [],
-        "path": "src/plugins/custom_integrations/common/index.ts",
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "customIntegrations",
-            "id": "def-server.IntegrationCategoryCount.count",
-            "type": "number",
-            "tags": [],
-            "label": "count",
-            "description": [],
-            "path": "src/plugins/custom_integrations/common/index.ts",
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "customIntegrations",
-            "id": "def-server.IntegrationCategoryCount.id",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "id",
-            "description": [],
-            "signature": [
-              "\"custom\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"sample_data\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | \"upload_file\" | \"language_client\" | \"updates_available\""
-            ],
-            "path": "src/plugins/custom_integrations/common/index.ts",
-            "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
       }
     ],
     "enums": [],
@@ -461,9 +430,11 @@
         "type": "Type",
         "tags": [],
         "label": "IntegrationCategory",
-        "description": [],
+        "description": [
+          "\nA category applicable to an Integration."
+        ],
         "signature": [
-          "\"custom\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"sample_data\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | \"upload_file\" | \"language_client\" | \"updates_available\""
+          "\"custom\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | \"upload_file\" | \"language_client\""
         ],
         "path": "src/plugins/custom_integrations/common/index.ts",
         "deprecated": false,
@@ -578,7 +549,9 @@
         "type": "Interface",
         "tags": [],
         "label": "CustomIntegration",
-        "description": [],
+        "description": [
+          "\nA definition of a dataintegration, which can be registered with Kibana."
+        ],
         "path": "src/plugins/custom_integrations/common/index.ts",
         "deprecated": false,
         "children": [
@@ -673,7 +646,7 @@
             "label": "categories",
             "description": [],
             "signature": [
-              "(\"custom\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"sample_data\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | \"upload_file\" | \"language_client\" | \"updates_available\")[]"
+              "(\"custom\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | \"upload_file\" | \"language_client\")[]"
             ],
             "path": "src/plugins/custom_integrations/common/index.ts",
             "deprecated": false
@@ -681,10 +654,13 @@
           {
             "parentPluginId": "customIntegrations",
             "id": "def-common.CustomIntegration.shipper",
-            "type": "string",
+            "type": "CompoundType",
             "tags": [],
             "label": "shipper",
             "description": [],
+            "signature": [
+              "\"beats\" | \"language_clients\" | \"other\" | \"sample_data\" | \"tests\" | \"tutorial\""
+            ],
             "path": "src/plugins/custom_integrations/common/index.ts",
             "deprecated": false
           },
@@ -710,7 +686,9 @@
         "type": "Interface",
         "tags": [],
         "label": "CustomIntegrationIcon",
-        "description": [],
+        "description": [
+          "\nAn icon representing an Integration."
+        ],
         "path": "src/plugins/custom_integrations/common/index.ts",
         "deprecated": false,
         "children": [
@@ -746,7 +724,9 @@
         "type": "Interface",
         "tags": [],
         "label": "IntegrationCategoryCount",
-        "description": [],
+        "description": [
+          "\nAn object containing the id of an `IntegrationCategory` and the count of all Integrations in that category."
+        ],
         "path": "src/plugins/custom_integrations/common/index.ts",
         "deprecated": false,
         "children": [
@@ -768,7 +748,7 @@
             "label": "id",
             "description": [],
             "signature": [
-              "\"custom\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"sample_data\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | \"upload_file\" | \"language_client\" | \"updates_available\""
+              "\"custom\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | \"upload_file\" | \"language_client\""
             ],
             "path": "src/plugins/custom_integrations/common/index.ts",
             "deprecated": false
@@ -779,15 +759,33 @@
     ],
     "enums": [],
     "misc": [
+      {
+        "parentPluginId": "customIntegrations",
+        "id": "def-common.category",
+        "type": "Array",
+        "tags": [],
+        "label": "category",
+        "description": [
+          "\nThe list of all available categories."
+        ],
+        "signature": [
+          "(\"custom\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | \"upload_file\" | \"language_client\")[]"
+        ],
+        "path": "src/plugins/custom_integrations/common/index.ts",
+        "deprecated": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "customIntegrations",
         "id": "def-common.IntegrationCategory",
         "type": "Type",
         "tags": [],
         "label": "IntegrationCategory",
-        "description": [],
+        "description": [
+          "\nA category applicable to an Integration."
+        ],
         "signature": [
-          "\"custom\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"sample_data\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | \"upload_file\" | \"language_client\" | \"updates_available\""
+          "\"custom\" | \"sample_data\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | \"upload_file\" | \"language_client\""
         ],
         "path": "src/plugins/custom_integrations/common/index.ts",
         "deprecated": false,
@@ -842,6 +840,38 @@
         "path": "src/plugins/custom_integrations/common/index.ts",
         "deprecated": false,
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "customIntegrations",
+        "id": "def-common.shipper",
+        "type": "Array",
+        "tags": [],
+        "label": "shipper",
+        "description": [
+          "\nThe list of all known shippers."
+        ],
+        "signature": [
+          "(\"beats\" | \"language_clients\" | \"other\" | \"sample_data\" | \"tests\" | \"tutorial\")[]"
+        ],
+        "path": "src/plugins/custom_integrations/common/index.ts",
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "customIntegrations",
+        "id": "def-common.Shipper",
+        "type": "Type",
+        "tags": [],
+        "label": "Shipper",
+        "description": [
+          "\nA shipper-- an internal or external system capable of storing data in ES/Kibana-- applicable to an Integration."
+        ],
+        "signature": [
+          "\"beats\" | \"language_clients\" | \"other\" | \"sample_data\" | \"tests\" | \"tutorial\""
+        ],
+        "path": "src/plugins/custom_integrations/common/index.ts",
+        "deprecated": false,
+        "initialIsOpen": false
       }
     ],
     "objects": [
@@ -851,7 +881,9 @@
         "type": "Object",
         "tags": [],
         "label": "INTEGRATION_CATEGORY_DISPLAY",
-        "description": [],
+        "description": [
+          "\nA map of category names and their corresponding titles."
+        ],
         "path": "src/plugins/custom_integrations/common/index.ts",
         "deprecated": false,
         "children": [
@@ -861,9 +893,7 @@
             "type": "string",
             "tags": [],
             "label": "aws",
-            "description": [
-              "// Known EPR"
-            ],
+            "description": [],
             "path": "src/plugins/custom_integrations/common/index.ts",
             "deprecated": false
           },
@@ -1118,16 +1148,79 @@
             "description": [],
             "path": "src/plugins/custom_integrations/common/index.ts",
             "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "customIntegrations",
+        "id": "def-common.SHIPPER_DISPLAY",
+        "type": "Object",
+        "tags": [],
+        "label": "SHIPPER_DISPLAY",
+        "description": [
+          "\nA map of shipper names and their corresponding titles."
+        ],
+        "path": "src/plugins/custom_integrations/common/index.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "customIntegrations",
+            "id": "def-common.SHIPPER_DISPLAY.beats",
+            "type": "string",
+            "tags": [],
+            "label": "beats",
+            "description": [],
+            "path": "src/plugins/custom_integrations/common/index.ts",
+            "deprecated": false
           },
           {
             "parentPluginId": "customIntegrations",
-            "id": "def-common.INTEGRATION_CATEGORY_DISPLAY.updates_available",
+            "id": "def-common.SHIPPER_DISPLAY.language_clients",
             "type": "string",
             "tags": [],
-            "label": "updates_available",
-            "description": [
-              "// Internal"
-            ],
+            "label": "language_clients",
+            "description": [],
+            "path": "src/plugins/custom_integrations/common/index.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "customIntegrations",
+            "id": "def-common.SHIPPER_DISPLAY.other",
+            "type": "string",
+            "tags": [],
+            "label": "other",
+            "description": [],
+            "path": "src/plugins/custom_integrations/common/index.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "customIntegrations",
+            "id": "def-common.SHIPPER_DISPLAY.sample_data",
+            "type": "string",
+            "tags": [],
+            "label": "sample_data",
+            "description": [],
+            "path": "src/plugins/custom_integrations/common/index.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "customIntegrations",
+            "id": "def-common.SHIPPER_DISPLAY.tests",
+            "type": "string",
+            "tags": [],
+            "label": "tests",
+            "description": [],
+            "path": "src/plugins/custom_integrations/common/index.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "customIntegrations",
+            "id": "def-common.SHIPPER_DISPLAY.tutorial",
+            "type": "string",
+            "tags": [],
+            "label": "tutorial",
+            "description": [],
             "path": "src/plugins/custom_integrations/common/index.ts",
             "deprecated": false
           }
diff --git a/api_docs/custom_integrations.mdx b/api_docs/custom_integrations.mdx
index 378d3b16c57fa..a5c470066ad71 100644
--- a/api_docs/custom_integrations.mdx
+++ b/api_docs/custom_integrations.mdx
@@ -18,7 +18,7 @@ Contact [Fleet](https://github.com/orgs/elastic/teams/fleet) for questions regar
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 85 | 1 | 78 | 1 |
+| 91 | 1 | 75 | 1 |
 
 ## Client
 
diff --git a/api_docs/dashboard.json b/api_docs/dashboard.json
index b42846c747bfa..48be2a07d8236 100644
--- a/api_docs/dashboard.json
+++ b/api_docs/dashboard.json
@@ -1560,7 +1560,7 @@
                 "section": "def-common.SearchSource",
                 "text": "SearchSource"
               },
-              "; history: Record<string, any>[]; setPreferredSearchStrategyId: (searchStrategyId: string) => void; setField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
+              "; history: Record<string, any>[]; setPreferredSearchStrategyId: (searchStrategyId: string) => void; setField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -1576,7 +1576,7 @@
                 "section": "def-common.SearchSource",
                 "text": "SearchSource"
               },
-              "; removeField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+              "; removeField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -1608,7 +1608,7 @@
                 "section": "def-common.SearchSourceFields",
                 "text": "SearchSourceFields"
               },
-              "; getField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
+              "; getField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -1616,7 +1616,7 @@
                 "section": "def-common.SearchSourceFields",
                 "text": "SearchSourceFields"
               },
-              "[K]; getOwnField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+              "[K]; getOwnField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -2501,7 +2501,7 @@
             "section": "def-server.SavedObjectsRepository",
             "text": "SavedObjectsRepository"
           },
-          ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">, \"find\">, embeddableType: string) => Promise<{ [key: string]: ",
+          ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">, \"find\">, embeddableType: string) => Promise<{ [key: string]: ",
           {
             "pluginId": "@kbn/utility-types",
             "scope": "server",
@@ -2530,7 +2530,7 @@
                 "section": "def-server.SavedObjectsRepository",
                 "text": "SavedObjectsRepository"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">, \"find\">"
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">, \"find\">"
             ],
             "path": "src/plugins/dashboard/server/usage/find_by_value_embeddables.ts",
             "deprecated": false,
diff --git a/api_docs/data.json b/api_docs/data.json
index ab02b81539cf2..532c629784c38 100644
--- a/api_docs/data.json
+++ b/api_docs/data.json
@@ -248,7 +248,7 @@
                     "section": "def-server.SerializableRecord",
                     "text": "SerializableRecord"
                   },
-                  " | undefined; schema?: string | undefined; }, \"enabled\" | \"id\" | \"schema\" | \"params\"> & Pick<{ type: ",
+                  " | undefined; schema?: string | undefined; }, \"id\" | \"enabled\" | \"schema\" | \"params\"> & Pick<{ type: ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -264,7 +264,7 @@
                     "section": "def-common.IAggType",
                     "text": "IAggType"
                   },
-                  "; }, never>, \"type\" | \"enabled\" | \"id\" | \"schema\" | \"params\">"
+                  "; }, never>, \"type\" | \"id\" | \"enabled\" | \"schema\" | \"params\">"
                 ],
                 "path": "src/plugins/data/common/search/aggs/agg_config.ts",
                 "deprecated": false,
@@ -1315,7 +1315,7 @@
                     "section": "def-server.SerializableRecord",
                     "text": "SerializableRecord"
                   },
-                  " | undefined; schema?: string | undefined; }, \"enabled\" | \"id\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
+                  " | undefined; schema?: string | undefined; }, \"id\" | \"enabled\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -1331,7 +1331,7 @@
                     "section": "def-common.IAggType",
                     "text": "IAggType"
                   },
-                  "; }, never>, \"type\" | \"enabled\" | \"id\" | \"schema\" | \"params\">[]"
+                  "; }, never>, \"type\" | \"id\" | \"enabled\" | \"schema\" | \"params\">[]"
                 ],
                 "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
                 "deprecated": false,
@@ -1560,7 +1560,7 @@
                 "section": "def-server.SerializableRecord",
                 "text": "SerializableRecord"
               },
-              " | undefined; schema?: string | undefined; }, \"enabled\" | \"id\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
+              " | undefined; schema?: string | undefined; }, \"id\" | \"enabled\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -1576,7 +1576,7 @@
                 "section": "def-common.IAggType",
                 "text": "IAggType"
               },
-              "; }, never>, \"type\" | \"enabled\" | \"id\" | \"schema\" | \"params\">, { addToAggConfigs }?: { addToAggConfigs?: boolean | undefined; }) => T"
+              "; }, never>, \"type\" | \"id\" | \"enabled\" | \"schema\" | \"params\">, { addToAggConfigs }?: { addToAggConfigs?: boolean | undefined; }) => T"
             ],
             "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
             "deprecated": false,
@@ -1597,7 +1597,7 @@
                     "section": "def-server.SerializableRecord",
                     "text": "SerializableRecord"
                   },
-                  " | undefined; schema?: string | undefined; }, \"enabled\" | \"id\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
+                  " | undefined; schema?: string | undefined; }, \"id\" | \"enabled\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -1613,7 +1613,7 @@
                     "section": "def-common.IAggType",
                     "text": "IAggType"
                   },
-                  "; }, never>, \"type\" | \"enabled\" | \"id\" | \"schema\" | \"params\">"
+                  "; }, never>, \"type\" | \"id\" | \"enabled\" | \"schema\" | \"params\">"
                 ],
                 "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
                 "deprecated": false,
@@ -2504,7 +2504,7 @@
                     "section": "def-public.PluginInitializerContext",
                     "text": "PluginInitializerContext"
                   },
-                  "<Readonly<{} & { search: Readonly<{} & { aggs: Readonly<{} & { shardDelay: Readonly<{} & { enabled: boolean; }>; }>; }>; autocomplete: Readonly<{} & { querySuggestions: Readonly<{} & { enabled: boolean; }>; valueSuggestions: Readonly<{} & { enabled: boolean; timeout: moment.Duration; tiers: string[]; terminateAfter: moment.Duration; }>; }>; }>>"
+                  "<Readonly<{} & { search: Readonly<{} & { aggs: Readonly<{} & { shardDelay: Readonly<{} & { enabled: boolean; }>; }>; }>; autocomplete: Readonly<{} & { querySuggestions: Readonly<{} & { enabled: boolean; }>; valueSuggestions: Readonly<{} & { timeout: moment.Duration; enabled: boolean; tiers: string[]; terminateAfter: moment.Duration; }>; }>; }>>"
                 ],
                 "path": "src/plugins/data/public/plugin.ts",
                 "deprecated": false,
@@ -3120,18 +3120,6 @@
             "plugin": "observability",
             "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/embeddable/types.ts"
@@ -3304,30 +3292,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/types.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/types.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx"
-          },
           {
             "plugin": "apm",
             "path": "x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/SelectedFilters.tsx"
@@ -3456,14 +3420,6 @@
             "plugin": "transform",
             "path": "x-pack/plugins/transform/common/types/index_pattern.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
           {
             "plugin": "lens",
             "path": "x-pack/plugins/lens/server/routes/existing_fields.test.ts"
@@ -3496,14 +3452,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
           {
             "plugin": "lens",
             "path": "x-pack/plugins/lens/target/types/server/routes/existing_fields.d.ts"
@@ -3636,6 +3584,22 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/components/doc_table/doc_table_wrapper.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.predecessors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.predecessors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.successors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.successors.test.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.test.ts"
@@ -3784,6 +3748,18 @@
             "plugin": "dataViews",
             "path": "src/plugins/data_views/common/fields/data_view_field.test.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
           {
             "plugin": "dataViews",
             "path": "src/plugins/data_views/public/index.ts"
@@ -3970,11 +3946,11 @@
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_state.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_state.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
           },
           {
             "plugin": "discover",
@@ -3982,7 +3958,11 @@
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
           },
           {
             "plugin": "discover",
@@ -4408,250 +4388,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/field_format_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/field_format_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
           {
             "plugin": "apm",
             "path": "x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx"
@@ -4952,22 +4688,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/components/geo_index_pattern_select.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts"
@@ -4980,14 +4700,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/classes/fields/agg/count_agg_field.d.ts"
@@ -5052,14 +4764,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/connected_components/edit_layer_panel/filter_editor/filter_editor.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/components/full_time_range_selector/full_time_range_selector.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/components/full_time_range_selector/full_time_range_selector.d.ts"
-          },
           {
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/target/types/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.d.ts"
@@ -5580,6 +5284,14 @@
             "plugin": "visDefaultEditor",
             "path": "src/plugins/vis_default_editor/target/types/public/components/agg_select.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.test.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/get_sharing_data.test.ts"
@@ -5628,6 +5340,14 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/utils/nested_fields.d.ts"
@@ -7576,7 +7296,7 @@
               "\nsets value to a single search source field"
             ],
             "signature": [
-              "<K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
+              "<K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -7641,7 +7361,7 @@
               "\nremove field"
             ],
             "signature": [
-              "<K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => this"
+              "<K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => this"
             ],
             "path": "src/plugins/data/common/search/search_source/search_source.ts",
             "deprecated": false,
@@ -7766,7 +7486,7 @@
               "\nGets a single field from the fields"
             ],
             "signature": [
-              "<K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
+              "<K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -7820,7 +7540,7 @@
               "\nGet the field from our own fields, don't traverse up the chain"
             ],
             "signature": [
-              "<K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+              "<K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -9284,7 +9004,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".FILTER>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ geo_bounding_box?: ({ type: \"geo_bounding_box\"; } & GeoBox) | ({ type: \"geo_bounding_box\"; } & { top_left: ",
+              ".FILTER>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ geo_bounding_box?: ({ type: \"geo_bounding_box\"; } & GeoBox) | ({ type: \"geo_bounding_box\"; } & { top_left: ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -9380,7 +9100,7 @@
                 "section": "def-common.Query",
                 "text": "Query"
               },
-              "> | undefined; }, never>, \"enabled\" | \"id\" | \"filter\" | \"schema\" | \"geo_bounding_box\" | \"json\" | \"customLabel\" | \"timeShift\">, ",
+              "> | undefined; }, never>, \"id\" | \"filter\" | \"enabled\" | \"schema\" | \"geo_bounding_box\" | \"json\" | \"customLabel\" | \"timeShift\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9436,7 +9156,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".FILTERS>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ filters?: ",
+              ".FILTERS>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ filters?: ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -9468,7 +9188,7 @@
                 "section": "def-common.QueryFilter",
                 "text": "QueryFilter"
               },
-              ">[] | undefined; }, never>, \"enabled\" | \"id\" | \"filters\" | \"schema\" | \"json\" | \"timeShift\">, ",
+              ">[] | undefined; }, never>, \"id\" | \"filters\" | \"enabled\" | \"schema\" | \"json\" | \"timeShift\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9580,7 +9300,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".IP_RANGE>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: (",
+              ".IP_RANGE>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: (",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -9644,7 +9364,7 @@
                 "section": "def-common.IpRange",
                 "text": "IpRange"
               },
-              ">)[] | undefined; ipRangeType?: string | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"ipRangeType\" | \"ranges\">, ",
+              ">)[] | undefined; ipRangeType?: string | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"ipRangeType\" | \"ranges\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9700,7 +9420,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".DATE_RANGE>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"time_zone\"> & Pick<{ ranges?: ",
+              ".DATE_RANGE>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"time_zone\"> & Pick<{ ranges?: ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -9732,7 +9452,7 @@
                 "section": "def-common.DateRange",
                 "text": "DateRange"
               },
-              ">[] | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"ranges\" | \"time_zone\">, ",
+              ">[] | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"ranges\" | \"time_zone\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9788,7 +9508,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".RANGE>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: ",
+              ".RANGE>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -9820,7 +9540,7 @@
                 "section": "def-common.NumericalRange",
                 "text": "NumericalRange"
               },
-              ">[] | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"ranges\">, ",
+              ">[] | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"ranges\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9932,7 +9652,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".GEOHASH_GRID>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\"> & Pick<{ boundingBox?: ({ type: \"geo_bounding_box\"; } & GeoBox) | ({ type: \"geo_bounding_box\"; } & { top_left: ",
+              ".GEOHASH_GRID>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\"> & Pick<{ boundingBox?: ({ type: \"geo_bounding_box\"; } & GeoBox) | ({ type: \"geo_bounding_box\"; } & { top_left: ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -9996,7 +9716,7 @@
                 "section": "def-common.GeoPoint",
                 "text": "GeoPoint"
               },
-              "; }) | ({ type: \"geo_bounding_box\"; } & WellKnownText) | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\" | \"boundingBox\">, ",
+              "; }) | ({ type: \"geo_bounding_box\"; } & WellKnownText) | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\" | \"boundingBox\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -10052,7 +9772,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\"> & Pick<{ extended_bounds?: ",
+              ".HISTOGRAM>, \"interval\" | \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\"> & Pick<{ extended_bounds?: ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -10084,7 +9804,7 @@
                 "section": "def-common.ExtendedBounds",
                 "text": "ExtendedBounds"
               },
-              "> | undefined; }, never>, \"enabled\" | \"interval\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\" | \"extended_bounds\">, ",
+              "> | undefined; }, never>, \"interval\" | \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\" | \"extended_bounds\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -10140,7 +9860,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".DATE_HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\"> & Pick<{ timeRange?: ",
+              ".DATE_HISTOGRAM>, \"interval\" | \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\"> & Pick<{ timeRange?: ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -10204,7 +9924,7 @@
                 "section": "def-common.ExtendedBounds",
                 "text": "ExtendedBounds"
               },
-              "> | undefined; }, never>, \"enabled\" | \"interval\" | \"id\" | \"timeRange\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"extended_bounds\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\">, ",
+              "> | undefined; }, never>, \"interval\" | \"id\" | \"timeRange\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"extended_bounds\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -10260,11 +9980,11 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".TERMS>, \"enabled\" | \"id\" | \"size\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"orderBy\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\"> & Pick<{ orderAgg?: ",
+              ".TERMS>, \"id\" | \"size\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"orderBy\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\"> & Pick<{ orderAgg?: ",
               "AggExpressionType",
               " | undefined; }, \"orderAgg\"> & Pick<{ orderAgg?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"size\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"orderBy\" | \"orderAgg\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\">, ",
+              " | undefined; }, never>, \"id\" | \"size\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"orderBy\" | \"orderAgg\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -10376,7 +10096,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".AVG_BUCKET>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
+              ".AVG_BUCKET>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -10384,7 +10104,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -10440,7 +10160,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MAX_BUCKET>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
+              ".MAX_BUCKET>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -10448,7 +10168,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -10504,7 +10224,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MIN_BUCKET>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
+              ".MIN_BUCKET>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -10512,7 +10232,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -10568,7 +10288,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".SUM_BUCKET>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
+              ".SUM_BUCKET>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -10576,7 +10296,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -10632,7 +10352,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".FILTERED_METRIC>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
+              ".FILTERED_METRIC>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -10640,7 +10360,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -10808,11 +10528,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".CUMULATIVE_SUM>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".CUMULATIVE_SUM>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -10868,11 +10588,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".DERIVATIVE>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".DERIVATIVE>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -11264,11 +10984,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MOVING_FN>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\"> & Pick<{ customMetric?: ",
+              ".MOVING_FN>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -11436,11 +11156,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".SERIAL_DIFF>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".SERIAL_DIFF>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -12387,14 +12107,6 @@
             "plugin": "fleet",
             "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
           {
             "plugin": "infra",
             "path": "x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx"
@@ -12567,34 +12279,6 @@
             "plugin": "stackAlerts",
             "path": "x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
           {
             "plugin": "infra",
             "path": "x-pack/plugins/infra/target/types/public/alerting/common/group_by_expression/group_by_expression.d.ts"
@@ -13137,142 +12821,6 @@
             "plugin": "timelines",
             "path": "x-pack/plugins/timelines/public/container/source/index.tsx"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/inventory_view/components/toolbars/toolbar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/inventory_view/components/toolbars/toolbar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/utils/kuery.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/utils/kuery.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/logs/log_filter/log_filter_state.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/logs/log_filter/log_filter_state.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/with_source/with_source.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/with_source/with_source.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx"
-          },
           {
             "plugin": "monitoring",
             "path": "x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx"
@@ -13517,30 +13065,6 @@
             "plugin": "timelines",
             "path": "x-pack/plugins/timelines/public/mock/index_pattern.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/containers/with_kuery_autocompletion.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/containers/with_kuery_autocompletion.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/containers/with_source/with_source.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/containers/with_source/with_source.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts"
-          },
           {
             "plugin": "monitoring",
             "path": "x-pack/plugins/monitoring/target/types/public/components/kuery_bar/with_kuery_autocompletion.d.ts"
@@ -13585,30 +13109,6 @@
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts"
-          },
           {
             "plugin": "monitoring",
             "path": "x-pack/plugins/monitoring/target/types/public/alerts/components/param_details_form/use_derived_index_pattern.d.ts"
@@ -13657,34 +13157,6 @@
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/target/types/public/ueba/pages/details/types.d.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts"
-          },
           {
             "plugin": "indexPatternManagement",
             "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx"
@@ -13717,70 +13189,6 @@
             "plugin": "indexPatternManagement",
             "path": "src/plugins/index_pattern_management/target/types/public/components/edit_index_pattern/index_header/index_header.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx"
-          },
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts"
@@ -13889,14 +13297,6 @@
             "plugin": "transform",
             "path": "x-pack/plugins/transform/server/routes/api/transforms.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts"
@@ -13904,34 +13304,6 @@
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts"
           }
         ],
         "children": [
@@ -14026,9 +13398,9 @@
             "signature": [
               "Record<string, ",
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
@@ -15223,7 +14595,7 @@
             "section": "def-common.IAggType",
             "text": "IAggType"
           },
-          "; enabled?: boolean | undefined; id?: string | undefined; schema?: string | undefined; params?: {} | ",
+          "; id?: string | undefined; enabled?: boolean | undefined; schema?: string | undefined; params?: {} | ",
           {
             "pluginId": "@kbn/utility-types",
             "scope": "server",
@@ -15404,7 +14776,7 @@
             "section": "def-server.SerializableRecord",
             "text": "SerializableRecord"
           },
-          " | undefined; schema?: string | undefined; }, \"enabled\" | \"id\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
+          " | undefined; schema?: string | undefined; }, \"id\" | \"enabled\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -15420,7 +14792,7 @@
             "section": "def-common.IAggType",
             "text": "IAggType"
           },
-          "; }, never>, \"type\" | \"enabled\" | \"id\" | \"schema\" | \"params\">[] | undefined) => ",
+          "; }, never>, \"type\" | \"id\" | \"enabled\" | \"schema\" | \"params\">[] | undefined) => ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -15492,23 +14864,23 @@
         "label": "DataViewsContract",
         "description": [],
         "signature": [
-          "{ get: (id: string) => Promise<",
+          "{ create: (spec: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataView",
-            "text": "DataView"
+            "section": "def-common.DataViewSpec",
+            "text": "DataViewSpec"
           },
-          ">; delete: (indexPatternId: string) => Promise<{}>; create: (spec: ",
+          ", skipFetchFields?: boolean) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataViewSpec",
-            "text": "DataViewSpec"
+            "section": "def-common.DataView",
+            "text": "DataView"
           },
-          ", skipFetchFields?: boolean) => Promise<",
+          ">; delete: (indexPatternId: string) => Promise<{}>; find: (search: string, size?: number) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -15516,7 +14888,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ">; find: (search: string, size?: number) => Promise<",
+          "[]>; get: (id: string) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -15524,7 +14896,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          "[]>; ensureDefaultDataView: ",
+          ">; ensureDefaultDataView: ",
           "EnsureDefaultDataView",
           "; getIds: (refresh?: boolean) => Promise<string[]>; getTitles: (refresh?: boolean) => Promise<string[]>; getIdsWithTitle: (refresh?: boolean) => Promise<",
           {
@@ -15674,7 +15046,15 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; }"
+          ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; getDefaultDataView: () => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataView",
+            "text": "DataView"
+          },
+          " | undefined>; }"
         ],
         "path": "src/plugins/data_views/common/data_views/data_views.ts",
         "deprecated": false,
@@ -17638,6 +17018,10 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/server/lib/detection_engine/types.ts"
@@ -18191,14 +17575,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
           {
             "plugin": "transform",
             "path": "x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts"
@@ -18227,34 +17603,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/components/sidebar/discover_index_pattern.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts"
-          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx"
@@ -18290,22 +17638,6 @@
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/discover_main_route.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/common/types/kibana.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/common/types/kibana.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/common/types/kibana.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/common/types/kibana.d.ts"
           }
         ],
         "initialIsOpen": false
@@ -18429,23 +17761,23 @@
         "label": "IndexPatternsContract",
         "description": [],
         "signature": [
-          "{ get: (id: string) => Promise<",
+          "{ create: (spec: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataView",
-            "text": "DataView"
+            "section": "def-common.DataViewSpec",
+            "text": "DataViewSpec"
           },
-          ">; delete: (indexPatternId: string) => Promise<{}>; create: (spec: ",
+          ", skipFetchFields?: boolean) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataViewSpec",
-            "text": "DataViewSpec"
+            "section": "def-common.DataView",
+            "text": "DataView"
           },
-          ", skipFetchFields?: boolean) => Promise<",
+          ">; delete: (indexPatternId: string) => Promise<{}>; find: (search: string, size?: number) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -18453,7 +17785,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ">; find: (search: string, size?: number) => Promise<",
+          "[]>; get: (id: string) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -18461,7 +17793,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          "[]>; ensureDefaultDataView: ",
+          ">; ensureDefaultDataView: ",
           "EnsureDefaultDataView",
           "; getIds: (refresh?: boolean) => Promise<string[]>; getTitles: (refresh?: boolean) => Promise<string[]>; getIdsWithTitle: (refresh?: boolean) => Promise<",
           {
@@ -18611,7 +17943,15 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; }"
+          ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; getDefaultDataView: () => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataView",
+            "text": "DataView"
+          },
+          " | undefined>; }"
         ],
         "path": "src/plugins/data_views/common/data_views/data_views.ts",
         "deprecated": true,
@@ -18644,50 +17984,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
           {
             "plugin": "observability",
             "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx"
@@ -18776,22 +18072,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/doc/components/doc.tsx"
           },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
-          },
           {
             "plugin": "visualizations",
             "path": "src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts"
@@ -18864,66 +18144,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/lazy_load_bundle/index.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/dependency_cache.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/dependency_cache.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/routing/resolvers.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/routing/resolvers.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/routing/router.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/routing/router.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
           {
             "plugin": "graph",
             "path": "x-pack/plugins/graph/public/application.ts"
@@ -18988,30 +18208,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/lazy_load_bundle/index.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/routing/router.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/routing/router.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/util/dependency_cache.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/util/dependency_cache.d.ts"
-          },
           {
             "plugin": "security",
             "path": "x-pack/plugins/security/target/types/public/management/roles/edit_role/edit_role_page.d.ts"
@@ -19148,14 +18344,6 @@
             "plugin": "indexPatternManagement",
             "path": "src/plugins/index_pattern_management/target/types/public/components/utils.d.ts"
           },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/_stubs.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/_stubs.ts"
-          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/doc/components/doc.d.ts"
@@ -19163,14 +18351,6 @@
           {
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/doc/components/doc.d.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
           }
         ],
         "initialIsOpen": false
@@ -19361,7 +18541,7 @@
             "section": "def-common.SearchSource",
             "text": "SearchSource"
           },
-          "; history: Record<string, any>[]; setPreferredSearchStrategyId: (searchStrategyId: string) => void; setField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
+          "; history: Record<string, any>[]; setPreferredSearchStrategyId: (searchStrategyId: string) => void; setField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -19377,7 +18557,7 @@
             "section": "def-common.SearchSource",
             "text": "SearchSource"
           },
-          "; removeField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+          "; removeField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -19409,7 +18589,7 @@
             "section": "def-common.SearchSourceFields",
             "text": "SearchSourceFields"
           },
-          "; getField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
+          "; getField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -19417,7 +18597,7 @@
             "section": "def-common.SearchSourceFields",
             "text": "SearchSourceFields"
           },
-          "[K]; getOwnField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+          "[K]; getOwnField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -25388,23 +24568,23 @@
             "\ndata views service\n{@link DataViewsContract}"
           ],
           "signature": [
-            "{ get: (id: string) => Promise<",
+            "{ create: (spec: ",
             {
               "pluginId": "dataViews",
               "scope": "common",
               "docId": "kibDataViewsPluginApi",
-              "section": "def-common.DataView",
-              "text": "DataView"
+              "section": "def-common.DataViewSpec",
+              "text": "DataViewSpec"
             },
-            ">; delete: (indexPatternId: string) => Promise<{}>; create: (spec: ",
+            ", skipFetchFields?: boolean) => Promise<",
             {
               "pluginId": "dataViews",
               "scope": "common",
               "docId": "kibDataViewsPluginApi",
-              "section": "def-common.DataViewSpec",
-              "text": "DataViewSpec"
+              "section": "def-common.DataView",
+              "text": "DataView"
             },
-            ", skipFetchFields?: boolean) => Promise<",
+            ">; delete: (indexPatternId: string) => Promise<{}>; find: (search: string, size?: number) => Promise<",
             {
               "pluginId": "dataViews",
               "scope": "common",
@@ -25412,7 +24592,7 @@
               "section": "def-common.DataView",
               "text": "DataView"
             },
-            ">; find: (search: string, size?: number) => Promise<",
+            "[]>; get: (id: string) => Promise<",
             {
               "pluginId": "dataViews",
               "scope": "common",
@@ -25420,7 +24600,7 @@
               "section": "def-common.DataView",
               "text": "DataView"
             },
-            "[]>; ensureDefaultDataView: ",
+            ">; ensureDefaultDataView: ",
             "EnsureDefaultDataView",
             "; getIds: (refresh?: boolean) => Promise<string[]>; getTitles: (refresh?: boolean) => Promise<string[]>; getIdsWithTitle: (refresh?: boolean) => Promise<",
             {
@@ -25570,7 +24750,15 @@
               "section": "def-common.DataView",
               "text": "DataView"
             },
-            ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; }"
+            ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; getDefaultDataView: () => Promise<",
+            {
+              "pluginId": "dataViews",
+              "scope": "common",
+              "docId": "kibDataViewsPluginApi",
+              "section": "def-common.DataView",
+              "text": "DataView"
+            },
+            " | undefined>; }"
           ],
           "path": "src/plugins/data/public/types.ts",
           "deprecated": false
@@ -25587,23 +24775,23 @@
             "\nindex patterns service\n{@link DataViewsContract}"
           ],
           "signature": [
-            "{ get: (id: string) => Promise<",
+            "{ create: (spec: ",
             {
               "pluginId": "dataViews",
               "scope": "common",
               "docId": "kibDataViewsPluginApi",
-              "section": "def-common.DataView",
-              "text": "DataView"
+              "section": "def-common.DataViewSpec",
+              "text": "DataViewSpec"
             },
-            ">; delete: (indexPatternId: string) => Promise<{}>; create: (spec: ",
+            ", skipFetchFields?: boolean) => Promise<",
             {
               "pluginId": "dataViews",
               "scope": "common",
               "docId": "kibDataViewsPluginApi",
-              "section": "def-common.DataViewSpec",
-              "text": "DataViewSpec"
+              "section": "def-common.DataView",
+              "text": "DataView"
             },
-            ", skipFetchFields?: boolean) => Promise<",
+            ">; delete: (indexPatternId: string) => Promise<{}>; find: (search: string, size?: number) => Promise<",
             {
               "pluginId": "dataViews",
               "scope": "common",
@@ -25611,7 +24799,7 @@
               "section": "def-common.DataView",
               "text": "DataView"
             },
-            ">; find: (search: string, size?: number) => Promise<",
+            "[]>; get: (id: string) => Promise<",
             {
               "pluginId": "dataViews",
               "scope": "common",
@@ -25619,7 +24807,7 @@
               "section": "def-common.DataView",
               "text": "DataView"
             },
-            "[]>; ensureDefaultDataView: ",
+            ">; ensureDefaultDataView: ",
             "EnsureDefaultDataView",
             "; getIds: (refresh?: boolean) => Promise<string[]>; getTitles: (refresh?: boolean) => Promise<string[]>; getIdsWithTitle: (refresh?: boolean) => Promise<",
             {
@@ -25769,7 +24957,15 @@
               "section": "def-common.DataView",
               "text": "DataView"
             },
-            ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; }"
+            ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; getDefaultDataView: () => Promise<",
+            {
+              "pluginId": "dataViews",
+              "scope": "common",
+              "docId": "kibDataViewsPluginApi",
+              "section": "def-common.DataView",
+              "text": "DataView"
+            },
+            " | undefined>; }"
           ],
           "path": "src/plugins/data/public/types.ts",
           "deprecated": true,
@@ -26672,7 +25868,7 @@
                     "section": "def-server.PluginInitializerContext",
                     "text": "PluginInitializerContext"
                   },
-                  "<Readonly<{} & { search: Readonly<{} & { aggs: Readonly<{} & { shardDelay: Readonly<{} & { enabled: boolean; }>; }>; }>; autocomplete: Readonly<{} & { querySuggestions: Readonly<{} & { enabled: boolean; }>; valueSuggestions: Readonly<{} & { enabled: boolean; timeout: moment.Duration; tiers: string[]; terminateAfter: moment.Duration; }>; }>; }>>"
+                  "<Readonly<{} & { search: Readonly<{} & { aggs: Readonly<{} & { shardDelay: Readonly<{} & { enabled: boolean; }>; }>; }>; autocomplete: Readonly<{} & { querySuggestions: Readonly<{} & { enabled: boolean; }>; valueSuggestions: Readonly<{} & { timeout: moment.Duration; enabled: boolean; tiers: string[]; terminateAfter: moment.Duration; }>; }>; }>>"
                 ],
                 "path": "src/plugins/data/server/plugin.ts",
                 "deprecated": false,
@@ -28323,13 +27519,21 @@
             "signature": [
               "(fieldName: string, format: ",
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>>) => void"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              ">) => void"
             ],
             "path": "src/plugins/data_views/common/data_views/data_view.ts",
             "deprecated": false,
@@ -28357,13 +27561,21 @@
                 "description": [],
                 "signature": [
                   {
-                    "pluginId": "expressions",
+                    "pluginId": "fieldFormats",
                     "scope": "common",
-                    "docId": "kibExpressionsPluginApi",
+                    "docId": "kibFieldFormatsPluginApi",
                     "section": "def-common.SerializedFieldFormat",
                     "text": "SerializedFieldFormat"
                   },
-                  "<Record<string, any>>"
+                  "<",
+                  {
+                    "pluginId": "fieldFormats",
+                    "scope": "common",
+                    "docId": "kibFieldFormatsPluginApi",
+                    "section": "def-common.FieldFormatParams",
+                    "text": "FieldFormatParams"
+                  },
+                  ">"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_view.ts",
                 "deprecated": false,
@@ -28786,18 +27998,6 @@
             "plugin": "observability",
             "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/embeddable/types.ts"
@@ -28970,30 +28170,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/types.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/types.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx"
-          },
           {
             "plugin": "apm",
             "path": "x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/SelectedFilters.tsx"
@@ -29122,14 +28298,6 @@
             "plugin": "transform",
             "path": "x-pack/plugins/transform/common/types/index_pattern.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
           {
             "plugin": "lens",
             "path": "x-pack/plugins/lens/server/routes/existing_fields.test.ts"
@@ -29162,14 +28330,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
           {
             "plugin": "lens",
             "path": "x-pack/plugins/lens/target/types/server/routes/existing_fields.d.ts"
@@ -29302,6 +28462,22 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/components/doc_table/doc_table_wrapper.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.predecessors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.predecessors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.successors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.successors.test.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.test.ts"
@@ -29450,6 +28626,18 @@
             "plugin": "dataViews",
             "path": "src/plugins/data_views/common/fields/data_view_field.test.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
           {
             "plugin": "dataViews",
             "path": "src/plugins/data_views/public/index.ts"
@@ -29636,11 +28824,11 @@
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_state.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_state.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
           },
           {
             "plugin": "discover",
@@ -29648,7 +28836,11 @@
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
           },
           {
             "plugin": "discover",
@@ -30074,250 +29266,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/field_format_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/field_format_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
           {
             "plugin": "apm",
             "path": "x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx"
@@ -30618,22 +29566,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/components/geo_index_pattern_select.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts"
@@ -30646,14 +29578,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/classes/fields/agg/count_agg_field.d.ts"
@@ -30718,14 +29642,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/connected_components/edit_layer_panel/filter_editor/filter_editor.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/components/full_time_range_selector/full_time_range_selector.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/components/full_time_range_selector/full_time_range_selector.d.ts"
-          },
           {
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/target/types/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.d.ts"
@@ -31246,6 +30162,14 @@
             "plugin": "visDefaultEditor",
             "path": "src/plugins/vis_default_editor/target/types/public/components/agg_select.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.test.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/get_sharing_data.test.ts"
@@ -31294,6 +30218,14 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/utils/nested_fields.d.ts"
@@ -34123,14 +33055,6 @@
             "plugin": "fleet",
             "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
           {
             "plugin": "infra",
             "path": "x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx"
@@ -34303,34 +33227,6 @@
             "plugin": "stackAlerts",
             "path": "x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
           {
             "plugin": "infra",
             "path": "x-pack/plugins/infra/target/types/public/alerting/common/group_by_expression/group_by_expression.d.ts"
@@ -36660,6 +35556,10 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/server/lib/detection_engine/types.ts"
@@ -37096,14 +35996,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
           {
             "plugin": "transform",
             "path": "x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts"
@@ -37132,34 +36024,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/components/sidebar/discover_index_pattern.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts"
-          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx"
@@ -37195,22 +36059,6 @@
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/discover_main_route.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/common/types/kibana.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/common/types/kibana.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/common/types/kibana.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/common/types/kibana.d.ts"
           }
         ],
         "initialIsOpen": false
@@ -40706,13 +39554,21 @@
             "signature": [
               "(fieldName: string, format: ",
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>>) => void"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              ">) => void"
             ],
             "path": "src/plugins/data_views/common/data_views/data_view.ts",
             "deprecated": false,
@@ -40740,13 +39596,21 @@
                 "description": [],
                 "signature": [
                   {
-                    "pluginId": "expressions",
+                    "pluginId": "fieldFormats",
                     "scope": "common",
-                    "docId": "kibExpressionsPluginApi",
+                    "docId": "kibFieldFormatsPluginApi",
                     "section": "def-common.SerializedFieldFormat",
                     "text": "SerializedFieldFormat"
                   },
-                  "<Record<string, any>>"
+                  "<",
+                  {
+                    "pluginId": "fieldFormats",
+                    "scope": "common",
+                    "docId": "kibFieldFormatsPluginApi",
+                    "section": "def-common.FieldFormatParams",
+                    "text": "FieldFormatParams"
+                  },
+                  ">"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_view.ts",
                 "deprecated": false,
@@ -41478,14 +40342,38 @@
             "parentPluginId": "data",
             "id": "def-common.DataViewsService.ensureDefaultDataView",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "ensureDefaultDataView",
             "description": [],
             "signature": [
               "() => Promise<unknown> | undefined"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
+            "deprecated": true,
+            "references": [
+              {
+                "plugin": "dataViews",
+                "path": "src/plugins/data_views/common/data_views/data_views.ts"
+              },
+              {
+                "plugin": "discover",
+                "path": "src/plugins/discover/public/application/apps/main/discover_main_route.tsx"
+              },
+              {
+                "plugin": "dashboard",
+                "path": "src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.ts"
+              },
+              {
+                "plugin": "lens",
+                "path": "x-pack/plugins/lens/public/plugin.ts"
+              },
+              {
+                "plugin": "visualize",
+                "path": "src/plugins/visualize/public/plugin.ts"
+              }
+            ],
             "returnComment": [],
             "children": []
           },
@@ -42559,6 +41447,33 @@
               }
             ],
             "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.DataViewsService.getDefaultDataView",
+            "type": "Function",
+            "tags": [],
+            "label": "getDefaultDataView",
+            "description": [
+              "\nReturns the default data view as an object. If no default is found, or it is missing\nanother data view is selected as default and returned."
+            ],
+            "signature": [
+              "() => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              " | undefined>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "children": [],
+            "returnComment": [
+              "default data view"
+            ]
           }
         ],
         "initialIsOpen": false
@@ -42997,18 +41912,6 @@
             "plugin": "observability",
             "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/embeddable/types.ts"
@@ -43181,30 +42084,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/types.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/types.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx"
-          },
           {
             "plugin": "apm",
             "path": "x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/SelectedFilters.tsx"
@@ -43333,14 +42212,6 @@
             "plugin": "transform",
             "path": "x-pack/plugins/transform/common/types/index_pattern.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
           {
             "plugin": "lens",
             "path": "x-pack/plugins/lens/server/routes/existing_fields.test.ts"
@@ -43373,14 +42244,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
           {
             "plugin": "lens",
             "path": "x-pack/plugins/lens/target/types/server/routes/existing_fields.d.ts"
@@ -43513,6 +42376,22 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/components/doc_table/doc_table_wrapper.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.predecessors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.predecessors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.successors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.successors.test.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.test.ts"
@@ -43661,6 +42540,18 @@
             "plugin": "dataViews",
             "path": "src/plugins/data_views/common/fields/data_view_field.test.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
           {
             "plugin": "dataViews",
             "path": "src/plugins/data_views/public/index.ts"
@@ -43847,11 +42738,11 @@
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_state.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_state.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
           },
           {
             "plugin": "discover",
@@ -43859,7 +42750,11 @@
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
           },
           {
             "plugin": "discover",
@@ -44285,250 +43180,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/field_format_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/field_format_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
           {
             "plugin": "apm",
             "path": "x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx"
@@ -44829,22 +43480,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/components/geo_index_pattern_select.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts"
@@ -44857,14 +43492,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/classes/fields/agg/count_agg_field.d.ts"
@@ -44929,14 +43556,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/connected_components/edit_layer_panel/filter_editor/filter_editor.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/components/full_time_range_selector/full_time_range_selector.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/components/full_time_range_selector/full_time_range_selector.d.ts"
-          },
           {
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/target/types/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.d.ts"
@@ -45457,6 +44076,14 @@
             "plugin": "visDefaultEditor",
             "path": "src/plugins/vis_default_editor/target/types/public/components/agg_select.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.test.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/get_sharing_data.test.ts"
@@ -45505,6 +44132,14 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/utils/nested_fields.d.ts"
@@ -49402,7 +48037,7 @@
             "section": "def-common.IndexPatternLoadExpressionFunctionDefinition",
             "text": "IndexPatternLoadExpressionFunctionDefinition"
           },
-          ", \"type\" | \"telemetry\" | \"inject\" | \"extract\" | \"migrations\" | \"name\" | \"disabled\" | \"help\" | \"inputTypes\" | \"args\" | \"aliases\" | \"context\">"
+          ", \"telemetry\" | \"inject\" | \"extract\" | \"migrations\" | \"type\" | \"name\" | \"disabled\" | \"help\" | \"inputTypes\" | \"args\" | \"aliases\" | \"context\">"
         ],
         "path": "src/plugins/data_views/common/expressions/load_index_pattern.ts",
         "deprecated": false,
@@ -51306,13 +49941,21 @@
             "signature": [
               "Record<string, ",
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>>> | undefined"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              ">> | undefined"
             ],
             "path": "src/plugins/data_views/common/types.ts",
             "deprecated": false
@@ -51505,13 +50148,21 @@
             "description": [],
             "signature": [
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>> | undefined"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              "> | undefined"
             ],
             "path": "src/plugins/data_views/common/types.ts",
             "deprecated": false
@@ -51809,13 +50460,21 @@
             "description": [],
             "signature": [
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>> | undefined"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              "> | undefined"
             ],
             "path": "src/plugins/data_views/common/types.ts",
             "deprecated": false
@@ -52282,14 +50941,6 @@
             "plugin": "fleet",
             "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
           {
             "plugin": "infra",
             "path": "x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx"
@@ -52462,34 +51113,6 @@
             "plugin": "stackAlerts",
             "path": "x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
           {
             "plugin": "infra",
             "path": "x-pack/plugins/infra/target/types/public/alerting/common/group_by_expression/group_by_expression.d.ts"
@@ -53032,142 +51655,6 @@
             "plugin": "timelines",
             "path": "x-pack/plugins/timelines/public/container/source/index.tsx"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/inventory_view/components/toolbars/toolbar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/inventory_view/components/toolbars/toolbar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/utils/kuery.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/utils/kuery.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/logs/log_filter/log_filter_state.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/logs/log_filter/log_filter_state.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/with_source/with_source.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/with_source/with_source.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx"
-          },
           {
             "plugin": "monitoring",
             "path": "x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx"
@@ -53412,30 +51899,6 @@
             "plugin": "timelines",
             "path": "x-pack/plugins/timelines/public/mock/index_pattern.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/containers/with_kuery_autocompletion.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/containers/with_kuery_autocompletion.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/containers/with_source/with_source.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/containers/with_source/with_source.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts"
-          },
           {
             "plugin": "monitoring",
             "path": "x-pack/plugins/monitoring/target/types/public/components/kuery_bar/with_kuery_autocompletion.d.ts"
@@ -53480,30 +51943,6 @@
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts"
-          },
           {
             "plugin": "monitoring",
             "path": "x-pack/plugins/monitoring/target/types/public/alerts/components/param_details_form/use_derived_index_pattern.d.ts"
@@ -53552,34 +51991,6 @@
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/target/types/public/ueba/pages/details/types.d.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts"
-          },
           {
             "plugin": "indexPatternManagement",
             "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx"
@@ -53612,70 +52023,6 @@
             "plugin": "indexPatternManagement",
             "path": "src/plugins/index_pattern_management/target/types/public/components/edit_index_pattern/index_header/index_header.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx"
-          },
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts"
@@ -53784,14 +52131,6 @@
             "plugin": "transform",
             "path": "x-pack/plugins/transform/server/routes/api/transforms.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts"
@@ -53799,34 +52138,6 @@
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts"
           }
         ],
         "children": [
@@ -53921,9 +52232,9 @@
             "signature": [
               "Record<string, ",
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
@@ -54582,7 +52893,7 @@
             "label": "type",
             "description": [],
             "signature": [
-              "\"boolean\" | \"date\" | \"keyword\" | \"geo_point\" | \"ip\" | \"long\" | \"double\""
+              "\"boolean\" | \"keyword\" | \"date\" | \"geo_point\" | \"ip\" | \"long\" | \"double\""
             ],
             "path": "src/plugins/data_views/common/types.ts",
             "deprecated": false
@@ -55524,23 +53835,23 @@
         "label": "DataViewsContract",
         "description": [],
         "signature": [
-          "{ get: (id: string) => Promise<",
+          "{ create: (spec: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataView",
-            "text": "DataView"
+            "section": "def-common.DataViewSpec",
+            "text": "DataViewSpec"
           },
-          ">; delete: (indexPatternId: string) => Promise<{}>; create: (spec: ",
+          ", skipFetchFields?: boolean) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataViewSpec",
-            "text": "DataViewSpec"
+            "section": "def-common.DataView",
+            "text": "DataView"
           },
-          ", skipFetchFields?: boolean) => Promise<",
+          ">; delete: (indexPatternId: string) => Promise<{}>; find: (search: string, size?: number) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -55548,7 +53859,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ">; find: (search: string, size?: number) => Promise<",
+          "[]>; get: (id: string) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -55556,7 +53867,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          "[]>; ensureDefaultDataView: ",
+          ">; ensureDefaultDataView: ",
           "EnsureDefaultDataView",
           "; getIds: (refresh?: boolean) => Promise<string[]>; getTitles: (refresh?: boolean) => Promise<string[]>; getIdsWithTitle: (refresh?: boolean) => Promise<",
           {
@@ -55706,7 +54017,15 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; }"
+          ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; getDefaultDataView: () => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataView",
+            "text": "DataView"
+          },
+          " | undefined>; }"
         ],
         "path": "src/plugins/data_views/common/data_views/data_views.ts",
         "deprecated": false,
@@ -55820,13 +54139,21 @@
         "signature": [
           "{ [x: string]: ",
           {
-            "pluginId": "expressions",
+            "pluginId": "fieldFormats",
             "scope": "common",
-            "docId": "kibExpressionsPluginApi",
+            "docId": "kibFieldFormatsPluginApi",
             "section": "def-common.SerializedFieldFormat",
             "text": "SerializedFieldFormat"
           },
-          "<Record<string, any>>; }"
+          "<",
+          {
+            "pluginId": "fieldFormats",
+            "scope": "common",
+            "docId": "kibFieldFormatsPluginApi",
+            "section": "def-common.FieldFormatParams",
+            "text": "FieldFormatParams"
+          },
+          ">; }"
         ],
         "path": "src/plugins/data_views/common/types.ts",
         "deprecated": false,
@@ -57434,6 +55761,10 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/server/lib/detection_engine/types.ts"
@@ -58021,14 +56352,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
           {
             "plugin": "transform",
             "path": "x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts"
@@ -58057,34 +56380,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/components/sidebar/discover_index_pattern.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts"
-          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx"
@@ -58120,22 +56415,6 @@
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/discover_main_route.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/common/types/kibana.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/common/types/kibana.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/common/types/kibana.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/common/types/kibana.d.ts"
           }
         ],
         "initialIsOpen": false
@@ -58289,23 +56568,23 @@
         "label": "IndexPatternsContract",
         "description": [],
         "signature": [
-          "{ get: (id: string) => Promise<",
+          "{ create: (spec: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataView",
-            "text": "DataView"
+            "section": "def-common.DataViewSpec",
+            "text": "DataViewSpec"
           },
-          ">; delete: (indexPatternId: string) => Promise<{}>; create: (spec: ",
+          ", skipFetchFields?: boolean) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataViewSpec",
-            "text": "DataViewSpec"
+            "section": "def-common.DataView",
+            "text": "DataView"
           },
-          ", skipFetchFields?: boolean) => Promise<",
+          ">; delete: (indexPatternId: string) => Promise<{}>; find: (search: string, size?: number) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -58313,7 +56592,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ">; find: (search: string, size?: number) => Promise<",
+          "[]>; get: (id: string) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -58321,7 +56600,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          "[]>; ensureDefaultDataView: ",
+          ">; ensureDefaultDataView: ",
           "EnsureDefaultDataView",
           "; getIds: (refresh?: boolean) => Promise<string[]>; getTitles: (refresh?: boolean) => Promise<string[]>; getIdsWithTitle: (refresh?: boolean) => Promise<",
           {
@@ -58471,7 +56750,15 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; }"
+          ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; getDefaultDataView: () => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataView",
+            "text": "DataView"
+          },
+          " | undefined>; }"
         ],
         "path": "src/plugins/data_views/common/data_views/data_views.ts",
         "deprecated": true,
@@ -58504,50 +56791,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
           {
             "plugin": "observability",
             "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx"
@@ -58636,22 +56879,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/doc/components/doc.tsx"
           },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
-          },
           {
             "plugin": "visualizations",
             "path": "src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts"
@@ -58724,66 +56951,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/lazy_load_bundle/index.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/dependency_cache.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/dependency_cache.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/routing/resolvers.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/routing/resolvers.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/routing/router.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/routing/router.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
           {
             "plugin": "graph",
             "path": "x-pack/plugins/graph/public/application.ts"
@@ -58848,30 +57015,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/lazy_load_bundle/index.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/routing/router.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/routing/router.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/util/dependency_cache.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/util/dependency_cache.d.ts"
-          },
           {
             "plugin": "security",
             "path": "x-pack/plugins/security/target/types/public/management/roles/edit_role/edit_role_page.d.ts"
@@ -59008,14 +57151,6 @@
             "plugin": "indexPatternManagement",
             "path": "src/plugins/index_pattern_management/target/types/public/components/utils.d.ts"
           },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/_stubs.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/_stubs.ts"
-          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/doc/components/doc.d.ts"
@@ -59023,14 +57158,6 @@
           {
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/doc/components/doc.d.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
           }
         ],
         "initialIsOpen": false
@@ -59702,7 +57829,7 @@
         "label": "RuntimeType",
         "description": [],
         "signature": [
-          "\"boolean\" | \"date\" | \"keyword\" | \"geo_point\" | \"ip\" | \"long\" | \"double\""
+          "\"boolean\" | \"keyword\" | \"date\" | \"geo_point\" | \"ip\" | \"long\" | \"double\""
         ],
         "path": "src/plugins/data_views/common/types.ts",
         "deprecated": false,
diff --git a/api_docs/data.mdx b/api_docs/data.mdx
index 0734f19d6c3eb..597810c06e8f4 100644
--- a/api_docs/data.mdx
+++ b/api_docs/data.mdx
@@ -18,7 +18,7 @@ Contact [App Services](https://github.com/orgs/elastic/teams/kibana-app-services
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 3192 | 43 | 2807 | 48 |
+| 3193 | 43 | 2807 | 48 |
 
 ## Client
 
diff --git a/api_docs/data_autocomplete.mdx b/api_docs/data_autocomplete.mdx
index 1eef9ef1c6932..022bb799670da 100644
--- a/api_docs/data_autocomplete.mdx
+++ b/api_docs/data_autocomplete.mdx
@@ -18,7 +18,7 @@ Contact [App Services](https://github.com/orgs/elastic/teams/kibana-app-services
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 3192 | 43 | 2807 | 48 |
+| 3193 | 43 | 2807 | 48 |
 
 ## Client
 
diff --git a/api_docs/data_query.json b/api_docs/data_query.json
index e711d7c5bbb76..858e25ebb2b09 100644
--- a/api_docs/data_query.json
+++ b/api_docs/data_query.json
@@ -1167,7 +1167,7 @@
             "section": "def-public.SavedObjectsClient",
             "text": "SavedObjectsClient"
           },
-          ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"bulkUpdate\">) => ",
+          ", \"create\" | \"bulkCreate\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"bulkUpdate\">) => ",
           {
             "pluginId": "data",
             "scope": "public",
@@ -1195,7 +1195,7 @@
                 "section": "def-public.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"bulkUpdate\">"
+              ", \"create\" | \"bulkCreate\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"bulkUpdate\">"
             ],
             "path": "src/plugins/data/public/query/saved_query/saved_query_service.ts",
             "deprecated": false,
diff --git a/api_docs/data_query.mdx b/api_docs/data_query.mdx
index bb88e5868b605..e83e8043e970d 100644
--- a/api_docs/data_query.mdx
+++ b/api_docs/data_query.mdx
@@ -18,7 +18,7 @@ Contact [App Services](https://github.com/orgs/elastic/teams/kibana-app-services
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 3192 | 43 | 2807 | 48 |
+| 3193 | 43 | 2807 | 48 |
 
 ## Client
 
diff --git a/api_docs/data_search.json b/api_docs/data_search.json
index 25ed62f473bd3..01cfaaa5d781b 100644
--- a/api_docs/data_search.json
+++ b/api_docs/data_search.json
@@ -217,11 +217,9 @@
               "\nSearch sessions SO CRUD\n{@link ISessionsClient}"
             ],
             "signature": [
-              "{ get: (sessionId: string) => Promise<",
+              "{ create: ({ name, appId, urlGeneratorId, initialState, restoreState, sessionId, }: { name: string; appId: string; initialState: Record<string, unknown>; restoreState: Record<string, unknown>; urlGeneratorId: string; sessionId: string; }) => Promise<",
               "SearchSessionSavedObject",
-              ">; delete: (sessionId: string) => Promise<void>; create: ({ name, appId, urlGeneratorId, initialState, restoreState, sessionId, }: { name: string; appId: string; initialState: Record<string, unknown>; restoreState: Record<string, unknown>; urlGeneratorId: string; sessionId: string; }) => Promise<",
-              "SearchSessionSavedObject",
-              ">; find: (options: Pick<",
+              ">; delete: (sessionId: string) => Promise<void>; find: (options: Pick<",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -237,7 +235,9 @@
                 "section": "def-server.SavedObjectsFindResponse",
                 "text": "SavedObjectsFindResponse"
               },
-              "<unknown, unknown>>; update: (sessionId: string, attributes: unknown) => Promise<",
+              "<unknown, unknown>>; get: (sessionId: string) => Promise<",
+              "SearchSessionSavedObject",
+              ">; update: (sessionId: string, attributes: unknown) => Promise<",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -379,7 +379,7 @@
                 "section": "def-server.SerializableRecord",
                 "text": "SerializableRecord"
               },
-              " | undefined; schema?: string | undefined; }, \"enabled\" | \"id\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
+              " | undefined; schema?: string | undefined; }, \"id\" | \"enabled\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -395,7 +395,7 @@
                 "section": "def-common.IAggType",
                 "text": "IAggType"
               },
-              "; }, never>, \"type\" | \"enabled\" | \"id\" | \"schema\" | \"params\">[] | undefined) => ",
+              "; }, never>, \"type\" | \"id\" | \"enabled\" | \"schema\" | \"params\">[] | undefined) => ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -617,11 +617,9 @@
               "\nSearch sessions SO CRUD\n{@link ISessionsClient}"
             ],
             "signature": [
-              "{ get: (sessionId: string) => Promise<",
+              "{ create: ({ name, appId, urlGeneratorId, initialState, restoreState, sessionId, }: { name: string; appId: string; initialState: Record<string, unknown>; restoreState: Record<string, unknown>; urlGeneratorId: string; sessionId: string; }) => Promise<",
               "SearchSessionSavedObject",
-              ">; delete: (sessionId: string) => Promise<void>; create: ({ name, appId, urlGeneratorId, initialState, restoreState, sessionId, }: { name: string; appId: string; initialState: Record<string, unknown>; restoreState: Record<string, unknown>; urlGeneratorId: string; sessionId: string; }) => Promise<",
-              "SearchSessionSavedObject",
-              ">; find: (options: Pick<",
+              ">; delete: (sessionId: string) => Promise<void>; find: (options: Pick<",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -637,7 +635,9 @@
                 "section": "def-server.SavedObjectsFindResponse",
                 "text": "SavedObjectsFindResponse"
               },
-              "<unknown, unknown>>; update: (sessionId: string, attributes: unknown) => Promise<",
+              "<unknown, unknown>>; get: (sessionId: string) => Promise<",
+              "SearchSessionSavedObject",
+              ">; update: (sessionId: string, attributes: unknown) => Promise<",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -957,11 +957,9 @@
         "label": "ISessionsClient",
         "description": [],
         "signature": [
-          "{ get: (sessionId: string) => Promise<",
+          "{ create: ({ name, appId, urlGeneratorId, initialState, restoreState, sessionId, }: { name: string; appId: string; initialState: Record<string, unknown>; restoreState: Record<string, unknown>; urlGeneratorId: string; sessionId: string; }) => Promise<",
           "SearchSessionSavedObject",
-          ">; delete: (sessionId: string) => Promise<void>; create: ({ name, appId, urlGeneratorId, initialState, restoreState, sessionId, }: { name: string; appId: string; initialState: Record<string, unknown>; restoreState: Record<string, unknown>; urlGeneratorId: string; sessionId: string; }) => Promise<",
-          "SearchSessionSavedObject",
-          ">; find: (options: Pick<",
+          ">; delete: (sessionId: string) => Promise<void>; find: (options: Pick<",
           {
             "pluginId": "core",
             "scope": "server",
@@ -977,7 +975,9 @@
             "section": "def-server.SavedObjectsFindResponse",
             "text": "SavedObjectsFindResponse"
           },
-          "<unknown, unknown>>; update: (sessionId: string, attributes: unknown) => Promise<",
+          "<unknown, unknown>>; get: (sessionId: string) => Promise<",
+          "SearchSessionSavedObject",
+          ">; update: (sessionId: string, attributes: unknown) => Promise<",
           {
             "pluginId": "core",
             "scope": "server",
@@ -1921,25 +1921,7 @@
             "label": "savedObjectsClient",
             "description": [],
             "signature": [
-              "{ get: <T = unknown>(type: string, id: string, options?: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsBaseOptions",
-                "text": "SavedObjectsBaseOptions"
-              },
-              ") => Promise<",
-              "SavedObject",
-              "<T>>; delete: (type: string, id: string, options?: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsDeleteOptions",
-                "text": "SavedObjectsDeleteOptions"
-              },
-              ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+              "{ create: <T = unknown>(type: string, attributes: T, options?: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -1997,7 +1979,15 @@
                 "section": "def-server.SavedObjectsCheckConflictsResponse",
                 "text": "SavedObjectsCheckConflictsResponse"
               },
-              ">; find: <T = unknown, A = unknown>(options: ",
+              ">; delete: (type: string, id: string, options?: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-server.SavedObjectsDeleteOptions",
+                "text": "SavedObjectsDeleteOptions"
+              },
+              ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -2061,6 +2051,16 @@
                 "section": "def-server.SavedObjectsBulkResolveResponse",
                 "text": "SavedObjectsBulkResolveResponse"
               },
+              "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-server.SavedObjectsBaseOptions",
+                "text": "SavedObjectsBaseOptions"
+              },
+              ") => Promise<",
+              "SavedObject",
               "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
               {
                 "pluginId": "core",
@@ -2593,7 +2593,7 @@
                     "section": "def-server.SerializableRecord",
                     "text": "SerializableRecord"
                   },
-                  " | undefined; schema?: string | undefined; }, \"enabled\" | \"id\" | \"schema\" | \"params\"> & Pick<{ type: ",
+                  " | undefined; schema?: string | undefined; }, \"id\" | \"enabled\" | \"schema\" | \"params\"> & Pick<{ type: ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -2609,7 +2609,7 @@
                     "section": "def-common.IAggType",
                     "text": "IAggType"
                   },
-                  "; }, never>, \"type\" | \"enabled\" | \"id\" | \"schema\" | \"params\">"
+                  "; }, never>, \"type\" | \"id\" | \"enabled\" | \"schema\" | \"params\">"
                 ],
                 "path": "src/plugins/data/common/search/aggs/agg_config.ts",
                 "deprecated": false,
@@ -3660,7 +3660,7 @@
                     "section": "def-server.SerializableRecord",
                     "text": "SerializableRecord"
                   },
-                  " | undefined; schema?: string | undefined; }, \"enabled\" | \"id\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
+                  " | undefined; schema?: string | undefined; }, \"id\" | \"enabled\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -3676,7 +3676,7 @@
                     "section": "def-common.IAggType",
                     "text": "IAggType"
                   },
-                  "; }, never>, \"type\" | \"enabled\" | \"id\" | \"schema\" | \"params\">[]"
+                  "; }, never>, \"type\" | \"id\" | \"enabled\" | \"schema\" | \"params\">[]"
                 ],
                 "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
                 "deprecated": false,
@@ -3905,7 +3905,7 @@
                 "section": "def-server.SerializableRecord",
                 "text": "SerializableRecord"
               },
-              " | undefined; schema?: string | undefined; }, \"enabled\" | \"id\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
+              " | undefined; schema?: string | undefined; }, \"id\" | \"enabled\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -3921,7 +3921,7 @@
                 "section": "def-common.IAggType",
                 "text": "IAggType"
               },
-              "; }, never>, \"type\" | \"enabled\" | \"id\" | \"schema\" | \"params\">, { addToAggConfigs }?: { addToAggConfigs?: boolean | undefined; }) => T"
+              "; }, never>, \"type\" | \"id\" | \"enabled\" | \"schema\" | \"params\">, { addToAggConfigs }?: { addToAggConfigs?: boolean | undefined; }) => T"
             ],
             "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
             "deprecated": false,
@@ -3942,7 +3942,7 @@
                     "section": "def-server.SerializableRecord",
                     "text": "SerializableRecord"
                   },
-                  " | undefined; schema?: string | undefined; }, \"enabled\" | \"id\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
+                  " | undefined; schema?: string | undefined; }, \"id\" | \"enabled\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -3958,7 +3958,7 @@
                     "section": "def-common.IAggType",
                     "text": "IAggType"
                   },
-                  "; }, never>, \"type\" | \"enabled\" | \"id\" | \"schema\" | \"params\">"
+                  "; }, never>, \"type\" | \"id\" | \"enabled\" | \"schema\" | \"params\">"
                 ],
                 "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
                 "deprecated": false,
@@ -4967,7 +4967,7 @@
               "\nThe type the values produced by this agg will have in the final data table.\nIf not specified, the type of the field is used."
             ],
             "signature": [
-              "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"nested\" | \"histogram\" | \"null\" | undefined"
+              "\"string\" | \"number\" | \"boolean\" | \"object\" | \"_source\" | \"attachment\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"nested\" | \"histogram\" | \"null\" | undefined"
             ],
             "path": "src/plugins/data/common/search/aggs/agg_type.ts",
             "deprecated": false
@@ -5289,7 +5289,7 @@
                     "section": "def-common.SearchSource",
                     "text": "SearchSource"
                   },
-                  "; history: Record<string, any>[]; setPreferredSearchStrategyId: (searchStrategyId: string) => void; setField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
+                  "; history: Record<string, any>[]; setPreferredSearchStrategyId: (searchStrategyId: string) => void; setField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -5305,7 +5305,7 @@
                     "section": "def-common.SearchSource",
                     "text": "SearchSource"
                   },
-                  "; removeField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+                  "; removeField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -5337,7 +5337,7 @@
                     "section": "def-common.SearchSourceFields",
                     "text": "SearchSourceFields"
                   },
-                  "; getField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
+                  "; getField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -5345,7 +5345,7 @@
                     "section": "def-common.SearchSourceFields",
                     "text": "SearchSourceFields"
                   },
-                  "[K]; getOwnField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+                  "[K]; getOwnField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -5528,13 +5528,21 @@
             "signature": [
               "(agg: TAggConfig) => ",
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>>"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              ">"
             ],
             "path": "src/plugins/data/common/search/aggs/agg_type.ts",
             "deprecated": false,
@@ -7556,7 +7564,7 @@
               "\nsets value to a single search source field"
             ],
             "signature": [
-              "<K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
+              "<K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -7621,7 +7629,7 @@
               "\nremove field"
             ],
             "signature": [
-              "<K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => this"
+              "<K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => this"
             ],
             "path": "src/plugins/data/common/search/search_source/search_source.ts",
             "deprecated": false,
@@ -7746,7 +7754,7 @@
               "\nGets a single field from the fields"
             ],
             "signature": [
-              "<K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
+              "<K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -7800,7 +7808,7 @@
               "\nGet the field from our own fields, don't traverse up the chain"
             ],
             "signature": [
-              "<K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+              "<K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -8381,7 +8389,7 @@
                 "section": "def-common.DataViewsService",
                 "text": "DataViewsService"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"find\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\">, dependencies: ",
+              ", \"create\" | \"delete\" | \"find\" | \"get\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\" | \"getDefaultDataView\">, dependencies: ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -8434,7 +8442,7 @@
                     "section": "def-common.DataViewsService",
                     "text": "DataViewsService"
                   },
-                  ", \"get\" | \"delete\" | \"create\" | \"find\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\">"
+                  ", \"create\" | \"delete\" | \"find\" | \"get\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\" | \"getDefaultDataView\">"
                 ],
                 "path": "src/plugins/data/common/search/search_source/search_source_service.ts",
                 "deprecated": false,
@@ -9388,7 +9396,7 @@
             "section": "def-common.DataViewsService",
             "text": "DataViewsService"
           },
-          ", \"get\" | \"delete\" | \"create\" | \"find\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\">, searchSourceDependencies: ",
+          ", \"create\" | \"delete\" | \"find\" | \"get\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\" | \"getDefaultDataView\">, searchSourceDependencies: ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -9435,7 +9443,7 @@
                 "section": "def-common.DataViewsService",
                 "text": "DataViewsService"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"find\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\">"
+              ", \"create\" | \"delete\" | \"find\" | \"get\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\" | \"getDefaultDataView\">"
             ],
             "path": "src/plugins/data/common/search/search_source/create_search_source.ts",
             "deprecated": false,
@@ -13382,7 +13390,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".FILTER>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ geo_bounding_box?: ({ type: \"geo_bounding_box\"; } & GeoBox) | ({ type: \"geo_bounding_box\"; } & { top_left: ",
+              ".FILTER>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ geo_bounding_box?: ({ type: \"geo_bounding_box\"; } & GeoBox) | ({ type: \"geo_bounding_box\"; } & { top_left: ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -13478,7 +13486,7 @@
                 "section": "def-common.Query",
                 "text": "Query"
               },
-              "> | undefined; }, never>, \"enabled\" | \"id\" | \"filter\" | \"schema\" | \"geo_bounding_box\" | \"json\" | \"customLabel\" | \"timeShift\">, ",
+              "> | undefined; }, never>, \"id\" | \"filter\" | \"enabled\" | \"schema\" | \"geo_bounding_box\" | \"json\" | \"customLabel\" | \"timeShift\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -13534,7 +13542,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".FILTERS>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ filters?: ",
+              ".FILTERS>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ filters?: ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -13566,7 +13574,7 @@
                 "section": "def-common.QueryFilter",
                 "text": "QueryFilter"
               },
-              ">[] | undefined; }, never>, \"enabled\" | \"id\" | \"filters\" | \"schema\" | \"json\" | \"timeShift\">, ",
+              ">[] | undefined; }, never>, \"id\" | \"filters\" | \"enabled\" | \"schema\" | \"json\" | \"timeShift\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -13678,7 +13686,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".IP_RANGE>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: (",
+              ".IP_RANGE>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: (",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -13742,7 +13750,7 @@
                 "section": "def-common.IpRange",
                 "text": "IpRange"
               },
-              ">)[] | undefined; ipRangeType?: string | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"ipRangeType\" | \"ranges\">, ",
+              ">)[] | undefined; ipRangeType?: string | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"ipRangeType\" | \"ranges\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -13798,7 +13806,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".DATE_RANGE>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"time_zone\"> & Pick<{ ranges?: ",
+              ".DATE_RANGE>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"time_zone\"> & Pick<{ ranges?: ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -13830,7 +13838,7 @@
                 "section": "def-common.DateRange",
                 "text": "DateRange"
               },
-              ">[] | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"ranges\" | \"time_zone\">, ",
+              ">[] | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"ranges\" | \"time_zone\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -13886,7 +13894,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".RANGE>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: ",
+              ".RANGE>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -13918,7 +13926,7 @@
                 "section": "def-common.NumericalRange",
                 "text": "NumericalRange"
               },
-              ">[] | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"ranges\">, ",
+              ">[] | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"ranges\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -14030,7 +14038,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".GEOHASH_GRID>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\"> & Pick<{ boundingBox?: ({ type: \"geo_bounding_box\"; } & GeoBox) | ({ type: \"geo_bounding_box\"; } & { top_left: ",
+              ".GEOHASH_GRID>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\"> & Pick<{ boundingBox?: ({ type: \"geo_bounding_box\"; } & GeoBox) | ({ type: \"geo_bounding_box\"; } & { top_left: ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -14094,7 +14102,7 @@
                 "section": "def-common.GeoPoint",
                 "text": "GeoPoint"
               },
-              "; }) | ({ type: \"geo_bounding_box\"; } & WellKnownText) | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\" | \"boundingBox\">, ",
+              "; }) | ({ type: \"geo_bounding_box\"; } & WellKnownText) | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\" | \"boundingBox\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -14150,7 +14158,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\"> & Pick<{ extended_bounds?: ",
+              ".HISTOGRAM>, \"interval\" | \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\"> & Pick<{ extended_bounds?: ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -14182,7 +14190,7 @@
                 "section": "def-common.ExtendedBounds",
                 "text": "ExtendedBounds"
               },
-              "> | undefined; }, never>, \"enabled\" | \"interval\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\" | \"extended_bounds\">, ",
+              "> | undefined; }, never>, \"interval\" | \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\" | \"extended_bounds\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -14238,7 +14246,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".DATE_HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\"> & Pick<{ timeRange?: ",
+              ".DATE_HISTOGRAM>, \"interval\" | \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\"> & Pick<{ timeRange?: ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -14302,7 +14310,7 @@
                 "section": "def-common.ExtendedBounds",
                 "text": "ExtendedBounds"
               },
-              "> | undefined; }, never>, \"enabled\" | \"interval\" | \"id\" | \"timeRange\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"extended_bounds\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\">, ",
+              "> | undefined; }, never>, \"interval\" | \"id\" | \"timeRange\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"extended_bounds\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -14358,11 +14366,11 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".TERMS>, \"enabled\" | \"id\" | \"size\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"orderBy\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\"> & Pick<{ orderAgg?: ",
+              ".TERMS>, \"id\" | \"size\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"orderBy\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\"> & Pick<{ orderAgg?: ",
               "AggExpressionType",
               " | undefined; }, \"orderAgg\"> & Pick<{ orderAgg?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"size\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"orderBy\" | \"orderAgg\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\">, ",
+              " | undefined; }, never>, \"id\" | \"size\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"field\" | \"orderBy\" | \"orderAgg\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -14474,7 +14482,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".AVG_BUCKET>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
+              ".AVG_BUCKET>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -14482,7 +14490,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -14538,7 +14546,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MAX_BUCKET>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
+              ".MAX_BUCKET>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -14546,7 +14554,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -14602,7 +14610,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MIN_BUCKET>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
+              ".MIN_BUCKET>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -14610,7 +14618,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -14666,7 +14674,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".SUM_BUCKET>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
+              ".SUM_BUCKET>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -14674,7 +14682,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -14730,7 +14738,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".FILTERED_METRIC>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
+              ".FILTERED_METRIC>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -14738,7 +14746,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -14906,11 +14914,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".CUMULATIVE_SUM>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".CUMULATIVE_SUM>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -14966,11 +14974,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".DERIVATIVE>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".DERIVATIVE>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -15362,11 +15370,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MOVING_FN>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\"> & Pick<{ customMetric?: ",
+              ".MOVING_FN>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -15534,11 +15542,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".SERIAL_DIFF>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".SERIAL_DIFF>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"id\" | \"enabled\" | \"schema\" | \"json\" | \"customLabel\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -18302,7 +18310,7 @@
             "label": "valueType",
             "description": [],
             "signature": [
-              "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"nested\" | \"histogram\" | \"null\" | undefined"
+              "\"string\" | \"number\" | \"boolean\" | \"object\" | \"_source\" | \"attachment\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"nested\" | \"histogram\" | \"null\" | undefined"
             ],
             "path": "src/plugins/data/common/search/aggs/agg_type.ts",
             "deprecated": false
@@ -18397,13 +18405,21 @@
             "signature": [
               "((agg: TAggConfig) => ",
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>>) | undefined"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              ">) | undefined"
             ],
             "path": "src/plugins/data/common/search/aggs/agg_type.ts",
             "deprecated": false,
@@ -22456,7 +22472,7 @@
             "section": "def-common.IAggType",
             "text": "IAggType"
           },
-          "; enabled?: boolean | undefined; id?: string | undefined; schema?: string | undefined; params?: {} | ",
+          "; id?: string | undefined; enabled?: boolean | undefined; schema?: string | undefined; params?: {} | ",
           {
             "pluginId": "@kbn/utility-types",
             "scope": "server",
@@ -22945,7 +22961,7 @@
             "section": "def-server.SerializableRecord",
             "text": "SerializableRecord"
           },
-          " | undefined; schema?: string | undefined; }, \"enabled\" | \"id\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
+          " | undefined; schema?: string | undefined; }, \"id\" | \"enabled\" | \"schema\" | \"params\"> & Pick<{ type: string | ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -22961,7 +22977,7 @@
             "section": "def-common.IAggType",
             "text": "IAggType"
           },
-          "; }, never>, \"type\" | \"enabled\" | \"id\" | \"schema\" | \"params\">[] | undefined) => ",
+          "; }, never>, \"type\" | \"id\" | \"enabled\" | \"schema\" | \"params\">[] | undefined) => ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -23132,7 +23148,7 @@
             "section": "def-common.IAggType",
             "text": "IAggType"
           },
-          "; enabled?: boolean | undefined; id?: string | undefined; schema?: string | undefined; params?: {} | ",
+          "; id?: string | undefined; enabled?: boolean | undefined; schema?: string | undefined; params?: {} | ",
           {
             "pluginId": "@kbn/utility-types",
             "scope": "server",
@@ -25452,7 +25468,7 @@
             "section": "def-common.SearchSource",
             "text": "SearchSource"
           },
-          "; history: Record<string, any>[]; setPreferredSearchStrategyId: (searchStrategyId: string) => void; setField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
+          "; history: Record<string, any>[]; setPreferredSearchStrategyId: (searchStrategyId: string) => void; setField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -25468,7 +25484,7 @@
             "section": "def-common.SearchSource",
             "text": "SearchSource"
           },
-          "; removeField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+          "; removeField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -25500,7 +25516,7 @@
             "section": "def-common.SearchSourceFields",
             "text": "SearchSourceFields"
           },
-          "; getField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
+          "; getField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -25508,7 +25524,7 @@
             "section": "def-common.SearchSourceFields",
             "text": "SearchSourceFields"
           },
-          "[K]; getOwnField: <K extends \"type\" | \"from\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+          "[K]; getOwnField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
           {
             "pluginId": "data",
             "scope": "common",
diff --git a/api_docs/data_search.mdx b/api_docs/data_search.mdx
index c7256296f1634..d4d521164f6ce 100644
--- a/api_docs/data_search.mdx
+++ b/api_docs/data_search.mdx
@@ -18,7 +18,7 @@ Contact [App Services](https://github.com/orgs/elastic/teams/kibana-app-services
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 3192 | 43 | 2807 | 48 |
+| 3193 | 43 | 2807 | 48 |
 
 ## Client
 
diff --git a/api_docs/data_ui.mdx b/api_docs/data_ui.mdx
index 39a1948d15c2c..81fec9e59c0da 100644
--- a/api_docs/data_ui.mdx
+++ b/api_docs/data_ui.mdx
@@ -18,7 +18,7 @@ Contact [App Services](https://github.com/orgs/elastic/teams/kibana-app-services
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 3192 | 43 | 2807 | 48 |
+| 3193 | 43 | 2807 | 48 |
 
 ## Client
 
diff --git a/api_docs/data_views.json b/api_docs/data_views.json
index c77aa02425e22..1d6f430c302c2 100644
--- a/api_docs/data_views.json
+++ b/api_docs/data_views.json
@@ -1357,13 +1357,21 @@
             "signature": [
               "(fieldName: string, format: ",
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>>) => void"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              ">) => void"
             ],
             "path": "src/plugins/data_views/common/data_views/data_view.ts",
             "deprecated": false,
@@ -1391,13 +1399,21 @@
                 "description": [],
                 "signature": [
                   {
-                    "pluginId": "expressions",
+                    "pluginId": "fieldFormats",
                     "scope": "common",
-                    "docId": "kibExpressionsPluginApi",
+                    "docId": "kibFieldFormatsPluginApi",
                     "section": "def-common.SerializedFieldFormat",
                     "text": "SerializedFieldFormat"
                   },
-                  "<Record<string, any>>"
+                  "<",
+                  {
+                    "pluginId": "fieldFormats",
+                    "scope": "common",
+                    "docId": "kibFieldFormatsPluginApi",
+                    "section": "def-common.FieldFormatParams",
+                    "text": "FieldFormatParams"
+                  },
+                  ">"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_view.ts",
                 "deprecated": false,
@@ -1647,7 +1663,7 @@
             "section": "def-common.DataViewsService",
             "text": "DataViewsService"
           },
-          ", \"get\" | \"delete\" | \"create\" | \"find\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\">, ",
+          ", \"create\" | \"delete\" | \"find\" | \"get\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\" | \"getDefaultDataView\">, ",
           "DataViewsPublicSetupDependencies",
           ", ",
           "DataViewsPublicStartDependencies",
@@ -1682,7 +1698,7 @@
                 "section": "def-common.DataViewsService",
                 "text": "DataViewsService"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"find\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\">>, { expressions }: ",
+              ", \"create\" | \"delete\" | \"find\" | \"get\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\" | \"getDefaultDataView\">>, { expressions }: ",
               "DataViewsPublicSetupDependencies",
               ") => ",
               {
@@ -1721,7 +1737,7 @@
                     "section": "def-common.DataViewsService",
                     "text": "DataViewsService"
                   },
-                  ", \"get\" | \"delete\" | \"create\" | \"find\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\">>"
+                  ", \"create\" | \"delete\" | \"find\" | \"get\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\" | \"getDefaultDataView\">>"
                 ],
                 "path": "src/plugins/data_views/public/plugin.ts",
                 "deprecated": false,
@@ -1770,7 +1786,7 @@
                 "section": "def-common.DataViewsService",
                 "text": "DataViewsService"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"find\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\">"
+              ", \"create\" | \"delete\" | \"find\" | \"get\" | \"ensureDefaultDataView\" | \"getIds\" | \"getTitles\" | \"getIdsWithTitle\" | \"clearCache\" | \"getCache\" | \"getDefault\" | \"getDefaultId\" | \"setDefault\" | \"hasUserDataView\" | \"getFieldsForWildcard\" | \"getFieldsForIndexPattern\" | \"refreshFields\" | \"fieldArrayToMap\" | \"savedObjectToSpec\" | \"createAndSave\" | \"createSavedObject\" | \"updateSavedObject\" | \"getDefaultDataView\">"
             ],
             "path": "src/plugins/data_views/public/plugin.ts",
             "deprecated": false,
@@ -1844,14 +1860,34 @@
             "parentPluginId": "dataViews",
             "id": "def-public.DataViewsService.ensureDefaultDataView",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "ensureDefaultDataView",
             "description": [],
             "signature": [
               "() => Promise<unknown> | undefined"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
+            "deprecated": true,
+            "references": [
+              {
+                "plugin": "discover",
+                "path": "src/plugins/discover/public/application/apps/main/discover_main_route.tsx"
+              },
+              {
+                "plugin": "dashboard",
+                "path": "src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.ts"
+              },
+              {
+                "plugin": "lens",
+                "path": "x-pack/plugins/lens/public/plugin.ts"
+              },
+              {
+                "plugin": "visualize",
+                "path": "src/plugins/visualize/public/plugin.ts"
+              }
+            ],
             "returnComment": [],
             "children": []
           },
@@ -2925,6 +2961,33 @@
               }
             ],
             "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-public.DataViewsService.getDefaultDataView",
+            "type": "Function",
+            "tags": [],
+            "label": "getDefaultDataView",
+            "description": [
+              "\nReturns the default data view as an object. If no default is found, or it is missing\nanother data view is selected as default and returned."
+            ],
+            "signature": [
+              "() => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              " | undefined>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "children": [],
+            "returnComment": [
+              "default data view"
+            ]
           }
         ],
         "initialIsOpen": false
@@ -3446,18 +3509,6 @@
             "plugin": "observability",
             "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/embeddable/types.ts"
@@ -3630,30 +3681,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/types.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/types.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx"
-          },
           {
             "plugin": "apm",
             "path": "x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/SelectedFilters.tsx"
@@ -3782,14 +3809,6 @@
             "plugin": "transform",
             "path": "x-pack/plugins/transform/common/types/index_pattern.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
           {
             "plugin": "lens",
             "path": "x-pack/plugins/lens/server/routes/existing_fields.test.ts"
@@ -3822,14 +3841,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
           {
             "plugin": "lens",
             "path": "x-pack/plugins/lens/target/types/server/routes/existing_fields.d.ts"
@@ -4190,6 +4201,22 @@
             "plugin": "data",
             "path": "src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.predecessors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.predecessors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.successors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.successors.test.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.test.ts"
@@ -4330,6 +4357,18 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/components/doc_table/components/table_header/table_header.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
           {
             "plugin": "data",
             "path": "src/plugins/data/public/index.ts"
@@ -4536,11 +4575,11 @@
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_state.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_state.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
           },
           {
             "plugin": "discover",
@@ -4548,7 +4587,11 @@
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
           },
           {
             "plugin": "discover",
@@ -4974,250 +5017,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/field_format_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/field_format_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
           {
             "plugin": "apm",
             "path": "x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx"
@@ -5518,22 +5317,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/components/geo_index_pattern_select.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts"
@@ -5547,16 +5330,8 @@
             "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts"
-          },
-          {
-            "plugin": "maps",
-            "path": "x-pack/plugins/maps/target/types/public/classes/fields/agg/count_agg_field.d.ts"
+            "plugin": "maps",
+            "path": "x-pack/plugins/maps/target/types/public/classes/fields/agg/count_agg_field.d.ts"
           },
           {
             "plugin": "maps",
@@ -5618,14 +5393,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/connected_components/edit_layer_panel/filter_editor/filter_editor.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/components/full_time_range_selector/full_time_range_selector.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/components/full_time_range_selector/full_time_range_selector.d.ts"
-          },
           {
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/target/types/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.d.ts"
@@ -6146,6 +5913,14 @@
             "plugin": "visDefaultEditor",
             "path": "src/plugins/vis_default_editor/target/types/public/components/agg_select.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.test.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/get_sharing_data.test.ts"
@@ -6194,6 +5969,14 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/utils/nested_fields.d.ts"
@@ -8020,7 +7803,7 @@
                     "section": "def-public.SavedObjectsClient",
                     "text": "SavedObjectsClient"
                   },
-                  ", \"delete\" | \"create\" | \"find\" | \"resolve\" | \"update\">"
+                  ", \"create\" | \"delete\" | \"find\" | \"resolve\" | \"update\">"
                 ],
                 "path": "src/plugins/data_views/public/saved_objects_client_wrapper.ts",
                 "deprecated": false,
@@ -8405,7 +8188,7 @@
             "signature": [
               "<T = any>() => Promise<Record<string, Pick<",
               "UiSettingsParams",
-              "<unknown>, \"type\" | \"options\" | \"description\" | \"name\" | \"order\" | \"value\" | \"category\" | \"optionLabels\" | \"requiresPageReload\" | \"readonly\" | \"sensitive\" | \"deprecation\" | \"metric\"> & ",
+              "<unknown>, \"type\" | \"description\" | \"name\" | \"options\" | \"order\" | \"value\" | \"category\" | \"optionLabels\" | \"requiresPageReload\" | \"readonly\" | \"sensitive\" | \"deprecation\" | \"metric\"> & ",
               "UserProvidedValues",
               "<T>>>"
             ],
@@ -9219,23 +9002,23 @@
         "\nData plugin public Start contract"
       ],
       "signature": [
-        "{ get: (id: string) => Promise<",
+        "{ create: (spec: ",
         {
           "pluginId": "dataViews",
           "scope": "common",
           "docId": "kibDataViewsPluginApi",
-          "section": "def-common.DataView",
-          "text": "DataView"
+          "section": "def-common.DataViewSpec",
+          "text": "DataViewSpec"
         },
-        ">; delete: (indexPatternId: string) => Promise<{}>; create: (spec: ",
+        ", skipFetchFields?: boolean) => Promise<",
         {
           "pluginId": "dataViews",
           "scope": "common",
           "docId": "kibDataViewsPluginApi",
-          "section": "def-common.DataViewSpec",
-          "text": "DataViewSpec"
+          "section": "def-common.DataView",
+          "text": "DataView"
         },
-        ", skipFetchFields?: boolean) => Promise<",
+        ">; delete: (indexPatternId: string) => Promise<{}>; find: (search: string, size?: number) => Promise<",
         {
           "pluginId": "dataViews",
           "scope": "common",
@@ -9243,7 +9026,7 @@
           "section": "def-common.DataView",
           "text": "DataView"
         },
-        ">; find: (search: string, size?: number) => Promise<",
+        "[]>; get: (id: string) => Promise<",
         {
           "pluginId": "dataViews",
           "scope": "common",
@@ -9251,7 +9034,7 @@
           "section": "def-common.DataView",
           "text": "DataView"
         },
-        "[]>; ensureDefaultDataView: ",
+        ">; ensureDefaultDataView: ",
         "EnsureDefaultDataView",
         "; getIds: (refresh?: boolean) => Promise<string[]>; getTitles: (refresh?: boolean) => Promise<string[]>; getIdsWithTitle: (refresh?: boolean) => Promise<",
         {
@@ -9401,7 +9184,15 @@
           "section": "def-common.DataView",
           "text": "DataView"
         },
-        ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; }"
+        ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; getDefaultDataView: () => Promise<",
+        {
+          "pluginId": "dataViews",
+          "scope": "common",
+          "docId": "kibDataViewsPluginApi",
+          "section": "def-common.DataView",
+          "text": "DataView"
+        },
+        " | undefined>; }"
       ],
       "path": "src/plugins/data_views/public/types.ts",
       "deprecated": false,
@@ -9618,7 +9409,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, elasticsearchClient: ",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, elasticsearchClient: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -9642,7 +9433,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, elasticsearchClient: ",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, elasticsearchClient: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -10052,7 +9843,7 @@
             "section": "def-server.SavedObjectsClient",
             "text": "SavedObjectsClient"
           },
-          ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, elasticsearchClient: ",
+          ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, elasticsearchClient: ",
           {
             "pluginId": "core",
             "scope": "server",
@@ -10162,7 +9953,7 @@
             "section": "def-server.SavedObjectsClient",
             "text": "SavedObjectsClient"
           },
-          ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, index: string) => Promise<",
+          ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, index: string) => Promise<",
           "SavedObject",
           "<",
           {
@@ -10193,7 +9984,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
             ],
             "path": "src/plugins/data_views/server/utils.ts",
             "deprecated": false,
@@ -10608,7 +10399,7 @@
               "section": "def-server.SavedObjectsClient",
               "text": "SavedObjectsClient"
             },
-            ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, elasticsearchClient: ",
+            ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, elasticsearchClient: ",
             {
               "pluginId": "core",
               "scope": "server",
@@ -10638,25 +10429,7 @@
               "label": "savedObjectsClient",
               "description": [],
               "signature": [
-                "{ get: <T = unknown>(type: string, id: string, options?: ",
-                {
-                  "pluginId": "core",
-                  "scope": "server",
-                  "docId": "kibCoreSavedObjectsPluginApi",
-                  "section": "def-server.SavedObjectsBaseOptions",
-                  "text": "SavedObjectsBaseOptions"
-                },
-                ") => Promise<",
-                "SavedObject",
-                "<T>>; delete: (type: string, id: string, options?: ",
-                {
-                  "pluginId": "core",
-                  "scope": "server",
-                  "docId": "kibCoreSavedObjectsPluginApi",
-                  "section": "def-server.SavedObjectsDeleteOptions",
-                  "text": "SavedObjectsDeleteOptions"
-                },
-                ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+                "{ create: <T = unknown>(type: string, attributes: T, options?: ",
                 {
                   "pluginId": "core",
                   "scope": "server",
@@ -10714,7 +10487,15 @@
                   "section": "def-server.SavedObjectsCheckConflictsResponse",
                   "text": "SavedObjectsCheckConflictsResponse"
                 },
-                ">; find: <T = unknown, A = unknown>(options: ",
+                ">; delete: (type: string, id: string, options?: ",
+                {
+                  "pluginId": "core",
+                  "scope": "server",
+                  "docId": "kibCoreSavedObjectsPluginApi",
+                  "section": "def-server.SavedObjectsDeleteOptions",
+                  "text": "SavedObjectsDeleteOptions"
+                },
+                ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
                 {
                   "pluginId": "core",
                   "scope": "server",
@@ -10778,6 +10559,16 @@
                   "section": "def-server.SavedObjectsBulkResolveResponse",
                   "text": "SavedObjectsBulkResolveResponse"
                 },
+                "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+                {
+                  "pluginId": "core",
+                  "scope": "server",
+                  "docId": "kibCoreSavedObjectsPluginApi",
+                  "section": "def-server.SavedObjectsBaseOptions",
+                  "text": "SavedObjectsBaseOptions"
+                },
+                ") => Promise<",
+                "SavedObject",
                 "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
                 {
                   "pluginId": "core",
@@ -10977,7 +10768,7 @@
               "signature": [
                 "Pick<",
                 "KibanaClient",
-                ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                 "TransportRequestParams",
                 ", options?: ",
                 "TransportRequestOptions",
@@ -11010,7 +10801,7 @@
               "section": "def-server.SavedObjectsClient",
               "text": "SavedObjectsClient"
             },
-            ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, elasticsearchClient: ",
+            ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, elasticsearchClient: ",
             {
               "pluginId": "core",
               "scope": "server",
@@ -11094,25 +10885,7 @@
               "label": "savedObjectsClient",
               "description": [],
               "signature": [
-                "{ get: <T = unknown>(type: string, id: string, options?: ",
-                {
-                  "pluginId": "core",
-                  "scope": "server",
-                  "docId": "kibCoreSavedObjectsPluginApi",
-                  "section": "def-server.SavedObjectsBaseOptions",
-                  "text": "SavedObjectsBaseOptions"
-                },
-                ") => Promise<",
-                "SavedObject",
-                "<T>>; delete: (type: string, id: string, options?: ",
-                {
-                  "pluginId": "core",
-                  "scope": "server",
-                  "docId": "kibCoreSavedObjectsPluginApi",
-                  "section": "def-server.SavedObjectsDeleteOptions",
-                  "text": "SavedObjectsDeleteOptions"
-                },
-                ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+                "{ create: <T = unknown>(type: string, attributes: T, options?: ",
                 {
                   "pluginId": "core",
                   "scope": "server",
@@ -11170,7 +10943,15 @@
                   "section": "def-server.SavedObjectsCheckConflictsResponse",
                   "text": "SavedObjectsCheckConflictsResponse"
                 },
-                ">; find: <T = unknown, A = unknown>(options: ",
+                ">; delete: (type: string, id: string, options?: ",
+                {
+                  "pluginId": "core",
+                  "scope": "server",
+                  "docId": "kibCoreSavedObjectsPluginApi",
+                  "section": "def-server.SavedObjectsDeleteOptions",
+                  "text": "SavedObjectsDeleteOptions"
+                },
+                ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
                 {
                   "pluginId": "core",
                   "scope": "server",
@@ -11234,6 +11015,16 @@
                   "section": "def-server.SavedObjectsBulkResolveResponse",
                   "text": "SavedObjectsBulkResolveResponse"
                 },
+                "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+                {
+                  "pluginId": "core",
+                  "scope": "server",
+                  "docId": "kibCoreSavedObjectsPluginApi",
+                  "section": "def-server.SavedObjectsBaseOptions",
+                  "text": "SavedObjectsBaseOptions"
+                },
+                ") => Promise<",
+                "SavedObject",
                 "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
                 {
                   "pluginId": "core",
@@ -11433,7 +11224,7 @@
               "signature": [
                 "Pick<",
                 "KibanaClient",
-                ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                 "TransportRequestParams",
                 ", options?: ",
                 "TransportRequestOptions",
@@ -12823,13 +12614,21 @@
             "signature": [
               "(fieldName: string, format: ",
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>>) => void"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              ">) => void"
             ],
             "path": "src/plugins/data_views/common/data_views/data_view.ts",
             "deprecated": false,
@@ -12857,13 +12656,21 @@
                 "description": [],
                 "signature": [
                   {
-                    "pluginId": "expressions",
+                    "pluginId": "fieldFormats",
                     "scope": "common",
-                    "docId": "kibExpressionsPluginApi",
+                    "docId": "kibFieldFormatsPluginApi",
                     "section": "def-common.SerializedFieldFormat",
                     "text": "SerializedFieldFormat"
                   },
-                  "<Record<string, any>>"
+                  "<",
+                  {
+                    "pluginId": "fieldFormats",
+                    "scope": "common",
+                    "docId": "kibFieldFormatsPluginApi",
+                    "section": "def-common.FieldFormatParams",
+                    "text": "FieldFormatParams"
+                  },
+                  ">"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_view.ts",
                 "deprecated": false,
@@ -13595,14 +13402,34 @@
             "parentPluginId": "dataViews",
             "id": "def-common.DataViewsService.ensureDefaultDataView",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "ensureDefaultDataView",
             "description": [],
             "signature": [
               "() => Promise<unknown> | undefined"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
+            "deprecated": true,
+            "references": [
+              {
+                "plugin": "discover",
+                "path": "src/plugins/discover/public/application/apps/main/discover_main_route.tsx"
+              },
+              {
+                "plugin": "dashboard",
+                "path": "src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.ts"
+              },
+              {
+                "plugin": "lens",
+                "path": "x-pack/plugins/lens/public/plugin.ts"
+              },
+              {
+                "plugin": "visualize",
+                "path": "src/plugins/visualize/public/plugin.ts"
+              }
+            ],
             "returnComment": [],
             "children": []
           },
@@ -14676,6 +14503,33 @@
               }
             ],
             "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getDefaultDataView",
+            "type": "Function",
+            "tags": [],
+            "label": "getDefaultDataView",
+            "description": [
+              "\nReturns the default data view as an object. If no default is found, or it is missing\nanother data view is selected as default and returned."
+            ],
+            "signature": [
+              "() => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              " | undefined>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "children": [],
+            "returnComment": [
+              "default data view"
+            ]
           }
         ],
         "initialIsOpen": false
@@ -15250,18 +15104,6 @@
             "plugin": "observability",
             "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/embeddable/types.ts"
@@ -15434,30 +15276,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/types.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/types.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx"
-          },
           {
             "plugin": "apm",
             "path": "x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/SelectedFilters.tsx"
@@ -15586,14 +15404,6 @@
             "plugin": "transform",
             "path": "x-pack/plugins/transform/common/types/index_pattern.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
           {
             "plugin": "lens",
             "path": "x-pack/plugins/lens/server/routes/existing_fields.test.ts"
@@ -15626,14 +15436,6 @@
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
           {
             "plugin": "lens",
             "path": "x-pack/plugins/lens/target/types/server/routes/existing_fields.d.ts"
@@ -15994,6 +15796,22 @@
             "plugin": "data",
             "path": "src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.predecessors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.predecessors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.successors.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.successors.test.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.test.ts"
@@ -16134,6 +15952,18 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/components/doc_table/components/table_header/table_header.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_fetch.test.ts"
+          },
           {
             "plugin": "data",
             "path": "src/plugins/data/public/index.ts"
@@ -16340,11 +16170,11 @@
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_state.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/utils/use_context_app_state.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
           },
           {
             "plugin": "discover",
@@ -16352,7 +16182,11 @@
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
+            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
           },
           {
             "plugin": "discover",
@@ -16779,316 +16613,72 @@
             "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
+            "plugin": "apm",
+            "path": "x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
+            "plugin": "apm",
+            "path": "x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
+            "plugin": "apm",
+            "path": "x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/field_format_service.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/types/app_state.ts"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/field_format_service.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/types/app_state.ts"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/services/persistence/deserialize.ts"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/services/persistence/deserialize.ts"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/services/persistence/deserialize.ts"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/services/persistence/deserialize.ts"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/state_management/datasource.sagas.ts"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/state_management/datasource.sagas.ts"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/components/search_bar.tsx"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/components/search_bar.tsx"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/components/search_bar.tsx"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/components/search_bar.tsx"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/components/inspect_panel.tsx"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts"
-          },
-          {
-            "plugin": "apm",
-            "path": "x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx"
-          },
-          {
-            "plugin": "apm",
-            "path": "x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx"
-          },
-          {
-            "plugin": "apm",
-            "path": "x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/types/app_state.ts"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/types/app_state.ts"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/services/persistence/deserialize.ts"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/services/persistence/deserialize.ts"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/services/persistence/deserialize.ts"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/services/persistence/deserialize.ts"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/state_management/datasource.sagas.ts"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/state_management/datasource.sagas.ts"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/components/search_bar.tsx"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/components/search_bar.tsx"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/components/search_bar.tsx"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/components/search_bar.tsx"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/components/inspect_panel.tsx"
-          },
-          {
-            "plugin": "graph",
-            "path": "x-pack/plugins/graph/public/components/inspect_panel.tsx"
+            "plugin": "graph",
+            "path": "x-pack/plugins/graph/public/components/inspect_panel.tsx"
           },
           {
             "plugin": "graph",
@@ -17322,22 +16912,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/components/geo_index_pattern_select.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts"
@@ -17350,14 +16924,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/classes/fields/agg/count_agg_field.d.ts"
@@ -17422,14 +16988,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/connected_components/edit_layer_panel/filter_editor/filter_editor.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/components/full_time_range_selector/full_time_range_selector.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/components/full_time_range_selector/full_time_range_selector.d.ts"
-          },
           {
             "plugin": "dataVisualizer",
             "path": "x-pack/plugins/data_visualizer/target/types/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.d.ts"
@@ -17950,6 +17508,14 @@
             "plugin": "visDefaultEditor",
             "path": "src/plugins/vis_default_editor/target/types/public/components/agg_select.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.test.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/public/application/apps/context/services/anchor.test.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/get_sharing_data.test.ts"
@@ -17998,6 +17564,14 @@
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
           },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
+          {
+            "plugin": "discover",
+            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
+          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/main/utils/nested_fields.d.ts"
@@ -19953,7 +19527,7 @@
             "section": "def-common.IndexPatternLoadExpressionFunctionDefinition",
             "text": "IndexPatternLoadExpressionFunctionDefinition"
           },
-          ", \"type\" | \"telemetry\" | \"inject\" | \"extract\" | \"migrations\" | \"name\" | \"disabled\" | \"help\" | \"inputTypes\" | \"args\" | \"aliases\" | \"context\">"
+          ", \"telemetry\" | \"inject\" | \"extract\" | \"migrations\" | \"type\" | \"name\" | \"disabled\" | \"help\" | \"inputTypes\" | \"args\" | \"aliases\" | \"context\">"
         ],
         "path": "src/plugins/data_views/common/expressions/load_index_pattern.ts",
         "deprecated": false,
@@ -20480,13 +20054,21 @@
             "signature": [
               "Record<string, ",
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>>> | undefined"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              ">> | undefined"
             ],
             "path": "src/plugins/data_views/common/types.ts",
             "deprecated": false
@@ -20679,13 +20261,21 @@
             "description": [],
             "signature": [
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>> | undefined"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              "> | undefined"
             ],
             "path": "src/plugins/data_views/common/types.ts",
             "deprecated": false
@@ -20983,13 +20573,21 @@
             "description": [],
             "signature": [
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>> | undefined"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              "> | undefined"
             ],
             "path": "src/plugins/data_views/common/types.ts",
             "deprecated": false
@@ -21444,14 +21042,6 @@
             "plugin": "fleet",
             "path": "x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_grid/common.ts"
-          },
           {
             "plugin": "infra",
             "path": "x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx"
@@ -21624,34 +21214,6 @@
             "plugin": "stackAlerts",
             "path": "x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/field_types_utils.test.ts"
-          },
           {
             "plugin": "infra",
             "path": "x-pack/plugins/infra/target/types/public/alerting/common/group_by_expression/group_by_expression.d.ts"
@@ -22447,172 +22009,36 @@
             "path": "x-pack/plugins/timelines/public/container/source/index.tsx"
           },
           {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx"
+            "plugin": "monitoring",
+            "path": "x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx"
           },
           {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx"
+            "plugin": "monitoring",
+            "path": "x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx"
           },
           {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx"
+            "plugin": "monitoring",
+            "path": "x-pack/plugins/monitoring/public/components/kuery_bar/with_kuery_autocompletion.tsx"
           },
           {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx"
+            "plugin": "monitoring",
+            "path": "x-pack/plugins/monitoring/public/components/kuery_bar/with_kuery_autocompletion.tsx"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
+            "plugin": "monitoring",
+            "path": "x-pack/plugins/monitoring/public/components/kuery_bar/index.tsx"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
+            "plugin": "monitoring",
+            "path": "x-pack/plugins/monitoring/public/components/kuery_bar/index.tsx"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts"
+            "plugin": "monitoring",
+            "path": "x-pack/plugins/monitoring/public/lib/kuery.ts"
           },
           {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/inventory_view/components/toolbars/toolbar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/inventory_view/components/toolbars/toolbar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/utils/kuery.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/utils/kuery.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/logs/log_filter/log_filter_state.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/logs/log_filter/log_filter_state.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/with_source/with_source.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/with_source/with_source.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx"
-          },
-          {
-            "plugin": "monitoring",
-            "path": "x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx"
-          },
-          {
-            "plugin": "monitoring",
-            "path": "x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx"
-          },
-          {
-            "plugin": "monitoring",
-            "path": "x-pack/plugins/monitoring/public/components/kuery_bar/with_kuery_autocompletion.tsx"
-          },
-          {
-            "plugin": "monitoring",
-            "path": "x-pack/plugins/monitoring/public/components/kuery_bar/with_kuery_autocompletion.tsx"
-          },
-          {
-            "plugin": "monitoring",
-            "path": "x-pack/plugins/monitoring/public/components/kuery_bar/index.tsx"
-          },
-          {
-            "plugin": "monitoring",
-            "path": "x-pack/plugins/monitoring/public/components/kuery_bar/index.tsx"
-          },
-          {
-            "plugin": "monitoring",
-            "path": "x-pack/plugins/monitoring/public/lib/kuery.ts"
-          },
-          {
-            "plugin": "monitoring",
-            "path": "x-pack/plugins/monitoring/public/lib/kuery.ts"
+            "plugin": "monitoring",
+            "path": "x-pack/plugins/monitoring/public/lib/kuery.ts"
           },
           {
             "plugin": "securitySolution",
@@ -22826,30 +22252,6 @@
             "plugin": "timelines",
             "path": "x-pack/plugins/timelines/public/mock/index_pattern.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/containers/with_kuery_autocompletion.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/containers/with_kuery_autocompletion.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/containers/with_source/with_source.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/containers/with_source/with_source.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts"
-          },
           {
             "plugin": "monitoring",
             "path": "x-pack/plugins/monitoring/target/types/public/components/kuery_bar/with_kuery_autocompletion.d.ts"
@@ -22894,30 +22296,6 @@
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/target/types/public/network/components/network_top_countries_table/columns.d.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/components/expression_chart.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/alerting/metric_threshold/hooks/use_metrics_explorer_chart_data.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/index.d.ts"
-          },
           {
             "plugin": "monitoring",
             "path": "x-pack/plugins/monitoring/target/types/public/alerts/components/param_details_form/use_derived_index_pattern.d.ts"
@@ -22966,34 +22344,6 @@
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/target/types/public/ueba/pages/details/types.d.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/jobs/new_job/common/index_pattern_context.d.ts"
-          },
           {
             "plugin": "indexPatternManagement",
             "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx"
@@ -23026,70 +22376,6 @@
             "plugin": "indexPatternManagement",
             "path": "src/plugins/index_pattern_management/target/types/public/components/edit_index_pattern/index_header/index_header.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/pages/metrics/index.tsx"
-          },
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts"
@@ -23198,14 +22484,6 @@
             "plugin": "transform",
             "path": "x-pack/plugins/transform/server/routes/api/transforms.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts"
@@ -23214,34 +22492,6 @@
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/public/common/mock/index_pattern.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts"
-          },
           {
             "plugin": "data",
             "path": "src/plugins/data/common/query/timefilter/get_time.test.ts"
@@ -23399,9 +22649,9 @@
             "signature": [
               "Record<string, ",
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
@@ -23997,7 +23247,7 @@
             "label": "type",
             "description": [],
             "signature": [
-              "\"boolean\" | \"date\" | \"keyword\" | \"geo_point\" | \"ip\" | \"long\" | \"double\""
+              "\"boolean\" | \"keyword\" | \"date\" | \"geo_point\" | \"ip\" | \"long\" | \"double\""
             ],
             "path": "src/plugins/data_views/common/types.ts",
             "deprecated": false
@@ -24846,23 +24096,23 @@
         "label": "DataViewsContract",
         "description": [],
         "signature": [
-          "{ get: (id: string) => Promise<",
+          "{ create: (spec: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataView",
-            "text": "DataView"
+            "section": "def-common.DataViewSpec",
+            "text": "DataViewSpec"
           },
-          ">; delete: (indexPatternId: string) => Promise<{}>; create: (spec: ",
+          ", skipFetchFields?: boolean) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataViewSpec",
-            "text": "DataViewSpec"
+            "section": "def-common.DataView",
+            "text": "DataView"
           },
-          ", skipFetchFields?: boolean) => Promise<",
+          ">; delete: (indexPatternId: string) => Promise<{}>; find: (search: string, size?: number) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -24870,7 +24120,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ">; find: (search: string, size?: number) => Promise<",
+          "[]>; get: (id: string) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -24878,7 +24128,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          "[]>; ensureDefaultDataView: ",
+          ">; ensureDefaultDataView: ",
           "EnsureDefaultDataView",
           "; getIds: (refresh?: boolean) => Promise<string[]>; getTitles: (refresh?: boolean) => Promise<string[]>; getIdsWithTitle: (refresh?: boolean) => Promise<",
           {
@@ -25028,7 +24278,15 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; }"
+          ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; getDefaultDataView: () => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataView",
+            "text": "DataView"
+          },
+          " | undefined>; }"
         ],
         "path": "src/plugins/data_views/common/data_views/data_views.ts",
         "deprecated": false,
@@ -25044,13 +24302,21 @@
         "signature": [
           "{ [x: string]: ",
           {
-            "pluginId": "expressions",
+            "pluginId": "fieldFormats",
             "scope": "common",
-            "docId": "kibExpressionsPluginApi",
+            "docId": "kibFieldFormatsPluginApi",
             "section": "def-common.SerializedFieldFormat",
             "text": "SerializedFieldFormat"
           },
-          "<Record<string, any>>; }"
+          "<",
+          {
+            "pluginId": "fieldFormats",
+            "scope": "common",
+            "docId": "kibFieldFormatsPluginApi",
+            "section": "def-common.FieldFormatParams",
+            "text": "FieldFormatParams"
+          },
+          ">; }"
         ],
         "path": "src/plugins/data_views/common/types.ts",
         "deprecated": false,
@@ -25213,14 +24479,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
           {
             "plugin": "transform",
             "path": "x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts"
@@ -25253,34 +24511,6 @@
             "plugin": "data",
             "path": "src/plugins/data/server/index.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts"
-          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx"
@@ -25316,22 +24546,6 @@
           {
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/discover_main_route.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/common/types/kibana.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/common/types/kibana.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/common/types/kibana.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/common/types/kibana.d.ts"
           }
         ],
         "initialIsOpen": false
@@ -25485,23 +24699,23 @@
         "label": "IndexPatternsContract",
         "description": [],
         "signature": [
-          "{ get: (id: string) => Promise<",
+          "{ create: (spec: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataView",
-            "text": "DataView"
+            "section": "def-common.DataViewSpec",
+            "text": "DataViewSpec"
           },
-          ">; delete: (indexPatternId: string) => Promise<{}>; create: (spec: ",
+          ", skipFetchFields?: boolean) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataViewSpec",
-            "text": "DataViewSpec"
+            "section": "def-common.DataView",
+            "text": "DataView"
           },
-          ", skipFetchFields?: boolean) => Promise<",
+          ">; delete: (indexPatternId: string) => Promise<{}>; find: (search: string, size?: number) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -25509,7 +24723,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ">; find: (search: string, size?: number) => Promise<",
+          "[]>; get: (id: string) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -25517,7 +24731,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          "[]>; ensureDefaultDataView: ",
+          ">; ensureDefaultDataView: ",
           "EnsureDefaultDataView",
           "; getIds: (refresh?: boolean) => Promise<string[]>; getTitles: (refresh?: boolean) => Promise<string[]>; getIdsWithTitle: (refresh?: boolean) => Promise<",
           {
@@ -25667,7 +24881,15 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; }"
+          ", saveAttempts?: number, ignoreErrors?: boolean) => Promise<void | Error>; getDefaultDataView: () => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataView",
+            "text": "DataView"
+          },
+          " | undefined>; }"
         ],
         "path": "src/plugins/data_views/common/data_views/data_views.ts",
         "deprecated": true,
@@ -25732,50 +24954,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts"
           },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
-          {
-            "plugin": "infra",
-            "path": "x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts"
-          },
           {
             "plugin": "observability",
             "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx"
@@ -25948,22 +25126,6 @@
             "plugin": "discover",
             "path": "src/plugins/discover/public/application/apps/doc/components/doc.tsx"
           },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/anchor.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/context.ts"
-          },
           {
             "plugin": "visualizations",
             "path": "src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts"
@@ -26036,66 +25198,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/public/lazy_load_bundle/index.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/dependency_cache.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/dependency_cache.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/util/index_utils.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/routing/resolvers.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/routing/resolvers.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/routing/router.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/routing/router.tsx"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts"
-          },
           {
             "plugin": "graph",
             "path": "x-pack/plugins/graph/public/application.ts"
@@ -26160,30 +25262,6 @@
             "plugin": "maps",
             "path": "x-pack/plugins/maps/target/types/public/lazy_load_bundle/index.d.ts"
           },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/routing/router.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/routing/router.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/util/dependency_cache.d.ts"
-          },
-          {
-            "plugin": "ml",
-            "path": "x-pack/plugins/ml/target/types/public/application/util/dependency_cache.d.ts"
-          },
           {
             "plugin": "security",
             "path": "x-pack/plugins/security/target/types/public/management/roles/edit_role/edit_role_page.d.ts"
@@ -26352,14 +25430,6 @@
             "plugin": "indexPatternManagement",
             "path": "src/plugins/index_pattern_management/target/types/public/components/utils.d.ts"
           },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/_stubs.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/context/services/_stubs.ts"
-          },
           {
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/doc/components/doc.d.ts"
@@ -26367,14 +25437,6 @@
           {
             "plugin": "discover",
             "path": "src/plugins/discover/target/types/public/application/apps/doc/components/doc.d.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/target/types/public/application/apps/context/services/context.d.ts"
           }
         ],
         "initialIsOpen": false
@@ -26586,7 +25648,7 @@
         "label": "RuntimeType",
         "description": [],
         "signature": [
-          "\"boolean\" | \"date\" | \"keyword\" | \"geo_point\" | \"ip\" | \"long\" | \"double\""
+          "\"boolean\" | \"keyword\" | \"date\" | \"geo_point\" | \"ip\" | \"long\" | \"double\""
         ],
         "path": "src/plugins/data_views/common/types.ts",
         "deprecated": false,
diff --git a/api_docs/data_views.mdx b/api_docs/data_views.mdx
index e907c075b9a8f..77f14d3d39a25 100644
--- a/api_docs/data_views.mdx
+++ b/api_docs/data_views.mdx
@@ -18,7 +18,7 @@ Contact [App Services](https://github.com/orgs/elastic/teams/kibana-app-services
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 681 | 6 | 541 | 5 |
+| 683 | 6 | 541 | 5 |
 
 ## Client
 
diff --git a/api_docs/data_visualizer.json b/api_docs/data_visualizer.json
index 6e46a32aabda7..4a0e41ac2318c 100644
--- a/api_docs/data_visualizer.json
+++ b/api_docs/data_visualizer.json
@@ -574,7 +574,7 @@
             "label": "type",
             "description": [],
             "signature": [
-              "\"number\" | \"boolean\" | \"date\" | \"keyword\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"unknown\" | \"histogram\" | \"text\""
+              "\"number\" | \"boolean\" | \"keyword\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"unknown\" | \"histogram\" | \"text\""
             ],
             "path": "x-pack/plugins/data_visualizer/common/types/field_request_config.ts",
             "deprecated": false
@@ -1004,7 +1004,7 @@
         "label": "JobFieldType",
         "description": [],
         "signature": [
-          "\"number\" | \"boolean\" | \"date\" | \"keyword\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"unknown\" | \"histogram\" | \"text\""
+          "\"number\" | \"boolean\" | \"keyword\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"unknown\" | \"histogram\" | \"text\""
         ],
         "path": "x-pack/plugins/data_visualizer/common/types/job_field_type.ts",
         "deprecated": false,
diff --git a/api_docs/deprecations_by_api.mdx b/api_docs/deprecations_by_api.mdx
index a083c82e69d05..341a6b6b6bb33 100644
--- a/api_docs/deprecations_by_api.mdx
+++ b/api_docs/deprecations_by_api.mdx
@@ -14,27 +14,27 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | Deprecated API | Referencing plugin(s) | Remove By |
 | ---------------|-----------|-----------|
 | <DocLink id="kibDashboardPluginApi" section="def-public.DashboardStart.dashboardUrlGenerator" text="dashboardUrlGenerator"/> | securitySolution | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IndexPattern" text="IndexPattern"/> | dataViews, visTypeTimeseries, reporting, discover, observability, infra, maps, dataVisualizer, ml, apm, lens, osquery, securitySolution, transform, savedObjects, indexPatternFieldEditor, visualizations, dashboard, graph, stackAlerts, uptime, indexPatternEditor, indexPatternManagement, inputControlVis, savedObjectsManagement, visualize, visDefaultEditor, visTypeVega, data | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IndexPattern" text="IndexPattern"/> | dataViews, visTypeTimeseries, reporting, discover, observability, maps, dataVisualizer, apm, lens, osquery, securitySolution, transform, savedObjects, indexPatternFieldEditor, visualizations, dashboard, graph, stackAlerts, uptime, indexPatternEditor, indexPatternManagement, inputControlVis, savedObjectsManagement, visualize, visDefaultEditor, visTypeVega, data | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IndexPatternField" text="IndexPatternField"/> | dataViews, discover, maps, dataVisualizer, lens, indexPatternFieldEditor, securitySolution, indexPatternEditor, indexPatternManagement, inputControlVis, visDefaultEditor, visTypeTimeseries, data | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | dataViews, timelines, infra, ml, monitoring, securitySolution, indexPatternManagement, stackAlerts, transform | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | dataViews, timelines, monitoring, securitySolution, indexPatternManagement, stackAlerts, transform | - |
 | <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.indexPatterns" text="indexPatterns"/> | home, savedObjects, security, fleet, indexPatternFieldEditor, discover, visualizations, dashboard, lens, observability, maps, fileUpload, dataVisualizer, ml, infra, apm, graph, monitoring, osquery, securitySolution, stackAlerts, transform, upgradeAssistant, uptime, indexPatternEditor, indexPatternManagement, inputControlVis, kibanaOverview, savedObjectsManagement, visualize, visTypeTimelion, visTypeTimeseries, visTypeVega | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | dataViews, timelines, infra, ml, monitoring, securitySolution, indexPatternManagement, stackAlerts, transform, data | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | dataViews, timelines, monitoring, securitySolution, indexPatternManagement, stackAlerts, transform, data | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternField" text="IndexPatternField"/> | dataViews, discover, maps, dataVisualizer, lens, indexPatternFieldEditor, securitySolution, indexPatternEditor, indexPatternManagement, inputControlVis, visDefaultEditor, visTypeTimeseries, data | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IndexPattern" text="IndexPattern"/> | dataViews, visTypeTimeseries, reporting, discover, observability, infra, maps, dataVisualizer, ml, apm, lens, osquery, securitySolution, transform, savedObjects, indexPatternFieldEditor, visualizations, dashboard, graph, stackAlerts, uptime, indexPatternEditor, indexPatternManagement, inputControlVis, savedObjectsManagement, visualize, visDefaultEditor, visTypeVega, data | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IndexPattern" text="IndexPattern"/> | dataViews, visTypeTimeseries, reporting, discover, observability, maps, dataVisualizer, apm, lens, osquery, securitySolution, transform, savedObjects, indexPatternFieldEditor, visualizations, dashboard, graph, stackAlerts, uptime, indexPatternEditor, indexPatternManagement, inputControlVis, savedObjectsManagement, visualize, visDefaultEditor, visTypeVega, data | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPatternField" text="IndexPatternField"/> | dataViews, discover, maps, dataVisualizer, lens, indexPatternFieldEditor, securitySolution, indexPatternEditor, indexPatternManagement, inputControlVis, visDefaultEditor, visTypeTimeseries | - |
-| <DocLink id="kibDataPluginApi" section="def-server.IndexPattern" text="IndexPattern"/> | dataViews, visTypeTimeseries, reporting, discover, observability, infra, maps, dataVisualizer, ml, apm, lens, osquery, securitySolution, transform, savedObjects, indexPatternFieldEditor, visualizations, dashboard, graph, stackAlerts, uptime, indexPatternEditor, indexPatternManagement, inputControlVis, savedObjectsManagement, visualize, visDefaultEditor, visTypeVega | - |
+| <DocLink id="kibDataPluginApi" section="def-server.IndexPattern" text="IndexPattern"/> | dataViews, visTypeTimeseries, reporting, discover, observability, maps, dataVisualizer, apm, lens, osquery, securitySolution, transform, savedObjects, indexPatternFieldEditor, visualizations, dashboard, graph, stackAlerts, uptime, indexPatternEditor, indexPatternManagement, inputControlVis, savedObjectsManagement, visualize, visDefaultEditor, visTypeVega | - |
 | <DocLink id="kibLicensingPluginApi" section="def-public.PublicLicense.mode" text="mode"/> | apm, security, securitySolution | - |
 | <DocLink id="kibLicensingPluginApi" section="def-server.PublicLicense.mode" text="mode"/> | apm, security, securitySolution | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authc" text="authc"/> | reporting, encryptedSavedObjects, actions, ml, dataEnhanced, logstash, securitySolution | - |
 | <DocLink id="kibCorePluginApi" section="def-public.AppMountParameters.onAppLeave" text="onAppLeave"/> | dashboard, lens, maps, ml, securitySolution, security, visualize | - |
 | <DocLink id="kibCorePluginApi" section="def-public.AppLeaveHandler" text="AppLeaveHandler"/> | securitySolution | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IndexPatternsService" text="IndexPatternsService"/> | dataViews, visTypeTimeseries, maps, lens, discover, data | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IndexPatternsContract" text="IndexPatternsContract"/> | dataViews, discover, infra, observability, savedObjects, security, visualizations, dashboard, lens, maps, ml, graph, stackAlerts, transform, indexPatternManagement, inputControlVis, savedObjectsManagement, visTypeTimelion, data | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IndexPatternAttributes" text="IndexPatternAttributes"/> | dataViews, discover, ml, transform, canvas | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IndexPatternsContract" text="IndexPatternsContract"/> | dataViews, discover, observability, savedObjects, security, visualizations, dashboard, lens, maps, graph, stackAlerts, transform, indexPatternManagement, inputControlVis, savedObjectsManagement, visTypeTimelion, data | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IndexPatternAttributes" text="IndexPatternAttributes"/> | dataViews, discover, transform, canvas | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IndexPatternSpec" text="IndexPatternSpec"/> | dataViews, observability, indexPatternEditor, apm | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IndexPatternType" text="IndexPatternType"/> | dataViews | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IndexPatternListItem" text="IndexPatternListItem"/> | dataViews, indexPatternManagement | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IndexPatternAttributes" text="IndexPatternAttributes"/> | dataViews, discover, ml, transform, canvas, data | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IndexPatternAttributes" text="IndexPatternAttributes"/> | dataViews, discover, transform, canvas, data | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPatternsApiClient" text="IIndexPatternsApiClient"/> | dataViews, data | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternFieldMap" text="IndexPatternFieldMap"/> | dataViews, data | - |
 | <DocLink id="kibDataPluginApi" section="def-common.DataViewSpec.intervalName" text="intervalName"/> | dataViews | - |
@@ -42,38 +42,39 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-common.INDEX_PATTERN_SAVED_OBJECT_TYPE" text="INDEX_PATTERN_SAVED_OBJECT_TYPE"/> | dataViews, visualizations, dashboard, data | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternType" text="IndexPatternType"/> | dataViews, data | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsService" text="IndexPatternsService"/> | dataViews, visTypeTimeseries, maps, lens, discover, data | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsContract" text="IndexPatternsContract"/> | dataViews, discover, infra, observability, savedObjects, security, visualizations, dashboard, lens, maps, ml, graph, stackAlerts, transform, indexPatternManagement, inputControlVis, savedObjectsManagement, visTypeTimelion, data | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsContract" text="IndexPatternsContract"/> | dataViews, discover, observability, savedObjects, security, visualizations, dashboard, lens, maps, graph, stackAlerts, transform, indexPatternManagement, inputControlVis, savedObjectsManagement, visTypeTimelion, data | - |
+| <DocLink id="kibDataPluginApi" section="def-common.DataViewsService.ensureDefaultDataView" text="ensureDefaultDataView"/> | dataViews, discover, dashboard, lens, visualize | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternListItem" text="IndexPatternListItem"/> | dataViews, indexPatternManagement, data | - |
-| <DocLink id="kibDataPluginApi" section="def-server.IndexPatternAttributes" text="IndexPatternAttributes"/> | dataViews, discover, ml, transform, canvas | - |
+| <DocLink id="kibDataPluginApi" section="def-server.IndexPatternAttributes" text="IndexPatternAttributes"/> | dataViews, discover, transform, canvas | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPatternsService" text="IndexPatternsService"/> | dataViews, visTypeTimeseries, maps, lens, discover | - |
 | <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | fleet, indexPatternFieldEditor, discover, dashboard, lens, ml, stackAlerts, indexPatternManagement, visTypePie, visTypeTable, visTypeTimeseries, visTypeXy, visTypeVislib | - |
 | <DocLink id="kibDataPluginApi" section="def-server.DataPluginStart.fieldFormats" text="fieldFormats"/> | reporting, visTypeTimeseries | - |
 | <DocLink id="kibDataViewsPluginApi" section="def-server.DataViewsServerPluginStart.indexPatternsServiceFactory" text="indexPatternsServiceFactory"/> | data, lens, visTypeTimeseries, infra, maps, visTypeTimelion | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectsStart.settings" text="settings"/> | dashboard, maps, graph, visualize | - |
 | <DocLink id="kibLicensingPluginApi" section="def-server.LicensingPluginSetup.license$" text="license$"/> | spaces, security, reporting, actions, alerting, ml, fleet, remoteClusters, graph, indexLifecycleManagement, maps, painlessLab, rollup, searchprofiler, snapshotRestore, transform, upgradeAssistant | - |
+| <DocLink id="kibDataViewsPluginApi" section="def-public.DataViewsService.ensureDefaultDataView" text="ensureDefaultDataView"/> | discover, dashboard, lens, visualize | - |
 | <DocLink id="kibCorePluginApi" section="def-server.SavedObjectsMigrationLogger.warning" text="warning"/> | lens, dashboard | - |
 | <DocLink id="kibDataPluginApi" section="def-public.SearchSource.create" text="create"/> | discover | - |
 | <DocLink id="kibDataPluginApi" section="def-common.SearchSource.create" text="create"/> | discover | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | embeddable, presentationUtil, discover, dashboard, graph | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | discover, visualizations, dashboard | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | discover, savedObjectsTaggingOss, visualizations, dashboard, visualize, visDefaultEditor | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | savedObjectsTaggingOss, discover, visualizations, dashboard | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectsStart.SavedObjectClass" text="SavedObjectClass"/> | discover, visualizations, dashboard | - |
 | <DocLink id="kibUiActionsPluginApi" section="def-public.UiActionsService.executeTriggerActions" text="executeTriggerActions"/> | data, discover, embeddable | - |
 | <DocLink id="kibCorePluginApi" section="def-public.UiSettingsParams.metric" text="metric"/> | advancedSettings, discover | - |
 | <DocLink id="kibCorePluginApi" section="def-server.UiSettingsParams.metric" text="metric"/> | advancedSettings, discover | - |
-| <DocLink id="kibSharePluginApi" section="def-public.LocatorPublic.getUrl" text="getUrl"/> | ml, infra, reporting, ingestPipelines | - |
-| <DocLink id="kibSharePluginApi" section="def-common.LocatorPublic.getUrl" text="getUrl"/> | ml, infra, reporting, ingestPipelines | - |
 | <DocLink id="kibDiscoverPluginApi" section="def-public.DiscoverStart.urlGenerator" text="urlGenerator"/> | observability, osquery | - |
 | <DocLink id="kibFeaturesPluginApi" section="def-common.FeatureElasticsearchPrivileges.requiredRoles" text="requiredRoles"/> | security | - |
 | <DocLink id="kibFeaturesPluginApi" section="def-server.FeatureElasticsearchPrivileges.requiredRoles" text="requiredRoles"/> | security | - |
 | <DocLink id="kibLicensingPluginApi" section="def-public.LicensingPluginSetup.license$" text="license$"/> | security, licenseManagement, ml, fleet, apm, reporting, crossClusterReplication, logstash, painlessLab, searchprofiler, watcher | - |
 | <DocLink id="kibCorePluginApi" section="def-public.AppMountParameters.appBasePath" text="appBasePath"/> | management, fleet, security, kibanaOverview | - |
-| <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authz" text="authz"/> | actions, ml, enterpriseSearch, savedObjectsTagging | - |
-| <DocLink id="kibCorePluginApi" section="def-public.IHttpFetchError.req" text="req"/> | ml | - |
+| <DocLink id="kibDiscoverPluginApi" section="def-public.__LEGACY" text="__LEGACY"/> | visualizations | - |
 | <DocLink id="kibCorePluginApi" section="def-public.SavedObjectsImportSuccess.createNewCopy" text="createNewCopy"/> | spaces, savedObjectsManagement | - |
 | <DocLink id="kibCorePluginApi" section="def-server.SavedObjectsImportSuccess.createNewCopy" text="createNewCopy"/> | spaces, savedObjectsManagement | - |
 | <DocLink id="kibDataPluginApi" section="def-public.SearchSourceFields.fieldsFromSource" text="fieldsFromSource"/> | reporting | - |
 | <DocLink id="kibDataPluginApi" section="def-common.SearchSourceFields.fieldsFromSource" text="fieldsFromSource"/> | reporting | - |
+| <DocLink id="kibSharePluginApi" section="def-public.LocatorPublic.getUrl" text="getUrl"/> | ml, infra, reporting, ingestPipelines | - |
+| <DocLink id="kibSharePluginApi" section="def-common.LocatorPublic.getUrl" text="getUrl"/> | ml, infra, reporting, ingestPipelines | - |
 | <DocLink id="kibHomePluginApi" section="def-public.HomePublicPluginSetup.environment" text="environment"/> | cloud, apm | - |
 | <DocLink id="kibCorePluginApi" section="def-public.CoreSetup.injectedMetadata" text="injectedMetadata"/> | visTypeVega | - |
 | <DocLink id="kibCorePluginApi" section="def-public.CoreStart.injectedMetadata" text="injectedMetadata"/> | monitoring, visTypeVega | - |
@@ -89,6 +90,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibExpressionsPluginApi" section="def-common.ExpressionsServiceSetup.getFunctions" text="getFunctions"/> | canvas | - |
 | <DocLink id="kibExpressionsPluginApi" section="def-common.ExpressionsServiceSetup.getTypes" text="getTypes"/> | canvas | - |
 | <DocLink id="kibExpressionsPluginApi" section="def-server.ExpressionFunctionDefinition.context" text="context"/> | canvas, visTypeXy | - |
+| <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authz" text="authz"/> | actions, ml, enterpriseSearch, savedObjectsTagging | - |
+| <DocLink id="kibCorePluginApi" section="def-public.IHttpFetchError.req" text="req"/> | ml | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | encryptedSavedObjects, actions, alerting | - |
 | <DocLink id="kibTaskManagerPluginApi" section="def-server.TaskManagerSetupContract.index" text="index"/> | actions | - |
 | <DocLink id="kibCorePluginApi" section="def-server.ElasticsearchServiceSetup.legacy" text="legacy"/> | console | - |
@@ -100,14 +103,14 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | discover, visualizations, dashboard, lens, observability, timelines, maps, infra, dashboardEnhanced, discoverEnhanced, securitySolution, urlDrilldown, inputControlVis, visualize, visTypeTimelion, visTypeVega, ml, visTypeTimeseries | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | discover, visualizations, dashboard, lens, observability, timelines, maps, infra, dashboardEnhanced, discoverEnhanced, securitySolution, urlDrilldown, inputControlVis, visualize, visTypeTimelion, visTypeVega, ml, visTypeTimeseries | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | discover, visualizations, dashboard, lens, observability, timelines, maps, infra, dashboardEnhanced, discoverEnhanced, securitySolution, urlDrilldown, inputControlVis, visualize, visTypeTimelion, visTypeVega, ml, visTypeTimeseries | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | dataViews, fleet, ml, infra, monitoring, stackAlerts, indexPatternManagement | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | dataViews, fleet, ml, infra, monitoring, stackAlerts, indexPatternManagement, data | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | dataViews, fleet, infra, monitoring, stackAlerts, indexPatternManagement | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | dataViews, fleet, infra, monitoring, stackAlerts, indexPatternManagement, data | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-common.DataView.intervalName" text="intervalName"/> | dataViews | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-common.DataView.addScriptedField" text="addScriptedField"/> | dataViews | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-common.DataView.removeScriptedField" text="removeScriptedField"/> | indexPatternManagement, dataViews | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-common.DataView.getNonScriptedFields" text="getNonScriptedFields"/> | visTypeTimeseries, graph, indexPatternManagement, dataViews | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-common.DataView.getScriptedFields" text="getScriptedFields"/> | dataViews, indexPatternManagement | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | dataViews, fleet, ml, infra, monitoring, stackAlerts, indexPatternManagement | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | dataViews, fleet, infra, monitoring, stackAlerts, indexPatternManagement | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-server.DataView.intervalName" text="intervalName"/> | dataViews | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-server.DataView.addScriptedField" text="addScriptedField"/> | dataViews | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-server.DataView.removeScriptedField" text="removeScriptedField"/> | indexPatternManagement, dataViews | 8.1 |
@@ -211,6 +214,8 @@ Safe to remove.
 | <DocLink id="kibDataViewsPluginApi" section="def-common.DataViewSpec.intervalName" text="intervalName"/> |
 | <DocLink id="kibDataViewsPluginApi" section="def-common.DataView.intervalName" text="intervalName"/> |
 | <DocLink id="kibDataViewsPluginApi" section="def-common.DataView.addScriptedField" text="addScriptedField"/> |
+| <DocLink id="kibDiscoverPluginApi" section="def-public.LegacySavedSearch" text="LegacySavedSearch"/> |
+| <DocLink id="kibDiscoverPluginApi" section="def-public.SavedSearchLoader" text="SavedSearchLoader"/> |
 | <DocLink id="kibExpressionsPluginApi" section="def-public.ExpressionExecutor" text="ExpressionExecutor"/> |
 | <DocLink id="kibExpressionsPluginApi" section="def-public.Executor.functions" text="functions"/> |
 | <DocLink id="kibExpressionsPluginApi" section="def-public.Executor.types" text="types"/> |
diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx
index b33ab317ca885..7ef3a75269963 100644
--- a/api_docs/deprecations_by_plugin.mdx
+++ b/api_docs/deprecations_by_plugin.mdx
@@ -131,10 +131,12 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [saved_dashboard.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=Filter), [saved_dashboard.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=Filter), [dashboard_state_slice.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts#:~:text=Filter), [dashboard_state_slice.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts#:~:text=Filter), [dashboard_state_slice.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts#:~:text=Filter)+ 25 more | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-common.INDEX_PATTERN_SAVED_OBJECT_TYPE" text="INDEX_PATTERN_SAVED_OBJECT_TYPE"/> | [replace_index_pattern_reference.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts#:~:text=INDEX_PATTERN_SAVED_OBJECT_TYPE), [replace_index_pattern_reference.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts#:~:text=INDEX_PATTERN_SAVED_OBJECT_TYPE), [dashboard_migrations.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts#:~:text=INDEX_PATTERN_SAVED_OBJECT_TYPE), [dashboard_migrations.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts#:~:text=INDEX_PATTERN_SAVED_OBJECT_TYPE), [dashboard_migrations.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts#:~:text=INDEX_PATTERN_SAVED_OBJECT_TYPE), [replace_index_pattern_reference.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts#:~:text=INDEX_PATTERN_SAVED_OBJECT_TYPE), [replace_index_pattern_reference.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts#:~:text=INDEX_PATTERN_SAVED_OBJECT_TYPE), [dashboard_migrations.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts#:~:text=INDEX_PATTERN_SAVED_OBJECT_TYPE), [dashboard_migrations.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts#:~:text=INDEX_PATTERN_SAVED_OBJECT_TYPE), [dashboard_migrations.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts#:~:text=INDEX_PATTERN_SAVED_OBJECT_TYPE) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsContract" text="IndexPatternsContract"/> | [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPatternsContract), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPatternsContract), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/types.ts#:~:text=IndexPatternsContract), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/types.ts#:~:text=IndexPatternsContract), [make_default_services.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts#:~:text=IndexPatternsContract), [make_default_services.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts#:~:text=IndexPatternsContract), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPatternsContract), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPatternsContract), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/types.ts#:~:text=IndexPatternsContract), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/types.ts#:~:text=IndexPatternsContract)+ 2 more | - |
+| <DocLink id="kibDataPluginApi" section="def-common.DataViewsService.ensureDefaultDataView" text="ensureDefaultDataView"/> | [load_saved_dashboard_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.ts#:~:text=ensureDefaultDataView), [load_saved_dashboard_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.ts#:~:text=ensureDefaultDataView) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPattern" text="IndexPattern"/> | [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/types.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/types.ts#:~:text=IndexPattern), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern)+ 6 more | - |
 | <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [saved_dashboard.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=Filter), [saved_dashboard.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=Filter), [dashboard_state_slice.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts#:~:text=Filter), [dashboard_state_slice.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts#:~:text=Filter), [dashboard_state_slice.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts#:~:text=Filter)+ 25 more | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPattern" text="IndexPattern"/> | [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [sync_dashboard_index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/types.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/types.ts#:~:text=IndexPattern) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [filter_utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/filter_utils.ts#:~:text=Filter), [saved_dashboard.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=Filter), [saved_dashboard.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=Filter), [dashboard_state_slice.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts#:~:text=Filter), [dashboard_state_slice.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts#:~:text=Filter), [dashboard_state_slice.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts#:~:text=Filter)+ 25 more | 8.1 |
+| <DocLink id="kibDataViewsPluginApi" section="def-public.DataViewsService.ensureDefaultDataView" text="ensureDefaultDataView"/> | [load_saved_dashboard_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.ts#:~:text=ensureDefaultDataView) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | [saved_objects.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/services/saved_objects.ts#:~:text=SavedObjectSaveModal), [save_modal.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/top_nav/save_modal.tsx#:~:text=SavedObjectSaveModal), [save_modal.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/top_nav/save_modal.tsx#:~:text=SavedObjectSaveModal) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [saved_objects.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/services/saved_objects.ts#:~:text=SavedObjectLoader), [saved_dashboards.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts#:~:text=SavedObjectLoader), [saved_dashboards.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts#:~:text=SavedObjectLoader), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/types.ts#:~:text=SavedObjectLoader), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/types.ts#:~:text=SavedObjectLoader), [plugin.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/plugin.tsx#:~:text=SavedObjectLoader), [plugin.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/plugin.tsx#:~:text=SavedObjectLoader), [make_default_services.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts#:~:text=SavedObjectLoader), [make_default_services.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts#:~:text=SavedObjectLoader), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/url_generator.ts#:~:text=SavedObjectLoader)+ 3 more | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [saved_objects.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/services/saved_objects.ts#:~:text=SavedObject), [saved_dashboard.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=SavedObject), [saved_dashboard.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#:~:text=SavedObject), [dashboard_tagging.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts#:~:text=SavedObject), [dashboard_tagging.ts](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject), [clone_panel_action.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#:~:text=SavedObject) | - |
@@ -222,6 +224,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternType" text="IndexPatternType"/> | [index.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/index.ts#:~:text=IndexPatternType) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsService" text="IndexPatternsService"/> | [index.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/index.ts#:~:text=IndexPatternsService), [index.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/public/index.ts#:~:text=IndexPatternsService) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsContract" text="IndexPatternsContract"/> | [index.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/index.ts#:~:text=IndexPatternsContract), [index.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/public/index.ts#:~:text=IndexPatternsContract) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.DataViewsService.ensureDefaultDataView" text="ensureDefaultDataView"/> | [data_views.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/data_views/data_views.ts#:~:text=ensureDefaultDataView) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPattern" text="IndexPattern"/> | [index.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/index.ts#:~:text=IndexPattern), [data_view_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/fields/data_view_field.test.ts#:~:text=IndexPattern), [data_view_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/fields/data_view_field.test.ts#:~:text=IndexPattern), [index.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/public/index.ts#:~:text=IndexPattern), [data_view.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=IndexPattern), [data_view.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=IndexPattern), [data_view.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=IndexPattern), [data_view.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=IndexPattern) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternListItem" text="IndexPatternListItem"/> | [data_views.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/data_views/data_views.ts#:~:text=IndexPatternListItem), [index.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/index.ts#:~:text=IndexPatternListItem) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.DataView.intervalName" text="intervalName"/> | [data_view.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/data_views/data_view.ts#:~:text=intervalName), [data_view.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/data_views/data_view.ts#:~:text=intervalName), [data_view.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/common/data_views/data_view.ts#:~:text=intervalName), [update_index_pattern.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/server/routes/update_index_pattern.ts#:~:text=intervalName), [update_index_pattern.ts](https://github.com/elastic/kibana/tree/master/src/plugins/data_views/server/routes/update_index_pattern.ts#:~:text=intervalName) | 8.1 |
@@ -261,8 +264,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
 | <DocLink id="kibDataPluginApi" section="def-public.IndexPatternsService" text="IndexPatternsService"/> | [index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/__mocks__/index_patterns.ts#:~:text=IndexPatternsService), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/__mocks__/index_patterns.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/__mocks__/index_patterns.ts#:~:text=IndexPatternsService), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/__mocks__/index_patterns.ts#:~:text=IndexPatternsService)+ 6 more | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IndexPatternsContract" text="IndexPatternsContract"/> | [use_data_grid_columns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts#:~:text=IndexPatternsContract), [use_data_grid_columns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts#:~:text=IndexPatternsContract), [use_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_index_pattern.tsx#:~:text=IndexPatternsContract), [use_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_index_pattern.tsx#:~:text=IndexPatternsContract), [resolve_index_pattern.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts#:~:text=IndexPatternsContract), [resolve_index_pattern.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts#:~:text=IndexPatternsContract), [use_data_grid_columns.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/helpers/use_data_grid_columns.d.ts#:~:text=IndexPatternsContract), [use_data_grid_columns.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/helpers/use_data_grid_columns.d.ts#:~:text=IndexPatternsContract), [resolve_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/utils/resolve_index_pattern.d.ts#:~:text=IndexPatternsContract), [resolve_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/utils/resolve_index_pattern.d.ts#:~:text=IndexPatternsContract)+ 50 more | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IndexPattern" text="IndexPattern"/> | [helpers.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx#:~:text=IndexPattern), [helpers.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx#:~:text=IndexPattern), [discover_grid_flyout.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx#:~:text=IndexPattern), [discover_grid_flyout.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx#:~:text=IndexPattern), [discover_grid_context.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_context.tsx#:~:text=IndexPattern), [discover_grid_context.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_context.tsx#:~:text=IndexPattern), [get_render_cell_value.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx#:~:text=IndexPattern), [get_render_cell_value.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx#:~:text=IndexPattern), [discover_grid_columns.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx#:~:text=IndexPattern), [discover_grid_columns.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx#:~:text=IndexPattern)+ 354 more | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IndexPatternsContract" text="IndexPatternsContract"/> | [use_data_grid_columns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts#:~:text=IndexPatternsContract), [use_data_grid_columns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts#:~:text=IndexPatternsContract), [use_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_index_pattern.tsx#:~:text=IndexPatternsContract), [use_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_index_pattern.tsx#:~:text=IndexPatternsContract), [resolve_index_pattern.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts#:~:text=IndexPatternsContract), [resolve_index_pattern.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts#:~:text=IndexPatternsContract), [use_data_grid_columns.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/helpers/use_data_grid_columns.d.ts#:~:text=IndexPatternsContract), [use_data_grid_columns.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/helpers/use_data_grid_columns.d.ts#:~:text=IndexPatternsContract), [resolve_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/utils/resolve_index_pattern.d.ts#:~:text=IndexPatternsContract), [resolve_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/utils/resolve_index_pattern.d.ts#:~:text=IndexPatternsContract)+ 34 more | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IndexPattern" text="IndexPattern"/> | [helpers.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx#:~:text=IndexPattern), [helpers.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx#:~:text=IndexPattern), [discover_grid_flyout.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx#:~:text=IndexPattern), [discover_grid_flyout.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx#:~:text=IndexPattern), [discover_grid_context.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_context.tsx#:~:text=IndexPattern), [discover_grid_context.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_context.tsx#:~:text=IndexPattern), [get_render_cell_value.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx#:~:text=IndexPattern), [get_render_cell_value.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx#:~:text=IndexPattern), [discover_grid_columns.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx#:~:text=IndexPattern), [discover_grid_columns.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx#:~:text=IndexPattern)+ 378 more | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IndexPatternField" text="IndexPatternField"/> | [discover_grid_cell_actions.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx#:~:text=IndexPatternField), [discover_grid_cell_actions.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx#:~:text=IndexPatternField), [doc_table_wrapper.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/doc_table_wrapper.tsx#:~:text=IndexPatternField), [doc_table_wrapper.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/doc_table_wrapper.tsx#:~:text=IndexPatternField), [saved_search_embeddable.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx#:~:text=IndexPatternField), [saved_search_embeddable.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx#:~:text=IndexPatternField), [context_app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/context/context_app.tsx#:~:text=IndexPatternField), [context_app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/context/context_app.tsx#:~:text=IndexPatternField), [discover_field_visualize.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_visualize.tsx#:~:text=IndexPatternField), [discover_field_visualize.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_visualize.tsx#:~:text=IndexPatternField)+ 192 more | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IndexPatternAttributes" text="IndexPatternAttributes"/> | [discover_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx#:~:text=IndexPatternAttributes), [discover_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx#:~:text=IndexPatternAttributes), [discover_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/components/sidebar/discover_index_pattern.d.ts#:~:text=IndexPatternAttributes), [discover_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/components/sidebar/discover_index_pattern.d.ts#:~:text=IndexPatternAttributes), [discover_sidebar_responsive.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx#:~:text=IndexPatternAttributes), [discover_sidebar_responsive.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx#:~:text=IndexPatternAttributes), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/layout/types.ts#:~:text=IndexPatternAttributes), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/layout/types.ts#:~:text=IndexPatternAttributes), [discover_main_app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_app.tsx#:~:text=IndexPatternAttributes), [discover_main_app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_app.tsx#:~:text=IndexPatternAttributes)+ 3 more | - |
 | <DocLink id="kibDataPluginApi" section="def-public.SearchSource.create" text="create"/> | [saved_search_embeddable.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx#:~:text=create), [saved_search_embeddable.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx#:~:text=create) | - |
@@ -270,24 +273,26 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.indexPatterns" text="indexPatterns"/> | [build_services.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/build_services.ts#:~:text=indexPatterns), [source_viewer.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/source_viewer/source_viewer.tsx#:~:text=indexPatterns), [discover_main_route.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_route.tsx#:~:text=indexPatterns), [discover_main_route.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_route.tsx#:~:text=indexPatterns), [discover_main_route.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_route.tsx#:~:text=indexPatterns), [plugin.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/plugin.tsx#:~:text=indexPatterns) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | [histogram.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/chart/histogram.tsx#:~:text=fieldFormats) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.esFilters" text="esFilters"/> | [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=esFilters), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=esFilters), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=esFilters), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=esFilters), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=esFilters), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=esFilters), [get_context_url.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/get_context_url.tsx#:~:text=esFilters), [get_context_url.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/get_context_url.tsx#:~:text=esFilters), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=esFilters), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=esFilters)+ 17 more | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#:~:text=Filter), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=Filter), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=Filter)+ 21 more | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#:~:text=Filter), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=Filter), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=Filter)+ 22 more | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternAttributes" text="IndexPatternAttributes"/> | [discover_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx#:~:text=IndexPatternAttributes), [discover_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx#:~:text=IndexPatternAttributes), [discover_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/components/sidebar/discover_index_pattern.d.ts#:~:text=IndexPatternAttributes), [discover_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/components/sidebar/discover_index_pattern.d.ts#:~:text=IndexPatternAttributes), [discover_sidebar_responsive.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx#:~:text=IndexPatternAttributes), [discover_sidebar_responsive.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx#:~:text=IndexPatternAttributes), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/layout/types.ts#:~:text=IndexPatternAttributes), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/layout/types.ts#:~:text=IndexPatternAttributes), [discover_main_app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_app.tsx#:~:text=IndexPatternAttributes), [discover_main_app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_app.tsx#:~:text=IndexPatternAttributes)+ 16 more | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternField" text="IndexPatternField"/> | [discover_grid_cell_actions.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx#:~:text=IndexPatternField), [discover_grid_cell_actions.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx#:~:text=IndexPatternField), [doc_table_wrapper.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/doc_table_wrapper.tsx#:~:text=IndexPatternField), [doc_table_wrapper.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/doc_table_wrapper.tsx#:~:text=IndexPatternField), [saved_search_embeddable.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx#:~:text=IndexPatternField), [saved_search_embeddable.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx#:~:text=IndexPatternField), [context_app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/context/context_app.tsx#:~:text=IndexPatternField), [context_app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/context/context_app.tsx#:~:text=IndexPatternField), [discover_field_visualize.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_visualize.tsx#:~:text=IndexPatternField), [discover_field_visualize.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_visualize.tsx#:~:text=IndexPatternField)+ 192 more | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsService" text="IndexPatternsService"/> | [index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/__mocks__/index_patterns.ts#:~:text=IndexPatternsService), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/__mocks__/index_patterns.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/__mocks__/index_patterns.ts#:~:text=IndexPatternsService), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/__mocks__/index_patterns.ts#:~:text=IndexPatternsService)+ 6 more | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsContract" text="IndexPatternsContract"/> | [use_data_grid_columns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts#:~:text=IndexPatternsContract), [use_data_grid_columns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts#:~:text=IndexPatternsContract), [use_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_index_pattern.tsx#:~:text=IndexPatternsContract), [use_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_index_pattern.tsx#:~:text=IndexPatternsContract), [resolve_index_pattern.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts#:~:text=IndexPatternsContract), [resolve_index_pattern.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts#:~:text=IndexPatternsContract), [use_data_grid_columns.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/helpers/use_data_grid_columns.d.ts#:~:text=IndexPatternsContract), [use_data_grid_columns.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/helpers/use_data_grid_columns.d.ts#:~:text=IndexPatternsContract), [resolve_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/utils/resolve_index_pattern.d.ts#:~:text=IndexPatternsContract), [resolve_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/utils/resolve_index_pattern.d.ts#:~:text=IndexPatternsContract)+ 50 more | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IndexPattern" text="IndexPattern"/> | [helpers.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx#:~:text=IndexPattern), [helpers.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx#:~:text=IndexPattern), [discover_grid_flyout.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx#:~:text=IndexPattern), [discover_grid_flyout.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx#:~:text=IndexPattern), [discover_grid_context.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_context.tsx#:~:text=IndexPattern), [discover_grid_context.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_context.tsx#:~:text=IndexPattern), [get_render_cell_value.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx#:~:text=IndexPattern), [get_render_cell_value.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx#:~:text=IndexPattern), [discover_grid_columns.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx#:~:text=IndexPattern), [discover_grid_columns.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx#:~:text=IndexPattern)+ 354 more | - |
-| <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#:~:text=Filter), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=Filter), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=Filter)+ 21 more | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsContract" text="IndexPatternsContract"/> | [use_data_grid_columns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts#:~:text=IndexPatternsContract), [use_data_grid_columns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts#:~:text=IndexPatternsContract), [use_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_index_pattern.tsx#:~:text=IndexPatternsContract), [use_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/use_index_pattern.tsx#:~:text=IndexPatternsContract), [resolve_index_pattern.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts#:~:text=IndexPatternsContract), [resolve_index_pattern.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts#:~:text=IndexPatternsContract), [use_data_grid_columns.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/helpers/use_data_grid_columns.d.ts#:~:text=IndexPatternsContract), [use_data_grid_columns.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/helpers/use_data_grid_columns.d.ts#:~:text=IndexPatternsContract), [resolve_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/utils/resolve_index_pattern.d.ts#:~:text=IndexPatternsContract), [resolve_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/utils/resolve_index_pattern.d.ts#:~:text=IndexPatternsContract)+ 34 more | - |
+| <DocLink id="kibDataPluginApi" section="def-common.DataViewsService.ensureDefaultDataView" text="ensureDefaultDataView"/> | [discover_main_route.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_route.tsx#:~:text=ensureDefaultDataView), [discover_main_route.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_route.tsx#:~:text=ensureDefaultDataView) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IndexPattern" text="IndexPattern"/> | [helpers.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx#:~:text=IndexPattern), [helpers.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx#:~:text=IndexPattern), [discover_grid_flyout.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx#:~:text=IndexPattern), [discover_grid_flyout.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx#:~:text=IndexPattern), [discover_grid_context.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_context.tsx#:~:text=IndexPattern), [discover_grid_context.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_context.tsx#:~:text=IndexPattern), [get_render_cell_value.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx#:~:text=IndexPattern), [get_render_cell_value.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx#:~:text=IndexPattern), [discover_grid_columns.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx#:~:text=IndexPattern), [discover_grid_columns.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx#:~:text=IndexPattern)+ 378 more | - |
+| <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#:~:text=Filter), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=Filter), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=Filter)+ 22 more | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-common.SearchSource.create" text="create"/> | [saved_search_embeddable.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx#:~:text=create), [saved_search_embeddable.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx#:~:text=create) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.SearchSource.fetch" text="fetch"/> | [anchor.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/context/services/anchor.ts#:~:text=fetch), [fetch_hits_in_interval.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/context/services/utils/fetch_hits_in_interval.ts#:~:text=fetch) | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPatternField" text="IndexPatternField"/> | [discover_grid_cell_actions.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx#:~:text=IndexPatternField), [discover_grid_cell_actions.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx#:~:text=IndexPatternField), [doc_table_wrapper.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/doc_table_wrapper.tsx#:~:text=IndexPatternField), [doc_table_wrapper.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/doc_table_wrapper.tsx#:~:text=IndexPatternField), [saved_search_embeddable.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx#:~:text=IndexPatternField), [saved_search_embeddable.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx#:~:text=IndexPatternField), [context_app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/context/context_app.tsx#:~:text=IndexPatternField), [context_app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/context/context_app.tsx#:~:text=IndexPatternField), [discover_field_visualize.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_visualize.tsx#:~:text=IndexPatternField), [discover_field_visualize.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_visualize.tsx#:~:text=IndexPatternField)+ 91 more | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPatternAttributes" text="IndexPatternAttributes"/> | [discover_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx#:~:text=IndexPatternAttributes), [discover_index_pattern.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx#:~:text=IndexPatternAttributes), [discover_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/components/sidebar/discover_index_pattern.d.ts#:~:text=IndexPatternAttributes), [discover_index_pattern.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/apps/main/components/sidebar/discover_index_pattern.d.ts#:~:text=IndexPatternAttributes), [discover_sidebar_responsive.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx#:~:text=IndexPatternAttributes), [discover_sidebar_responsive.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx#:~:text=IndexPatternAttributes), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/layout/types.ts#:~:text=IndexPatternAttributes), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/layout/types.ts#:~:text=IndexPatternAttributes), [discover_main_app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_app.tsx#:~:text=IndexPatternAttributes), [discover_main_app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_app.tsx#:~:text=IndexPatternAttributes)+ 3 more | - |
-| <DocLink id="kibDataPluginApi" section="def-server.IndexPattern" text="IndexPattern"/> | [helpers.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx#:~:text=IndexPattern), [helpers.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx#:~:text=IndexPattern), [discover_grid_flyout.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx#:~:text=IndexPattern), [discover_grid_flyout.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx#:~:text=IndexPattern), [discover_grid_context.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_context.tsx#:~:text=IndexPattern), [discover_grid_context.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_context.tsx#:~:text=IndexPattern), [get_render_cell_value.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx#:~:text=IndexPattern), [get_render_cell_value.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx#:~:text=IndexPattern), [discover_grid_columns.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx#:~:text=IndexPattern), [discover_grid_columns.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx#:~:text=IndexPattern)+ 172 more | - |
+| <DocLink id="kibDataPluginApi" section="def-server.IndexPattern" text="IndexPattern"/> | [helpers.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx#:~:text=IndexPattern), [helpers.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx#:~:text=IndexPattern), [discover_grid_flyout.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx#:~:text=IndexPattern), [discover_grid_flyout.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx#:~:text=IndexPattern), [discover_grid_context.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_context.tsx#:~:text=IndexPattern), [discover_grid_context.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_context.tsx#:~:text=IndexPattern), [get_render_cell_value.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx#:~:text=IndexPattern), [get_render_cell_value.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx#:~:text=IndexPattern), [discover_grid_columns.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx#:~:text=IndexPattern), [discover_grid_columns.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx#:~:text=IndexPattern)+ 184 more | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPatternsService" text="IndexPatternsService"/> | [index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/__mocks__/index_patterns.ts#:~:text=IndexPatternsService), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/__mocks__/index_patterns.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [popularize_field.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/helpers/popularize_field.test.ts#:~:text=IndexPatternsService), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/__mocks__/index_patterns.ts#:~:text=IndexPatternsService), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/__mocks__/index_patterns.ts#:~:text=IndexPatternsService)+ 6 more | - |
-| <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#:~:text=Filter), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=Filter), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=Filter)+ 21 more | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [url_generator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/url_generator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/locator.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#:~:text=Filter), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=Filter), [discover_state.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/services/discover_state.ts#:~:text=Filter)+ 22 more | 8.1 |
+| <DocLink id="kibDataViewsPluginApi" section="def-public.DataViewsService.ensureDefaultDataView" text="ensureDefaultDataView"/> | [discover_main_route.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_route.tsx#:~:text=ensureDefaultDataView) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | [on_save_search.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx#:~:text=SavedObjectSaveModal), [on_save_search.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx#:~:text=SavedObjectSaveModal) | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [saved_searches.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/saved_searches/saved_searches.ts#:~:text=SavedObjectLoader), [saved_searches.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/saved_searches/saved_searches.ts#:~:text=SavedObjectLoader), [plugin.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/plugin.tsx#:~:text=SavedObjectLoader), [plugin.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/plugin.tsx#:~:text=SavedObjectLoader) | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [discover_main_route.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_route.tsx#:~:text=SavedObject), [_saved_search.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/saved_searches/_saved_search.ts#:~:text=SavedObject), [_saved_search.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/saved_searches/_saved_search.ts#:~:text=SavedObject), [discover_main_route.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_route.tsx#:~:text=SavedObject), [discover_main_route.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/discover_main_route.tsx#:~:text=SavedObject) | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectsStart.SavedObjectClass" text="SavedObjectClass"/> | [_saved_search.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/saved_searches/_saved_search.ts#:~:text=SavedObjectClass) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [saved_searches.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/saved_searches/legacy/saved_searches.ts#:~:text=SavedObjectLoader), [saved_searches.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/saved_searches/legacy/saved_searches.ts#:~:text=SavedObjectLoader), [plugin.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/plugin.tsx#:~:text=SavedObjectLoader), [plugin.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/plugin.tsx#:~:text=SavedObjectLoader) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [_saved_search.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/saved_searches/legacy/_saved_search.ts#:~:text=SavedObject), [_saved_search.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/saved_searches/legacy/_saved_search.ts#:~:text=SavedObject) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectsStart.SavedObjectClass" text="SavedObjectClass"/> | [_saved_search.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/saved_searches/legacy/_saved_search.ts#:~:text=SavedObjectClass) | - |
 | <DocLink id="kibUiActionsPluginApi" section="def-public.UiActionsService.executeTriggerActions" text="executeTriggerActions"/> | [saved_search_embeddable.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/saved_search_embeddable.tsx#:~:text=executeTriggerActions), [search_embeddable_factory.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/search_embeddable_factory.ts#:~:text=executeTriggerActions), [plugin.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/plugin.tsx#:~:text=executeTriggerActions), [search_embeddable_factory.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/target/types/public/application/embeddable/search_embeddable_factory.d.ts#:~:text=executeTriggerActions) | - |
 | <DocLink id="kibCorePluginApi" section="def-public.UiSettingsParams.metric" text="metric"/> | [ui_settings.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/server/ui_settings.ts#:~:text=metric), [ui_settings.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/server/ui_settings.ts#:~:text=metric) | - |
 | <DocLink id="kibCorePluginApi" section="def-server.UiSettingsParams.metric" text="metric"/> | [ui_settings.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/server/ui_settings.ts#:~:text=metric), [ui_settings.ts](https://github.com/elastic/kibana/tree/master/src/plugins/discover/server/ui_settings.ts#:~:text=metric) | - |
@@ -467,21 +472,14 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibDataPluginApi" section="def-public.IndexPatternsContract" text="IndexPatternsContract"/> | [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPatternsContract), [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPatternsContract), [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPatternsContract), [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPatternsContract), [log_source.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts#:~:text=IndexPatternsContract), [log_source.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts#:~:text=IndexPatternsContract), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts#:~:text=IndexPatternsContract), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts#:~:text=IndexPatternsContract), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts#:~:text=IndexPatternsContract), [index_patterns.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts#:~:text=IndexPatternsContract)+ 12 more | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IndexPattern" text="IndexPattern"/> | [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPattern), [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPattern), [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPattern), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts#:~:text=IndexPattern), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts#:~:text=IndexPattern), [index_patterns.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts#:~:text=IndexPattern), [index_patterns.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts#:~:text=IndexPattern), [validation_errors.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts#:~:text=IndexPattern), [validation_errors.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts#:~:text=IndexPattern), [validation_errors.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts#:~:text=IndexPattern)+ 14 more | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [with_kuery_autocompletion.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx#:~:text=IIndexPattern), [with_kuery_autocompletion.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx#:~:text=IIndexPattern), [kuery_bar.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx#:~:text=IIndexPattern), [kuery_bar.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx#:~:text=IIndexPattern), [toolbar.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/toolbars/toolbar.tsx#:~:text=IIndexPattern), [toolbar.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/toolbars/toolbar.tsx#:~:text=IIndexPattern), [kuery.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/utils/kuery.ts#:~:text=IIndexPattern), [kuery.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/utils/kuery.ts#:~:text=IIndexPattern), [use_metrics_explorer_data.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts#:~:text=IIndexPattern), [use_metrics_explorer_data.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts#:~:text=IIndexPattern)+ 34 more | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [custom_metric_form.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx#:~:text=IFieldType), [custom_metric_form.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx#:~:text=IFieldType), [index.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/index.tsx#:~:text=IFieldType), [index.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/index.tsx#:~:text=IFieldType), [custom_field_panel.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/custom_field_panel.tsx#:~:text=IFieldType), [custom_field_panel.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/custom_field_panel.tsx#:~:text=IFieldType), [waffle_group_by_controls.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx#:~:text=IFieldType), [waffle_group_by_controls.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx#:~:text=IFieldType), [metric.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx#:~:text=IFieldType), [metric.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx#:~:text=IFieldType)+ 46 more | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.indexPatterns" text="indexPatterns"/> | [editor.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx#:~:text=indexPatterns), [log_stream.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx#:~:text=indexPatterns), [log_stream.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx#:~:text=indexPatterns), [logs_overview_fetchers.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts#:~:text=indexPatterns), [redirect_to_node_logs.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx#:~:text=indexPatterns), [use_kibana_index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.ts#:~:text=indexPatterns), [page_providers.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/page_providers.tsx#:~:text=indexPatterns), [logs_overview_fetches.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts#:~:text=indexPatterns) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.esKuery" text="esKuery"/> | [kuery_bar.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx#:~:text=esKuery), [kuery_bar.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx#:~:text=esKuery), [kuery.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/utils/kuery.ts#:~:text=esKuery), [kuery.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/utils/kuery.ts#:~:text=esKuery), [kuery.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/utils/kuery.ts#:~:text=esKuery), [use_waffle_filters.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_filters.ts#:~:text=esKuery), [use_waffle_filters.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_filters.ts#:~:text=esKuery) | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-public.esQuery" text="esQuery"/> | [index.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts#:~:text=esQuery), [index.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts#:~:text=esQuery), [log_filter_state.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/logs/log_filter/log_filter_state.ts#:~:text=esQuery), [log_filter_state.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/logs/log_filter/log_filter_state.ts#:~:text=esQuery), [log_filter_state.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/logs/log_filter/log_filter_state.ts#:~:text=esQuery) | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [log_stream_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx#:~:text=Filter), [log_stream_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx#:~:text=Filter), [use_dataset_filtering.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts#:~:text=Filter), [use_dataset_filtering.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts#:~:text=Filter), [use_dataset_filtering.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts#:~:text=Filter) | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [custom_metric_form.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx#:~:text=IFieldType), [custom_metric_form.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx#:~:text=IFieldType), [index.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/index.tsx#:~:text=IFieldType), [index.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/index.tsx#:~:text=IFieldType), [custom_field_panel.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/custom_field_panel.tsx#:~:text=IFieldType), [custom_field_panel.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/custom_field_panel.tsx#:~:text=IFieldType), [waffle_group_by_controls.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx#:~:text=IFieldType), [waffle_group_by_controls.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx#:~:text=IFieldType), [metric.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx#:~:text=IFieldType), [metric.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx#:~:text=IFieldType)+ 102 more | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [with_kuery_autocompletion.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx#:~:text=IIndexPattern), [with_kuery_autocompletion.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx#:~:text=IIndexPattern), [kuery_bar.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx#:~:text=IIndexPattern), [kuery_bar.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx#:~:text=IIndexPattern), [toolbar.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/toolbars/toolbar.tsx#:~:text=IIndexPattern), [toolbar.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/toolbars/toolbar.tsx#:~:text=IIndexPattern), [kuery.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/utils/kuery.ts#:~:text=IIndexPattern), [kuery.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/utils/kuery.ts#:~:text=IIndexPattern), [use_metrics_explorer_data.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts#:~:text=IIndexPattern), [use_metrics_explorer_data.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts#:~:text=IIndexPattern)+ 78 more | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsContract" text="IndexPatternsContract"/> | [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPatternsContract), [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPatternsContract), [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPatternsContract), [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPatternsContract), [log_source.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts#:~:text=IndexPatternsContract), [log_source.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts#:~:text=IndexPatternsContract), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts#:~:text=IndexPatternsContract), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts#:~:text=IndexPatternsContract), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts#:~:text=IndexPatternsContract), [index_patterns.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts#:~:text=IndexPatternsContract)+ 12 more | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IndexPattern" text="IndexPattern"/> | [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPattern), [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPattern), [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPattern), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts#:~:text=IndexPattern), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts#:~:text=IndexPattern), [index_patterns.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts#:~:text=IndexPattern), [index_patterns.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts#:~:text=IndexPattern), [validation_errors.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts#:~:text=IndexPattern), [validation_errors.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts#:~:text=IndexPattern), [validation_errors.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts#:~:text=IndexPattern)+ 14 more | - |
 | <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [log_stream_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx#:~:text=Filter), [log_stream_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx#:~:text=Filter), [use_dataset_filtering.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts#:~:text=Filter), [use_dataset_filtering.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts#:~:text=Filter), [use_dataset_filtering.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts#:~:text=Filter) | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [custom_metric_form.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx#:~:text=IFieldType), [custom_metric_form.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx#:~:text=IFieldType), [index.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/index.tsx#:~:text=IFieldType), [index.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/index.tsx#:~:text=IFieldType), [custom_field_panel.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/custom_field_panel.tsx#:~:text=IFieldType), [custom_field_panel.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/custom_field_panel.tsx#:~:text=IFieldType), [waffle_group_by_controls.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx#:~:text=IFieldType), [waffle_group_by_controls.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx#:~:text=IFieldType), [metric.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx#:~:text=IFieldType), [metric.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx#:~:text=IFieldType)+ 46 more | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-server.IndexPattern" text="IndexPattern"/> | [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPattern), [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPattern), [resolved_log_source_configuration.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts#:~:text=IndexPattern), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts#:~:text=IndexPattern), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts#:~:text=IndexPattern), [index_patterns.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts#:~:text=IndexPattern), [index_patterns.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/common/dependency_mocks/index_patterns.d.ts#:~:text=IndexPattern), [validation_errors.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts#:~:text=IndexPattern), [validation_errors.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts#:~:text=IndexPattern), [validation_errors.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts#:~:text=IndexPattern)+ 2 more | - |
 | <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [log_stream_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx#:~:text=Filter), [log_stream_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx#:~:text=Filter), [use_dataset_filtering.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts#:~:text=Filter), [use_dataset_filtering.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts#:~:text=Filter), [use_dataset_filtering.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts#:~:text=Filter) | 8.1 |
 | <DocLink id="kibDataViewsPluginApi" section="def-server.DataViewsServerPluginStart.indexPatternsServiceFactory" text="indexPatternsServiceFactory"/> | [kibana_framework_adapter.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts#:~:text=indexPatternsServiceFactory), [log_entries_search_strategy.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts#:~:text=indexPatternsServiceFactory), [log_entry_search_strategy.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.ts#:~:text=indexPatternsServiceFactory) | - |
 | <DocLink id="kibSharePluginApi" section="def-public.LocatorPublic.getUrl" text="getUrl"/> | [module_list_card.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_flyout/module_list_card.tsx#:~:text=getUrl) | - |
@@ -555,12 +553,14 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternField" text="IndexPatternField"/> | [field_stats.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#:~:text=IndexPatternField), [field_stats.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#:~:text=IndexPatternField), [field_stats.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#:~:text=IndexPatternField), [field_stats.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#:~:text=IndexPatternField), [field_stats.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#:~:text=IndexPatternField), [field_stats.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts#:~:text=IndexPatternField), [field_stats.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts#:~:text=IndexPatternField), [field_stats.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts#:~:text=IndexPatternField), [field_stats.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts#:~:text=IndexPatternField), [field_stats.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#:~:text=IndexPatternField)+ 8 more | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsService" text="IndexPatternsService"/> | [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=IndexPatternsService), [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=IndexPatternsService), [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=IndexPatternsService), [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=IndexPatternsService) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsContract" text="IndexPatternsContract"/> | [embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/embeddable/embeddable.tsx#:~:text=IndexPatternsContract), [embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/embeddable/embeddable.tsx#:~:text=IndexPatternsContract), [utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/utils.ts#:~:text=IndexPatternsContract), [utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/utils.ts#:~:text=IndexPatternsContract), [loader.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts#:~:text=IndexPatternsContract), [loader.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts#:~:text=IndexPatternsContract), [embeddable_factory.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/embeddable/embeddable_factory.ts#:~:text=IndexPatternsContract), [embeddable_factory.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/embeddable/embeddable_factory.ts#:~:text=IndexPatternsContract), [loader.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts#:~:text=IndexPatternsContract), [loader.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts#:~:text=IndexPatternsContract)+ 20 more | - |
+| <DocLink id="kibDataPluginApi" section="def-common.DataViewsService.ensureDefaultDataView" text="ensureDefaultDataView"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/plugin.ts#:~:text=ensureDefaultDataView), [plugin.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/plugin.ts#:~:text=ensureDefaultDataView) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPattern" text="IndexPattern"/> | [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=IndexPattern), [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=IndexPattern), [existing_fields.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.test.ts#:~:text=IndexPattern), [existing_fields.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.test.ts#:~:text=IndexPattern), [existing_fields.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.test.ts#:~:text=IndexPattern), [existing_fields.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.test.ts#:~:text=IndexPattern), [existing_fields.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/existing_fields.d.ts#:~:text=IndexPattern), [existing_fields.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/existing_fields.d.ts#:~:text=IndexPattern), [loader.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts#:~:text=IndexPattern), [embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/embeddable/embeddable.tsx#:~:text=IndexPattern)+ 36 more | - |
 | <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/types.ts#:~:text=Filter), [embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/embeddable/embeddable.tsx#:~:text=Filter), [embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/embeddable/embeddable.tsx#:~:text=Filter), [embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/embeddable/embeddable.tsx#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/state_management/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/state_management/types.ts#:~:text=Filter), [field_item.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx#:~:text=Filter), [field_item.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx#:~:text=Filter)+ 16 more | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPatternField" text="IndexPatternField"/> | [field_stats.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#:~:text=IndexPatternField), [field_stats.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#:~:text=IndexPatternField), [field_stats.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#:~:text=IndexPatternField), [field_stats.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#:~:text=IndexPatternField), [field_stats.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#:~:text=IndexPatternField), [field_stats.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts#:~:text=IndexPatternField), [field_stats.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts#:~:text=IndexPatternField), [field_stats.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts#:~:text=IndexPatternField), [field_stats.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts#:~:text=IndexPatternField) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPattern" text="IndexPattern"/> | [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=IndexPattern), [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=IndexPattern), [existing_fields.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.test.ts#:~:text=IndexPattern), [existing_fields.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.test.ts#:~:text=IndexPattern), [existing_fields.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.test.ts#:~:text=IndexPattern), [existing_fields.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.test.ts#:~:text=IndexPattern), [existing_fields.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/existing_fields.d.ts#:~:text=IndexPattern), [existing_fields.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/existing_fields.d.ts#:~:text=IndexPattern), [loader.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts#:~:text=IndexPattern), [embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/embeddable/embeddable.tsx#:~:text=IndexPattern)+ 13 more | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPatternsService" text="IndexPatternsService"/> | [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=IndexPatternsService), [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=IndexPatternsService), [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=IndexPatternsService), [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=IndexPatternsService) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/types.ts#:~:text=Filter), [embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/embeddable/embeddable.tsx#:~:text=Filter), [embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/embeddable/embeddable.tsx#:~:text=Filter), [embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/embeddable/embeddable.tsx#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/state_management/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/state_management/types.ts#:~:text=Filter), [field_item.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx#:~:text=Filter), [field_item.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx#:~:text=Filter)+ 16 more | 8.1 |
+| <DocLink id="kibDataViewsPluginApi" section="def-public.DataViewsService.ensureDefaultDataView" text="ensureDefaultDataView"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/plugin.ts#:~:text=ensureDefaultDataView) | - |
 | <DocLink id="kibDataViewsPluginApi" section="def-server.DataViewsServerPluginStart.indexPatternsServiceFactory" text="indexPatternsServiceFactory"/> | [existing_fields.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/existing_fields.ts#:~:text=indexPatternsServiceFactory), [field_stats.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#:~:text=indexPatternsServiceFactory) | - |
 | <DocLink id="kibCorePluginApi" section="def-public.AppMountParameters.onAppLeave" text="onAppLeave"/> | [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/app_plugin/types.ts#:~:text=onAppLeave), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/app_plugin/types.ts#:~:text=onAppLeave), [mounter.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/app_plugin/mounter.tsx#:~:text=onAppLeave) | - |
 | <DocLink id="kibCorePluginApi" section="def-server.SavedObjectsMigrationLogger.warning" text="warning"/> | [saved_object_migrations.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/migrations/saved_object_migrations.ts#:~:text=warning), [saved_object_migrations.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/migrations/saved_object_migrations.ts#:~:text=warning) | - |
@@ -625,23 +625,10 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibDataPluginApi" section="def-public.IndexPatternsContract" text="IndexPatternsContract"/> | [dependency_cache.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/dependency_cache.ts#:~:text=IndexPatternsContract), [dependency_cache.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/dependency_cache.ts#:~:text=IndexPatternsContract), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPatternsContract), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPatternsContract), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPatternsContract), [resolvers.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/routing/resolvers.ts#:~:text=IndexPatternsContract), [resolvers.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/routing/resolvers.ts#:~:text=IndexPatternsContract), [preconfigured_job_redirect.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts#:~:text=IndexPatternsContract), [preconfigured_job_redirect.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts#:~:text=IndexPatternsContract), [load_new_job_capabilities.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts#:~:text=IndexPatternsContract)+ 32 more | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IndexPattern" text="IndexPattern"/> | [chart_loader.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts#:~:text=IndexPattern), [chart_loader.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/types.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/types.ts#:~:text=IndexPattern), [anomaly_charts_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx#:~:text=IndexPattern), [anomaly_charts_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx#:~:text=IndexPattern), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPattern), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPattern), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPattern), [field_format_service.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/field_format_service.ts#:~:text=IndexPattern)+ 130 more | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IIndexPattern), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IIndexPattern), [new_job_capabilities_service_analytics.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts#:~:text=IIndexPattern), [new_job_capabilities_service_analytics.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts#:~:text=IIndexPattern), [data_recognizer.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts#:~:text=IIndexPattern), [data_recognizer.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts#:~:text=IIndexPattern), [new_job_capabilities_service.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts#:~:text=IIndexPattern), [new_job_capabilities_service.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts#:~:text=IIndexPattern), [load_new_job_capabilities.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts#:~:text=IIndexPattern), [load_new_job_capabilities.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts#:~:text=IIndexPattern)+ 24 more | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [common.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/data_grid/common.ts#:~:text=IFieldType), [common.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/data_grid/common.ts#:~:text=IFieldType), [field_types_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.ts#:~:text=IFieldType), [field_types_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-public.IndexPatternAttributes" text="IndexPatternAttributes"/> | [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPatternAttributes), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPatternAttributes), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts#:~:text=IndexPatternAttributes), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts#:~:text=IndexPatternAttributes), [rollup.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts#:~:text=IndexPatternAttributes), [rollup.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts#:~:text=IndexPatternAttributes), [rollup.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts#:~:text=IndexPatternAttributes), [data_recognizer.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts#:~:text=IndexPatternAttributes), [data_recognizer.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts#:~:text=IndexPatternAttributes), [kibana.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/common/types/kibana.ts#:~:text=IndexPatternAttributes)+ 3 more | - |
 | <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.indexPatterns" text="indexPatterns"/> | [index_data_visualizer.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx#:~:text=indexPatterns), [file_datavisualizer.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx#:~:text=indexPatterns), [app.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/app.tsx#:~:text=indexPatterns), [app.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/app.tsx#:~:text=indexPatterns), [import_jobs_flyout.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/import_jobs_flyout.tsx#:~:text=indexPatterns), [anomaly_charts_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx#:~:text=indexPatterns) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | [dependency_cache.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/dependency_cache.ts#:~:text=fieldFormats), [app.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/app.tsx#:~:text=fieldFormats), [dependency_cache.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/target/types/public/application/util/dependency_cache.d.ts#:~:text=fieldFormats) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [apply_influencer_filters_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx#:~:text=Filter), [apply_influencer_filters_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx#:~:text=Filter), [apply_entity_filters_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx#:~:text=Filter), [apply_entity_filters_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx#:~:text=Filter) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [common.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/data_grid/common.ts#:~:text=IFieldType), [common.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/data_grid/common.ts#:~:text=IFieldType), [field_types_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.ts#:~:text=IFieldType), [field_types_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [common.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/data_grid/common.ts#:~:text=IFieldType)+ 8 more | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IIndexPattern), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IIndexPattern), [new_job_capabilities_service_analytics.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts#:~:text=IIndexPattern), [new_job_capabilities_service_analytics.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts#:~:text=IIndexPattern), [data_recognizer.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts#:~:text=IIndexPattern), [data_recognizer.d.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts#:~:text=IIndexPattern), [new_job_capabilities_service.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts#:~:text=IIndexPattern), [new_job_capabilities_service.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts#:~:text=IIndexPattern), [load_new_job_capabilities.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts#:~:text=IIndexPattern), [load_new_job_capabilities.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts#:~:text=IIndexPattern)+ 58 more | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IndexPatternAttributes" text="IndexPatternAttributes"/> | [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPatternAttributes), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPatternAttributes), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts#:~:text=IndexPatternAttributes), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts#:~:text=IndexPatternAttributes), [rollup.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts#:~:text=IndexPatternAttributes), [rollup.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts#:~:text=IndexPatternAttributes), [rollup.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts#:~:text=IndexPatternAttributes), [data_recognizer.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts#:~:text=IndexPatternAttributes), [data_recognizer.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts#:~:text=IndexPatternAttributes), [kibana.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/common/types/kibana.ts#:~:text=IndexPatternAttributes)+ 16 more | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IndexPatternsContract" text="IndexPatternsContract"/> | [dependency_cache.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/dependency_cache.ts#:~:text=IndexPatternsContract), [dependency_cache.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/dependency_cache.ts#:~:text=IndexPatternsContract), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPatternsContract), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPatternsContract), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPatternsContract), [resolvers.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/routing/resolvers.ts#:~:text=IndexPatternsContract), [resolvers.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/routing/resolvers.ts#:~:text=IndexPatternsContract), [preconfigured_job_redirect.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts#:~:text=IndexPatternsContract), [preconfigured_job_redirect.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts#:~:text=IndexPatternsContract), [load_new_job_capabilities.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts#:~:text=IndexPatternsContract)+ 32 more | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IndexPattern" text="IndexPattern"/> | [chart_loader.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts#:~:text=IndexPattern), [chart_loader.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/types.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/types.ts#:~:text=IndexPattern), [anomaly_charts_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx#:~:text=IndexPattern), [anomaly_charts_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx#:~:text=IndexPattern), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPattern), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPattern), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPattern), [field_format_service.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/field_format_service.ts#:~:text=IndexPattern)+ 130 more | - |
 | <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [apply_influencer_filters_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx#:~:text=Filter), [apply_influencer_filters_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx#:~:text=Filter), [apply_entity_filters_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx#:~:text=Filter), [apply_entity_filters_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx#:~:text=Filter) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [common.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/data_grid/common.ts#:~:text=IFieldType), [common.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/data_grid/common.ts#:~:text=IFieldType), [field_types_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.ts#:~:text=IFieldType), [field_types_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType), [field_types_utils.test.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts#:~:text=IFieldType) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-server.IndexPatternAttributes" text="IndexPatternAttributes"/> | [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPatternAttributes), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPatternAttributes), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts#:~:text=IndexPatternAttributes), [index_patterns.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts#:~:text=IndexPatternAttributes), [rollup.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts#:~:text=IndexPatternAttributes), [rollup.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts#:~:text=IndexPatternAttributes), [rollup.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts#:~:text=IndexPatternAttributes), [data_recognizer.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts#:~:text=IndexPatternAttributes), [data_recognizer.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts#:~:text=IndexPatternAttributes), [kibana.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/common/types/kibana.ts#:~:text=IndexPatternAttributes)+ 3 more | - |
-| <DocLink id="kibDataPluginApi" section="def-server.IndexPattern" text="IndexPattern"/> | [chart_loader.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts#:~:text=IndexPattern), [chart_loader.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/types.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/types.ts#:~:text=IndexPattern), [anomaly_charts_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx#:~:text=IndexPattern), [anomaly_charts_embeddable.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx#:~:text=IndexPattern), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPattern), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPattern), [index_utils.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/util/index_utils.ts#:~:text=IndexPattern), [field_format_service.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/services/field_format_service.ts#:~:text=IndexPattern)+ 60 more | - |
 | <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [apply_influencer_filters_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx#:~:text=Filter), [apply_influencer_filters_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx#:~:text=Filter), [apply_entity_filters_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx#:~:text=Filter), [apply_entity_filters_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx#:~:text=Filter) | 8.1 |
 | <DocLink id="kibSharePluginApi" section="def-public.LocatorPublic.getUrl" text="getUrl"/> | [use_create_url.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts#:~:text=getUrl), [use_create_url.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts#:~:text=getUrl), [main_tabs.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/navigation_menu/main_tabs.tsx#:~:text=getUrl), [anomaly_detection_panel.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/overview/components/anomaly_detection_panel/anomaly_detection_panel.tsx#:~:text=getUrl), [anomaly_detection_panel.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/overview/components/anomaly_detection_panel/anomaly_detection_panel.tsx#:~:text=getUrl), [use_view_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/use_view_action.tsx#:~:text=getUrl), [use_map_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_map/use_map_action.tsx#:~:text=getUrl), [analytics_panel.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/overview/components/analytics_panel/analytics_panel.tsx#:~:text=getUrl), [page.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx#:~:text=getUrl), [page.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx#:~:text=getUrl)+ 14 more | - |
 | <DocLink id="kibSharePluginApi" section="def-common.LocatorPublic.getUrl" text="getUrl"/> | [use_create_url.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts#:~:text=getUrl), [use_create_url.ts](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts#:~:text=getUrl), [main_tabs.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/components/navigation_menu/main_tabs.tsx#:~:text=getUrl), [anomaly_detection_panel.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/overview/components/anomaly_detection_panel/anomaly_detection_panel.tsx#:~:text=getUrl), [anomaly_detection_panel.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/overview/components/anomaly_detection_panel/anomaly_detection_panel.tsx#:~:text=getUrl), [use_view_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_view/use_view_action.tsx#:~:text=getUrl), [use_map_action.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_map/use_map_action.tsx#:~:text=getUrl), [analytics_panel.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/overview/components/analytics_panel/analytics_panel.tsx#:~:text=getUrl), [page.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx#:~:text=getUrl), [page.tsx](https://github.com/elastic/kibana/tree/master/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx#:~:text=getUrl)+ 14 more | - |
@@ -979,7 +966,6 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-common.AggConfig.toJSON" text="toJSON"/> | [reducers.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts#:~:text=toJSON), [reducers.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts#:~:text=toJSON), [reducers.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts#:~:text=toJSON), [sidebar.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx#:~:text=toJSON) | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPatternField" text="IndexPatternField"/> | [agg_type_field_filters.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/agg_filters/agg_type_field_filters.ts#:~:text=IndexPatternField), [agg_type_field_filters.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/agg_filters/agg_type_field_filters.ts#:~:text=IndexPatternField), [agg_type_field_filters.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/agg_filters/agg_type_field_filters.ts#:~:text=IndexPatternField), [agg_param_props.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/agg_param_props.ts#:~:text=IndexPatternField), [agg_param_props.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/agg_param_props.ts#:~:text=IndexPatternField), [field.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/controls/field.tsx#:~:text=IndexPatternField), [field.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/controls/field.tsx#:~:text=IndexPatternField), [field.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/controls/field.tsx#:~:text=IndexPatternField), [field.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/controls/field.tsx#:~:text=IndexPatternField), [top_field.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/controls/top_field.tsx#:~:text=IndexPatternField)+ 14 more | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPattern" text="IndexPattern"/> | [agg_type_filters.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/agg_filters/agg_type_filters.ts#:~:text=IndexPattern), [agg_type_filters.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/agg_filters/agg_type_filters.ts#:~:text=IndexPattern), [agg_type_filters.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/agg_filters/agg_type_filters.ts#:~:text=IndexPattern), [editor_config.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/utils/editor_config.ts#:~:text=IndexPattern), [editor_config.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/utils/editor_config.ts#:~:text=IndexPattern), [agg_params_helper.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/agg_params_helper.ts#:~:text=IndexPattern), [agg_params_helper.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/agg_params_helper.ts#:~:text=IndexPattern), [agg_select.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/agg_select.tsx#:~:text=IndexPattern), [agg_select.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/agg_select.tsx#:~:text=IndexPattern), [agg_params.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/agg_params.tsx#:~:text=IndexPattern)+ 7 more | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [sidebar_title.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx#:~:text=SavedObject), [sidebar_title.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx#:~:text=SavedObject), [sidebar_title.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx#:~:text=SavedObject), [sidebar.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx#:~:text=SavedObject), [sidebar.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx#:~:text=SavedObject), [sidebar.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/target/types/public/components/sidebar/sidebar.d.ts#:~:text=SavedObject), [sidebar.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/target/types/public/components/sidebar/sidebar.d.ts#:~:text=SavedObject), [sidebar_title.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/target/types/public/components/sidebar/sidebar_title.d.ts#:~:text=SavedObject), [sidebar_title.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/target/types/public/components/sidebar/sidebar_title.d.ts#:~:text=SavedObject), [sidebar_title.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_default_editor/target/types/public/components/sidebar/sidebar_title.d.ts#:~:text=SavedObject) | - |
 
 
 
@@ -1100,7 +1086,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-common.AggConfig.toJSON" text="toJSON"/> | [vis.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/vis.ts#:~:text=toJSON) | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPattern" text="IndexPattern"/> | [vis.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/vis.ts#:~:text=IndexPattern), [vis.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/vis.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/vis_types/types.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/vis_types/types.ts#:~:text=IndexPattern), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/vis_types/types.ts#:~:text=IndexPattern), [create_vis_embeddable_from_object.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/embeddable/create_vis_embeddable_from_object.ts#:~:text=IndexPattern), [create_vis_embeddable_from_object.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/embeddable/create_vis_embeddable_from_object.ts#:~:text=IndexPattern), [visualize_embeddable.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts#:~:text=IndexPattern), [visualize_embeddable.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts#:~:text=IndexPattern), [visualize_embeddable.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts#:~:text=IndexPattern) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [visualize_embeddable.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts#:~:text=Filter), [visualize_embeddable.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts#:~:text=Filter), [visualize_embeddable.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts#:~:text=Filter) | 8.1 |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [find_list_items.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/find_list_items.ts#:~:text=SavedObjectLoader), [find_list_items.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/find_list_items.ts#:~:text=SavedObjectLoader), [saved_visualizations.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts#:~:text=SavedObjectLoader), [saved_visualizations.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts#:~:text=SavedObjectLoader), [saved_visualizations.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts#:~:text=SavedObjectLoader), [services.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/services.ts#:~:text=SavedObjectLoader), [services.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/services.ts#:~:text=SavedObjectLoader) | - |
+| <DocLink id="kibDiscoverPluginApi" section="def-public.__LEGACY" text="__LEGACY"/> | [_saved_vis.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts#:~:text=__LEGACY), [_saved_vis.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts#:~:text=__LEGACY) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [find_list_items.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/find_list_items.ts#:~:text=SavedObjectLoader), [find_list_items.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/find_list_items.ts#:~:text=SavedObjectLoader), [saved_visualizations.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts#:~:text=SavedObjectLoader), [saved_visualizations.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts#:~:text=SavedObjectLoader), [saved_visualizations.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts#:~:text=SavedObjectLoader) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [_saved_vis.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts#:~:text=SavedObject), [_saved_vis.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts#:~:text=SavedObject), [_saved_vis.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts#:~:text=SavedObject), [_saved_vis.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts#:~:text=SavedObject) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectsStart.SavedObjectClass" text="SavedObjectClass"/> | [_saved_vis.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts#:~:text=SavedObjectClass) | - |
 
@@ -1114,12 +1101,13 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.indexPatterns" text="indexPatterns"/> | [visualize_top_nav.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_top_nav.tsx#:~:text=indexPatterns), [visualize_top_nav.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_top_nav.tsx#:~:text=indexPatterns), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/plugin.ts#:~:text=indexPatterns), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/plugin.ts#:~:text=indexPatterns) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.esFilters" text="esFilters"/> | [use_visualize_app_state.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/use/use_visualize_app_state.tsx#:~:text=esFilters), [use_visualize_app_state.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/use/use_visualize_app_state.tsx#:~:text=esFilters), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/plugin.ts#:~:text=esFilters), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/plugin.ts#:~:text=esFilters), [get_visualize_list_item_link.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/get_visualize_list_item_link.test.ts#:~:text=esFilters), [get_visualize_list_item_link.test.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/get_visualize_list_item_link.test.ts#:~:text=esFilters) | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=Filter), [utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/utils.ts#:~:text=Filter), [utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/utils.ts#:~:text=Filter), [use_linked_search_updates.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/use/use_linked_search_updates.ts#:~:text=Filter), [use_linked_search_updates.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/use/use_linked_search_updates.ts#:~:text=Filter), [types.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/types.d.ts#:~:text=Filter), [types.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/types.d.ts#:~:text=Filter)+ 6 more | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-common.DataViewsService.ensureDefaultDataView" text="ensureDefaultDataView"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/plugin.ts#:~:text=ensureDefaultDataView), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/plugin.ts#:~:text=ensureDefaultDataView) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IndexPattern" text="IndexPattern"/> | [visualize_top_nav.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_top_nav.tsx#:~:text=IndexPattern), [visualize_top_nav.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_top_nav.tsx#:~:text=IndexPattern), [visualize_top_nav.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_top_nav.tsx#:~:text=IndexPattern), [visualize_top_nav.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_top_nav.tsx#:~:text=IndexPattern), [visualize_top_nav.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_top_nav.tsx#:~:text=IndexPattern), [visualize_top_nav.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_top_nav.tsx#:~:text=IndexPattern) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.isFilterPinned" text="isFilterPinned"/> | [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/common/locator.ts#:~:text=isFilterPinned), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/common/locator.ts#:~:text=isFilterPinned), [locator.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/common/locator.ts#:~:text=isFilterPinned) | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=Filter), [utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/utils.ts#:~:text=Filter), [utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/utils.ts#:~:text=Filter), [use_linked_search_updates.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/use/use_linked_search_updates.ts#:~:text=Filter), [use_linked_search_updates.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/use/use_linked_search_updates.ts#:~:text=Filter), [types.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/types.d.ts#:~:text=Filter), [types.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/types.d.ts#:~:text=Filter)+ 6 more | 8.1 |
 | <DocLink id="kibDataPluginApi" section="def-server.IndexPattern" text="IndexPattern"/> | [visualize_top_nav.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_top_nav.tsx#:~:text=IndexPattern), [visualize_top_nav.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_top_nav.tsx#:~:text=IndexPattern), [visualize_top_nav.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_top_nav.tsx#:~:text=IndexPattern) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=Filter), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=Filter), [utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/utils.ts#:~:text=Filter), [utils.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/utils.ts#:~:text=Filter), [use_linked_search_updates.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/use/use_linked_search_updates.ts#:~:text=Filter), [use_linked_search_updates.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/use/use_linked_search_updates.ts#:~:text=Filter), [types.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/types.d.ts#:~:text=Filter), [types.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/types.d.ts#:~:text=Filter)+ 6 more | 8.1 |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=SavedObject), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=SavedObject), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=SavedObject), [types.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/types.ts#:~:text=SavedObject), [get_visualization_instance.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/get_visualization_instance.ts#:~:text=SavedObject), [get_visualization_instance.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/utils/get_visualization_instance.ts#:~:text=SavedObject), [types.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/types.d.ts#:~:text=SavedObject), [types.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/types.d.ts#:~:text=SavedObject), [types.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/types.d.ts#:~:text=SavedObject), [types.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/types.d.ts#:~:text=SavedObject)+ 3 more | - |
+| <DocLink id="kibDataViewsPluginApi" section="def-public.DataViewsService.ensureDefaultDataView" text="ensureDefaultDataView"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/plugin.ts#:~:text=ensureDefaultDataView) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectsStart.settings" text="settings"/> | [visualize_listing.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_listing.tsx#:~:text=settings), [visualize_listing.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_listing.tsx#:~:text=settings) | - |
 | <DocLink id="kibCorePluginApi" section="def-public.AppMountParameters.onAppLeave" text="onAppLeave"/> | [visualize_top_nav.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_top_nav.tsx#:~:text=onAppLeave), [visualize_editor_common.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/components/visualize_editor_common.tsx#:~:text=onAppLeave), [app.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/app.tsx#:~:text=onAppLeave), [index.tsx](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/public/application/index.tsx#:~:text=onAppLeave), [app.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/app.d.ts#:~:text=onAppLeave), [index.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/index.d.ts#:~:text=onAppLeave), [visualize_editor_common.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/components/visualize_editor_common.d.ts#:~:text=onAppLeave), [visualize_top_nav.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/visualize/target/types/public/application/components/visualize_top_nav.d.ts#:~:text=onAppLeave) | - |
 
diff --git a/api_docs/discover.json b/api_docs/discover.json
index bab87863a903b..2e8dd6a450e7a 100644
--- a/api_docs/discover.json
+++ b/api_docs/discover.json
@@ -5,35 +5,157 @@
     "functions": [
       {
         "parentPluginId": "discover",
-        "id": "def-public.createSavedSearchesLoader",
+        "id": "def-public.getSavedSearch",
         "type": "Function",
         "tags": [],
-        "label": "createSavedSearchesLoader",
+        "label": "getSavedSearch",
         "description": [],
         "signature": [
-          "({ savedObjectsClient, savedObjects }: Services) => ",
+          "(savedSearchId: string | undefined, dependencies: GetSavedSearchDependencies) => Promise<",
           {
-            "pluginId": "savedObjects",
+            "pluginId": "discover",
             "scope": "public",
-            "docId": "kibSavedObjectsPluginApi",
-            "section": "def-public.SavedObjectLoader",
-            "text": "SavedObjectLoader"
+            "docId": "kibDiscoverPluginApi",
+            "section": "def-public.SavedSearch",
+            "text": "SavedSearch"
+          },
+          ">"
+        ],
+        "path": "src/plugins/discover/public/saved_searches/get_saved_searches.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.getSavedSearch.$1",
+            "type": "string",
+            "tags": [],
+            "label": "savedSearchId",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/get_saved_searches.ts",
+            "deprecated": false,
+            "isRequired": false
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.getSavedSearch.$2",
+            "type": "Object",
+            "tags": [],
+            "label": "dependencies",
+            "description": [],
+            "signature": [
+              "GetSavedSearchDependencies"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/get_saved_searches.ts",
+            "deprecated": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "discover",
+        "id": "def-public.getSavedSearchFullPathUrl",
+        "type": "Function",
+        "tags": [],
+        "label": "getSavedSearchFullPathUrl",
+        "description": [],
+        "signature": [
+          "(id?: string | undefined) => string"
+        ],
+        "path": "src/plugins/discover/public/saved_searches/saved_searches_utils.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.getSavedSearchFullPathUrl.$1",
+            "type": "string",
+            "tags": [],
+            "label": "id",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/saved_searches_utils.ts",
+            "deprecated": false,
+            "isRequired": false
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "discover",
+        "id": "def-public.getSavedSearchUrl",
+        "type": "Function",
+        "tags": [],
+        "label": "getSavedSearchUrl",
+        "description": [],
+        "signature": [
+          "(id?: string | undefined) => string"
+        ],
+        "path": "src/plugins/discover/public/saved_searches/saved_searches_utils.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.getSavedSearchUrl.$1",
+            "type": "string",
+            "tags": [],
+            "label": "id",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/saved_searches_utils.ts",
+            "deprecated": false,
+            "isRequired": false
           }
         ],
-        "path": "src/plugins/discover/public/saved_searches/saved_searches.ts",
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "discover",
+        "id": "def-public.getSavedSearchUrlConflictMessage",
+        "type": "Function",
+        "tags": [],
+        "label": "getSavedSearchUrlConflictMessage",
+        "description": [],
+        "signature": [
+          "(savedSearch: ",
+          {
+            "pluginId": "discover",
+            "scope": "public",
+            "docId": "kibDiscoverPluginApi",
+            "section": "def-public.SavedSearch",
+            "text": "SavedSearch"
+          },
+          ") => Promise<string>"
+        ],
+        "path": "src/plugins/discover/public/saved_searches/saved_searches_utils.ts",
         "deprecated": false,
         "children": [
           {
             "parentPluginId": "discover",
-            "id": "def-public.createSavedSearchesLoader.$1",
+            "id": "def-public.getSavedSearchUrlConflictMessage.$1",
             "type": "Object",
             "tags": [],
-            "label": "{ savedObjectsClient, savedObjects }",
+            "label": "savedSearch",
             "description": [],
             "signature": [
-              "Services"
+              {
+                "pluginId": "discover",
+                "scope": "public",
+                "docId": "kibDiscoverPluginApi",
+                "section": "def-public.SavedSearch",
+                "text": "SavedSearch"
+              }
             ],
-            "path": "src/plugins/discover/public/saved_searches/saved_searches.ts",
+            "path": "src/plugins/discover/public/saved_searches/saved_searches_utils.ts",
             "deprecated": false,
             "isRequired": true
           }
@@ -58,6 +180,51 @@
         "children": [],
         "returnComment": [],
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "discover",
+        "id": "def-public.throwErrorOnSavedSearchUrlConflict",
+        "type": "Function",
+        "tags": [],
+        "label": "throwErrorOnSavedSearchUrlConflict",
+        "description": [],
+        "signature": [
+          "(savedSearch: ",
+          {
+            "pluginId": "discover",
+            "scope": "public",
+            "docId": "kibDiscoverPluginApi",
+            "section": "def-public.SavedSearch",
+            "text": "SavedSearch"
+          },
+          ") => Promise<void>"
+        ],
+        "path": "src/plugins/discover/public/saved_searches/saved_searches_utils.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.throwErrorOnSavedSearchUrlConflict.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "savedSearch",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "discover",
+                "scope": "public",
+                "docId": "kibDiscoverPluginApi",
+                "section": "def-public.SavedSearch",
+                "text": "SavedSearch"
+              }
+            ],
+            "path": "src/plugins/discover/public/saved_searches/saved_searches_utils.ts",
+            "deprecated": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
       }
     ],
     "interfaces": [
@@ -602,181 +769,341 @@
       },
       {
         "parentPluginId": "discover",
-        "id": "def-public.SavedSearch",
+        "id": "def-public.LegacySavedSearch",
         "type": "Interface",
-        "tags": [],
-        "label": "SavedSearch",
+        "tags": [
+          "deprecated"
+        ],
+        "label": "LegacySavedSearch",
         "description": [],
-        "path": "src/plugins/discover/public/saved_searches/types.ts",
-        "deprecated": false,
+        "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
+        "deprecated": true,
+        "references": [],
         "children": [
           {
             "parentPluginId": "discover",
-            "id": "def-public.SavedSearch.id",
+            "id": "def-public.LegacySavedSearch.id",
             "type": "string",
             "tags": [],
             "label": "id",
             "description": [],
-            "path": "src/plugins/discover/public/saved_searches/types.ts",
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
             "deprecated": false
           },
           {
             "parentPluginId": "discover",
-            "id": "def-public.SavedSearch.title",
+            "id": "def-public.LegacySavedSearch.title",
             "type": "string",
             "tags": [],
             "label": "title",
             "description": [],
-            "path": "src/plugins/discover/public/saved_searches/types.ts",
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
             "deprecated": false
           },
           {
             "parentPluginId": "discover",
-            "id": "def-public.SavedSearch.searchSource",
+            "id": "def-public.LegacySavedSearch.searchSource",
             "type": "Object",
             "tags": [],
             "label": "searchSource",
             "description": [],
             "signature": [
+              "{ create: () => ",
               {
                 "pluginId": "data",
                 "scope": "common",
                 "docId": "kibDataSearchPluginApi",
                 "section": "def-common.SearchSource",
                 "text": "SearchSource"
-              }
-            ],
-            "path": "src/plugins/discover/public/saved_searches/types.ts",
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "discover",
-            "id": "def-public.SavedSearch.description",
-            "type": "string",
-            "tags": [],
-            "label": "description",
-            "description": [],
-            "signature": [
-              "string | undefined"
-            ],
-            "path": "src/plugins/discover/public/saved_searches/types.ts",
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "discover",
-            "id": "def-public.SavedSearch.columns",
-            "type": "Array",
-            "tags": [],
-            "label": "columns",
-            "description": [],
-            "signature": [
-              "string[]"
-            ],
-            "path": "src/plugins/discover/public/saved_searches/types.ts",
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "discover",
-            "id": "def-public.SavedSearch.sort",
-            "type": "Array",
-            "tags": [],
-            "label": "sort",
-            "description": [],
-            "signature": [
-              "SortOrder",
-              "[]"
-            ],
-            "path": "src/plugins/discover/public/saved_searches/types.ts",
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "discover",
-            "id": "def-public.SavedSearch.grid",
-            "type": "Object",
-            "tags": [],
-            "label": "grid",
-            "description": [],
-            "signature": [
-              "DiscoverGridSettings"
-            ],
-            "path": "src/plugins/discover/public/saved_searches/types.ts",
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "discover",
-            "id": "def-public.SavedSearch.destroy",
-            "type": "Function",
-            "tags": [],
-            "label": "destroy",
-            "description": [],
-            "signature": [
-              "() => void"
-            ],
-            "path": "src/plugins/discover/public/saved_searches/types.ts",
-            "deprecated": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "discover",
-            "id": "def-public.SavedSearch.save",
-            "type": "Function",
-            "tags": [],
-            "label": "save",
-            "description": [],
-            "signature": [
-              "(saveOptions: ",
+              },
+              "; history: Record<string, any>[]; setPreferredSearchStrategyId: (searchStrategyId: string) => void; setField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
               {
-                "pluginId": "savedObjects",
-                "scope": "public",
-                "docId": "kibSavedObjectsPluginApi",
-                "section": "def-public.SavedObjectSaveOpts",
-                "text": "SavedObjectSaveOpts"
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceFields",
+                "text": "SearchSourceFields"
               },
-              ") => Promise<string>"
-            ],
-            "path": "src/plugins/discover/public/saved_searches/types.ts",
-            "deprecated": false,
-            "children": [
+              "[K]) => ",
               {
-                "parentPluginId": "discover",
-                "id": "def-public.SavedSearch.save.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "saveOptions",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "savedObjects",
-                    "scope": "public",
-                    "docId": "kibSavedObjectsPluginApi",
-                    "section": "def-public.SavedObjectSaveOpts",
-                    "text": "SavedObjectSaveOpts"
-                  }
-                ],
-                "path": "src/plugins/discover/public/saved_searches/types.ts",
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; removeField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; setFields: (newFields: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceFields",
+                "text": "SearchSourceFields"
+              },
+              ") => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; getId: () => string; getFields: () => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceFields",
+                "text": "SearchSourceFields"
+              },
+              "; getField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceFields",
+                "text": "SearchSourceFields"
+              },
+              "[K]; getOwnField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceFields",
+                "text": "SearchSourceFields"
+              },
+              "[K]; createCopy: () => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; createChild: (options?: {}) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; setParent: (parent?: Pick<",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              ", \"create\" | \"history\" | \"setPreferredSearchStrategyId\" | \"setField\" | \"removeField\" | \"setFields\" | \"getId\" | \"getFields\" | \"getField\" | \"getOwnField\" | \"createCopy\" | \"createChild\" | \"setParent\" | \"getParent\" | \"fetch$\" | \"fetch\" | \"onRequestStart\" | \"getSearchRequestBody\" | \"destroy\" | \"getSerializedFields\" | \"serialize\"> | undefined, options?: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceOptions",
+                "text": "SearchSourceOptions"
+              },
+              ") => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; getParent: () => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              " | undefined; fetch$: (options?: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.ISearchOptions",
+                "text": "ISearchOptions"
+              },
+              ") => ",
+              "Observable",
+              "<",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.IKibanaSearchResponse",
+                "text": "IKibanaSearchResponse"
+              },
+              "<",
+              "SearchResponse",
+              "<any>>>; fetch: (options?: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.ISearchOptions",
+                "text": "ISearchOptions"
+              },
+              ") => Promise<",
+              "SearchResponse",
+              "<any>>; onRequestStart: (handler: (searchSource: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              ", options?: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.ISearchOptions",
+                "text": "ISearchOptions"
+              },
+              " | undefined) => Promise<unknown>) => void; getSearchRequestBody: () => any; destroy: () => void; getSerializedFields: (recurse?: boolean) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceFields",
+                "text": "SearchSourceFields"
+              },
+              "; serialize: () => { searchSourceJSON: string; references: ",
+              "SavedObjectReference",
+              "[]; }; }"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
+            "deprecated": false
           },
           {
             "parentPluginId": "discover",
-            "id": "def-public.SavedSearch.lastSavedTitle",
+            "id": "def-public.LegacySavedSearch.description",
             "type": "string",
             "tags": [],
-            "label": "lastSavedTitle",
+            "label": "description",
             "description": [],
             "signature": [
               "string | undefined"
             ],
-            "path": "src/plugins/discover/public/saved_searches/types.ts",
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.LegacySavedSearch.columns",
+            "type": "Array",
+            "tags": [],
+            "label": "columns",
+            "description": [],
+            "signature": [
+              "string[]"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.LegacySavedSearch.sort",
+            "type": "Array",
+            "tags": [],
+            "label": "sort",
+            "description": [],
+            "signature": [
+              "SortOrder",
+              "[]"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
             "deprecated": false
           },
           {
             "parentPluginId": "discover",
-            "id": "def-public.SavedSearch.copyOnSave",
+            "id": "def-public.LegacySavedSearch.grid",
+            "type": "Object",
+            "tags": [],
+            "label": "grid",
+            "description": [],
+            "signature": [
+              "DiscoverGridSettings"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.LegacySavedSearch.destroy",
+            "type": "Function",
+            "tags": [],
+            "label": "destroy",
+            "description": [],
+            "signature": [
+              "() => void"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.LegacySavedSearch.save",
+            "type": "Function",
+            "tags": [],
+            "label": "save",
+            "description": [],
+            "signature": [
+              "(saveOptions: ",
+              {
+                "pluginId": "savedObjects",
+                "scope": "public",
+                "docId": "kibSavedObjectsPluginApi",
+                "section": "def-public.SavedObjectSaveOpts",
+                "text": "SavedObjectSaveOpts"
+              },
+              ") => Promise<string>"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "discover",
+                "id": "def-public.LegacySavedSearch.save.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "saveOptions",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "savedObjects",
+                    "scope": "public",
+                    "docId": "kibSavedObjectsPluginApi",
+                    "section": "def-public.SavedObjectSaveOpts",
+                    "text": "SavedObjectSaveOpts"
+                  }
+                ],
+                "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.LegacySavedSearch.copyOnSave",
             "type": "CompoundType",
             "tags": [],
             "label": "copyOnSave",
@@ -784,6 +1111,301 @@
             "signature": [
               "boolean | undefined"
             ],
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.LegacySavedSearch.hideChart",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "hideChart",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
+            "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "discover",
+        "id": "def-public.SavedSearch",
+        "type": "Interface",
+        "tags": [],
+        "label": "SavedSearch",
+        "description": [],
+        "path": "src/plugins/discover/public/saved_searches/types.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.SavedSearch.searchSource",
+            "type": "Object",
+            "tags": [],
+            "label": "searchSource",
+            "description": [],
+            "signature": [
+              "{ create: () => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; history: Record<string, any>[]; setPreferredSearchStrategyId: (searchStrategyId: string) => void; setField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, value: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceFields",
+                "text": "SearchSourceFields"
+              },
+              "[K]) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; removeField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; setFields: (newFields: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceFields",
+                "text": "SearchSourceFields"
+              },
+              ") => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; getId: () => string; getFields: () => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceFields",
+                "text": "SearchSourceFields"
+              },
+              "; getField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K, recurse?: boolean) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceFields",
+                "text": "SearchSourceFields"
+              },
+              "[K]; getOwnField: <K extends \"type\" | \"query\" | \"source\" | \"sort\" | \"version\" | \"filter\" | \"highlight\" | \"highlightAll\" | \"trackTotalHits\" | \"aggs\" | \"from\" | \"size\" | \"fields\" | \"fieldsFromSource\" | \"index\" | \"searchAfter\" | \"timeout\" | \"terminate_after\" | \"parent\">(field: K) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceFields",
+                "text": "SearchSourceFields"
+              },
+              "[K]; createCopy: () => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; createChild: (options?: {}) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; setParent: (parent?: Pick<",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              ", \"create\" | \"history\" | \"setPreferredSearchStrategyId\" | \"setField\" | \"removeField\" | \"setFields\" | \"getId\" | \"getFields\" | \"getField\" | \"getOwnField\" | \"createCopy\" | \"createChild\" | \"setParent\" | \"getParent\" | \"fetch$\" | \"fetch\" | \"onRequestStart\" | \"getSearchRequestBody\" | \"destroy\" | \"getSerializedFields\" | \"serialize\"> | undefined, options?: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceOptions",
+                "text": "SearchSourceOptions"
+              },
+              ") => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              "; getParent: () => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              " | undefined; fetch$: (options?: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.ISearchOptions",
+                "text": "ISearchOptions"
+              },
+              ") => ",
+              "Observable",
+              "<",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.IKibanaSearchResponse",
+                "text": "IKibanaSearchResponse"
+              },
+              "<",
+              "SearchResponse",
+              "<any>>>; fetch: (options?: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.ISearchOptions",
+                "text": "ISearchOptions"
+              },
+              ") => Promise<",
+              "SearchResponse",
+              "<any>>; onRequestStart: (handler: (searchSource: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              ", options?: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.ISearchOptions",
+                "text": "ISearchOptions"
+              },
+              " | undefined) => Promise<unknown>) => void; getSearchRequestBody: () => any; destroy: () => void; getSerializedFields: (recurse?: boolean) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSourceFields",
+                "text": "SearchSourceFields"
+              },
+              "; serialize: () => { searchSourceJSON: string; references: ",
+              "SavedObjectReference",
+              "[]; }; }"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/types.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.SavedSearch.id",
+            "type": "string",
+            "tags": [],
+            "label": "id",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/types.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.SavedSearch.title",
+            "type": "string",
+            "tags": [],
+            "label": "title",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/types.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.SavedSearch.sort",
+            "type": "Array",
+            "tags": [],
+            "label": "sort",
+            "description": [],
+            "signature": [
+              "[string, string][] | undefined"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/types.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.SavedSearch.columns",
+            "type": "Array",
+            "tags": [],
+            "label": "columns",
+            "description": [],
+            "signature": [
+              "string[] | undefined"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/types.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.SavedSearch.description",
+            "type": "string",
+            "tags": [],
+            "label": "description",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/types.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.SavedSearch.grid",
+            "type": "Object",
+            "tags": [],
+            "label": "grid",
+            "description": [],
+            "signature": [
+              "{ columns?: Record<string, ",
+              "DiscoverGridSettingsColumn",
+              "> | undefined; } | undefined"
+            ],
             "path": "src/plugins/discover/public/saved_searches/types.ts",
             "deprecated": false
           },
@@ -799,6 +1421,19 @@
             ],
             "path": "src/plugins/discover/public/saved_searches/types.ts",
             "deprecated": false
+          },
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.SavedSearch.sharingSavedObjectProps",
+            "type": "Object",
+            "tags": [],
+            "label": "sharingSavedObjectProps",
+            "description": [],
+            "signature": [
+              "{ outcome?: \"conflict\" | \"exactMatch\" | \"aliasMatch\" | undefined; aliasTargetId?: string | undefined; errorJSON?: string | undefined; } | undefined"
+            ],
+            "path": "src/plugins/discover/public/saved_searches/types.ts",
+            "deprecated": false
           }
         ],
         "initialIsOpen": false
@@ -807,11 +1442,14 @@
         "parentPluginId": "discover",
         "id": "def-public.SavedSearchLoader",
         "type": "Interface",
-        "tags": [],
+        "tags": [
+          "deprecated"
+        ],
         "label": "SavedSearchLoader",
         "description": [],
-        "path": "src/plugins/discover/public/saved_searches/types.ts",
-        "deprecated": false,
+        "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
+        "deprecated": true,
+        "references": [],
         "children": [
           {
             "parentPluginId": "discover",
@@ -826,12 +1464,12 @@
                 "pluginId": "discover",
                 "scope": "public",
                 "docId": "kibDiscoverPluginApi",
-                "section": "def-public.SavedSearch",
-                "text": "SavedSearch"
+                "section": "def-public.LegacySavedSearch",
+                "text": "LegacySavedSearch"
               },
               ">"
             ],
-            "path": "src/plugins/discover/public/saved_searches/types.ts",
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
             "deprecated": false,
             "children": [
               {
@@ -844,7 +1482,7 @@
                 "signature": [
                   "string"
                 ],
-                "path": "src/plugins/discover/public/saved_searches/types.ts",
+                "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
                 "deprecated": false,
                 "isRequired": true
               }
@@ -861,7 +1499,7 @@
             "signature": [
               "(id: string) => string"
             ],
-            "path": "src/plugins/discover/public/saved_searches/types.ts",
+            "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
             "deprecated": false,
             "children": [
               {
@@ -874,7 +1512,7 @@
                 "signature": [
                   "string"
                 ],
-                "path": "src/plugins/discover/public/saved_searches/types.ts",
+                "path": "src/plugins/discover/public/saved_searches/legacy/types.ts",
                 "deprecated": false,
                 "isRequired": true
               }
@@ -1068,7 +1706,69 @@
         "initialIsOpen": false
       }
     ],
-    "objects": [],
+    "objects": [
+      {
+        "parentPluginId": "discover",
+        "id": "def-public.__LEGACY",
+        "type": "Object",
+        "tags": [
+          "deprecated"
+        ],
+        "label": "__LEGACY",
+        "description": [],
+        "path": "src/plugins/discover/public/saved_searches/index.ts",
+        "deprecated": true,
+        "references": [
+          {
+            "plugin": "visualizations",
+            "path": "src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts"
+          },
+          {
+            "plugin": "visualizations",
+            "path": "src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts"
+          }
+        ],
+        "children": [
+          {
+            "parentPluginId": "discover",
+            "id": "def-public.__LEGACY.createSavedSearchesLoader",
+            "type": "Function",
+            "tags": [],
+            "label": "createSavedSearchesLoader",
+            "description": [],
+            "signature": [
+              "({ savedObjectsClient, savedObjects }: Services) => ",
+              {
+                "pluginId": "savedObjects",
+                "scope": "public",
+                "docId": "kibSavedObjectsPluginApi",
+                "section": "def-public.SavedObjectLoader",
+                "text": "SavedObjectLoader"
+              }
+            ],
+            "path": "src/plugins/discover/public/saved_searches/index.ts",
+            "deprecated": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "discover",
+                "id": "def-public.__LEGACY.createSavedSearchesLoader.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "__0",
+                "description": [],
+                "signature": [
+                  "Services"
+                ],
+                "path": "src/plugins/discover/public/saved_searches/legacy/saved_searches.ts",
+                "deprecated": false
+              }
+            ]
+          }
+        ],
+        "initialIsOpen": false
+      }
+    ],
     "setup": {
       "parentPluginId": "discover",
       "id": "def-public.DiscoverSetup",
@@ -1134,19 +1834,21 @@
       "children": [
         {
           "parentPluginId": "discover",
-          "id": "def-public.DiscoverStart.savedSearchLoader",
+          "id": "def-public.DiscoverStart.__LEGACY",
           "type": "Object",
           "tags": [],
-          "label": "savedSearchLoader",
+          "label": "__LEGACY",
           "description": [],
           "signature": [
+            "{ savedSearchLoader: ",
             {
               "pluginId": "savedObjects",
               "scope": "public",
               "docId": "kibSavedObjectsPluginApi",
               "section": "def-public.SavedObjectLoader",
               "text": "SavedObjectLoader"
-            }
+            },
+            "; }"
           ],
           "path": "src/plugins/discover/public/plugin.tsx",
           "deprecated": false
diff --git a/api_docs/discover.mdx b/api_docs/discover.mdx
index aee0f4b9724c6..46e681aabc0a6 100644
--- a/api_docs/discover.mdx
+++ b/api_docs/discover.mdx
@@ -18,7 +18,7 @@ Contact [Data Discovery](https://github.com/orgs/elastic/teams/kibana-data-disco
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 82 | 0 | 56 | 6 |
+| 103 | 0 | 77 | 7 |
 
 ## Client
 
@@ -28,6 +28,9 @@ Contact [Data Discovery](https://github.com/orgs/elastic/teams/kibana-data-disco
 ### Start
 <DocDefinitionList data={[discoverObj.client.start]}/>
 
+### Objects
+<DocDefinitionList data={discoverObj.client.objects}/>
+
 ### Functions
 <DocDefinitionList data={discoverObj.client.functions}/>
 
diff --git a/api_docs/elastic_apm_generator.json b/api_docs/elastic_apm_generator.json
index dc69c08bba5b2..24f11791d92b6 100644
--- a/api_docs/elastic_apm_generator.json
+++ b/api_docs/elastic_apm_generator.json
@@ -11,6 +11,37 @@
   "server": {
     "classes": [],
     "functions": [
+      {
+        "parentPluginId": "@elastic/apm-generator",
+        "id": "def-server.getBreakdownMetrics",
+        "type": "Function",
+        "tags": [],
+        "label": "getBreakdownMetrics",
+        "description": [],
+        "signature": [
+          "(events: Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'container.id': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'host.name': string; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; 'span.self_time.count': number; 'span.self_time.sum.us': number; }>[]) => Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'container.id': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'host.name': string; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; 'span.self_time.count': number; 'span.self_time.sum.us': number; }>[]"
+        ],
+        "path": "packages/elastic-apm-generator/src/lib/utils/get_breakdown_metrics.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "@elastic/apm-generator",
+            "id": "def-server.getBreakdownMetrics.$1",
+            "type": "Array",
+            "tags": [],
+            "label": "events",
+            "description": [],
+            "signature": [
+              "Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'container.id': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'host.name': string; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; 'span.self_time.count': number; 'span.self_time.sum.us': number; }>[]"
+            ],
+            "path": "packages/elastic-apm-generator/src/lib/utils/get_breakdown_metrics.ts",
+            "deprecated": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@elastic/apm-generator",
         "id": "def-server.getObserverDefaults",
@@ -19,7 +50,7 @@
         "label": "getObserverDefaults",
         "description": [],
         "signature": [
-          "() => Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; }>"
+          "() => Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'container.id': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'host.name': string; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; 'span.self_time.count': number; 'span.self_time.sum.us': number; }>"
         ],
         "path": "packages/elastic-apm-generator/src/lib/defaults/get_observer_defaults.ts",
         "deprecated": false,
@@ -35,7 +66,7 @@
         "label": "getSpanDestinationMetrics",
         "description": [],
         "signature": [
-          "(events: Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; }>[]) => Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; }>[]"
+          "(events: Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'container.id': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'host.name': string; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; 'span.self_time.count': number; 'span.self_time.sum.us': number; }>[]) => { \"metricset.name\": string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; '@timestamp'?: number | undefined; 'agent.name'?: string | undefined; 'agent.version'?: string | undefined; 'container.id'?: string | undefined; 'ecs.version'?: string | undefined; 'event.outcome'?: string | undefined; 'event.ingested'?: number | undefined; 'host.name'?: string | undefined; 'observer.version'?: string | undefined; 'observer.version_major'?: number | undefined; 'parent.id'?: string | undefined; 'processor.event'?: string | undefined; 'processor.name'?: string | undefined; 'trace.id'?: string | undefined; 'transaction.name'?: string | undefined; 'transaction.type'?: string | undefined; 'transaction.id'?: string | undefined; 'transaction.duration.us'?: number | undefined; 'transaction.duration.histogram'?: { values: number[]; counts: number[]; } | undefined; 'transaction.sampled'?: true | undefined; 'service.name'?: string | undefined; 'service.environment'?: string | undefined; 'service.node.name'?: string | undefined; 'span.id'?: string | undefined; 'span.name'?: string | undefined; 'span.type'?: string | undefined; 'span.subtype'?: string | undefined; 'span.duration.us'?: number | undefined; 'span.destination.service.name'?: string | undefined; 'span.destination.service.resource'?: string | undefined; 'span.destination.service.type'?: string | undefined; 'span.self_time.count'?: number | undefined; 'span.self_time.sum.us'?: number | undefined; }[]"
         ],
         "path": "packages/elastic-apm-generator/src/lib/utils/get_span_destination_metrics.ts",
         "deprecated": false,
@@ -48,7 +79,7 @@
             "label": "events",
             "description": [],
             "signature": [
-              "Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; }>[]"
+              "Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'container.id': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'host.name': string; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; 'span.self_time.count': number; 'span.self_time.sum.us': number; }>[]"
             ],
             "path": "packages/elastic-apm-generator/src/lib/utils/get_span_destination_metrics.ts",
             "deprecated": false,
@@ -66,7 +97,7 @@
         "label": "getTransactionMetrics",
         "description": [],
         "signature": [
-          "(events: Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; }>[]) => { \"transaction.duration.histogram\": { values: number[]; counts: number[]; }; _doc_count: number; '@timestamp'?: number | undefined; 'agent.name'?: string | undefined; 'agent.version'?: string | undefined; 'ecs.version'?: string | undefined; 'event.outcome'?: string | undefined; 'event.ingested'?: number | undefined; 'metricset.name'?: string | undefined; 'observer.version'?: string | undefined; 'observer.version_major'?: number | undefined; 'parent.id'?: string | undefined; 'processor.event'?: string | undefined; 'processor.name'?: string | undefined; 'trace.id'?: string | undefined; 'transaction.name'?: string | undefined; 'transaction.type'?: string | undefined; 'transaction.id'?: string | undefined; 'transaction.duration.us'?: number | undefined; 'transaction.sampled'?: true | undefined; 'service.name'?: string | undefined; 'service.environment'?: string | undefined; 'service.node.name'?: string | undefined; 'span.id'?: string | undefined; 'span.name'?: string | undefined; 'span.type'?: string | undefined; 'span.subtype'?: string | undefined; 'span.duration.us'?: number | undefined; 'span.destination.service.name'?: string | undefined; 'span.destination.service.resource'?: string | undefined; 'span.destination.service.type'?: string | undefined; 'span.destination.service.response_time.sum.us'?: number | undefined; 'span.destination.service.response_time.count'?: number | undefined; }[]"
+          "(events: Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'container.id': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'host.name': string; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; 'span.self_time.count': number; 'span.self_time.sum.us': number; }>[]) => { 'transaction.duration.histogram': { values: number[]; counts: number[]; }; _doc_count: number; '@timestamp'?: number | undefined; 'agent.name'?: string | undefined; 'agent.version'?: string | undefined; 'container.id'?: string | undefined; 'ecs.version'?: string | undefined; 'event.outcome'?: string | undefined; 'event.ingested'?: number | undefined; 'host.name'?: string | undefined; 'metricset.name'?: string | undefined; 'observer.version'?: string | undefined; 'observer.version_major'?: number | undefined; 'parent.id'?: string | undefined; 'processor.event'?: string | undefined; 'processor.name'?: string | undefined; 'trace.id'?: string | undefined; 'transaction.name'?: string | undefined; 'transaction.type'?: string | undefined; 'transaction.id'?: string | undefined; 'transaction.duration.us'?: number | undefined; 'transaction.sampled'?: true | undefined; 'service.name'?: string | undefined; 'service.environment'?: string | undefined; 'service.node.name'?: string | undefined; 'span.id'?: string | undefined; 'span.name'?: string | undefined; 'span.type'?: string | undefined; 'span.subtype'?: string | undefined; 'span.duration.us'?: number | undefined; 'span.destination.service.name'?: string | undefined; 'span.destination.service.resource'?: string | undefined; 'span.destination.service.type'?: string | undefined; 'span.destination.service.response_time.sum.us'?: number | undefined; 'span.destination.service.response_time.count'?: number | undefined; 'span.self_time.count'?: number | undefined; 'span.self_time.sum.us'?: number | undefined; }[]"
         ],
         "path": "packages/elastic-apm-generator/src/lib/utils/get_transaction_metrics.ts",
         "deprecated": false,
@@ -79,7 +110,7 @@
             "label": "events",
             "description": [],
             "signature": [
-              "Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; }>[]"
+              "Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'container.id': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'host.name': string; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; 'span.self_time.count': number; 'span.self_time.sum.us': number; }>[]"
             ],
             "path": "packages/elastic-apm-generator/src/lib/utils/get_transaction_metrics.ts",
             "deprecated": false,
@@ -203,7 +234,7 @@
         "label": "toElasticsearchOutput",
         "description": [],
         "signature": [
-          "(events: Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; }>[], versionOverride: string | undefined) => { _index: string; _source: {}; }[]"
+          "(events: Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'container.id': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'host.name': string; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; 'span.self_time.count': number; 'span.self_time.sum.us': number; }>[], versionOverride: string | undefined) => { _index: string; _source: {}; }[]"
         ],
         "path": "packages/elastic-apm-generator/src/lib/output/to_elasticsearch_output.ts",
         "deprecated": false,
@@ -216,7 +247,7 @@
             "label": "events",
             "description": [],
             "signature": [
-              "Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; }>[]"
+              "Partial<{ '@timestamp': number; 'agent.name': string; 'agent.version': string; 'container.id': string; 'ecs.version': string; 'event.outcome': string; 'event.ingested': number; 'host.name': string; 'metricset.name': string; 'observer.version': string; 'observer.version_major': number; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'trace.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.id': string; 'transaction.duration.us': number; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.sampled': true; 'service.name': string; 'service.environment': string; 'service.node.name': string; 'span.id': string; 'span.name': string; 'span.type': string; 'span.subtype': string; 'span.duration.us': number; 'span.destination.service.name': string; 'span.destination.service.resource': string; 'span.destination.service.type': string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; 'span.self_time.count': number; 'span.self_time.sum.us': number; }>[]"
             ],
             "path": "packages/elastic-apm-generator/src/lib/output/to_elasticsearch_output.ts",
             "deprecated": false,
diff --git a/api_docs/elastic_apm_generator.mdx b/api_docs/elastic_apm_generator.mdx
index 3b7667a6837b5..4c95050b09c28 100644
--- a/api_docs/elastic_apm_generator.mdx
+++ b/api_docs/elastic_apm_generator.mdx
@@ -18,7 +18,7 @@ Contact [Owner missing] for questions regarding this plugin.
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 15 | 0 | 15 | 2 |
+| 17 | 0 | 17 | 2 |
 
 ## Server
 
diff --git a/api_docs/es_ui_shared.json b/api_docs/es_ui_shared.json
index 83d71b321cfcf..da0ba7b688c93 100644
--- a/api_docs/es_ui_shared.json
+++ b/api_docs/es_ui_shared.json
@@ -1175,7 +1175,7 @@
             "label": "method",
             "description": [],
             "signature": [
-              "\"get\" | \"post\" | \"put\" | \"delete\" | \"patch\" | \"head\""
+              "\"delete\" | \"get\" | \"post\" | \"put\" | \"patch\" | \"head\""
             ],
             "path": "src/plugins/es_ui_shared/public/request/send_request.ts",
             "deprecated": false
diff --git a/api_docs/event_log.json b/api_docs/event_log.json
index 1991fbff2589d..60a3d9e83be7b 100644
--- a/api_docs/event_log.json
+++ b/api_docs/event_log.json
@@ -753,7 +753,7 @@
             "label": "logEvent",
             "description": [],
             "signature": [
-              "(properties: DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; outcome?: string | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => void"
+              "(properties: DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => void"
             ],
             "path": "x-pack/plugins/event_log/server/types.ts",
             "deprecated": false,
@@ -766,7 +766,7 @@
                 "label": "properties",
                 "description": [],
                 "signature": [
-                  "DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; outcome?: string | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
+                  "DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
                 ],
                 "path": "x-pack/plugins/event_log/server/types.ts",
                 "deprecated": false,
@@ -783,7 +783,7 @@
             "label": "startTiming",
             "description": [],
             "signature": [
-              "(event: DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; outcome?: string | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => void"
+              "(event: DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => void"
             ],
             "path": "x-pack/plugins/event_log/server/types.ts",
             "deprecated": false,
@@ -796,7 +796,7 @@
                 "label": "event",
                 "description": [],
                 "signature": [
-                  "DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; outcome?: string | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
+                  "DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
                 ],
                 "path": "x-pack/plugins/event_log/server/types.ts",
                 "deprecated": false,
@@ -813,7 +813,7 @@
             "label": "stopTiming",
             "description": [],
             "signature": [
-              "(event: DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; outcome?: string | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => void"
+              "(event: DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => void"
             ],
             "path": "x-pack/plugins/event_log/server/types.ts",
             "deprecated": false,
@@ -826,7 +826,7 @@
                 "label": "event",
                 "description": [],
                 "signature": [
-                  "DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; outcome?: string | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
+                  "DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
                 ],
                 "path": "x-pack/plugins/event_log/server/types.ts",
                 "deprecated": false,
@@ -886,7 +886,7 @@
             "label": "data",
             "description": [],
             "signature": [
-              "(Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; outcome?: string | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}> | undefined)[]"
+              "(Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}> | undefined)[]"
             ],
             "path": "x-pack/plugins/event_log/server/es/cluster_client_adapter.ts",
             "deprecated": false
@@ -905,7 +905,7 @@
         "label": "IEvent",
         "description": [],
         "signature": [
-          "DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; outcome?: string | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
+          "DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
         ],
         "path": "x-pack/plugins/event_log/generated/schemas.ts",
         "deprecated": false,
@@ -919,7 +919,7 @@
         "label": "IValidatedEvent",
         "description": [],
         "signature": [
-          "Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; outcome?: string | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}> | undefined"
+          "Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}> | undefined"
         ],
         "path": "x-pack/plugins/event_log/generated/schemas.ts",
         "deprecated": false,
@@ -1138,7 +1138,7 @@
           "label": "getLogger",
           "description": [],
           "signature": [
-            "(properties: DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; outcome?: string | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => ",
+            "(properties: DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => ",
             {
               "pluginId": "eventLog",
               "scope": "server",
@@ -1158,7 +1158,7 @@
               "label": "properties",
               "description": [],
               "signature": [
-                "DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; outcome?: string | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
+                "DeepPartial<DeepWriteable<Readonly<{ tags?: string[] | undefined; kibana?: Readonly<{ version?: string | undefined; alert?: Readonly<{ rule?: Readonly<{ execution?: Readonly<{ status?: string | undefined; metrics?: Readonly<{ total_indexing_duration_ms?: number | undefined; total_search_duration_ms?: number | undefined; execution_gap_duration_s?: number | undefined; } & {}> | undefined; uuid?: string | undefined; status_order?: number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; task?: Readonly<{ scheduled?: string | undefined; schedule_delay?: number | undefined; } & {}> | undefined; space_ids?: string[] | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; url?: string | undefined; code?: string | undefined; original?: string | undefined; action?: string | undefined; kind?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ id?: string | undefined; description?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
               ],
               "path": "x-pack/plugins/event_log/server/types.ts",
               "deprecated": false,
diff --git a/api_docs/expressions.json b/api_docs/expressions.json
index 5cb989ee85e61..952184350bc79 100644
--- a/api_docs/expressions.json
+++ b/api_docs/expressions.json
@@ -2494,7 +2494,7 @@
             "label": "types",
             "description": [],
             "signature": [
-              "(string[] & (\"date\" | \"filter\" | ",
+              "(string[] & (\"filter\" | \"date\" | ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -2502,7 +2502,7 @@
                 "section": "def-common.KnownTypeToString",
                 "text": "KnownTypeToString"
               },
-              "<T>)[]) | (string[] & (\"date\" | \"filter\" | ArrayTypeToArgumentString<T>)[]) | (string[] & (\"date\" | \"filter\" | UnresolvedTypeToArgumentString<T>)[]) | (string[] & (\"date\" | \"filter\" | UnresolvedArrayTypeToArgumentString<T>)[]) | undefined"
+              "<T>)[]) | (string[] & (\"filter\" | \"date\" | ArrayTypeToArgumentString<T>)[]) | (string[] & (\"filter\" | \"date\" | UnresolvedTypeToArgumentString<T>)[]) | (string[] & (\"filter\" | \"date\" | UnresolvedArrayTypeToArgumentString<T>)[]) | undefined"
             ],
             "path": "src/plugins/expressions/common/expression_functions/expression_function_parameter.ts",
             "deprecated": false
@@ -7683,7 +7683,7 @@
               "\nName of type of value this function outputs."
             ],
             "signature": [
-              "\"date\" | \"filter\" | ",
+              "\"filter\" | \"date\" | ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -10477,57 +10477,6 @@
           }
         ],
         "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "expressions",
-        "id": "def-public.SerializedFieldFormat",
-        "type": "Interface",
-        "tags": [],
-        "label": "SerializedFieldFormat",
-        "description": [
-          "\nJSON representation of a field formatter configuration.\nIs used to carry information about how to format data in\na data table as part of the column definition."
-        ],
-        "signature": [
-          {
-            "pluginId": "expressions",
-            "scope": "common",
-            "docId": "kibExpressionsPluginApi",
-            "section": "def-common.SerializedFieldFormat",
-            "text": "SerializedFieldFormat"
-          },
-          "<TParams>"
-        ],
-        "path": "src/plugins/expressions/common/types/common.ts",
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "expressions",
-            "id": "def-public.SerializedFieldFormat.id",
-            "type": "string",
-            "tags": [],
-            "label": "id",
-            "description": [],
-            "signature": [
-              "string | undefined"
-            ],
-            "path": "src/plugins/expressions/common/types/common.ts",
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "expressions",
-            "id": "def-public.SerializedFieldFormat.params",
-            "type": "Uncategorized",
-            "tags": [],
-            "label": "params",
-            "description": [],
-            "signature": [
-              "TParams | undefined"
-            ],
-            "path": "src/plugins/expressions/common/types/common.ts",
-            "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
       }
     ],
     "enums": [
@@ -10692,7 +10641,7 @@
           "\nThis type represents the `type` of any `DatatableColumn` in a `Datatable`.\nits duplicated from KBN_FIELD_TYPES"
         ],
         "signature": [
-          "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"nested\" | \"histogram\" | \"null\""
+          "\"string\" | \"number\" | \"boolean\" | \"object\" | \"_source\" | \"attachment\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"nested\" | \"histogram\" | \"null\""
         ],
         "path": "src/plugins/expressions/common/expression_types/specs/datatable.ts",
         "deprecated": false,
@@ -11558,7 +11507,7 @@
           "\nThis can convert a type into a known Expression string representation of\nthat type. For example, `TypeToString<Datatable>` will resolve to `'datatable'`.\nThis allows Expression Functions to continue to specify their type in a\nsimple string format."
         ],
         "signature": [
-          "\"date\" | \"filter\" | ",
+          "\"filter\" | \"date\" | ",
           {
             "pluginId": "expressions",
             "scope": "common",
@@ -11582,7 +11531,7 @@
           "\nTypes used in Expressions that don't map to a primitive cleanly:\n\n`date` is typed as a number or string, and represents a date"
         ],
         "signature": [
-          "\"date\" | \"filter\""
+          "\"filter\" | \"date\""
         ],
         "path": "src/plugins/expressions/common/types/common.ts",
         "deprecated": false,
@@ -14170,7 +14119,7 @@
             "label": "types",
             "description": [],
             "signature": [
-              "(string[] & (\"date\" | \"filter\" | ",
+              "(string[] & (\"filter\" | \"date\" | ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -14178,7 +14127,7 @@
                 "section": "def-common.KnownTypeToString",
                 "text": "KnownTypeToString"
               },
-              "<T>)[]) | (string[] & (\"date\" | \"filter\" | ArrayTypeToArgumentString<T>)[]) | (string[] & (\"date\" | \"filter\" | UnresolvedTypeToArgumentString<T>)[]) | (string[] & (\"date\" | \"filter\" | UnresolvedArrayTypeToArgumentString<T>)[]) | undefined"
+              "<T>)[]) | (string[] & (\"filter\" | \"date\" | ArrayTypeToArgumentString<T>)[]) | (string[] & (\"filter\" | \"date\" | UnresolvedTypeToArgumentString<T>)[]) | (string[] & (\"filter\" | \"date\" | UnresolvedArrayTypeToArgumentString<T>)[]) | undefined"
             ],
             "path": "src/plugins/expressions/common/expression_functions/expression_function_parameter.ts",
             "deprecated": false
@@ -17730,7 +17679,7 @@
               "\nName of type of value this function outputs."
             ],
             "signature": [
-              "\"date\" | \"filter\" | ",
+              "\"filter\" | \"date\" | ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -19489,57 +19438,6 @@
           }
         ],
         "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "expressions",
-        "id": "def-server.SerializedFieldFormat",
-        "type": "Interface",
-        "tags": [],
-        "label": "SerializedFieldFormat",
-        "description": [
-          "\nJSON representation of a field formatter configuration.\nIs used to carry information about how to format data in\na data table as part of the column definition."
-        ],
-        "signature": [
-          {
-            "pluginId": "expressions",
-            "scope": "common",
-            "docId": "kibExpressionsPluginApi",
-            "section": "def-common.SerializedFieldFormat",
-            "text": "SerializedFieldFormat"
-          },
-          "<TParams>"
-        ],
-        "path": "src/plugins/expressions/common/types/common.ts",
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "expressions",
-            "id": "def-server.SerializedFieldFormat.id",
-            "type": "string",
-            "tags": [],
-            "label": "id",
-            "description": [],
-            "signature": [
-              "string | undefined"
-            ],
-            "path": "src/plugins/expressions/common/types/common.ts",
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "expressions",
-            "id": "def-server.SerializedFieldFormat.params",
-            "type": "Uncategorized",
-            "tags": [],
-            "label": "params",
-            "description": [],
-            "signature": [
-              "TParams | undefined"
-            ],
-            "path": "src/plugins/expressions/common/types/common.ts",
-            "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
       }
     ],
     "enums": [
@@ -19704,7 +19602,7 @@
           "\nThis type represents the `type` of any `DatatableColumn` in a `Datatable`.\nits duplicated from KBN_FIELD_TYPES"
         ],
         "signature": [
-          "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"nested\" | \"histogram\" | \"null\""
+          "\"string\" | \"number\" | \"boolean\" | \"object\" | \"_source\" | \"attachment\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"nested\" | \"histogram\" | \"null\""
         ],
         "path": "src/plugins/expressions/common/expression_types/specs/datatable.ts",
         "deprecated": false,
@@ -20468,7 +20366,7 @@
           "\nThis can convert a type into a known Expression string representation of\nthat type. For example, `TypeToString<Datatable>` will resolve to `'datatable'`.\nThis allows Expression Functions to continue to specify their type in a\nsimple string format."
         ],
         "signature": [
-          "\"date\" | \"filter\" | ",
+          "\"filter\" | \"date\" | ",
           {
             "pluginId": "expressions",
             "scope": "common",
@@ -20492,7 +20390,7 @@
           "\nTypes used in Expressions that don't map to a primitive cleanly:\n\n`date` is typed as a number or string, and represents a date"
         ],
         "signature": [
-          "\"date\" | \"filter\""
+          "\"filter\" | \"date\""
         ],
         "path": "src/plugins/expressions/common/types/common.ts",
         "deprecated": false,
@@ -23037,7 +22935,7 @@
             "label": "types",
             "description": [],
             "signature": [
-              "(string[] & (\"date\" | \"filter\" | ",
+              "(string[] & (\"filter\" | \"date\" | ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -23045,7 +22943,7 @@
                 "section": "def-common.KnownTypeToString",
                 "text": "KnownTypeToString"
               },
-              "<T>)[]) | (string[] & (\"date\" | \"filter\" | ArrayTypeToArgumentString<T>)[]) | (string[] & (\"date\" | \"filter\" | UnresolvedTypeToArgumentString<T>)[]) | (string[] & (\"date\" | \"filter\" | UnresolvedArrayTypeToArgumentString<T>)[]) | undefined"
+              "<T>)[]) | (string[] & (\"filter\" | \"date\" | ArrayTypeToArgumentString<T>)[]) | (string[] & (\"filter\" | \"date\" | UnresolvedTypeToArgumentString<T>)[]) | (string[] & (\"filter\" | \"date\" | UnresolvedArrayTypeToArgumentString<T>)[]) | undefined"
             ],
             "path": "src/plugins/expressions/common/expression_functions/expression_function_parameter.ts",
             "deprecated": false
@@ -27529,7 +27427,7 @@
             "label": "type",
             "description": [],
             "signature": [
-              "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"nested\" | \"histogram\" | \"null\""
+              "\"string\" | \"number\" | \"boolean\" | \"object\" | \"_source\" | \"attachment\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"nested\" | \"histogram\" | \"null\""
             ],
             "path": "src/plugins/expressions/common/expression_types/specs/datatable.ts",
             "deprecated": false
@@ -27590,13 +27488,21 @@
             ],
             "signature": [
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>> | undefined"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              "> | undefined"
             ],
             "path": "src/plugins/expressions/common/expression_types/specs/datatable.ts",
             "deprecated": false
@@ -29657,7 +29563,7 @@
               "\nName of type of value this function outputs."
             ],
             "signature": [
-              "\"date\" | \"filter\" | ",
+              "\"filter\" | \"date\" | ",
               {
                 "pluginId": "expressions",
                 "scope": "common",
@@ -32751,57 +32657,6 @@
         ],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "expressions",
-        "id": "def-common.SerializedFieldFormat",
-        "type": "Interface",
-        "tags": [],
-        "label": "SerializedFieldFormat",
-        "description": [
-          "\nJSON representation of a field formatter configuration.\nIs used to carry information about how to format data in\na data table as part of the column definition."
-        ],
-        "signature": [
-          {
-            "pluginId": "expressions",
-            "scope": "common",
-            "docId": "kibExpressionsPluginApi",
-            "section": "def-common.SerializedFieldFormat",
-            "text": "SerializedFieldFormat"
-          },
-          "<TParams>"
-        ],
-        "path": "src/plugins/expressions/common/types/common.ts",
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "expressions",
-            "id": "def-common.SerializedFieldFormat.id",
-            "type": "string",
-            "tags": [],
-            "label": "id",
-            "description": [],
-            "signature": [
-              "string | undefined"
-            ],
-            "path": "src/plugins/expressions/common/types/common.ts",
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "expressions",
-            "id": "def-common.SerializedFieldFormat.params",
-            "type": "Uncategorized",
-            "tags": [],
-            "label": "params",
-            "description": [],
-            "signature": [
-              "TParams | undefined"
-            ],
-            "path": "src/plugins/expressions/common/types/common.ts",
-            "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "expressions",
         "id": "def-common.UiSettingArguments",
@@ -33048,7 +32903,7 @@
           "\nThis type represents the `type` of any `DatatableColumn` in a `Datatable`.\nits duplicated from KBN_FIELD_TYPES"
         ],
         "signature": [
-          "\"string\" | \"number\" | \"boolean\" | \"object\" | \"date\" | \"_source\" | \"attachment\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"nested\" | \"histogram\" | \"null\""
+          "\"string\" | \"number\" | \"boolean\" | \"object\" | \"_source\" | \"attachment\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"murmur3\" | \"unknown\" | \"conflict\" | \"nested\" | \"histogram\" | \"null\""
         ],
         "path": "src/plugins/expressions/common/expression_types/specs/datatable.ts",
         "deprecated": false,
@@ -34684,7 +34539,7 @@
           "\nThis can convert a type into a known Expression string representation of\nthat type. For example, `TypeToString<Datatable>` will resolve to `'datatable'`.\nThis allows Expression Functions to continue to specify their type in a\nsimple string format."
         ],
         "signature": [
-          "\"date\" | \"filter\" | ",
+          "\"filter\" | \"date\" | ",
           {
             "pluginId": "expressions",
             "scope": "common",
@@ -34722,7 +34577,7 @@
           "\nTypes used in Expressions that don't map to a primitive cleanly:\n\n`date` is typed as a number or string, and represents a date"
         ],
         "signature": [
-          "\"date\" | \"filter\""
+          "\"filter\" | \"date\""
         ],
         "path": "src/plugins/expressions/common/types/common.ts",
         "deprecated": false,
diff --git a/api_docs/expressions.mdx b/api_docs/expressions.mdx
index 82b35631ddfe1..9f086cc496faf 100644
--- a/api_docs/expressions.mdx
+++ b/api_docs/expressions.mdx
@@ -18,7 +18,7 @@ Contact [App Services](https://github.com/orgs/elastic/teams/kibana-app-services
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 2095 | 27 | 1646 | 4 |
+| 2086 | 27 | 1640 | 4 |
 
 ## Client
 
diff --git a/api_docs/fleet.json b/api_docs/fleet.json
index 0bdb078d6f70d..b50a2f598b926 100644
--- a/api_docs/fleet.json
+++ b/api_docs/fleet.json
@@ -2624,7 +2624,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, id: string, withPackagePolicies?: boolean) => Promise<",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, id: string, withPackagePolicies?: boolean) => Promise<",
               {
                 "pluginId": "fleet",
                 "scope": "common",
@@ -2646,25 +2646,7 @@
                 "label": "soClient",
                 "description": [],
                 "signature": [
-                  "{ get: <T = unknown>(type: string, id: string, options?: ",
-                  {
-                    "pluginId": "core",
-                    "scope": "server",
-                    "docId": "kibCoreSavedObjectsPluginApi",
-                    "section": "def-server.SavedObjectsBaseOptions",
-                    "text": "SavedObjectsBaseOptions"
-                  },
-                  ") => Promise<",
-                  "SavedObject",
-                  "<T>>; delete: (type: string, id: string, options?: ",
-                  {
-                    "pluginId": "core",
-                    "scope": "server",
-                    "docId": "kibCoreSavedObjectsPluginApi",
-                    "section": "def-server.SavedObjectsDeleteOptions",
-                    "text": "SavedObjectsDeleteOptions"
-                  },
-                  ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+                  "{ create: <T = unknown>(type: string, attributes: T, options?: ",
                   {
                     "pluginId": "core",
                     "scope": "server",
@@ -2722,7 +2704,15 @@
                     "section": "def-server.SavedObjectsCheckConflictsResponse",
                     "text": "SavedObjectsCheckConflictsResponse"
                   },
-                  ">; find: <T = unknown, A = unknown>(options: ",
+                  ">; delete: (type: string, id: string, options?: ",
+                  {
+                    "pluginId": "core",
+                    "scope": "server",
+                    "docId": "kibCoreSavedObjectsPluginApi",
+                    "section": "def-server.SavedObjectsDeleteOptions",
+                    "text": "SavedObjectsDeleteOptions"
+                  },
+                  ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
                   {
                     "pluginId": "core",
                     "scope": "server",
@@ -2786,6 +2776,16 @@
                     "section": "def-server.SavedObjectsBulkResolveResponse",
                     "text": "SavedObjectsBulkResolveResponse"
                   },
+                  "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+                  {
+                    "pluginId": "core",
+                    "scope": "server",
+                    "docId": "kibCoreSavedObjectsPluginApi",
+                    "section": "def-server.SavedObjectsBaseOptions",
+                    "text": "SavedObjectsBaseOptions"
+                  },
+                  ") => Promise<",
+                  "SavedObject",
                   "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
                   {
                     "pluginId": "core",
@@ -3013,7 +3013,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, options: Readonly<{ page?: number | undefined; perPage?: number | undefined; sortField?: string | undefined; sortOrder?: \"asc\" | \"desc\" | undefined; kuery?: any; showUpgradeable?: boolean | undefined; } & {}> & { withPackagePolicies?: boolean | undefined; }) => Promise<{ items: ",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, options: Readonly<{ page?: number | undefined; perPage?: number | undefined; sortField?: string | undefined; sortOrder?: \"asc\" | \"desc\" | undefined; kuery?: any; showUpgradeable?: boolean | undefined; } & {}> & { withPackagePolicies?: boolean | undefined; }) => Promise<{ items: ",
               {
                 "pluginId": "fleet",
                 "scope": "common",
@@ -3035,25 +3035,7 @@
                 "label": "soClient",
                 "description": [],
                 "signature": [
-                  "{ get: <T = unknown>(type: string, id: string, options?: ",
-                  {
-                    "pluginId": "core",
-                    "scope": "server",
-                    "docId": "kibCoreSavedObjectsPluginApi",
-                    "section": "def-server.SavedObjectsBaseOptions",
-                    "text": "SavedObjectsBaseOptions"
-                  },
-                  ") => Promise<",
-                  "SavedObject",
-                  "<T>>; delete: (type: string, id: string, options?: ",
-                  {
-                    "pluginId": "core",
-                    "scope": "server",
-                    "docId": "kibCoreSavedObjectsPluginApi",
-                    "section": "def-server.SavedObjectsDeleteOptions",
-                    "text": "SavedObjectsDeleteOptions"
-                  },
-                  ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+                  "{ create: <T = unknown>(type: string, attributes: T, options?: ",
                   {
                     "pluginId": "core",
                     "scope": "server",
@@ -3111,7 +3093,15 @@
                     "section": "def-server.SavedObjectsCheckConflictsResponse",
                     "text": "SavedObjectsCheckConflictsResponse"
                   },
-                  ">; find: <T = unknown, A = unknown>(options: ",
+                  ">; delete: (type: string, id: string, options?: ",
+                  {
+                    "pluginId": "core",
+                    "scope": "server",
+                    "docId": "kibCoreSavedObjectsPluginApi",
+                    "section": "def-server.SavedObjectsDeleteOptions",
+                    "text": "SavedObjectsDeleteOptions"
+                  },
+                  ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
                   {
                     "pluginId": "core",
                     "scope": "server",
@@ -3175,6 +3165,16 @@
                     "section": "def-server.SavedObjectsBulkResolveResponse",
                     "text": "SavedObjectsBulkResolveResponse"
                   },
+                  "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+                  {
+                    "pluginId": "core",
+                    "scope": "server",
+                    "docId": "kibCoreSavedObjectsPluginApi",
+                    "section": "def-server.SavedObjectsBaseOptions",
+                    "text": "SavedObjectsBaseOptions"
+                  },
+                  ") => Promise<",
+                  "SavedObject",
                   "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
                   {
                     "pluginId": "core",
@@ -3395,7 +3395,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => Promise<string>"
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => Promise<string>"
             ],
             "path": "x-pack/plugins/fleet/server/services/index.ts",
             "deprecated": false,
@@ -3409,25 +3409,7 @@
                 "label": "soClient",
                 "description": [],
                 "signature": [
-                  "{ get: <T = unknown>(type: string, id: string, options?: ",
-                  {
-                    "pluginId": "core",
-                    "scope": "server",
-                    "docId": "kibCoreSavedObjectsPluginApi",
-                    "section": "def-server.SavedObjectsBaseOptions",
-                    "text": "SavedObjectsBaseOptions"
-                  },
-                  ") => Promise<",
-                  "SavedObject",
-                  "<T>>; delete: (type: string, id: string, options?: ",
-                  {
-                    "pluginId": "core",
-                    "scope": "server",
-                    "docId": "kibCoreSavedObjectsPluginApi",
-                    "section": "def-server.SavedObjectsDeleteOptions",
-                    "text": "SavedObjectsDeleteOptions"
-                  },
-                  ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+                  "{ create: <T = unknown>(type: string, attributes: T, options?: ",
                   {
                     "pluginId": "core",
                     "scope": "server",
@@ -3485,7 +3467,15 @@
                     "section": "def-server.SavedObjectsCheckConflictsResponse",
                     "text": "SavedObjectsCheckConflictsResponse"
                   },
-                  ">; find: <T = unknown, A = unknown>(options: ",
+                  ">; delete: (type: string, id: string, options?: ",
+                  {
+                    "pluginId": "core",
+                    "scope": "server",
+                    "docId": "kibCoreSavedObjectsPluginApi",
+                    "section": "def-server.SavedObjectsDeleteOptions",
+                    "text": "SavedObjectsDeleteOptions"
+                  },
+                  ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
                   {
                     "pluginId": "core",
                     "scope": "server",
@@ -3549,6 +3539,16 @@
                     "section": "def-server.SavedObjectsBulkResolveResponse",
                     "text": "SavedObjectsBulkResolveResponse"
                   },
+                  "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+                  {
+                    "pluginId": "core",
+                    "scope": "server",
+                    "docId": "kibCoreSavedObjectsPluginApi",
+                    "section": "def-server.SavedObjectsBaseOptions",
+                    "text": "SavedObjectsBaseOptions"
+                  },
+                  ") => Promise<",
+                  "SavedObject",
                   "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
                   {
                     "pluginId": "core",
@@ -3756,7 +3756,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, id: string, options?: { standalone: boolean; } | undefined) => Promise<",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, id: string, options?: { standalone: boolean; } | undefined) => Promise<",
               {
                 "pluginId": "fleet",
                 "scope": "common",
@@ -3778,25 +3778,7 @@
                 "label": "soClient",
                 "description": [],
                 "signature": [
-                  "{ get: <T = unknown>(type: string, id: string, options?: ",
-                  {
-                    "pluginId": "core",
-                    "scope": "server",
-                    "docId": "kibCoreSavedObjectsPluginApi",
-                    "section": "def-server.SavedObjectsBaseOptions",
-                    "text": "SavedObjectsBaseOptions"
-                  },
-                  ") => Promise<",
-                  "SavedObject",
-                  "<T>>; delete: (type: string, id: string, options?: ",
-                  {
-                    "pluginId": "core",
-                    "scope": "server",
-                    "docId": "kibCoreSavedObjectsPluginApi",
-                    "section": "def-server.SavedObjectsDeleteOptions",
-                    "text": "SavedObjectsDeleteOptions"
-                  },
-                  ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+                  "{ create: <T = unknown>(type: string, attributes: T, options?: ",
                   {
                     "pluginId": "core",
                     "scope": "server",
@@ -3854,7 +3836,15 @@
                     "section": "def-server.SavedObjectsCheckConflictsResponse",
                     "text": "SavedObjectsCheckConflictsResponse"
                   },
-                  ">; find: <T = unknown, A = unknown>(options: ",
+                  ">; delete: (type: string, id: string, options?: ",
+                  {
+                    "pluginId": "core",
+                    "scope": "server",
+                    "docId": "kibCoreSavedObjectsPluginApi",
+                    "section": "def-server.SavedObjectsDeleteOptions",
+                    "text": "SavedObjectsDeleteOptions"
+                  },
+                  ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
                   {
                     "pluginId": "core",
                     "scope": "server",
@@ -3918,6 +3908,16 @@
                     "section": "def-server.SavedObjectsBulkResolveResponse",
                     "text": "SavedObjectsBulkResolveResponse"
                   },
+                  "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+                  {
+                    "pluginId": "core",
+                    "scope": "server",
+                    "docId": "kibCoreSavedObjectsPluginApi",
+                    "section": "def-server.SavedObjectsBaseOptions",
+                    "text": "SavedObjectsBaseOptions"
+                  },
+                  ") => Promise<",
+                  "SavedObject",
                   "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
                   {
                     "pluginId": "core",
@@ -4148,7 +4148,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, ids: string[], options?: { fields?: string[] | undefined; }) => Promise<",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, ids: string[], options?: { fields?: string[] | undefined; }) => Promise<",
               {
                 "pluginId": "fleet",
                 "scope": "common",
@@ -4170,25 +4170,7 @@
                 "label": "soClient",
                 "description": [],
                 "signature": [
-                  "{ get: <T = unknown>(type: string, id: string, options?: ",
-                  {
-                    "pluginId": "core",
-                    "scope": "server",
-                    "docId": "kibCoreSavedObjectsPluginApi",
-                    "section": "def-server.SavedObjectsBaseOptions",
-                    "text": "SavedObjectsBaseOptions"
-                  },
-                  ") => Promise<",
-                  "SavedObject",
-                  "<T>>; delete: (type: string, id: string, options?: ",
-                  {
-                    "pluginId": "core",
-                    "scope": "server",
-                    "docId": "kibCoreSavedObjectsPluginApi",
-                    "section": "def-server.SavedObjectsDeleteOptions",
-                    "text": "SavedObjectsDeleteOptions"
-                  },
-                  ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+                  "{ create: <T = unknown>(type: string, attributes: T, options?: ",
                   {
                     "pluginId": "core",
                     "scope": "server",
@@ -4246,7 +4228,15 @@
                     "section": "def-server.SavedObjectsCheckConflictsResponse",
                     "text": "SavedObjectsCheckConflictsResponse"
                   },
-                  ">; find: <T = unknown, A = unknown>(options: ",
+                  ">; delete: (type: string, id: string, options?: ",
+                  {
+                    "pluginId": "core",
+                    "scope": "server",
+                    "docId": "kibCoreSavedObjectsPluginApi",
+                    "section": "def-server.SavedObjectsDeleteOptions",
+                    "text": "SavedObjectsDeleteOptions"
+                  },
+                  ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
                   {
                     "pluginId": "core",
                     "scope": "server",
@@ -4310,6 +4300,16 @@
                     "section": "def-server.SavedObjectsBulkResolveResponse",
                     "text": "SavedObjectsBulkResolveResponse"
                   },
+                  "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+                  {
+                    "pluginId": "core",
+                    "scope": "server",
+                    "docId": "kibCoreSavedObjectsPluginApi",
+                    "section": "def-server.SavedObjectsBaseOptions",
+                    "text": "SavedObjectsBaseOptions"
+                  },
+                  ") => Promise<",
+                  "SavedObject",
                   "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
                   {
                     "pluginId": "core",
@@ -4584,7 +4584,7 @@
                 "signature": [
                   "Pick<",
                   "KibanaClient",
-                  ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                  ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                   "TransportRequestParams",
                   ", options?: ",
                   "TransportRequestOptions",
@@ -4876,7 +4876,7 @@
                 "signature": [
                   "Pick<",
                   "KibanaClient",
-                  ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                  ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                   "TransportRequestParams",
                   ", options?: ",
                   "TransportRequestOptions",
@@ -5231,7 +5231,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, pkgName: string, datasetPath: string) => Promise<string | undefined>"
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, pkgName: string, datasetPath: string) => Promise<string | undefined>"
             ],
             "path": "x-pack/plugins/fleet/server/services/index.ts",
             "deprecated": false,
@@ -5252,7 +5252,7 @@
                     "section": "def-server.SavedObjectsClient",
                     "text": "SavedObjectsClient"
                   },
-                  ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
+                  ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
                 ],
                 "path": "x-pack/plugins/fleet/server/services/index.ts",
                 "deprecated": false,
@@ -5451,7 +5451,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; pkgName: string; }) => Promise<",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; pkgName: string; }) => Promise<",
               {
                 "pluginId": "fleet",
                 "scope": "common",
@@ -5481,7 +5481,7 @@
                     "section": "def-server.SavedObjectsClient",
                     "text": "SavedObjectsClient"
                   },
-                  ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; pkgName: string; }"
+                  ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; pkgName: string; }"
                 ],
                 "path": "x-pack/plugins/fleet/server/services/epm/packages/get.ts",
                 "deprecated": false
@@ -6579,7 +6579,7 @@
             "section": "def-common.RegistryPackage",
             "text": "RegistryPackage"
           },
-          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"installed\"; savedObject: ",
+          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"installed\"; savedObject: ",
           "SavedObject",
           "<",
           {
@@ -6597,7 +6597,7 @@
             "section": "def-common.RegistryPackage",
             "text": "RegistryPackage"
           },
-          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"installing\"; savedObject: ",
+          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"installing\"; savedObject: ",
           "SavedObject",
           "<",
           {
@@ -6615,7 +6615,7 @@
             "section": "def-common.RegistryPackage",
             "text": "RegistryPackage"
           },
-          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"not_installed\"; } & { integration?: string | undefined; id: string; }) | (Pick<",
+          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"not_installed\"; } & { integration?: string | undefined; id: string; }) | (Pick<",
           {
             "pluginId": "fleet",
             "scope": "common",
@@ -6623,7 +6623,7 @@
             "section": "def-common.RegistryPackage",
             "text": "RegistryPackage"
           },
-          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"install_failed\"; } & { integration?: string | undefined; id: string; })) => boolean"
+          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"install_failed\"; } & { integration?: string | undefined; id: string; })) => boolean"
         ],
         "path": "x-pack/plugins/fleet/common/services/packages_with_integrations.ts",
         "deprecated": false,
@@ -6835,7 +6835,7 @@
                 "section": "def-common.RegistryPackage",
                 "text": "RegistryPackage"
               },
-              ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"installed\"; savedObject: ",
+              ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"installed\"; savedObject: ",
               "SavedObject",
               "<",
               {
@@ -6853,7 +6853,7 @@
                 "section": "def-common.RegistryPackage",
                 "text": "RegistryPackage"
               },
-              ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"installing\"; savedObject: ",
+              ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"installing\"; savedObject: ",
               "SavedObject",
               "<",
               {
@@ -6871,7 +6871,7 @@
                 "section": "def-common.RegistryPackage",
                 "text": "RegistryPackage"
               },
-              ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"not_installed\"; } & { integration?: string | undefined; id: string; }) | (Pick<",
+              ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"not_installed\"; } & { integration?: string | undefined; id: string; }) | (Pick<",
               {
                 "pluginId": "fleet",
                 "scope": "common",
@@ -6879,7 +6879,7 @@
                 "section": "def-common.RegistryPackage",
                 "text": "RegistryPackage"
               },
-              ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"install_failed\"; } & { integration?: string | undefined; id: string; })"
+              ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"install_failed\"; } & { integration?: string | undefined; id: string; })"
             ],
             "path": "x-pack/plugins/fleet/common/services/packages_with_integrations.ts",
             "deprecated": false,
@@ -7854,7 +7854,7 @@
             "label": "status",
             "description": [],
             "signature": [
-              "\"warning\" | \"offline\" | \"online\" | \"error\" | \"inactive\" | \"enrolling\" | \"unenrolling\" | \"updating\" | \"degraded\" | undefined"
+              "\"offline\" | \"online\" | \"error\" | \"warning\" | \"inactive\" | \"enrolling\" | \"unenrolling\" | \"updating\" | \"degraded\" | undefined"
             ],
             "path": "x-pack/plugins/fleet/common/types/models/agent.ts",
             "deprecated": false
@@ -11241,7 +11241,7 @@
             "label": "missing_requirements",
             "description": [],
             "signature": [
-              "(\"fleet_server\" | \"tls_required\" | \"api_keys\" | \"fleet_admin_user\" | \"encrypted_saved_object_encryption_key_required\")[]"
+              "(\"fleet_server\" | \"security_required\" | \"tls_required\" | \"api_keys\" | \"fleet_admin_user\" | \"encrypted_saved_object_encryption_key_required\")[]"
             ],
             "path": "x-pack/plugins/fleet/common/types/rest_spec/fleet_setup.ts",
             "deprecated": false
@@ -12795,6 +12795,19 @@
             "description": [],
             "path": "x-pack/plugins/fleet/common/types/models/epm.ts",
             "deprecated": false
+          },
+          {
+            "parentPluginId": "fleet",
+            "id": "def-common.IntegrationCardItem.categories",
+            "type": "Array",
+            "tags": [],
+            "label": "categories",
+            "description": [],
+            "signature": [
+              "string[]"
+            ],
+            "path": "x-pack/plugins/fleet/common/types/models/epm.ts",
+            "deprecated": false
           }
         ],
         "initialIsOpen": false
@@ -13668,7 +13681,7 @@
             "section": "def-common.NewPackagePolicy",
             "text": "NewPackagePolicy"
           },
-          ", \"enabled\" | \"description\" | \"name\" | \"package\" | \"policy_id\" | \"namespace\" | \"output_id\" | \"vars\">"
+          ", \"description\" | \"name\" | \"enabled\" | \"package\" | \"policy_id\" | \"namespace\" | \"output_id\" | \"vars\">"
         ],
         "path": "x-pack/plugins/fleet/common/types/models/package_policy.ts",
         "deprecated": false,
@@ -14857,7 +14870,7 @@
                 "section": "def-common.NewPackagePolicy",
                 "text": "NewPackagePolicy"
               },
-              ", \"enabled\" | \"description\" | \"name\" | \"policy_id\" | \"namespace\" | \"output_id\" | \"vars\">> & { name: string; package: Partial<",
+              ", \"description\" | \"name\" | \"enabled\" | \"policy_id\" | \"namespace\" | \"output_id\" | \"vars\">> & { name: string; package: Partial<",
               {
                 "pluginId": "fleet",
                 "scope": "common",
@@ -17011,7 +17024,7 @@
         "label": "AgentStatus",
         "description": [],
         "signature": [
-          "\"warning\" | \"offline\" | \"online\" | \"error\" | \"inactive\" | \"enrolling\" | \"unenrolling\" | \"updating\" | \"degraded\""
+          "\"offline\" | \"online\" | \"error\" | \"warning\" | \"inactive\" | \"enrolling\" | \"unenrolling\" | \"updating\" | \"degraded\""
         ],
         "path": "x-pack/plugins/fleet/common/types/models/agent.ts",
         "deprecated": false,
@@ -17662,6 +17675,20 @@
         "deprecated": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "fleet",
+        "id": "def-common.FLEET_APM_PACKAGE",
+        "type": "string",
+        "tags": [],
+        "label": "FLEET_APM_PACKAGE",
+        "description": [],
+        "signature": [
+          "\"apm\""
+        ],
+        "path": "x-pack/plugins/fleet/common/constants/epm.ts",
+        "deprecated": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "fleet",
         "id": "def-common.FLEET_ELASTIC_AGENT_PACKAGE",
@@ -17760,6 +17787,20 @@
         "deprecated": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "fleet",
+        "id": "def-common.FLEET_SYNTHETICS_PACKAGE",
+        "type": "string",
+        "tags": [],
+        "label": "FLEET_SYNTHETICS_PACKAGE",
+        "description": [],
+        "signature": [
+          "\"synthetics\""
+        ],
+        "path": "x-pack/plugins/fleet/common/constants/epm.ts",
+        "deprecated": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "fleet",
         "id": "def-common.FLEET_SYSTEM_PACKAGE",
@@ -18639,7 +18680,7 @@
             "section": "def-common.RegistryPackage",
             "text": "RegistryPackage"
           },
-          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"installed\"; savedObject: ",
+          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"installed\"; savedObject: ",
           "SavedObject",
           "<",
           {
@@ -18657,7 +18698,7 @@
             "section": "def-common.RegistryPackage",
             "text": "RegistryPackage"
           },
-          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"installing\"; savedObject: ",
+          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"installing\"; savedObject: ",
           "SavedObject",
           "<",
           {
@@ -18675,7 +18716,7 @@
             "section": "def-common.RegistryPackage",
             "text": "RegistryPackage"
           },
-          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"not_installed\"; } & { integration?: string | undefined; id: string; }) | (Pick<",
+          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"not_installed\"; } & { integration?: string | undefined; id: string; }) | (Pick<",
           {
             "pluginId": "fleet",
             "scope": "common",
@@ -18683,7 +18724,7 @@
             "section": "def-common.RegistryPackage",
             "text": "RegistryPackage"
           },
-          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"install_failed\"; } & { integration?: string | undefined; id: string; })"
+          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\"> & { status: \"install_failed\"; } & { integration?: string | undefined; id: string; })"
         ],
         "path": "x-pack/plugins/fleet/common/types/models/epm.ts",
         "deprecated": false,
@@ -18748,7 +18789,7 @@
         "label": "PackagePolicySOAttributes",
         "description": [],
         "signature": [
-          "{ enabled: boolean; description?: string | undefined; name: string; package?: ",
+          "{ description?: string | undefined; name: string; enabled: boolean; package?: ",
           {
             "pluginId": "fleet",
             "scope": "common",
@@ -19074,7 +19115,7 @@
             "section": "def-common.RegistryImage",
             "text": "RegistryImage"
           },
-          "[]) | undefined; name: string; version: string; path: string; download: string; internal?: boolean | undefined; data_streams?: ",
+          "[]) | undefined; categories?: (\"custom\" | \"aws\" | \"azure\" | \"cloud\" | \"config_management\" | \"containers\" | \"crm\" | \"datastore\" | \"elastic_stack\" | \"google_cloud\" | \"kubernetes\" | \"languages\" | \"message_queue\" | \"monitoring\" | \"network\" | \"notification\" | \"os_system\" | \"productivity\" | \"security\" | \"support\" | \"ticketing\" | \"version_control\" | \"web\" | undefined)[] | undefined; name: string; version: string; path: string; download: string; internal?: boolean | undefined; data_streams?: ",
           {
             "pluginId": "fleet",
             "scope": "common",
@@ -19112,7 +19153,7 @@
             "section": "def-common.RegistryPackage",
             "text": "RegistryPackage"
           },
-          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\">[]"
+          ", \"type\" | \"title\" | \"description\" | \"icons\" | \"categories\" | \"name\" | \"version\" | \"path\" | \"download\" | \"internal\" | \"data_streams\" | \"release\" | \"policy_templates\">[]"
         ],
         "path": "x-pack/plugins/fleet/common/types/models/epm.ts",
         "deprecated": false,
diff --git a/api_docs/fleet.mdx b/api_docs/fleet.mdx
index 88d006982d0f0..3d01ccbb559a1 100644
--- a/api_docs/fleet.mdx
+++ b/api_docs/fleet.mdx
@@ -18,7 +18,7 @@ Contact [Fleet](https://github.com/orgs/elastic/teams/fleet) for questions regar
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 1207 | 15 | 1107 | 10 |
+| 1210 | 15 | 1110 | 10 |
 
 ## Client
 
diff --git a/api_docs/global_search.json b/api_docs/global_search.json
index a8b5ca35c634e..7dd6198974f6c 100644
--- a/api_docs/global_search.json
+++ b/api_docs/global_search.json
@@ -625,7 +625,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; typeRegistry: Pick<",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; typeRegistry: Pick<",
               {
                 "pluginId": "core",
                 "scope": "server",
diff --git a/api_docs/home.json b/api_docs/home.json
index 585bd6b18d07b..1bda24024cf7c 100644
--- a/api_docs/home.json
+++ b/api_docs/home.json
@@ -959,7 +959,7 @@
         "label": "InstructionsSchema",
         "description": [],
         "signature": [
-          "{ readonly params?: Readonly<{ defaultValue?: any; } & { type: \"string\" | \"number\"; label: string; id: string; }>[] | undefined; readonly instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }"
+          "{ readonly params?: Readonly<{ defaultValue?: any; } & { label: string; type: \"string\" | \"number\"; id: string; }>[] | undefined; readonly instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }"
         ],
         "path": "src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts",
         "deprecated": false,
@@ -981,7 +981,7 @@
             "section": "def-server.Writable",
             "text": "Writable"
           },
-          "<Readonly<{ status?: string | undefined; darkPreviewImagePath?: string | undefined; iconPath?: string | undefined; statusMsg?: string | undefined; } & { id: string; description: string; name: string; savedObjects: Readonly<{ version?: any; attributes?: any; } & { type: string; id: string; references: any[]; }>[]; defaultIndex: string; previewImagePath: string; overviewDashboard: string; appLinks: Readonly<{} & { label: string; path: string; icon: string; }>[]; dataIndices: Readonly<{} & { id: string; fields: Record<string, any>; timeFields: string[]; dataPath: string; currentTimeMarker: string; preserveDayOfWeekTimeOfDay: boolean; }>[]; }>>[]; addSavedObjectsToSampleDataset: (id: string, savedObjects: ",
+          "<Readonly<{ status?: string | undefined; darkPreviewImagePath?: string | undefined; iconPath?: string | undefined; statusMsg?: string | undefined; } & { id: string; description: string; name: string; defaultIndex: string; savedObjects: Readonly<{ version?: any; attributes?: any; } & { type: string; id: string; references: any[]; }>[]; previewImagePath: string; overviewDashboard: string; appLinks: Readonly<{} & { label: string; path: string; icon: string; }>[]; dataIndices: Readonly<{} & { id: string; fields: Record<string, any>; timeFields: string[]; dataPath: string; currentTimeMarker: string; preserveDayOfWeekTimeOfDay: boolean; }>[]; }>>[]; addSavedObjectsToSampleDataset: (id: string, savedObjects: ",
           "SavedObject",
           "<unknown>[]) => void; addAppLinksToSampleDataset: (id: string, appLinks: Readonly<{} & { label: string; path: string; icon: string; }>[]) => void; replacePanelInSampleDatasetDashboard: ({ sampleDataId, dashboardId, oldEmbeddableId, embeddableId, embeddableType, embeddableConfig, }: ",
           "SampleDatasetDashboardPanel",
@@ -1007,7 +1007,7 @@
             "section": "def-server.Writable",
             "text": "Writable"
           },
-          "<Readonly<{ status?: string | undefined; darkPreviewImagePath?: string | undefined; iconPath?: string | undefined; statusMsg?: string | undefined; } & { id: string; description: string; name: string; savedObjects: Readonly<{ version?: any; attributes?: any; } & { type: string; id: string; references: any[]; }>[]; defaultIndex: string; previewImagePath: string; overviewDashboard: string; appLinks: Readonly<{} & { label: string; path: string; icon: string; }>[]; dataIndices: Readonly<{} & { id: string; fields: Record<string, any>; timeFields: string[]; dataPath: string; currentTimeMarker: string; preserveDayOfWeekTimeOfDay: boolean; }>[]; }>>"
+          "<Readonly<{ status?: string | undefined; darkPreviewImagePath?: string | undefined; iconPath?: string | undefined; statusMsg?: string | undefined; } & { id: string; description: string; name: string; defaultIndex: string; savedObjects: Readonly<{ version?: any; attributes?: any; } & { type: string; id: string; references: any[]; }>[]; previewImagePath: string; overviewDashboard: string; appLinks: Readonly<{} & { label: string; path: string; icon: string; }>[]; dataIndices: Readonly<{} & { id: string; fields: Record<string, any>; timeFields: string[]; dataPath: string; currentTimeMarker: string; preserveDayOfWeekTimeOfDay: boolean; }>[]; }>>"
         ],
         "path": "src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts",
         "deprecated": false,
@@ -1025,7 +1025,7 @@
         "signature": [
           "(context: ",
           "TutorialContext",
-          ") => Readonly<{ isBeta?: boolean | undefined; savedObjects?: any[] | undefined; euiIconType?: string | undefined; previewImagePath?: string | undefined; moduleName?: string | undefined; completionTimeMinutes?: number | undefined; elasticCloud?: Readonly<{ params?: Readonly<{ defaultValue?: any; } & { type: \"string\" | \"number\"; label: string; id: string; }>[] | undefined; } & { instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }> | undefined; onPremElasticCloud?: Readonly<{ params?: Readonly<{ defaultValue?: any; } & { type: \"string\" | \"number\"; label: string; id: string; }>[] | undefined; } & { instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }> | undefined; artifacts?: Readonly<{ application?: Readonly<{} & { label: string; path: string; }> | undefined; exportedFields?: Readonly<{} & { documentationUrl: string; }> | undefined; } & { dashboards: Readonly<{ linkLabel?: string | undefined; } & { id: string; isOverview: boolean; }>[]; }> | undefined; savedObjectsInstallMsg?: string | undefined; customStatusCheckName?: string | undefined; integrationBrowserCategories?: string[] | undefined; eprPackageOverlap?: string | undefined; } & { id: string; name: string; category: \"security\" | \"metrics\" | \"other\" | \"logging\"; shortDescription: string; longDescription: string; onPrem: Readonly<{ params?: Readonly<{ defaultValue?: any; } & { type: \"string\" | \"number\"; label: string; id: string; }>[] | undefined; } & { instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }>; }>"
+          ") => Readonly<{ isBeta?: boolean | undefined; savedObjects?: any[] | undefined; euiIconType?: string | undefined; previewImagePath?: string | undefined; moduleName?: string | undefined; completionTimeMinutes?: number | undefined; elasticCloud?: Readonly<{ params?: Readonly<{ defaultValue?: any; } & { label: string; type: \"string\" | \"number\"; id: string; }>[] | undefined; } & { instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }> | undefined; onPremElasticCloud?: Readonly<{ params?: Readonly<{ defaultValue?: any; } & { label: string; type: \"string\" | \"number\"; id: string; }>[] | undefined; } & { instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }> | undefined; artifacts?: Readonly<{ application?: Readonly<{} & { label: string; path: string; }> | undefined; exportedFields?: Readonly<{} & { documentationUrl: string; }> | undefined; } & { dashboards: Readonly<{ linkLabel?: string | undefined; } & { id: string; isOverview: boolean; }>[]; }> | undefined; savedObjectsInstallMsg?: string | undefined; customStatusCheckName?: string | undefined; integrationBrowserCategories?: string[] | undefined; eprPackageOverlap?: string | undefined; } & { id: string; name: string; category: \"other\" | \"security\" | \"metrics\" | \"logging\"; shortDescription: string; longDescription: string; onPrem: Readonly<{ params?: Readonly<{ defaultValue?: any; } & { label: string; type: \"string\" | \"number\"; id: string; }>[] | undefined; } & { instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }>; }>"
         ],
         "path": "src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts",
         "deprecated": false,
@@ -1055,7 +1055,7 @@
         "label": "TutorialSchema",
         "description": [],
         "signature": [
-          "{ readonly isBeta?: boolean | undefined; readonly savedObjects?: any[] | undefined; readonly euiIconType?: string | undefined; readonly previewImagePath?: string | undefined; readonly moduleName?: string | undefined; readonly completionTimeMinutes?: number | undefined; readonly elasticCloud?: Readonly<{ params?: Readonly<{ defaultValue?: any; } & { type: \"string\" | \"number\"; label: string; id: string; }>[] | undefined; } & { instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }> | undefined; readonly onPremElasticCloud?: Readonly<{ params?: Readonly<{ defaultValue?: any; } & { type: \"string\" | \"number\"; label: string; id: string; }>[] | undefined; } & { instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }> | undefined; readonly artifacts?: Readonly<{ application?: Readonly<{} & { label: string; path: string; }> | undefined; exportedFields?: Readonly<{} & { documentationUrl: string; }> | undefined; } & { dashboards: Readonly<{ linkLabel?: string | undefined; } & { id: string; isOverview: boolean; }>[]; }> | undefined; readonly savedObjectsInstallMsg?: string | undefined; readonly customStatusCheckName?: string | undefined; readonly integrationBrowserCategories?: string[] | undefined; readonly eprPackageOverlap?: string | undefined; readonly id: string; readonly name: string; readonly category: \"security\" | \"metrics\" | \"other\" | \"logging\"; readonly shortDescription: string; readonly longDescription: string; readonly onPrem: Readonly<{ params?: Readonly<{ defaultValue?: any; } & { type: \"string\" | \"number\"; label: string; id: string; }>[] | undefined; } & { instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }>; }"
+          "{ readonly isBeta?: boolean | undefined; readonly savedObjects?: any[] | undefined; readonly euiIconType?: string | undefined; readonly previewImagePath?: string | undefined; readonly moduleName?: string | undefined; readonly completionTimeMinutes?: number | undefined; readonly elasticCloud?: Readonly<{ params?: Readonly<{ defaultValue?: any; } & { label: string; type: \"string\" | \"number\"; id: string; }>[] | undefined; } & { instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }> | undefined; readonly onPremElasticCloud?: Readonly<{ params?: Readonly<{ defaultValue?: any; } & { label: string; type: \"string\" | \"number\"; id: string; }>[] | undefined; } & { instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }> | undefined; readonly artifacts?: Readonly<{ application?: Readonly<{} & { label: string; path: string; }> | undefined; exportedFields?: Readonly<{} & { documentationUrl: string; }> | undefined; } & { dashboards: Readonly<{ linkLabel?: string | undefined; } & { id: string; isOverview: boolean; }>[]; }> | undefined; readonly savedObjectsInstallMsg?: string | undefined; readonly customStatusCheckName?: string | undefined; readonly integrationBrowserCategories?: string[] | undefined; readonly eprPackageOverlap?: string | undefined; readonly id: string; readonly name: string; readonly category: \"other\" | \"security\" | \"metrics\" | \"logging\"; readonly shortDescription: string; readonly longDescription: string; readonly onPrem: Readonly<{ params?: Readonly<{ defaultValue?: any; } & { label: string; type: \"string\" | \"number\"; id: string; }>[] | undefined; } & { instructionSets: Readonly<{ title?: string | undefined; callOut?: Readonly<{ iconType?: string | undefined; message?: string | undefined; } & { title: string; }> | undefined; statusCheck?: Readonly<{ title?: string | undefined; text?: string | undefined; error?: string | undefined; success?: string | undefined; btnLabel?: string | undefined; } & { esHitsCheck: Readonly<{} & { query: Record<string, any>; index: string | string[]; }>; }> | undefined; } & { instructionVariants: Readonly<{} & { id: string; instructions: Readonly<{ title?: string | undefined; commands?: string[] | undefined; textPre?: string | undefined; textPost?: string | undefined; customComponentName?: string | undefined; } & {}>[]; }>[]; }>[]; }>; }"
         ],
         "path": "src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts",
         "deprecated": false,
@@ -1314,7 +1314,7 @@
               "section": "def-server.Writable",
               "text": "Writable"
             },
-            "<Readonly<{ status?: string | undefined; darkPreviewImagePath?: string | undefined; iconPath?: string | undefined; statusMsg?: string | undefined; } & { id: string; description: string; name: string; savedObjects: Readonly<{ version?: any; attributes?: any; } & { type: string; id: string; references: any[]; }>[]; defaultIndex: string; previewImagePath: string; overviewDashboard: string; appLinks: Readonly<{} & { label: string; path: string; icon: string; }>[]; dataIndices: Readonly<{} & { id: string; fields: Record<string, any>; timeFields: string[]; dataPath: string; currentTimeMarker: string; preserveDayOfWeekTimeOfDay: boolean; }>[]; }>>[]; addSavedObjectsToSampleDataset: (id: string, savedObjects: ",
+            "<Readonly<{ status?: string | undefined; darkPreviewImagePath?: string | undefined; iconPath?: string | undefined; statusMsg?: string | undefined; } & { id: string; description: string; name: string; defaultIndex: string; savedObjects: Readonly<{ version?: any; attributes?: any; } & { type: string; id: string; references: any[]; }>[]; previewImagePath: string; overviewDashboard: string; appLinks: Readonly<{} & { label: string; path: string; icon: string; }>[]; dataIndices: Readonly<{} & { id: string; fields: Record<string, any>; timeFields: string[]; dataPath: string; currentTimeMarker: string; preserveDayOfWeekTimeOfDay: boolean; }>[]; }>>[]; addSavedObjectsToSampleDataset: (id: string, savedObjects: ",
             "SavedObject",
             "<unknown>[]) => void; addAppLinksToSampleDataset: (id: string, appLinks: Readonly<{} & { label: string; path: string; icon: string; }>[]) => void; replacePanelInSampleDatasetDashboard: ({ sampleDataId, dashboardId, oldEmbeddableId, embeddableId, embeddableType, embeddableConfig, }: ",
             "SampleDatasetDashboardPanel",
diff --git a/api_docs/kbn_dev_utils.json b/api_docs/kbn_dev_utils.json
index 04ce7aebc51e6..1fea3bfd21ae8 100644
--- a/api_docs/kbn_dev_utils.json
+++ b/api_docs/kbn_dev_utils.json
@@ -26,7 +26,9 @@
             "type": "Function",
             "tags": [],
             "label": "fromEnv",
-            "description": [],
+            "description": [
+              "\nCreate a CiStatsReporter by inspecting the ENV for the necessary config"
+            ],
             "signature": [
               "(log: ",
               {
@@ -92,7 +94,13 @@
                 "label": "config",
                 "description": [],
                 "signature": [
-                  "Config",
+                  {
+                    "pluginId": "@kbn/dev-utils",
+                    "scope": "server",
+                    "docId": "kibKbnDevUtilsPluginApi",
+                    "section": "def-server.Config",
+                    "text": "Config"
+                  },
                   " | undefined"
                 ],
                 "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
@@ -128,7 +136,9 @@
             "type": "Function",
             "tags": [],
             "label": "isEnabled",
-            "description": [],
+            "description": [
+              "\nDetermine if CI_STATS is explicitly disabled by the environment. To determine\nif the CiStatsReporter has enough information in the environment to send metrics\nfor builds use #hasBuildConfig()."
+            ],
             "signature": [
               "() => boolean"
             ],
@@ -143,7 +153,9 @@
             "type": "Function",
             "tags": [],
             "label": "hasBuildConfig",
-            "description": [],
+            "description": [
+              "\nDetermines if the CiStatsReporter is disabled by the environment, or properly\nconfigured and able to send stats"
+            ],
             "signature": [
               "() => boolean"
             ],
@@ -216,7 +228,15 @@
                 "section": "def-server.CiStatsMetric",
                 "text": "CiStatsMetric"
               },
-              "[]) => Promise<true | undefined>"
+              "[], options?: ",
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.MetricsOptions",
+                "text": "MetricsOptions"
+              },
+              " | undefined) => Promise<true | undefined>"
             ],
             "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
             "deprecated": false,
@@ -241,6 +261,27 @@
                 "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
                 "deprecated": false,
                 "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/dev-utils",
+                "id": "def-server.CiStatsReporter.metrics.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "options",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/dev-utils",
+                    "scope": "server",
+                    "docId": "kibKbnDevUtilsPluginApi",
+                    "section": "def-server.MetricsOptions",
+                    "text": "MetricsOptions"
+                  },
+                  " | undefined"
+                ],
+                "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
+                "deprecated": false,
+                "isRequired": false
               }
             ],
             "returnComment": []
@@ -644,19 +685,59 @@
                 "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
                 "deprecated": false,
                 "isRequired": false
+              },
+              {
+                "parentPluginId": "@kbn/dev-utils",
+                "id": "def-server.ToolingLog.Unnamed.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "options",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/dev-utils",
+                    "scope": "server",
+                    "docId": "kibKbnDevUtilsPluginApi",
+                    "section": "def-server.ToolingLogOptions",
+                    "text": "ToolingLogOptions"
+                  },
+                  " | undefined"
+                ],
+                "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
+                "deprecated": false,
+                "isRequired": false
               }
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "@kbn/dev-utils",
+            "id": "def-server.ToolingLog.getIndent",
+            "type": "Function",
+            "tags": [],
+            "label": "getIndent",
+            "description": [
+              "\nGet the current indentation level of the ToolingLog"
+            ],
+            "signature": [
+              "() => number"
+            ],
+            "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
           {
             "parentPluginId": "@kbn/dev-utils",
             "id": "def-server.ToolingLog.indent",
             "type": "Function",
             "tags": [],
             "label": "indent",
-            "description": [],
+            "description": [
+              "\nIndent the output of the ToolingLog by some character (4 is a good choice usually).\n\nIf provided, the `block` function will be executed and once it's promise is resolved\nor rejected the indentation will be reset to its original state.\n"
+            ],
             "signature": [
-              "(delta?: number) => number"
+              "<T>(delta?: number, block?: (() => Promise<T>) | undefined) => Promise<T> | undefined"
             ],
             "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
             "deprecated": false,
@@ -667,13 +748,31 @@
                 "type": "number",
                 "tags": [],
                 "label": "delta",
-                "description": [],
+                "description": [
+                  "the number of spaces to increase/decrease the indentation"
+                ],
                 "signature": [
                   "number"
                 ],
                 "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
                 "deprecated": false,
                 "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/dev-utils",
+                "id": "def-server.ToolingLog.indent.$2",
+                "type": "Function",
+                "tags": [],
+                "label": "block",
+                "description": [
+                  "a function to run and reset any indentation changes after"
+                ],
+                "signature": [
+                  "(() => Promise<T>) | undefined"
+                ],
+                "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
+                "deprecated": false,
+                "isRequired": false
               }
             ],
             "returnComment": []
@@ -897,7 +996,13 @@
             "description": [],
             "signature": [
               "() => ",
-              "Writer",
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.Writer",
+                "text": "Writer"
+              },
               "[]"
             ],
             "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
@@ -914,7 +1019,13 @@
             "description": [],
             "signature": [
               "(writers: ",
-              "Writer",
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.Writer",
+                "text": "Writer"
+              },
               "[]) => void"
             ],
             "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
@@ -928,7 +1039,13 @@
                 "label": "writers",
                 "description": [],
                 "signature": [
-                  "Writer",
+                  {
+                    "pluginId": "@kbn/dev-utils",
+                    "scope": "server",
+                    "docId": "kibKbnDevUtilsPluginApi",
+                    "section": "def-server.Writer",
+                    "text": "Writer"
+                  },
                   "[]"
                 ],
                 "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
@@ -949,13 +1066,60 @@
               "() => ",
               "Observable",
               "<",
-              "Message",
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.Message",
+                "text": "Message"
+              },
               ">"
             ],
             "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
             "deprecated": false,
             "children": [],
             "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/dev-utils",
+            "id": "def-server.ToolingLog.withType",
+            "type": "Function",
+            "tags": [],
+            "label": "withType",
+            "description": [
+              "\nCreate a new ToolingLog which sets a different \"type\", allowing messages to be filtered out by \"source\""
+            ],
+            "signature": [
+              "(type: string) => ",
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.ToolingLog",
+                "text": "ToolingLog"
+              }
+            ],
+            "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/dev-utils",
+                "id": "def-server.ToolingLog.withType.$1",
+                "type": "string",
+                "tags": [],
+                "label": "type",
+                "description": [
+                  "A string that will be passed along with messages from this logger which can be used to filter messages with `ignoreSources`"
+                ],
+                "signature": [
+                  "string"
+                ],
+                "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
           }
         ],
         "initialIsOpen": false
@@ -1021,7 +1185,53 @@
                 "label": "level",
                 "description": [],
                 "signature": [
-                  "\"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\""
+                  "\"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\""
+                ],
+                "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts",
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/dev-utils",
+            "id": "def-server.ToolingLogCollectingWriter.write",
+            "type": "Function",
+            "tags": [],
+            "label": "write",
+            "description": [
+              "\nCalled by ToolingLog, extends messages with the source if message includes one."
+            ],
+            "signature": [
+              "(msg: ",
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.Message",
+                "text": "Message"
+              },
+              ") => boolean"
+            ],
+            "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts",
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/dev-utils",
+                "id": "def-server.ToolingLogCollectingWriter.write.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "msg",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/dev-utils",
+                    "scope": "server",
+                    "docId": "kibKbnDevUtilsPluginApi",
+                    "section": "def-server.Message",
+                    "text": "Message"
+                  }
                 ],
                 "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log_collecting_writer.ts",
                 "deprecated": false,
@@ -1049,7 +1259,13 @@
             "text": "ToolingLogTextWriter"
           },
           " implements ",
-          "Writer"
+          {
+            "pluginId": "@kbn/dev-utils",
+            "scope": "server",
+            "docId": "kibKbnDevUtilsPluginApi",
+            "section": "def-server.Writer",
+            "text": "Writer"
+          }
         ],
         "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts",
         "deprecated": false,
@@ -1062,7 +1278,7 @@
             "label": "level",
             "description": [],
             "signature": [
-              "{ name: \"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\"; flags: { warning: boolean; error: boolean; info: boolean; success: boolean; debug: boolean; silent: boolean; verbose: boolean; }; }"
+              "{ name: \"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\"; flags: { error: boolean; info: boolean; success: boolean; warning: boolean; debug: boolean; silent: boolean; verbose: boolean; }; }"
             ],
             "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts",
             "deprecated": false
@@ -1125,7 +1341,13 @@
             "description": [],
             "signature": [
               "(msg: ",
-              "Message",
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.Message",
+                "text": "Message"
+              },
               ") => boolean"
             ],
             "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts",
@@ -1139,7 +1361,13 @@
                 "label": "msg",
                 "description": [],
                 "signature": [
-                  "Message"
+                  {
+                    "pluginId": "@kbn/dev-utils",
+                    "scope": "server",
+                    "docId": "kibKbnDevUtilsPluginApi",
+                    "section": "def-server.Message",
+                    "text": "Message"
+                  }
                 ],
                 "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts",
                 "deprecated": false,
@@ -1157,7 +1385,13 @@
             "description": [],
             "signature": [
               "(writeTo: { write(msg: string): void; }, prefix: string, msg: ",
-              "Message",
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.Message",
+                "text": "Message"
+              },
               ") => void"
             ],
             "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts",
@@ -1199,7 +1433,13 @@
                 "label": "msg",
                 "description": [],
                 "signature": [
-                  "Message"
+                  {
+                    "pluginId": "@kbn/dev-utils",
+                    "scope": "server",
+                    "docId": "kibKbnDevUtilsPluginApi",
+                    "section": "def-server.Message",
+                    "text": "Message"
+                  }
                 ],
                 "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts",
                 "deprecated": false,
@@ -2455,7 +2695,7 @@
         "label": "parseLogLevel",
         "description": [],
         "signature": [
-          "(name: \"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\") => { name: \"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\"; flags: { warning: boolean; error: boolean; info: boolean; success: boolean; debug: boolean; silent: boolean; verbose: boolean; }; }"
+          "(name: \"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\") => { name: \"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\"; flags: { error: boolean; info: boolean; success: boolean; warning: boolean; debug: boolean; silent: boolean; verbose: boolean; }; }"
         ],
         "path": "packages/kbn-dev-utils/src/tooling_log/log_levels.ts",
         "deprecated": false,
@@ -2468,7 +2708,7 @@
             "label": "name",
             "description": [],
             "signature": [
-              "\"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\""
+              "\"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\""
             ],
             "path": "packages/kbn-dev-utils/src/tooling_log/log_levels.ts",
             "deprecated": false,
@@ -2486,7 +2726,7 @@
         "label": "pickLevelFromFlags",
         "description": [],
         "signature": [
-          "(flags: Record<string, string | boolean | string[] | undefined>, options: { default?: \"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\" | undefined; }) => \"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\""
+          "(flags: Record<string, string | boolean | string[] | undefined>, options: { default?: \"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\" | undefined; }) => \"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\""
         ],
         "path": "packages/kbn-dev-utils/src/tooling_log/log_levels.ts",
         "deprecated": false,
@@ -2523,7 +2763,7 @@
                 "label": "default",
                 "description": [],
                 "signature": [
-                  "\"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\" | undefined"
+                  "\"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\" | undefined"
                 ],
                 "path": "packages/kbn-dev-utils/src/tooling_log/log_levels.ts",
                 "deprecated": false
@@ -2945,6 +3185,34 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/dev-utils",
+        "id": "def-server.CiStatsMetadata",
+        "type": "Interface",
+        "tags": [],
+        "label": "CiStatsMetadata",
+        "description": [],
+        "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/dev-utils",
+            "id": "def-server.CiStatsMetadata.Unnamed",
+            "type": "Any",
+            "tags": [],
+            "label": "Unnamed",
+            "description": [
+              "\nArbitrary key-value pairs which can be attached to CiStatsTiming and CiStatsMetric\nobjects stored in the ci-stats service"
+            ],
+            "signature": [
+              "any"
+            ],
+            "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
+            "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/dev-utils",
         "id": "def-server.CiStatsMetric",
@@ -2961,7 +3229,9 @@
             "type": "string",
             "tags": [],
             "label": "group",
-            "description": [],
+            "description": [
+              "Top-level categorization for the metric, e.g. \"page load bundle size\""
+            ],
             "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
             "deprecated": false
           },
@@ -2971,7 +3241,9 @@
             "type": "string",
             "tags": [],
             "label": "id",
-            "description": [],
+            "description": [
+              "Specific sub-set of the \"group\", e.g. \"dashboard\""
+            ],
             "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
             "deprecated": false
           },
@@ -2981,7 +3253,9 @@
             "type": "number",
             "tags": [],
             "label": "value",
-            "description": [],
+            "description": [
+              "integer value recorded as the value of this metric"
+            ],
             "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
             "deprecated": false
           },
@@ -2991,7 +3265,9 @@
             "type": "number",
             "tags": [],
             "label": "limit",
-            "description": [],
+            "description": [
+              "optional limit which will generate an error on PRs when the metric exceeds the limit"
+            ],
             "signature": [
               "number | undefined"
             ],
@@ -3004,33 +3280,59 @@
             "type": "string",
             "tags": [],
             "label": "limitConfigPath",
-            "description": [],
+            "description": [
+              "\npath, relative to the repo, where the config file contianing limits\nis kept. Linked from PR comments instructing contributors how to fix\ntheir PRs."
+            ],
             "signature": [
               "string | undefined"
             ],
             "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
             "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/dev-utils",
-        "id": "def-server.CiStatsTiming",
-        "type": "Interface",
-        "tags": [],
-        "label": "CiStatsTiming",
-        "description": [],
-        "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
-        "deprecated": false,
-        "children": [
+          },
           {
             "parentPluginId": "@kbn/dev-utils",
-            "id": "def-server.CiStatsTiming.group",
+            "id": "def-server.CiStatsMetric.meta",
+            "type": "Object",
+            "tags": [],
+            "label": "meta",
+            "description": [
+              "Arbitrary key-value pairs which can be used for additional filtering/reporting"
+            ],
+            "signature": [
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.CiStatsMetadata",
+                "text": "CiStatsMetadata"
+              },
+              " | undefined"
+            ],
+            "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
+            "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/dev-utils",
+        "id": "def-server.CiStatsTiming",
+        "type": "Interface",
+        "tags": [],
+        "label": "CiStatsTiming",
+        "description": [],
+        "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/dev-utils",
+            "id": "def-server.CiStatsTiming.group",
             "type": "string",
             "tags": [],
             "label": "group",
-            "description": [],
+            "description": [
+              "Top-level categorization for the timing, e.g. \"scripts/foo\", process type, etc."
+            ],
             "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
             "deprecated": false
           },
@@ -3040,7 +3342,9 @@
             "type": "string",
             "tags": [],
             "label": "id",
-            "description": [],
+            "description": [
+              "Specific timing (witin the \"group\" being tracked) e.g. \"total\""
+            ],
             "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
             "deprecated": false
           },
@@ -3050,7 +3354,9 @@
             "type": "number",
             "tags": [],
             "label": "ms",
-            "description": [],
+            "description": [
+              "time in milliseconds which should be recorded"
+            ],
             "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
             "deprecated": false
           },
@@ -3060,14 +3366,16 @@
             "type": "Object",
             "tags": [],
             "label": "meta",
-            "description": [],
+            "description": [
+              "hash of key-value pairs which will be stored with the timing for additional filtering and reporting"
+            ],
             "signature": [
               {
                 "pluginId": "@kbn/dev-utils",
                 "scope": "server",
                 "docId": "kibKbnDevUtilsPluginApi",
-                "section": "def-server.CiStatsTimingMetadata",
-                "text": "CiStatsTimingMetadata"
+                "section": "def-server.CiStatsMetadata",
+                "text": "CiStatsMetadata"
               },
               " | undefined"
             ],
@@ -3077,32 +3385,6 @@
         ],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "@kbn/dev-utils",
-        "id": "def-server.CiStatsTimingMetadata",
-        "type": "Interface",
-        "tags": [],
-        "label": "CiStatsTimingMetadata",
-        "description": [],
-        "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "@kbn/dev-utils",
-            "id": "def-server.CiStatsTimingMetadata.Unnamed",
-            "type": "Any",
-            "tags": [],
-            "label": "Unnamed",
-            "description": [],
-            "signature": [
-              "any"
-            ],
-            "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
-            "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "@kbn/dev-utils",
         "id": "def-server.Command",
@@ -3226,6 +3508,45 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/dev-utils",
+        "id": "def-server.Config",
+        "type": "Interface",
+        "tags": [],
+        "label": "Config",
+        "description": [
+          "\nInformation about how CiStatsReporter should talk to the ci-stats service. Normally\nit is read from a JSON environment variable using the `parseConfig()` function\nexported by this module."
+        ],
+        "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_config.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/dev-utils",
+            "id": "def-server.Config.apiToken",
+            "type": "string",
+            "tags": [],
+            "label": "apiToken",
+            "description": [
+              "ApiToken necessary for writing build data to ci-stats service"
+            ],
+            "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_config.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "@kbn/dev-utils",
+            "id": "def-server.Config.buildId",
+            "type": "string",
+            "tags": [],
+            "label": "buildId",
+            "description": [
+              "\nuuid which should be obtained by first creating a build with the\nci-stats service and then passing it to all subsequent steps"
+            ],
+            "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_config.ts",
+            "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/dev-utils",
         "id": "def-server.FlagOptions",
@@ -3480,54 +3801,105 @@
       },
       {
         "parentPluginId": "@kbn/dev-utils",
-        "id": "def-server.ReqOptions",
+        "id": "def-server.Message",
         "type": "Interface",
         "tags": [],
-        "label": "ReqOptions",
-        "description": [],
-        "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
+        "label": "Message",
+        "description": [
+          "\nThe object shape passed to ToolingLog writers each time the log is used."
+        ],
+        "path": "packages/kbn-dev-utils/src/tooling_log/message.ts",
         "deprecated": false,
         "children": [
           {
             "parentPluginId": "@kbn/dev-utils",
-            "id": "def-server.ReqOptions.auth",
-            "type": "boolean",
+            "id": "def-server.Message.type",
+            "type": "CompoundType",
             "tags": [],
-            "label": "auth",
-            "description": [],
-            "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
+            "label": "type",
+            "description": [
+              "level/type of message"
+            ],
+            "signature": [
+              "\"write\" | \"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"verbose\""
+            ],
+            "path": "packages/kbn-dev-utils/src/tooling_log/message.ts",
             "deprecated": false
           },
           {
             "parentPluginId": "@kbn/dev-utils",
-            "id": "def-server.ReqOptions.path",
-            "type": "string",
+            "id": "def-server.Message.indent",
+            "type": "number",
             "tags": [],
-            "label": "path",
-            "description": [],
-            "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
+            "label": "indent",
+            "description": [
+              "indentation intended when message written to a text log"
+            ],
+            "path": "packages/kbn-dev-utils/src/tooling_log/message.ts",
             "deprecated": false
           },
           {
             "parentPluginId": "@kbn/dev-utils",
-            "id": "def-server.ReqOptions.body",
-            "type": "Any",
+            "id": "def-server.Message.source",
+            "type": "string",
             "tags": [],
-            "label": "body",
-            "description": [],
+            "label": "source",
+            "description": [
+              "type of logger this message came from"
+            ],
             "signature": [
-              "any"
+              "string | undefined"
             ],
-            "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
+            "path": "packages/kbn-dev-utils/src/tooling_log/message.ts",
             "deprecated": false
           },
           {
             "parentPluginId": "@kbn/dev-utils",
-            "id": "def-server.ReqOptions.bodyDesc",
-            "type": "string",
+            "id": "def-server.Message.args",
+            "type": "Array",
             "tags": [],
-            "label": "bodyDesc",
-            "description": [],
+            "label": "args",
+            "description": [
+              "args passed to the logging method"
+            ],
+            "signature": [
+              "any[]"
+            ],
+            "path": "packages/kbn-dev-utils/src/tooling_log/message.ts",
+            "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/dev-utils",
+        "id": "def-server.MetricsOptions",
+        "type": "Interface",
+        "tags": [],
+        "label": "MetricsOptions",
+        "description": [],
+        "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/dev-utils",
+            "id": "def-server.MetricsOptions.defaultMeta",
+            "type": "Object",
+            "tags": [],
+            "label": "defaultMeta",
+            "description": [
+              "Default metadata to add to each metric"
+            ],
+            "signature": [
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.CiStatsMetadata",
+                "text": "CiStatsMetadata"
+              },
+              " | undefined"
+            ],
             "path": "packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts",
             "deprecated": false
           }
@@ -3625,7 +3997,13 @@
             "description": [],
             "signature": [
               "(task: ",
-              "CleanupTask",
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.CleanupTask",
+                "text": "CleanupTask"
+              },
               ") => void"
             ],
             "path": "packages/kbn-dev-utils/src/run/run.ts",
@@ -3639,7 +4017,13 @@
                 "label": "task",
                 "description": [],
                 "signature": [
-                  "CleanupTask"
+                  {
+                    "pluginId": "@kbn/dev-utils",
+                    "scope": "server",
+                    "docId": "kibKbnDevUtilsPluginApi",
+                    "section": "def-server.CleanupTask",
+                    "text": "CleanupTask"
+                  }
                 ],
                 "path": "packages/kbn-dev-utils/src/run/run.ts",
                 "deprecated": false,
@@ -3695,7 +4079,7 @@
             "label": "log",
             "description": [],
             "signature": [
-              "{ defaultLevel?: \"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\" | undefined; } | undefined"
+              "{ defaultLevel?: \"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\" | undefined; } | undefined"
             ],
             "path": "packages/kbn-dev-utils/src/run/run.ts",
             "deprecated": false
@@ -3751,7 +4135,7 @@
             "label": "log",
             "description": [],
             "signature": [
-              "{ defaultLevel?: \"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\" | undefined; } | undefined"
+              "{ defaultLevel?: \"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\" | undefined; } | undefined"
             ],
             "path": "packages/kbn-dev-utils/src/run/run_with_commands.ts",
             "deprecated": false
@@ -3914,6 +4298,56 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/dev-utils",
+        "id": "def-server.ToolingLogOptions",
+        "type": "Interface",
+        "tags": [],
+        "label": "ToolingLogOptions",
+        "description": [],
+        "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/dev-utils",
+            "id": "def-server.ToolingLogOptions.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [
+              "\ntype name for this logger, will be assigned to the \"source\"\nproperties of messages produced by this logger"
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "@kbn/dev-utils",
+            "id": "def-server.ToolingLogOptions.parent",
+            "type": "Object",
+            "tags": [],
+            "label": "parent",
+            "description": [
+              "\nparent ToolingLog. When a ToolingLog has a parent they will both\nshare indent and writers state. Changing the indent width or\nwriters on either log will update the other too."
+            ],
+            "signature": [
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.ToolingLog",
+                "text": "ToolingLog"
+              },
+              " | undefined"
+            ],
+            "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log.ts",
+            "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/dev-utils",
         "id": "def-server.ToolingLogTextWriterConfig",
@@ -3930,9 +4364,26 @@
             "type": "CompoundType",
             "tags": [],
             "label": "level",
-            "description": [],
+            "description": [
+              "\nLog level, messages below this level will be ignored"
+            ],
             "signature": [
-              "\"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\""
+              "\"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\""
+            ],
+            "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts",
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "@kbn/dev-utils",
+            "id": "def-server.ToolingLogTextWriterConfig.ignoreSources",
+            "type": "Array",
+            "tags": [],
+            "label": "ignoreSources",
+            "description": [
+              "\nList of message sources/ToolingLog types which will be ignored. Create\na logger with `ToolingLog#withType()` to create messages with a specific\nsource. Ignored messages will be dropped without writing."
+            ],
+            "signature": [
+              "string[] | undefined"
             ],
             "path": "packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts",
             "deprecated": false
@@ -3943,7 +4394,9 @@
             "type": "Object",
             "tags": [],
             "label": "writeTo",
-            "description": [],
+            "description": [
+              "\nTarget which will receive formatted message lines, a common value for `writeTo`\nis process.stdout"
+            ],
             "signature": [
               "{ write(s: string): void; }"
             ],
@@ -3952,6 +4405,69 @@
           }
         ],
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/dev-utils",
+        "id": "def-server.Writer",
+        "type": "Interface",
+        "tags": [],
+        "label": "Writer",
+        "description": [
+          "\nAn object which received ToolingLog `Messages` and sends them to\nsome interface for collecting logs like stdio, or a file"
+        ],
+        "path": "packages/kbn-dev-utils/src/tooling_log/writer.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/dev-utils",
+            "id": "def-server.Writer.write",
+            "type": "Function",
+            "tags": [],
+            "label": "write",
+            "description": [
+              "\nCalled with every log message, should return true if the message\nwas written and false if it was ignored."
+            ],
+            "signature": [
+              "(msg: ",
+              {
+                "pluginId": "@kbn/dev-utils",
+                "scope": "server",
+                "docId": "kibKbnDevUtilsPluginApi",
+                "section": "def-server.Message",
+                "text": "Message"
+              },
+              ") => boolean"
+            ],
+            "path": "packages/kbn-dev-utils/src/tooling_log/writer.ts",
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/dev-utils",
+                "id": "def-server.Writer.write.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "msg",
+                "description": [
+                  "The log message to write"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/dev-utils",
+                    "scope": "server",
+                    "docId": "kibKbnDevUtilsPluginApi",
+                    "section": "def-server.Message",
+                    "text": "Message"
+                  }
+                ],
+                "path": "packages/kbn-dev-utils/src/tooling_log/writer.ts",
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
       }
     ],
     "enums": [],
@@ -3967,6 +4483,24 @@
         "deprecated": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/dev-utils",
+        "id": "def-server.CleanupTask",
+        "type": "Type",
+        "tags": [],
+        "label": "CleanupTask",
+        "description": [
+          "\nA function which will be called when the CLI is torn-down which should\nquickly cleanup whatever it needs."
+        ],
+        "signature": [
+          "() => void"
+        ],
+        "path": "packages/kbn-dev-utils/src/run/cleanup.ts",
+        "deprecated": false,
+        "returnComment": [],
+        "children": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/dev-utils",
         "id": "def-server.CommandRunFn",
@@ -4150,7 +4684,7 @@
         "label": "LogLevel",
         "description": [],
         "signature": [
-          "\"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\""
+          "\"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\""
         ],
         "path": "packages/kbn-dev-utils/src/tooling_log/log_levels.ts",
         "deprecated": false,
@@ -4164,7 +4698,7 @@
         "label": "ParsedLogLevel",
         "description": [],
         "signature": [
-          "{ name: \"warning\" | \"error\" | \"info\" | \"success\" | \"debug\" | \"silent\" | \"verbose\"; flags: { warning: boolean; error: boolean; info: boolean; success: boolean; debug: boolean; silent: boolean; verbose: boolean; }; }"
+          "{ name: \"error\" | \"info\" | \"success\" | \"warning\" | \"debug\" | \"silent\" | \"verbose\"; flags: { error: boolean; info: boolean; success: boolean; warning: boolean; debug: boolean; silent: boolean; verbose: boolean; }; }"
         ],
         "path": "packages/kbn-dev-utils/src/tooling_log/log_levels.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_dev_utils.mdx b/api_docs/kbn_dev_utils.mdx
index c959baa6fda56..775e0c03fa49c 100644
--- a/api_docs/kbn_dev_utils.mdx
+++ b/api_docs/kbn_dev_utils.mdx
@@ -18,7 +18,7 @@ Contact [Owner missing] for questions regarding this plugin.
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 258 | 7 | 231 | 4 |
+| 280 | 6 | 214 | 0 |
 
 ## Server
 
diff --git a/api_docs/kbn_logging.json b/api_docs/kbn_logging.json
index efb4d27831199..7a72a785c57e0 100644
--- a/api_docs/kbn_logging.json
+++ b/api_docs/kbn_logging.json
@@ -616,7 +616,7 @@
         "label": "EcsEventCategory",
         "description": [],
         "signature": [
-          "\"host\" | \"network\" | \"web\" | \"database\" | \"package\" | \"session\" | \"file\" | \"registry\" | \"process\" | \"authentication\" | \"configuration\" | \"driver\" | \"iam\" | \"intrusion_detection\" | \"malware\""
+          "\"network\" | \"web\" | \"database\" | \"package\" | \"host\" | \"session\" | \"file\" | \"registry\" | \"process\" | \"authentication\" | \"configuration\" | \"driver\" | \"iam\" | \"intrusion_detection\" | \"malware\""
         ],
         "path": "packages/kbn-logging/src/ecs/event.ts",
         "deprecated": false,
@@ -658,7 +658,7 @@
         "label": "EcsEventType",
         "description": [],
         "signature": [
-          "\"start\" | \"connection\" | \"end\" | \"user\" | \"error\" | \"info\" | \"group\" | \"protocol\" | \"access\" | \"admin\" | \"allowed\" | \"change\" | \"creation\" | \"deletion\" | \"denied\" | \"installation\""
+          "\"start\" | \"end\" | \"user\" | \"error\" | \"info\" | \"connection\" | \"group\" | \"protocol\" | \"access\" | \"admin\" | \"allowed\" | \"change\" | \"creation\" | \"deletion\" | \"denied\" | \"installation\""
         ],
         "path": "packages/kbn-logging/src/ecs/event.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_monaco.json b/api_docs/kbn_monaco.json
index b87619f900457..17323f36e0d89 100644
--- a/api_docs/kbn_monaco.json
+++ b/api_docs/kbn_monaco.json
@@ -274,7 +274,7 @@
             "label": "kind",
             "description": [],
             "signature": [
-              "\"type\" | \"keyword\" | \"field\" | \"property\" | \"method\" | \"class\" | \"constructor\""
+              "\"keyword\" | \"type\" | \"field\" | \"property\" | \"method\" | \"class\" | \"constructor\""
             ],
             "path": "packages/kbn-monaco/src/painless/types.ts",
             "deprecated": false
@@ -369,7 +369,7 @@
         "label": "PainlessCompletionKind",
         "description": [],
         "signature": [
-          "\"type\" | \"keyword\" | \"field\" | \"property\" | \"method\" | \"class\" | \"constructor\""
+          "\"keyword\" | \"type\" | \"field\" | \"property\" | \"method\" | \"class\" | \"constructor\""
         ],
         "path": "packages/kbn-monaco/src/painless/types.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_securitysolution_autocomplete.json b/api_docs/kbn_securitysolution_autocomplete.json
index 940a7d08d6155..293b1ad2f4e8d 100644
--- a/api_docs/kbn_securitysolution_autocomplete.json
+++ b/api_docs/kbn_securitysolution_autocomplete.json
@@ -274,7 +274,7 @@
           "\nGiven an array of lists and optionally a field this will return all\nthe lists that match against the field based on the types from the field\n\nNOTE: That we support one additional property from \"FieldSpec\" located here:\nsrc/plugins/data/common/index_patterns/fields/types.ts\nThis type property is esTypes. If it exists and is on there we will read off the esTypes."
         ],
         "signature": [
-          "(lists: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[], field?: (",
+          "(lists: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[], field?: (",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -282,7 +282,7 @@
             "section": "def-common.DataViewFieldBase",
             "text": "DataViewFieldBase"
           },
-          " & { esTypes?: string[] | undefined; }) | undefined) => { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]"
+          " & { esTypes?: string[] | undefined; }) | undefined) => { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]"
         ],
         "path": "packages/kbn-securitysolution-autocomplete/src/filter_field_to_list/index.ts",
         "deprecated": false,
@@ -297,7 +297,7 @@
               "The lists to match against the field"
             ],
             "signature": [
-              "{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]"
+              "{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]"
             ],
             "path": "packages/kbn-securitysolution-autocomplete/src/filter_field_to_list/index.ts",
             "deprecated": false,
diff --git a/api_docs/kbn_securitysolution_es_utils.json b/api_docs/kbn_securitysolution_es_utils.json
index 680d6993530dd..3a5bb6e97e90d 100644
--- a/api_docs/kbn_securitysolution_es_utils.json
+++ b/api_docs/kbn_securitysolution_es_utils.json
@@ -44,7 +44,7 @@
         "signature": [
           "(esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, index: string) => Promise<unknown>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, index: string) => Promise<unknown>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/create_boostrap_index/index.ts",
         "deprecated": false,
@@ -59,7 +59,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
             ],
             "path": "packages/kbn-securitysolution-es-utils/src/create_boostrap_index/index.ts",
             "deprecated": false,
@@ -124,7 +124,7 @@
         "signature": [
           "(esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, pattern: string, maxAttempts?: number) => Promise<boolean>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, pattern: string, maxAttempts?: number) => Promise<boolean>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/delete_all_index/index.ts",
         "deprecated": false,
@@ -139,7 +139,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
             ],
             "path": "packages/kbn-securitysolution-es-utils/src/delete_all_index/index.ts",
             "deprecated": false,
@@ -187,7 +187,7 @@
         "signature": [
           "(esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, policy: string) => Promise<unknown>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, policy: string) => Promise<unknown>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/delete_policy/index.ts",
         "deprecated": false,
@@ -202,7 +202,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
             ],
             "path": "packages/kbn-securitysolution-es-utils/src/delete_policy/index.ts",
             "deprecated": false,
@@ -236,7 +236,7 @@
         "signature": [
           "(esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, name: string) => Promise<unknown>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, name: string) => Promise<unknown>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/delete_template/index.ts",
         "deprecated": false,
@@ -251,7 +251,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
             ],
             "path": "packages/kbn-securitysolution-es-utils/src/delete_template/index.ts",
             "deprecated": false,
@@ -320,7 +320,7 @@
         "signature": [
           "({ esClient, alias, }: { esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">; alias: string; }) => Promise<IndexAlias[]>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">; alias: string; }) => Promise<IndexAlias[]>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/get_index_aliases/index.ts",
         "deprecated": false,
@@ -343,27 +343,7 @@
                 "label": "esClient",
                 "description": [],
                 "signature": [
-                  "{ get: <TDocument = unknown, TContext = unknown>(params: ",
-                  "GetRequest",
-                  ", options?: ",
-                  "TransportRequestOptions",
-                  " | undefined) => ",
-                  "TransportRequestPromise",
-                  "<",
-                  "ApiResponse",
-                  "<",
-                  "GetResponse",
-                  "<TDocument>, TContext>>; delete: <TContext = unknown>(params: ",
-                  "DeleteRequest",
-                  ", options?: ",
-                  "TransportRequestOptions",
-                  " | undefined) => ",
-                  "TransportRequestPromise",
-                  "<",
-                  "ApiResponse",
-                  "<",
-                  "DeleteResponse",
-                  ", TContext>>; monitoring: { bulk<TContext = unknown>(params?: Record<string, any> | undefined, options?: ",
+                  "{ monitoring: { bulk<TContext = unknown>(params?: Record<string, any> | undefined, options?: ",
                   "TransportRequestOptions",
                   " | undefined): ",
                   "TransportRequestPromise",
@@ -765,7 +745,27 @@
                   "ApiResponse",
                   "<",
                   "IndexResponse",
-                  ", TContext>>; update: <TDocumentR = unknown, TDocument = unknown, TPartialDocument = unknown, TContext = unknown>(params: ",
+                  ", TContext>>; delete: <TContext = unknown>(params: ",
+                  "DeleteRequest",
+                  ", options?: ",
+                  "TransportRequestOptions",
+                  " | undefined) => ",
+                  "TransportRequestPromise",
+                  "<",
+                  "ApiResponse",
+                  "<",
+                  "DeleteResponse",
+                  ", TContext>>; get: <TDocument = unknown, TContext = unknown>(params: ",
+                  "GetRequest",
+                  ", options?: ",
+                  "TransportRequestOptions",
+                  " | undefined) => ",
+                  "TransportRequestPromise",
+                  "<",
+                  "ApiResponse",
+                  "<",
+                  "GetResponse",
+                  "<TDocument>, TContext>>; update: <TDocumentR = unknown, TDocument = unknown, TPartialDocument = unknown, TContext = unknown>(params: ",
                   "UpdateRequest",
                   "<TDocument, TPartialDocument>, options?: ",
                   "TransportRequestOptions",
@@ -4120,7 +4120,7 @@
         "signature": [
           "({ esClient, index, }: { esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">; index: string; }) => Promise<number>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">; index: string; }) => Promise<number>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/get_index_count/index.ts",
         "deprecated": false,
@@ -4143,27 +4143,7 @@
                 "label": "esClient",
                 "description": [],
                 "signature": [
-                  "{ get: <TDocument = unknown, TContext = unknown>(params: ",
-                  "GetRequest",
-                  ", options?: ",
-                  "TransportRequestOptions",
-                  " | undefined) => ",
-                  "TransportRequestPromise",
-                  "<",
-                  "ApiResponse",
-                  "<",
-                  "GetResponse",
-                  "<TDocument>, TContext>>; delete: <TContext = unknown>(params: ",
-                  "DeleteRequest",
-                  ", options?: ",
-                  "TransportRequestOptions",
-                  " | undefined) => ",
-                  "TransportRequestPromise",
-                  "<",
-                  "ApiResponse",
-                  "<",
-                  "DeleteResponse",
-                  ", TContext>>; monitoring: { bulk<TContext = unknown>(params?: Record<string, any> | undefined, options?: ",
+                  "{ monitoring: { bulk<TContext = unknown>(params?: Record<string, any> | undefined, options?: ",
                   "TransportRequestOptions",
                   " | undefined): ",
                   "TransportRequestPromise",
@@ -4565,7 +4545,27 @@
                   "ApiResponse",
                   "<",
                   "IndexResponse",
-                  ", TContext>>; update: <TDocumentR = unknown, TDocument = unknown, TPartialDocument = unknown, TContext = unknown>(params: ",
+                  ", TContext>>; delete: <TContext = unknown>(params: ",
+                  "DeleteRequest",
+                  ", options?: ",
+                  "TransportRequestOptions",
+                  " | undefined) => ",
+                  "TransportRequestPromise",
+                  "<",
+                  "ApiResponse",
+                  "<",
+                  "DeleteResponse",
+                  ", TContext>>; get: <TDocument = unknown, TContext = unknown>(params: ",
+                  "GetRequest",
+                  ", options?: ",
+                  "TransportRequestOptions",
+                  " | undefined) => ",
+                  "TransportRequestPromise",
+                  "<",
+                  "ApiResponse",
+                  "<",
+                  "GetResponse",
+                  "<TDocument>, TContext>>; update: <TDocumentR = unknown, TDocument = unknown, TPartialDocument = unknown, TContext = unknown>(params: ",
                   "UpdateRequest",
                   "<TDocument, TPartialDocument>, options?: ",
                   "TransportRequestOptions",
@@ -7918,7 +7918,7 @@
         "signature": [
           "(esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, index: string) => Promise<boolean>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, index: string) => Promise<boolean>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/get_index_exists/index.ts",
         "deprecated": false,
@@ -7933,7 +7933,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
             ],
             "path": "packages/kbn-securitysolution-es-utils/src/get_index_exists/index.ts",
             "deprecated": false,
@@ -7967,7 +7967,7 @@
         "signature": [
           "(esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, policy: string) => Promise<boolean>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, policy: string) => Promise<boolean>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/get_policy_exists/index.ts",
         "deprecated": false,
@@ -7982,7 +7982,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
             ],
             "path": "packages/kbn-securitysolution-es-utils/src/get_policy_exists/index.ts",
             "deprecated": false,
@@ -8016,7 +8016,7 @@
         "signature": [
           "(esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, template: string) => Promise<boolean>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, template: string) => Promise<boolean>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/get_template_exists/index.ts",
         "deprecated": false,
@@ -8031,7 +8031,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
             ],
             "path": "packages/kbn-securitysolution-es-utils/src/get_template_exists/index.ts",
             "deprecated": false,
@@ -8065,7 +8065,7 @@
         "signature": [
           "(esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, index: string) => Promise<unknown>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, index: string) => Promise<unknown>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/read_index/index.ts",
         "deprecated": false,
@@ -8080,7 +8080,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
             ],
             "path": "packages/kbn-securitysolution-es-utils/src/read_index/index.ts",
             "deprecated": false,
@@ -8114,7 +8114,7 @@
         "signature": [
           "(esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, index: string) => Promise<unknown>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, index: string) => Promise<unknown>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/read_privileges/index.ts",
         "deprecated": false,
@@ -8129,7 +8129,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
             ],
             "path": "packages/kbn-securitysolution-es-utils/src/read_privileges/index.ts",
             "deprecated": false,
@@ -8163,7 +8163,7 @@
         "signature": [
           "(esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, policy: string, body: Record<string, unknown>) => Promise<unknown>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, policy: string, body: Record<string, unknown>) => Promise<unknown>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/set_policy/index.ts",
         "deprecated": false,
@@ -8178,7 +8178,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
             ],
             "path": "packages/kbn-securitysolution-es-utils/src/set_policy/index.ts",
             "deprecated": false,
@@ -8226,7 +8226,7 @@
         "signature": [
           "(esClient: Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, name: string, body: Record<string, unknown>) => Promise<unknown>"
+          ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">, name: string, body: Record<string, unknown>) => Promise<unknown>"
         ],
         "path": "packages/kbn-securitysolution-es-utils/src/set_template/index.ts",
         "deprecated": false,
@@ -8241,7 +8241,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\">"
             ],
             "path": "packages/kbn-securitysolution-es-utils/src/set_template/index.ts",
             "deprecated": false,
diff --git a/api_docs/kbn_securitysolution_io_ts_list_types.json b/api_docs/kbn_securitysolution_io_ts_list_types.json
index 2a1efcc96c5a7..7d10a90dac167 100644
--- a/api_docs/kbn_securitysolution_io_ts_list_types.json
+++ b/api_docs/kbn_securitysolution_io_ts_list_types.json
@@ -27,7 +27,7 @@
         "label": "updateExceptionListItemValidate",
         "description": [],
         "signature": [
-          "(schema: { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }) => string[]"
+          "(schema: { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }) => string[]"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/update_exception_list_item_validation/index.ts",
         "deprecated": false,
@@ -40,7 +40,7 @@
             "label": "schema",
             "description": [],
             "signature": [
-              "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
+              "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
             ],
             "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/update_exception_list_item_validation/index.ts",
             "deprecated": false,
@@ -58,7 +58,7 @@
         "label": "validateComments",
         "description": [],
         "signature": [
-          "(item: { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }) => string[]"
+          "(item: { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }) => string[]"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/update_exception_list_item_validation/index.ts",
         "deprecated": false,
@@ -71,7 +71,7 @@
             "label": "item",
             "description": [],
             "signature": [
-              "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
+              "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
             ],
             "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/update_exception_list_item_validation/index.ts",
             "deprecated": false,
@@ -153,7 +153,7 @@
             "label": "listItem",
             "description": [],
             "signature": [
-              "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
+              "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
             ],
             "path": "packages/kbn-securitysolution-io-ts-list-types/src/typescript_types/index.ts",
             "deprecated": false
@@ -1216,7 +1216,7 @@
             "label": "listItem",
             "description": [],
             "signature": [
-              "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
+              "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
             ],
             "path": "packages/kbn-securitysolution-io-ts-list-types/src/typescript_types/index.ts",
             "deprecated": false
@@ -1307,7 +1307,7 @@
             "label": "exceptions",
             "description": [],
             "signature": [
-              "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]"
+              "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]"
             ],
             "path": "packages/kbn-securitysolution-io-ts-list-types/src/typescript_types/index.ts",
             "deprecated": false
@@ -1890,7 +1890,7 @@
         "label": "CreateEndpointListItemSchemaDecoded",
         "description": [],
         "signature": [
-          "Pick<{ description: string; entries: ({ field: string; operator: \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"included\"; type: \"match_any\"; value: string[]; } | { entries: ({ field: string; operator: \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; comments: { comment: string; }[] | undefined; item_id: string | undefined; meta: object | undefined; os_types: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags: string[] | undefined; }, \"type\" | \"description\" | \"name\" | \"meta\"> & { comments: { comment: string; }[]; tags: string[]; item_id: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; os_types: (\"windows\" | \"linux\" | \"macos\")[]; }"
+          "Pick<{ description: string; entries: ({ field: string; operator: \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"included\"; type: \"match_any\"; value: string[]; } | { entries: ({ field: string; operator: \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; comments: { comment: string; }[] | undefined; item_id: string | undefined; meta: object | undefined; os_types: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags: string[] | undefined; }, \"type\" | \"description\" | \"name\" | \"meta\"> & { comments: { comment: string; }[]; tags: string[]; item_id: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; os_types: (\"windows\" | \"linux\" | \"macos\")[]; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/create_endpoint_list_item_schema/index.ts",
         "deprecated": false,
@@ -1918,7 +1918,7 @@
         "label": "CreateExceptionListItemSchema",
         "description": [],
         "signature": [
-          "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
+          "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/create_exception_list_item_schema/index.ts",
         "deprecated": false,
@@ -1932,7 +1932,7 @@
         "label": "CreateExceptionListItemSchemaDecoded",
         "description": [],
         "signature": [
-          "Pick<{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; comments: { comment: string; }[] | undefined; item_id: string | undefined; meta: object | undefined; namespace_type: \"single\" | \"agnostic\" | undefined; os_types: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags: string[] | undefined; }, \"type\" | \"description\" | \"name\" | \"meta\" | \"list_id\" | \"os_types\"> & { comments: { comment: string; }[]; tags: string[]; item_id: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; }"
+          "Pick<{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; comments: { comment: string; }[] | undefined; item_id: string | undefined; meta: object | undefined; namespace_type: \"single\" | \"agnostic\" | undefined; os_types: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags: string[] | undefined; }, \"type\" | \"description\" | \"name\" | \"meta\" | \"list_id\" | \"os_types\"> & { comments: { comment: string; }[]; tags: string[]; item_id: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/create_exception_list_item_schema/index.ts",
         "deprecated": false,
@@ -2002,7 +2002,7 @@
         "label": "CreateListSchema",
         "description": [],
         "signature": [
-          "{ description: string; name: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; } & { deserializer?: string | undefined; id?: string | undefined; meta?: object | undefined; serializer?: string | undefined; version?: number | undefined; }"
+          "{ description: string; name: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; } & { deserializer?: string | undefined; id?: string | undefined; meta?: object | undefined; serializer?: string | undefined; version?: number | undefined; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/create_list_schema/index.ts",
         "deprecated": false,
@@ -2016,7 +2016,7 @@
         "label": "CreateListSchemaDecoded",
         "description": [],
         "signature": [
-          "{ type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; id: string | undefined; description: string; name: string; meta: object | undefined; serializer: string | undefined; deserializer: string | undefined; } & { version: number; }"
+          "{ type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; id: string | undefined; description: string; name: string; meta: object | undefined; serializer: string | undefined; deserializer: string | undefined; } & { version: number; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/create_list_schema/index.ts",
         "deprecated": false,
@@ -2310,7 +2310,7 @@
         "label": "EntriesArray",
         "description": [],
         "signature": [
-          "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]"
+          "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/common/entries/index.ts",
         "deprecated": false,
@@ -2324,7 +2324,7 @@
         "label": "EntriesArrayOrUndefined",
         "description": [],
         "signature": [
-          "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[] | undefined"
+          "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[] | undefined"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/common/entries/index.ts",
         "deprecated": false,
@@ -2338,7 +2338,7 @@
         "label": "Entry",
         "description": [],
         "signature": [
-          "{ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; }"
+          "{ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/common/entries/index.ts",
         "deprecated": false,
@@ -2366,7 +2366,7 @@
         "label": "EntryList",
         "description": [],
         "signature": [
-          "{ field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; }"
+          "{ field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/common/entries_list/index.ts",
         "deprecated": false,
@@ -2436,7 +2436,7 @@
         "label": "ExceptionListItemSchema",
         "description": [],
         "signature": [
-          "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }"
+          "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/response/exception_list_item_schema/index.ts",
         "deprecated": false,
@@ -2744,7 +2744,7 @@
         "label": "FoundExceptionListItemSchema",
         "description": [],
         "signature": [
-          "{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; }"
+          "{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/response/found_exception_list_item_schema/index.ts",
         "deprecated": false,
@@ -2772,7 +2772,7 @@
         "label": "FoundListItemSchema",
         "description": [],
         "signature": [
-          "{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; page: number; per_page: number; total: number; }"
+          "{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; page: number; per_page: number; total: number; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/response/found_list_item_schema/index.ts",
         "deprecated": false,
@@ -2786,7 +2786,7 @@
         "label": "FoundListSchema",
         "description": [],
         "signature": [
-          "{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]; page: number; per_page: number; total: number; }"
+          "{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]; page: number; per_page: number; total: number; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/response/found_list_schema/index.ts",
         "deprecated": false,
@@ -2856,7 +2856,7 @@
         "label": "ImportListItemQuerySchema",
         "description": [],
         "signature": [
-          "{ deserializer: string | undefined; list_id: string | undefined; serializer: string | undefined; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\" | undefined; }"
+          "{ deserializer: string | undefined; list_id: string | undefined; serializer: string | undefined; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\" | undefined; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/import_list_item_query_schema/index.ts",
         "deprecated": false,
@@ -2870,7 +2870,7 @@
         "label": "ImportListItemQuerySchemaEncoded",
         "description": [],
         "signature": [
-          "{ deserializer?: string | undefined; list_id?: string | undefined; serializer?: string | undefined; type?: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\" | undefined; }"
+          "{ deserializer?: string | undefined; list_id?: string | undefined; serializer?: string | undefined; type?: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\" | undefined; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/import_list_item_query_schema/index.ts",
         "deprecated": false,
@@ -2982,7 +2982,7 @@
         "label": "ListArraySchema",
         "description": [],
         "signature": [
-          "{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]"
+          "{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/response/list_schema/index.ts",
         "deprecated": false,
@@ -3024,7 +3024,7 @@
         "label": "ListItemArraySchema",
         "description": [],
         "signature": [
-          "{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]"
+          "{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/response/list_item_schema/index.ts",
         "deprecated": false,
@@ -3052,7 +3052,7 @@
         "label": "ListItemSchema",
         "description": [],
         "signature": [
-          "{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }"
+          "{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/response/list_item_schema/index.ts",
         "deprecated": false,
@@ -3080,7 +3080,7 @@
         "label": "ListSchema",
         "description": [],
         "signature": [
-          "{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }"
+          "{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/response/list_schema/index.ts",
         "deprecated": false,
@@ -3262,7 +3262,7 @@
         "label": "NonEmptyEntriesArray",
         "description": [],
         "signature": [
-          "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]"
+          "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/common/non_empty_entries_array/index.ts",
         "deprecated": false,
@@ -3276,7 +3276,7 @@
         "label": "NonEmptyEntriesArrayDecoded",
         "description": [],
         "signature": [
-          "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]"
+          "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/common/non_empty_entries_array/index.ts",
         "deprecated": false,
@@ -3598,7 +3598,7 @@
         "label": "SearchListItemArraySchema",
         "description": [],
         "signature": [
-          "{ items: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; value: unknown; }[]"
+          "{ items: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; value: unknown; }[]"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/response/search_list_item_schema/index.ts",
         "deprecated": false,
@@ -3612,7 +3612,7 @@
         "label": "SearchListItemSchema",
         "description": [],
         "signature": [
-          "{ items: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; value: unknown; }"
+          "{ items: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; value: unknown; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/response/search_list_item_schema/index.ts",
         "deprecated": false,
@@ -3752,7 +3752,7 @@
         "label": "Type",
         "description": [],
         "signature": [
-          "\"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\""
+          "\"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\""
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/common/type/index.ts",
         "deprecated": false,
@@ -3766,7 +3766,7 @@
         "label": "TypeOrUndefined",
         "description": [],
         "signature": [
-          "\"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\" | undefined"
+          "\"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\" | undefined"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/common/type/index.ts",
         "deprecated": false,
@@ -3822,7 +3822,7 @@
         "label": "UpdateEndpointListItemSchema",
         "description": [],
         "signature": [
-          "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
+          "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/update_endpoint_list_item_schema/index.ts",
         "deprecated": false,
@@ -3836,7 +3836,7 @@
         "label": "UpdateEndpointListItemSchemaDecoded",
         "description": [],
         "signature": [
-          "Pick<{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; _version: string | undefined; comments: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id: string | undefined; item_id: string | undefined; meta: object | undefined; os_types: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags: string[] | undefined; }, \"type\" | \"id\" | \"description\" | \"name\" | \"meta\" | \"_version\" | \"os_types\" | \"item_id\"> & { comments: ({ comment: string; } & { id?: string | undefined; })[]; tags: string[]; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; os_types: (\"windows\" | \"linux\" | \"macos\")[]; }"
+          "Pick<{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; _version: string | undefined; comments: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id: string | undefined; item_id: string | undefined; meta: object | undefined; os_types: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags: string[] | undefined; }, \"type\" | \"id\" | \"description\" | \"name\" | \"meta\" | \"_version\" | \"os_types\" | \"item_id\"> & { comments: ({ comment: string; } & { id?: string | undefined; })[]; tags: string[]; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; os_types: (\"windows\" | \"linux\" | \"macos\")[]; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/update_endpoint_list_item_schema/index.ts",
         "deprecated": false,
@@ -3850,7 +3850,7 @@
         "label": "UpdateExceptionListItemSchema",
         "description": [],
         "signature": [
-          "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
+          "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/update_exception_list_item_schema/index.ts",
         "deprecated": false,
@@ -3864,7 +3864,7 @@
         "label": "UpdateExceptionListItemSchemaDecoded",
         "description": [],
         "signature": [
-          "Pick<{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; _version: string | undefined; comments: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id: string | undefined; item_id: string | undefined; meta: object | undefined; namespace_type: \"single\" | \"agnostic\" | undefined; os_types: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags: string[] | undefined; }, \"type\" | \"id\" | \"description\" | \"name\" | \"meta\" | \"_version\" | \"item_id\"> & { comments: ({ comment: string; } & { id?: string | undefined; })[]; tags: string[]; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; }"
+          "Pick<{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; _version: string | undefined; comments: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id: string | undefined; item_id: string | undefined; meta: object | undefined; namespace_type: \"single\" | \"agnostic\" | undefined; os_types: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags: string[] | undefined; }, \"type\" | \"id\" | \"description\" | \"name\" | \"meta\" | \"_version\" | \"item_id\"> & { comments: ({ comment: string; } & { id?: string | undefined; })[]; tags: string[]; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[]; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; }"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/request/update_exception_list_item_schema/index.ts",
         "deprecated": false,
@@ -4341,7 +4341,7 @@
           "StringC",
           "; entries: ",
           "Type",
-          "<({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], unknown>; list_id: ",
+          "<({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], unknown>; list_id: ",
           "Type",
           "<string, string, unknown>; name: ",
           "StringC",
@@ -7077,7 +7077,7 @@
         ],
         "signature": [
           "Type",
-          "<({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], unknown>"
+          "<({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], unknown>"
         ],
         "path": "packages/kbn-securitysolution-io-ts-list-types/src/common/non_empty_entries_array/index.ts",
         "deprecated": false,
@@ -7902,7 +7902,7 @@
           "StringC",
           "; entries: ",
           "Type",
-          "<({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], unknown>; name: ",
+          "<({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], unknown>; name: ",
           "StringC",
           "; type: ",
           "KeyofC",
@@ -7955,7 +7955,7 @@
           "StringC",
           "; entries: ",
           "Type",
-          "<({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], unknown>; name: ",
+          "<({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; })[]; field: string; type: \"nested\"; })[], unknown>; name: ",
           "StringC",
           "; type: ",
           "KeyofC",
diff --git a/api_docs/kbn_securitysolution_list_api.json b/api_docs/kbn_securitysolution_list_api.json
index 7d6b00cbbc328..2c930b13c33b3 100644
--- a/api_docs/kbn_securitysolution_list_api.json
+++ b/api_docs/kbn_securitysolution_list_api.json
@@ -80,7 +80,7 @@
             "section": "def-common.AddExceptionListItemProps",
             "text": "AddExceptionListItemProps"
           },
-          ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
+          ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
         ],
         "path": "packages/kbn-securitysolution-list-api/src/api/index.ts",
         "deprecated": false,
@@ -248,7 +248,7 @@
             "section": "def-common.ApiCallByIdProps",
             "text": "ApiCallByIdProps"
           },
-          ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
+          ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
         ],
         "path": "packages/kbn-securitysolution-list-api/src/api/index.ts",
         "deprecated": false,
@@ -287,7 +287,7 @@
         "signature": [
           "({ deleteReferences, http, id, ignoreReferences, signal, }: ",
           "DeleteListParams",
-          ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
+          ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
         ],
         "path": "packages/kbn-securitysolution-list-api/src/list_api/index.ts",
         "deprecated": false,
@@ -453,7 +453,7 @@
             "section": "def-common.ApiCallByIdProps",
             "text": "ApiCallByIdProps"
           },
-          ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
+          ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
         ],
         "path": "packages/kbn-securitysolution-list-api/src/api/index.ts",
         "deprecated": false,
@@ -498,7 +498,7 @@
             "section": "def-common.ApiCallByListIdProps",
             "text": "ApiCallByListIdProps"
           },
-          ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; }>"
+          ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; }>"
         ],
         "path": "packages/kbn-securitysolution-list-api/src/api/index.ts",
         "deprecated": false,
@@ -582,7 +582,7 @@
         "signature": [
           "({ cursor, http, pageIndex, pageSize, signal, }: ",
           "FindListsParams",
-          ") => Promise<{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]; page: number; per_page: number; total: number; }>"
+          ") => Promise<{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]; page: number; per_page: number; total: number; }>"
         ],
         "path": "packages/kbn-securitysolution-list-api/src/list_api/index.ts",
         "deprecated": false,
@@ -615,7 +615,7 @@
         "signature": [
           "({ file, http, listId, type, signal, }: ",
           "ImportListParams",
-          ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
+          ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
         ],
         "path": "packages/kbn-securitysolution-list-api/src/list_api/index.ts",
         "deprecated": false,
@@ -785,7 +785,7 @@
             "section": "def-common.UpdateExceptionListItemProps",
             "text": "UpdateExceptionListItemProps"
           },
-          ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
+          ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
         ],
         "path": "packages/kbn-securitysolution-list-api/src/api/index.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_securitysolution_list_hooks.json b/api_docs/kbn_securitysolution_list_hooks.json
index bc26e83c859ac..a6dd6a78eefae 100644
--- a/api_docs/kbn_securitysolution_list_hooks.json
+++ b/api_docs/kbn_securitysolution_list_hooks.json
@@ -29,7 +29,7 @@
           "\nThis adds an id to the incoming exception item entries as ReactJS prefers to have\nan id added to them for use as a stable id. Later if we decide to change the data\nmodel to have id's within the array then this code should be removed. If not, then\nthis code should stay as an adapter for ReactJS.\n\nThis does break the type system slightly as we are lying a bit to the type system as we return\nthe same exceptionItem as we have previously but are augmenting the arrays with an id which TypeScript\ndoesn't mind us doing here. However, downstream you will notice that you have an id when the type\ndoes not indicate it. In that case use (ExceptionItem & { id: string }) temporarily if you're using the id. If you're not,\nyou can ignore the id and just use the normal TypeScript with ReactJS.\n"
         ],
         "signature": [
-          "(exceptionItem: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }) => { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }"
+          "(exceptionItem: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }) => { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }"
         ],
         "path": "packages/kbn-securitysolution-list-hooks/src/transforms/index.ts",
         "deprecated": false,
@@ -44,7 +44,7 @@
               "The exceptionItem to add an id to the threat matches."
             ],
             "signature": [
-              "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }"
+              "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }"
             ],
             "path": "packages/kbn-securitysolution-list-hooks/src/transforms/index.ts",
             "deprecated": false,
@@ -66,7 +66,7 @@
           "\nThis removes an id from the exceptionItem entries as ReactJS prefers to have\nan id added to them for use as a stable id. Later if we decide to change the data\nmodel to have id's within the array then this code should be removed. If not, then\nthis code should stay as an adapter for ReactJS.\n"
         ],
         "signature": [
-          "<T extends { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; }>(exceptionItem: T) => T"
+          "<T extends { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; }>(exceptionItem: T) => T"
         ],
         "path": "packages/kbn-securitysolution-list-hooks/src/transforms/index.ts",
         "deprecated": false,
@@ -103,7 +103,7 @@
           "\nTransforms the output of rules to compensate for technical debt or UI concerns such as\nReactJS preferences for having ids within arrays if the data is not modeled that way.\n\nIf you add a new transform of the input called \"myNewTransform\" do it\nin the form of:\nflow(addIdToExceptionItemEntries, myNewTransform)(exceptionItem)\n"
         ],
         "signature": [
-          "(exceptionItem: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }) => { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }"
+          "(exceptionItem: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }) => { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }"
         ],
         "path": "packages/kbn-securitysolution-list-hooks/src/transforms/index.ts",
         "deprecated": false,
@@ -118,7 +118,7 @@
               "The exceptionItem to transform the output of"
             ],
             "signature": [
-              "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }"
+              "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }"
             ],
             "path": "packages/kbn-securitysolution-list-hooks/src/transforms/index.ts",
             "deprecated": false,
@@ -138,7 +138,7 @@
         "label": "transformNewItemOutput",
         "description": [],
         "signature": [
-          "(exceptionItem: { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }) => { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
+          "(exceptionItem: { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }) => { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
         ],
         "path": "packages/kbn-securitysolution-list-hooks/src/transforms/index.ts",
         "deprecated": false,
@@ -151,7 +151,7 @@
             "label": "exceptionItem",
             "description": [],
             "signature": [
-              "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
+              "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
             ],
             "path": "packages/kbn-securitysolution-list-hooks/src/transforms/index.ts",
             "deprecated": false,
@@ -171,7 +171,7 @@
           "\nTransforms the output of exception items to compensate for technical debt or UI concerns such as\nReactJS preferences for having ids within arrays if the data is not modeled that way.\n\nIf you add a new transform of the output called \"myNewTransform\" do it\nin the form of:\nflow(removeIdFromExceptionItemsEntries, myNewTransform)(exceptionItem)\n"
         ],
         "signature": [
-          "(exceptionItem: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; })) => { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; })"
+          "(exceptionItem: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; })) => { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; })"
         ],
         "path": "packages/kbn-securitysolution-list-hooks/src/transforms/index.ts",
         "deprecated": false,
@@ -186,7 +186,7 @@
               "The exceptionItem to transform the output of"
             ],
             "signature": [
-              "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; })"
+              "{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; })"
             ],
             "path": "packages/kbn-securitysolution-list-hooks/src/transforms/index.ts",
             "deprecated": false,
@@ -329,7 +329,7 @@
           },
           "<",
           "DeleteListParams",
-          ">], { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
+          ">], { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
         ],
         "path": "packages/kbn-securitysolution-list-hooks/src/use_delete_list/index.ts",
         "deprecated": false,
@@ -493,7 +493,7 @@
           },
           "<",
           "FindListsParams",
-          ">], { cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]; page: number; per_page: number; total: number; }>"
+          ">], { cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]; page: number; per_page: number; total: number; }>"
         ],
         "path": "packages/kbn-securitysolution-list-hooks/src/use_find_lists/index.ts",
         "deprecated": false,
@@ -521,7 +521,7 @@
           },
           "<",
           "ImportListParams",
-          ">], { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
+          ">], { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
         ],
         "path": "packages/kbn-securitysolution-list-hooks/src/use_import_list/index.ts",
         "deprecated": false,
@@ -713,7 +713,7 @@
             "label": "addExceptionListItem",
             "description": [],
             "signature": [
-              "(arg: { listItem: { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }; }) => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
+              "(arg: { listItem: { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }; }) => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
             ],
             "path": "packages/kbn-securitysolution-list-hooks/src/use_api/index.ts",
             "deprecated": false,
@@ -736,7 +736,7 @@
                     "label": "listItem",
                     "description": [],
                     "signature": [
-                      "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
+                      "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
                     ],
                     "path": "packages/kbn-securitysolution-list-hooks/src/use_api/index.ts",
                     "deprecated": false
@@ -754,7 +754,7 @@
             "label": "updateExceptionListItem",
             "description": [],
             "signature": [
-              "(arg: { listItem: { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }; }) => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
+              "(arg: { listItem: { description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }; }) => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
             ],
             "path": "packages/kbn-securitysolution-list-hooks/src/use_api/index.ts",
             "deprecated": false,
@@ -777,7 +777,7 @@
                     "label": "listItem",
                     "description": [],
                     "signature": [
-                      "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
+                      "{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }"
                     ],
                     "path": "packages/kbn-securitysolution-list-hooks/src/use_api/index.ts",
                     "deprecated": false
@@ -891,7 +891,7 @@
                 "section": "def-common.ApiCallMemoProps",
                 "text": "ApiCallMemoProps"
               },
-              " & { onSuccess: (arg: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }) => void; }) => Promise<void>"
+              " & { onSuccess: (arg: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }) => void; }) => Promise<void>"
             ],
             "path": "packages/kbn-securitysolution-list-hooks/src/use_api/index.ts",
             "deprecated": false,
@@ -911,7 +911,7 @@
                     "section": "def-common.ApiCallMemoProps",
                     "text": "ApiCallMemoProps"
                   },
-                  " & { onSuccess: (arg: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }) => void; }"
+                  " & { onSuccess: (arg: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }) => void; }"
                 ],
                 "path": "packages/kbn-securitysolution-list-hooks/src/use_api/index.ts",
                 "deprecated": false,
@@ -1116,7 +1116,7 @@
         "label": "ReturnExceptionListAndItems",
         "description": [],
         "signature": [
-          "[boolean, { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[], ",
+          "[boolean, { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[], ",
           {
             "pluginId": "@kbn/securitysolution-io-ts-list-types",
             "scope": "common",
@@ -1176,7 +1176,7 @@
         "label": "ReturnPersistExceptionItem",
         "description": [],
         "signature": [
-          "[PersistReturnExceptionItem, React.Dispatch<({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }) | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }) | null>]"
+          "[PersistReturnExceptionItem, React.Dispatch<({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }) | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; name: string; type: \"simple\"; } & { _version?: string | undefined; comments?: ({ comment: string; } & { id?: string | undefined; })[] | undefined; id?: string | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }) | null>]"
         ],
         "path": "packages/kbn-securitysolution-list-hooks/src/use_persist_exception_item/index.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_securitysolution_list_utils.json b/api_docs/kbn_securitysolution_list_utils.json
index 5b956218f5ac8..5177d53b2acfb 100644
--- a/api_docs/kbn_securitysolution_list_utils.json
+++ b/api_docs/kbn_securitysolution_list_utils.json
@@ -27,7 +27,7 @@
         "label": "addIdToEntries",
         "description": [],
         "signature": [
-          "(entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]) => ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
+          "(entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]) => ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
         ],
         "path": "packages/kbn-securitysolution-list-utils/src/helpers/index.ts",
         "deprecated": false,
@@ -40,7 +40,7 @@
             "label": "entries",
             "description": [],
             "signature": [
-              "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
+              "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
             ],
             "path": "packages/kbn-securitysolution-list-utils/src/helpers/index.ts",
             "deprecated": false,
@@ -58,7 +58,7 @@
         "label": "buildExceptionFilter",
         "description": [],
         "signature": [
-          "({ lists, excludeExceptions, chunkSize, }: { lists: ({ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }))[]; excludeExceptions: boolean; chunkSize: number; }) => ",
+          "({ lists, excludeExceptions, chunkSize, }: { lists: ({ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }))[]; excludeExceptions: boolean; chunkSize: number; }) => ",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -89,7 +89,7 @@
                 "label": "lists",
                 "description": [],
                 "signature": [
-                  "({ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }))[]"
+                  "({ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }))[]"
                 ],
                 "path": "packages/kbn-securitysolution-list-utils/src/build_exception_filter/index.ts",
                 "deprecated": false
@@ -696,7 +696,7 @@
             "section": "def-common.ExceptionsBuilderExceptionItem",
             "text": "ExceptionsBuilderExceptionItem"
           },
-          "[]) => ({ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }))[]"
+          "[]) => ({ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | ({ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }))[]"
         ],
         "path": "packages/kbn-securitysolution-list-utils/src/helpers/index.ts",
         "deprecated": false,
@@ -968,7 +968,7 @@
             "section": "def-common.FormattedBuilderEntry",
             "text": "FormattedBuilderEntry"
           },
-          ") => ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } & { id?: string | undefined; }) | ({ field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } & { id?: string | undefined; }) | ({ field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } & { id?: string | undefined; }) | ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } & { id?: string | undefined; }) | ({ field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } & { id?: string | undefined; })"
+          ") => ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } & { id?: string | undefined; }) | ({ field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } & { id?: string | undefined; }) | ({ field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } & { id?: string | undefined; }) | ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } & { id?: string | undefined; }) | ({ field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } & { id?: string | undefined; })"
         ],
         "path": "packages/kbn-securitysolution-list-utils/src/helpers/index.ts",
         "deprecated": false,
@@ -1122,7 +1122,7 @@
             "section": "def-common.FormattedBuilderEntry",
             "text": "FormattedBuilderEntry"
           },
-          ", newField: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }) => { index: number; updatedEntry: ",
+          ", newField: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }) => { index: number; updatedEntry: ",
           {
             "pluginId": "@kbn/securitysolution-list-utils",
             "scope": "common",
@@ -1167,7 +1167,7 @@
               "- newly selected list"
             ],
             "signature": [
-              "{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }"
+              "{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }"
             ],
             "path": "packages/kbn-securitysolution-list-utils/src/helpers/index.ts",
             "deprecated": false,
@@ -2635,7 +2635,7 @@
         "label": "hasLargeValueList",
         "description": [],
         "signature": [
-          "(entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]) => boolean"
+          "(entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]) => boolean"
         ],
         "path": "packages/kbn-securitysolution-list-utils/src/has_large_value_list/index.ts",
         "deprecated": false,
@@ -2648,7 +2648,7 @@
             "label": "entries",
             "description": [],
             "signature": [
-              "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
+              "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
             ],
             "path": "packages/kbn-securitysolution-list-utils/src/has_large_value_list/index.ts",
             "deprecated": false,
@@ -3355,7 +3355,7 @@
         "label": "BuilderEntry",
         "description": [],
         "signature": [
-          "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } & { id?: string | undefined; }) | ({ field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } & { id?: string | undefined; }) | ({ field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } & { id?: string | undefined; }) | ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } & { id?: string | undefined; }) | ({ field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } & { id?: string | undefined; }) | ",
+          "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } & { id?: string | undefined; }) | ({ field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } & { id?: string | undefined; }) | ({ field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } & { id?: string | undefined; }) | ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } & { id?: string | undefined; }) | ({ field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } & { id?: string | undefined; }) | ",
           {
             "pluginId": "@kbn/securitysolution-list-utils",
             "scope": "common",
@@ -3414,7 +3414,7 @@
         "label": "CreateExceptionListItemBuilderSchema",
         "description": [],
         "signature": [
-          "Pick<{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }, \"type\" | \"description\" | \"name\" | \"tags\" | \"comments\" | \"list_id\" | \"namespace_type\" | \"os_types\" | \"item_id\"> & { meta: { temporaryUuid: string; }; entries: ",
+          "Pick<{ description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; })[]; list_id: string; name: string; type: \"simple\"; } & { comments?: { comment: string; }[] | undefined; item_id?: string | undefined; meta?: object | undefined; namespace_type?: \"single\" | \"agnostic\" | undefined; os_types?: (\"windows\" | \"linux\" | \"macos\")[] | undefined; tags?: string[] | undefined; }, \"type\" | \"description\" | \"name\" | \"tags\" | \"comments\" | \"list_id\" | \"namespace_type\" | \"os_types\" | \"item_id\"> & { meta: { temporaryUuid: string; }; entries: ",
           {
             "pluginId": "@kbn/securitysolution-list-utils",
             "scope": "common",
@@ -3548,7 +3548,7 @@
         "label": "ExceptionListItemBuilderSchema",
         "description": [],
         "signature": [
-          "Pick<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }, \"type\" | \"id\" | \"description\" | \"name\" | \"tags\" | \"meta\" | \"updated_at\" | \"comments\" | \"_version\" | \"created_at\" | \"created_by\" | \"updated_by\" | \"tie_breaker_id\" | \"list_id\" | \"namespace_type\" | \"os_types\" | \"item_id\"> & { entries: ",
+          "Pick<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }, \"type\" | \"id\" | \"description\" | \"name\" | \"tags\" | \"meta\" | \"updated_at\" | \"comments\" | \"_version\" | \"created_at\" | \"created_by\" | \"updated_by\" | \"tie_breaker_id\" | \"list_id\" | \"namespace_type\" | \"os_types\" | \"item_id\"> & { entries: ",
           {
             "pluginId": "@kbn/securitysolution-list-utils",
             "scope": "common",
diff --git a/api_docs/kbn_securitysolution_utils.json b/api_docs/kbn_securitysolution_utils.json
index fc0556f7926a0..61eda7861af56 100644
--- a/api_docs/kbn_securitysolution_utils.json
+++ b/api_docs/kbn_securitysolution_utils.json
@@ -76,6 +76,37 @@
         ],
         "returnComment": [],
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/securitysolution-utils",
+        "id": "def-server.transformDataToNdjson",
+        "type": "Function",
+        "tags": [],
+        "label": "transformDataToNdjson",
+        "description": [],
+        "signature": [
+          "(data: unknown[]) => string"
+        ],
+        "path": "packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/securitysolution-utils",
+            "id": "def-server.transformDataToNdjson.$1",
+            "type": "Array",
+            "tags": [],
+            "label": "data",
+            "description": [],
+            "signature": [
+              "unknown[]"
+            ],
+            "path": "packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.ts",
+            "deprecated": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
       }
     ],
     "interfaces": [],
diff --git a/api_docs/kbn_securitysolution_utils.mdx b/api_docs/kbn_securitysolution_utils.mdx
index 63039630e7c9a..23f9c42bfb9c4 100644
--- a/api_docs/kbn_securitysolution_utils.mdx
+++ b/api_docs/kbn_securitysolution_utils.mdx
@@ -18,7 +18,7 @@ Contact [Owner missing] for questions regarding this plugin.
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 4 | 0 | 2 | 0 |
+| 6 | 0 | 4 | 0 |
 
 ## Server
 
diff --git a/api_docs/kibana_react.json b/api_docs/kibana_react.json
index 5d7a7241dd956..be973dd7ceb10 100644
--- a/api_docs/kibana_react.json
+++ b/api_docs/kibana_react.json
@@ -3416,7 +3416,7 @@
             "label": "color",
             "description": [],
             "signature": [
-              "\"warning\" | \"primary\" | \"success\" | \"danger\" | undefined"
+              "\"primary\" | \"success\" | \"warning\" | \"danger\" | undefined"
             ],
             "path": "src/plugins/kibana_react/public/notifications/types.ts",
             "deprecated": false
@@ -3807,7 +3807,7 @@
           "DisambiguateSet",
           "<LabelAsString, LabelAsNode> & ",
           "DisambiguateSet",
-          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"warning\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
+          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
           "DisambiguateSet",
           "<",
           "PropsForAnchor",
@@ -3939,7 +3939,7 @@
           "DisambiguateSet",
           "<LabelAsString, LabelAsNode> & ",
           "DisambiguateSet",
-          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"warning\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
+          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
           "DisambiguateSet",
           "<",
           "PropsForAnchor",
@@ -4071,7 +4071,7 @@
           "DisambiguateSet",
           "<LabelAsString, LabelAsNode> & ",
           "DisambiguateSet",
-          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"warning\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
+          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
           "DisambiguateSet",
           "<",
           "PropsForAnchor",
@@ -4203,7 +4203,7 @@
           "DisambiguateSet",
           "<LabelAsString, LabelAsNode> & ",
           "DisambiguateSet",
-          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"warning\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
+          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
           "DisambiguateSet",
           "<",
           "PropsForAnchor",
@@ -4349,7 +4349,7 @@
           "DisambiguateSet",
           "<LabelAsString, LabelAsNode> & ",
           "DisambiguateSet",
-          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"warning\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
+          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
           "DisambiguateSet",
           "<",
           "PropsForAnchor",
@@ -4481,7 +4481,7 @@
           "DisambiguateSet",
           "<LabelAsString, LabelAsNode> & ",
           "DisambiguateSet",
-          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"warning\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
+          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
           "DisambiguateSet",
           "<",
           "PropsForAnchor",
@@ -4613,7 +4613,7 @@
           "DisambiguateSet",
           "<LabelAsString, LabelAsNode> & ",
           "DisambiguateSet",
-          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"warning\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
+          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
           "DisambiguateSet",
           "<",
           "PropsForAnchor",
@@ -4745,7 +4745,7 @@
           "DisambiguateSet",
           "<LabelAsString, LabelAsNode> & ",
           "DisambiguateSet",
-          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"warning\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
+          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
           "DisambiguateSet",
           "<",
           "PropsForAnchor",
@@ -5064,7 +5064,7 @@
           "DisambiguateSet",
           "<LabelAsString, LabelAsNode> & ",
           "DisambiguateSet",
-          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"warning\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
+          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
           "DisambiguateSet",
           "<",
           "PropsForAnchor",
@@ -5196,7 +5196,7 @@
           "DisambiguateSet",
           "<LabelAsString, LabelAsNode> & ",
           "DisambiguateSet",
-          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"warning\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
+          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
           "DisambiguateSet",
           "<",
           "PropsForAnchor",
@@ -5328,7 +5328,7 @@
           "DisambiguateSet",
           "<LabelAsString, LabelAsNode> & ",
           "DisambiguateSet",
-          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"warning\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
+          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
           "DisambiguateSet",
           "<",
           "PropsForAnchor",
@@ -5460,7 +5460,7 @@
           "DisambiguateSet",
           "<LabelAsString, LabelAsNode> & ",
           "DisambiguateSet",
-          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"warning\" | \"primary\" | \"success\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
+          "<{ tooltipContent: React.ReactNode; title?: string | undefined; }, { title: string; tooltipContent?: React.ReactNode; }> & { title: string; tooltipContent?: React.ReactNode; } & { label: React.ReactNode; }> | undefined; display?: \"primary\" | \"success\" | \"warning\" | \"danger\" | \"accent\" | \"transparent\" | \"plain\" | \"subdued\" | undefined; paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; selectable?: (",
           "DisambiguateSet",
           "<",
           "PropsForAnchor",
diff --git a/api_docs/kibana_utils.json b/api_docs/kibana_utils.json
index 744c735e94d68..71174e6eafe3f 100644
--- a/api_docs/kibana_utils.json
+++ b/api_docs/kibana_utils.json
@@ -6895,7 +6895,7 @@
           "signature": [
             "(history: Pick<",
             "History",
-            "<any>, \"location\" | \"replace\">) => void"
+            "<any>, \"replace\" | \"location\">) => void"
           ],
           "path": "src/plugins/kibana_utils/public/plugin.ts",
           "deprecated": false,
@@ -6910,7 +6910,7 @@
               "signature": [
                 "Pick<",
                 "History",
-                "<any>, \"location\" | \"replace\">"
+                "<any>, \"replace\" | \"location\">"
               ],
               "path": "src/plugins/kibana_utils/public/plugin.ts",
               "deprecated": false,
diff --git a/api_docs/lens.json b/api_docs/lens.json
index 18f6f3320f624..7dc468fcad234 100644
--- a/api_docs/lens.json
+++ b/api_docs/lens.json
@@ -332,7 +332,7 @@
             "label": "operationType",
             "description": [],
             "signature": [
-              "\"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"math\" | \"overall_sum\" | \"overall_min\" | \"overall_max\" | \"overall_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\" | \"formula\" | \"static_value\" | undefined"
+              "\"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"math\" | \"overall_sum\" | \"overall_min\" | \"overall_max\" | \"overall_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\" | \"formula\" | \"static_value\" | undefined"
             ],
             "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts",
             "deprecated": false
@@ -2290,7 +2290,7 @@
           "\nA union type of all available operation types. The operation type is a unique id of an operation.\nEach column is assigned to exactly one operation type."
         ],
         "signature": [
-          "\"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"math\" | \"overall_sum\" | \"overall_min\" | \"overall_max\" | \"overall_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\" | \"formula\" | \"static_value\""
+          "\"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"math\" | \"overall_sum\" | \"overall_min\" | \"overall_max\" | \"overall_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\" | \"formula\" | \"static_value\""
         ],
         "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts",
         "deprecated": false,
@@ -2911,7 +2911,7 @@
             "label": "state",
             "description": [],
             "signature": [
-              "{ datasourceMetaData: { filterableIndexPatterns: { id: string; title: string; }[]; }; datasourceStates: { indexpattern: { currentIndexPatternId: string; layers: Record<string, { columns: Record<string, { operationType: \"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }>; }; }; visualization: VisualizationState; query: ",
+              "{ datasourceMetaData: { filterableIndexPatterns: { id: string; title: string; }[]; }; datasourceStates: { indexpattern: { currentIndexPatternId: string; layers: Record<string, { columns: Record<string, { operationType: \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }>; }; }; visualization: VisualizationState; query: ",
               {
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
@@ -3212,7 +3212,7 @@
             "section": "def-server.LensDocShapePost712",
             "text": "LensDocShapePost712"
           },
-          "<unknown>, \"title\" | \"expression\" | \"visualizationType\"> & { state: Pick<{ datasourceMetaData: { filterableIndexPatterns: { id: string; title: string; }[]; }; datasourceStates: { indexpattern: { currentIndexPatternId: string; layers: Record<string, { columns: Record<string, { operationType: \"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }>; }; }; visualization: unknown; query: ",
+          "<unknown>, \"title\" | \"expression\" | \"visualizationType\"> & { state: Pick<{ datasourceMetaData: { filterableIndexPatterns: { id: string; title: string; }[]; }; datasourceStates: { indexpattern: { currentIndexPatternId: string; layers: Record<string, { columns: Record<string, { operationType: \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }>; }; }; visualization: unknown; query: ",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -3228,7 +3228,7 @@
             "section": "def-common.Filter",
             "text": "Filter"
           },
-          "[]; }, \"filters\" | \"query\" | \"visualization\" | \"datasourceMetaData\"> & { datasourceStates: { indexpattern: Pick<{ currentIndexPatternId: string; layers: Record<string, { columns: Record<string, { operationType: \"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }>; }, \"currentIndexPatternId\"> & { layers: Record<string, Pick<{ columns: Record<string, { operationType: \"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }, never> & { columns: Record<string, { operationType: \"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; } | { operationType: \"date_histogram\"; params: { interval: string; timeZone?: string | undefined; }; }>; }>; }; }; }; }"
+          "[]; }, \"filters\" | \"query\" | \"visualization\" | \"datasourceMetaData\"> & { datasourceStates: { indexpattern: Pick<{ currentIndexPatternId: string; layers: Record<string, { columns: Record<string, { operationType: \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }>; }, \"currentIndexPatternId\"> & { layers: Record<string, Pick<{ columns: Record<string, { operationType: \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }, never> & { columns: Record<string, { operationType: \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; } | { operationType: \"date_histogram\"; params: { interval: string; timeZone?: string | undefined; }; }>; }>; }; }; }; }"
         ],
         "path": "x-pack/plugins/lens/server/migrations/types.ts",
         "deprecated": false,
@@ -3250,7 +3250,7 @@
             "section": "def-server.LensDocShapePost712",
             "text": "LensDocShapePost712"
           },
-          "<unknown>, \"title\" | \"expression\" | \"visualizationType\"> & { state: Pick<{ datasourceMetaData: { filterableIndexPatterns: { id: string; title: string; }[]; }; datasourceStates: { indexpattern: { currentIndexPatternId: string; layers: Record<string, { columns: Record<string, { operationType: \"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }>; }; }; visualization: unknown; query: ",
+          "<unknown>, \"title\" | \"expression\" | \"visualizationType\"> & { state: Pick<{ datasourceMetaData: { filterableIndexPatterns: { id: string; title: string; }[]; }; datasourceStates: { indexpattern: { currentIndexPatternId: string; layers: Record<string, { columns: Record<string, { operationType: \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }>; }; }; visualization: unknown; query: ",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -3266,7 +3266,7 @@
             "section": "def-common.Filter",
             "text": "Filter"
           },
-          "[]; }, \"filters\" | \"query\" | \"visualization\" | \"datasourceMetaData\"> & { datasourceStates: { indexpattern: Pick<{ currentIndexPatternId: string; layers: Record<string, { columns: Record<string, { operationType: \"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }>; }, \"currentIndexPatternId\"> & { layers: Record<string, Pick<{ columns: Record<string, { operationType: \"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }, never> & { columns: Record<string, { operationType: \"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; } | { operationType: \"date_histogram\"; params: { interval: string; }; }>; }>; }; }; }; }"
+          "[]; }, \"filters\" | \"query\" | \"visualization\" | \"datasourceMetaData\"> & { datasourceStates: { indexpattern: Pick<{ currentIndexPatternId: string; layers: Record<string, { columns: Record<string, { operationType: \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }>; }, \"currentIndexPatternId\"> & { layers: Record<string, Pick<{ columns: Record<string, { operationType: \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; }>; }, never> & { columns: Record<string, { operationType: \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\"; } | { operationType: \"date_histogram\"; params: { interval: string; }; }>; }>; }; }; }; }"
         ],
         "path": "x-pack/plugins/lens/server/migrations/types.ts",
         "deprecated": false,
@@ -3280,7 +3280,7 @@
         "label": "OperationTypePost712",
         "description": [],
         "signature": [
-          "\"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\""
+          "\"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\""
         ],
         "path": "x-pack/plugins/lens/server/migrations/types.ts",
         "deprecated": false,
@@ -3294,7 +3294,7 @@
         "label": "OperationTypePre712",
         "description": [],
         "signature": [
-          "\"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"percentile\" | \"terms\" | \"avg\" | \"median\" | \"cumulative_sum\" | \"derivative\" | \"moving_average\" | \"cardinality\" | \"counter_rate\" | \"last_value\""
+          "\"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"percentile\" | \"range\" | \"terms\" | \"avg\" | \"median\" | \"cumulative_sum\" | \"derivative\" | \"moving_average\" | \"cardinality\" | \"counter_rate\" | \"last_value\""
         ],
         "path": "x-pack/plugins/lens/server/migrations/types.ts",
         "deprecated": false,
@@ -4244,13 +4244,21 @@
         "signature": [
           "(mapping?: ",
           {
-            "pluginId": "expressions",
+            "pluginId": "fieldFormats",
             "scope": "common",
-            "docId": "kibExpressionsPluginApi",
+            "docId": "kibFieldFormatsPluginApi",
             "section": "def-common.SerializedFieldFormat",
             "text": "SerializedFieldFormat"
           },
-          "<Record<string, any>> | undefined) => ",
+          "<",
+          {
+            "pluginId": "fieldFormats",
+            "scope": "common",
+            "docId": "kibFieldFormatsPluginApi",
+            "section": "def-common.FieldFormatParams",
+            "text": "FieldFormatParams"
+          },
+          "> | undefined) => ",
           {
             "pluginId": "fieldFormats",
             "scope": "common",
@@ -4272,13 +4280,21 @@
             "description": [],
             "signature": [
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>> | undefined"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              "> | undefined"
             ],
             "path": "x-pack/plugins/lens/common/types.ts",
             "deprecated": false
diff --git a/api_docs/lists.json b/api_docs/lists.json
index d6e2a97fa78ab..b3d498a4532d3 100644
--- a/api_docs/lists.json
+++ b/api_docs/lists.json
@@ -410,7 +410,7 @@
             "signature": [
               "({ itemId, id, namespaceType, }: ",
               "GetExceptionListItemOptions",
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
             "deprecated": false,
@@ -480,7 +480,7 @@
             "signature": [
               "({ comments, description, entries, itemId, meta, name, osTypes, tags, type, }: ",
               "CreateEndpointListItemOptions",
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
             "deprecated": false,
@@ -514,7 +514,7 @@
             "signature": [
               "({ _version, comments, description, entries, id, itemId, meta, name, osTypes, tags, type, }: ",
               "UpdateEndpointListItemOptions",
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
             "deprecated": false,
@@ -548,7 +548,7 @@
             "signature": [
               "({ itemId, id, }: ",
               "GetEndpointListItemOptions",
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
             "deprecated": false,
@@ -682,7 +682,7 @@
                 "section": "def-server.CreateExceptionListItemOptions",
                 "text": "CreateExceptionListItemOptions"
               },
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
             "deprecated": false,
@@ -726,7 +726,7 @@
                 "section": "def-server.UpdateExceptionListItemOptions",
                 "text": "UpdateExceptionListItemOptions"
               },
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
             "deprecated": false,
@@ -764,7 +764,7 @@
             "signature": [
               "({ id, itemId, namespaceType, }: ",
               "DeleteExceptionListItemOptions",
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
             "deprecated": false,
@@ -830,7 +830,7 @@
             "signature": [
               "({ id, itemId, }: ",
               "DeleteEndpointListItemOptions",
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
             "deprecated": false,
@@ -862,7 +862,7 @@
             "signature": [
               "({ listId, filter, perPage, page, sortField, sortOrder, namespaceType, }: ",
               "FindExceptionListItemOptions",
-              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
+              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
             "deprecated": false,
@@ -894,7 +894,7 @@
             "signature": [
               "({ listId, filter, perPage, page, sortField, sortOrder, namespaceType, }: ",
               "FindExceptionListsItemOptions",
-              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
+              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
             "deprecated": false,
@@ -926,7 +926,7 @@
             "signature": [
               "({ perPage, page, sortField, sortOrder, valueListId, }: ",
               "FindValueListExceptionListsItems",
-              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
+              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
             "deprecated": false,
@@ -992,7 +992,7 @@
             "signature": [
               "({ filter, perPage, page, sortField, sortOrder, }: ",
               "FindEndpointListItemOptions",
-              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
+              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
             "deprecated": false,
@@ -1097,7 +1097,7 @@
             "signature": [
               "({ id }: ",
               "GetListOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1129,7 +1129,7 @@
             "signature": [
               "({ id, deserializer, immutable, serializer, name, description, type, meta, version, }: ",
               "CreateListOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1161,7 +1161,7 @@
             "signature": [
               "({ id, deserializer, serializer, name, description, immutable, type, meta, version, }: ",
               "CreateListIfItDoesNotExistOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1493,7 +1493,7 @@
             "signature": [
               "({ id }: ",
               "DeleteListItemOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1525,7 +1525,7 @@
             "signature": [
               "({ listId, value, type, }: ",
               "DeleteListItemByValueOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1557,7 +1557,7 @@
             "signature": [
               "({ id }: ",
               "DeleteListOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1621,7 +1621,7 @@
             "signature": [
               "({ deserializer, serializer, type, listId, stream, meta, version, }: ",
               "ImportListItemsToStreamOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1653,7 +1653,7 @@
             "signature": [
               "({ listId, value, type, }: ",
               "GetListItemByValueOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1685,7 +1685,7 @@
             "signature": [
               "({ id, deserializer, serializer, listId, value, type, meta, }: ",
               "CreateListItemOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1717,7 +1717,7 @@
             "signature": [
               "({ _version, id, value, meta, }: ",
               "UpdateListItemOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1749,7 +1749,7 @@
             "signature": [
               "({ _version, id, name, description, meta, version, }: ",
               "UpdateListOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1781,7 +1781,7 @@
             "signature": [
               "({ id }: ",
               "GetListItemOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1813,7 +1813,7 @@
             "signature": [
               "({ type, listId, value, }: ",
               "GetListItemsByValueOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1845,7 +1845,7 @@
             "signature": [
               "({ type, listId, value, }: ",
               "SearchListItemByValuesOptions",
-              ") => Promise<{ items: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; value: unknown; }[]>"
+              ") => Promise<{ items: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; value: unknown; }[]>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1877,7 +1877,7 @@
             "signature": [
               "({ filter, currentIndexPosition, perPage, page, sortField, sortOrder, searchAfter, }: ",
               "FindListOptions",
-              ") => Promise<{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]; page: number; per_page: number; total: number; }>"
+              ") => Promise<{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]; page: number; per_page: number; total: number; }>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1909,7 +1909,7 @@
             "signature": [
               "({ listId, filter, currentIndexPosition, perPage, page, sortField, sortOrder, searchAfter, }: ",
               "FindListItemOptions",
-              ") => Promise<{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; page: number; per_page: number; total: number; } | null>"
+              ") => Promise<{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; page: number; per_page: number; total: number; } | null>"
             ],
             "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
             "deprecated": false,
@@ -1968,7 +1968,7 @@
             "label": "entries",
             "description": [],
             "signature": [
-              "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
+              "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
             "deprecated": false
@@ -2182,7 +2182,7 @@
             "label": "entries",
             "description": [],
             "signature": [
-              "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
+              "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"keyword\" | \"ip_range\" | \"date_range\" | \"date\" | \"geo_point\" | \"geo_shape\" | \"ip\" | \"long\" | \"double\" | \"text\" | \"date_nanos\" | \"shape\" | \"short\" | \"binary\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
             ],
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
             "deprecated": false
@@ -2337,7 +2337,7 @@
               "section": "def-server.SavedObjectsClient",
               "text": "SavedObjectsClient"
             },
-            ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, user: string) => ",
+            ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, user: string) => ",
             {
               "pluginId": "lists",
               "scope": "server",
@@ -2358,25 +2358,7 @@
               "label": "savedObjectsClient",
               "description": [],
               "signature": [
-                "{ get: <T = unknown>(type: string, id: string, options?: ",
-                {
-                  "pluginId": "core",
-                  "scope": "server",
-                  "docId": "kibCoreSavedObjectsPluginApi",
-                  "section": "def-server.SavedObjectsBaseOptions",
-                  "text": "SavedObjectsBaseOptions"
-                },
-                ") => Promise<",
-                "SavedObject",
-                "<T>>; delete: (type: string, id: string, options?: ",
-                {
-                  "pluginId": "core",
-                  "scope": "server",
-                  "docId": "kibCoreSavedObjectsPluginApi",
-                  "section": "def-server.SavedObjectsDeleteOptions",
-                  "text": "SavedObjectsDeleteOptions"
-                },
-                ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+                "{ create: <T = unknown>(type: string, attributes: T, options?: ",
                 {
                   "pluginId": "core",
                   "scope": "server",
@@ -2434,7 +2416,15 @@
                   "section": "def-server.SavedObjectsCheckConflictsResponse",
                   "text": "SavedObjectsCheckConflictsResponse"
                 },
-                ">; find: <T = unknown, A = unknown>(options: ",
+                ">; delete: (type: string, id: string, options?: ",
+                {
+                  "pluginId": "core",
+                  "scope": "server",
+                  "docId": "kibCoreSavedObjectsPluginApi",
+                  "section": "def-server.SavedObjectsDeleteOptions",
+                  "text": "SavedObjectsDeleteOptions"
+                },
+                ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
                 {
                   "pluginId": "core",
                   "scope": "server",
@@ -2498,6 +2488,16 @@
                   "section": "def-server.SavedObjectsBulkResolveResponse",
                   "text": "SavedObjectsBulkResolveResponse"
                 },
+                "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+                {
+                  "pluginId": "core",
+                  "scope": "server",
+                  "docId": "kibCoreSavedObjectsPluginApi",
+                  "section": "def-server.SavedObjectsBaseOptions",
+                  "text": "SavedObjectsBaseOptions"
+                },
+                ") => Promise<",
+                "SavedObject",
                 "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
                 {
                   "pluginId": "core",
@@ -2738,7 +2738,7 @@
               "signature": [
                 "Pick<",
                 "KibanaClient",
-                ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                 "TransportRequestParams",
                 ", options?: ",
                 "TransportRequestOptions",
diff --git a/api_docs/maps_ems.json b/api_docs/maps_ems.json
index 7d2d8d9eefddc..dd5f8d905952d 100644
--- a/api_docs/maps_ems.json
+++ b/api_docs/maps_ems.json
@@ -908,7 +908,7 @@
         "label": "DEFAULT_EMS_LANDING_PAGE_URL",
         "description": [],
         "signature": [
-          "\"https://maps.elastic.co/v7.15\""
+          "\"https://maps.elastic.co/v7.16\""
         ],
         "path": "src/plugins/maps_ems/common/index.ts",
         "deprecated": false,
diff --git a/api_docs/metrics_entities.json b/api_docs/metrics_entities.json
index 6b7d685b46939..601c41a282257 100644
--- a/api_docs/metrics_entities.json
+++ b/api_docs/metrics_entities.json
@@ -58,7 +58,7 @@
               "signature": [
                 "Pick<",
                 "KibanaClient",
-                ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                 "TransportRequestParams",
                 ", options?: ",
                 "TransportRequestOptions",
diff --git a/api_docs/ml.json b/api_docs/ml.json
index 102e433e4600e..d5f9d552690c1 100644
--- a/api_docs/ml.json
+++ b/api_docs/ml.json
@@ -1055,7 +1055,7 @@
               },
               "<",
               "MlAnomalyDetectionAlertParams",
-              ">, \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[] | undefined"
+              ">, \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[] | undefined"
             ],
             "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/summary_job.ts",
             "deprecated": false
@@ -2890,7 +2890,7 @@
               },
               "<",
               "MlAnomalyDetectionAlertParams",
-              ">, \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[] | undefined"
+              ">, \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[] | undefined"
             ],
             "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/summary_job.ts",
             "deprecated": false
@@ -3434,7 +3434,7 @@
           "section": "def-server.SavedObjectsClient",
           "text": "SavedObjectsClient"
         },
-        ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, request: ",
+        ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">, request: ",
         {
           "pluginId": "core",
           "scope": "server",
diff --git a/api_docs/monitoring.json b/api_docs/monitoring.json
index ddeba9737dc2d..0de686a2108eb 100644
--- a/api_docs/monitoring.json
+++ b/api_docs/monitoring.json
@@ -149,7 +149,7 @@
         "signature": [
           "{ ui: { elasticsearch: ",
           "MonitoringElasticsearchConfig",
-          "; enabled: boolean; container: Readonly<{} & { logstash: Readonly<{} & { enabled: boolean; }>; apm: Readonly<{} & { enabled: boolean; }>; elasticsearch: Readonly<{} & { enabled: boolean; }>; }>; logs: Readonly<{} & { index: string; }>; metricbeat: Readonly<{} & { index: string; }>; debug_mode: boolean; debug_log_path: string; ccs: Readonly<{} & { enabled: boolean; }>; max_bucket_size: number; min_interval_seconds: number; show_license_expiration: boolean; render_react_app: boolean; }; enabled: boolean; kibana: Readonly<{} & { collection: Readonly<{} & { enabled: boolean; interval: number; }>; }>; licensing: Readonly<{} & { api_polling_frequency: moment.Duration; }>; agent: Readonly<{} & { interval: string; }>; cluster_alerts: Readonly<{} & { enabled: boolean; allowedSpaces: string[]; email_notifications: Readonly<{} & { enabled: boolean; email_address: string; }>; }>; tests: Readonly<{} & { cloud_detector: Readonly<{} & { enabled: boolean; }>; }>; }"
+          "; enabled: boolean; container: Readonly<{} & { logstash: Readonly<{} & { enabled: boolean; }>; apm: Readonly<{} & { enabled: boolean; }>; elasticsearch: Readonly<{} & { enabled: boolean; }>; }>; logs: Readonly<{} & { index: string; }>; metricbeat: Readonly<{} & { index: string; }>; debug_mode: boolean; debug_log_path: string; ccs: Readonly<{} & { enabled: boolean; }>; max_bucket_size: number; min_interval_seconds: number; show_license_expiration: boolean; render_react_app: boolean; }; tests: Readonly<{} & { cloud_detector: Readonly<{} & { enabled: boolean; }>; }>; enabled: boolean; kibana: Readonly<{} & { collection: Readonly<{} & { interval: number; enabled: boolean; }>; }>; licensing: Readonly<{} & { api_polling_frequency: moment.Duration; }>; agent: Readonly<{} & { interval: string; }>; cluster_alerts: Readonly<{} & { enabled: boolean; allowedSpaces: string[]; email_notifications: Readonly<{} & { enabled: boolean; email_address: string; }>; }>; }"
         ],
         "path": "x-pack/plugins/monitoring/server/config.ts",
         "deprecated": false,
diff --git a/api_docs/observability.json b/api_docs/observability.json
index aa66c500c05e5..3889631a20bec 100644
--- a/api_docs/observability.json
+++ b/api_docs/observability.json
@@ -438,7 +438,7 @@
         "label": "LazyAlertsFlyout",
         "description": [],
         "signature": [
-          "React.ExoticComponent<Pick<AlertsFlyoutProps, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"key\" | \"id\" | \"title\" | \"security\" | \"size\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"paddingSize\" | \"data-test-subj\" | \"alert\" | \"onClose\" | \"css\" | \"as\" | \"ownFocus\" | \"alerts\" | \"maxWidth\" | \"hideCloseButton\" | \"closeButtonAriaLabel\" | \"closeButtonProps\" | \"closeButtonPosition\" | \"maskProps\" | \"outsideClickCloses\" | \"side\" | \"pushMinBreakpoint\" | \"isInApp\" | \"observabilityRuleTypeRegistry\" | \"selectedAlertId\"> & { ref?: React.RefObject<HTMLDivElement> | ((instance: HTMLDivElement | null) => void) | null | undefined; }> & { readonly _result: ({ alert, alerts, isInApp, observabilityRuleTypeRegistry, onClose, selectedAlertId, }: AlertsFlyoutProps) => JSX.Element | null; }"
+          "React.ExoticComponent<Pick<AlertsFlyoutProps, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"key\" | \"type\" | \"id\" | \"title\" | \"security\" | \"size\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"paddingSize\" | \"data-test-subj\" | \"alert\" | \"onClose\" | \"css\" | \"as\" | \"ownFocus\" | \"alerts\" | \"maxWidth\" | \"hideCloseButton\" | \"closeButtonAriaLabel\" | \"closeButtonProps\" | \"closeButtonPosition\" | \"maskProps\" | \"outsideClickCloses\" | \"side\" | \"pushMinBreakpoint\" | \"isInApp\" | \"observabilityRuleTypeRegistry\" | \"selectedAlertId\"> & { ref?: React.RefObject<HTMLDivElement> | ((instance: HTMLDivElement | null) => void) | null | undefined; }> & { readonly _result: ({ alert, alerts, isInApp, observabilityRuleTypeRegistry, onClose, selectedAlertId, }: AlertsFlyoutProps) => JSX.Element | null; }"
         ],
         "path": "x-pack/plugins/observability/public/index.ts",
         "deprecated": false,
@@ -1029,7 +1029,7 @@
         "label": "useUiTracker",
         "description": [],
         "signature": [
-          "({\n  app: defaultApp,\n}: { app?: \"fleet\" | \"apm\" | \"infra_metrics\" | \"infra_logs\" | \"uptime\" | \"synthetics\" | \"observability-overview\" | \"stack_monitoring\" | \"ux\" | undefined; }) => ({ app, metric, metricType }: ",
+          "({\n  app: defaultApp,\n}: { app?: \"fleet\" | \"apm\" | \"synthetics\" | \"infra_metrics\" | \"infra_logs\" | \"uptime\" | \"observability-overview\" | \"stack_monitoring\" | \"ux\" | undefined; }) => ({ app, metric, metricType }: ",
           {
             "pluginId": "observability",
             "scope": "public",
@@ -1060,7 +1060,7 @@
                 "label": "app",
                 "description": [],
                 "signature": [
-                  "\"fleet\" | \"apm\" | \"infra_metrics\" | \"infra_logs\" | \"uptime\" | \"synthetics\" | \"observability-overview\" | \"stack_monitoring\" | \"ux\" | undefined"
+                  "\"fleet\" | \"apm\" | \"synthetics\" | \"infra_metrics\" | \"infra_logs\" | \"uptime\" | \"observability-overview\" | \"stack_monitoring\" | \"ux\" | undefined"
                 ],
                 "path": "x-pack/plugins/observability/public/hooks/use_track_metric.tsx",
                 "deprecated": false
@@ -2517,7 +2517,7 @@
             "label": "operationType",
             "description": [],
             "signature": [
-              "\"range\" | \"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"math\" | \"overall_sum\" | \"overall_min\" | \"overall_max\" | \"overall_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\" | \"formula\" | \"static_value\" | undefined"
+              "\"filters\" | \"max\" | \"min\" | \"count\" | \"date_histogram\" | \"sum\" | \"average\" | \"percentile\" | \"range\" | \"terms\" | \"median\" | \"cumulative_sum\" | \"moving_average\" | \"math\" | \"overall_sum\" | \"overall_min\" | \"overall_max\" | \"overall_average\" | \"counter_rate\" | \"differences\" | \"unique_count\" | \"last_value\" | \"formula\" | \"static_value\" | undefined"
             ],
             "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
             "deprecated": false
@@ -2530,7 +2530,7 @@
             "label": "dataType",
             "description": [],
             "signature": [
-              "\"mobile\" | \"apm\" | \"infra_metrics\" | \"infra_logs\" | \"synthetics\" | \"ux\""
+              "\"mobile\" | \"apm\" | \"synthetics\" | \"infra_metrics\" | \"infra_logs\" | \"ux\""
             ],
             "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
             "deprecated": false
@@ -3233,7 +3233,7 @@
         "label": "ObservabilityFetchDataPlugins",
         "description": [],
         "signature": [
-          "\"apm\" | \"infra_metrics\" | \"infra_logs\" | \"synthetics\" | \"ux\""
+          "\"apm\" | \"synthetics\" | \"infra_metrics\" | \"infra_logs\" | \"ux\""
         ],
         "path": "x-pack/plugins/observability/public/typings/fetch_overview_data/index.ts",
         "deprecated": false,
@@ -3316,27 +3316,27 @@
           "DisambiguateSet",
           "<(",
           "DisambiguateSet",
-          "<React.ButtonHTMLAttributes<HTMLButtonElement>, Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">> & Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">) | (",
+          "<React.ButtonHTMLAttributes<HTMLButtonElement>, Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">> & Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">) | (",
           "DisambiguateSet",
-          "<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">, React.ButtonHTMLAttributes<HTMLButtonElement>> & React.ButtonHTMLAttributes<HTMLButtonElement>), React.HTMLAttributes<HTMLSpanElement>> & React.HTMLAttributes<HTMLSpanElement>) | (",
+          "<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">, React.ButtonHTMLAttributes<HTMLButtonElement>> & React.ButtonHTMLAttributes<HTMLButtonElement>), React.HTMLAttributes<HTMLSpanElement>> & React.HTMLAttributes<HTMLSpanElement>) | (",
           "DisambiguateSet",
           "<React.HTMLAttributes<HTMLSpanElement>, (",
           "DisambiguateSet",
-          "<React.ButtonHTMLAttributes<HTMLButtonElement>, Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">> & Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">) | (",
+          "<React.ButtonHTMLAttributes<HTMLButtonElement>, Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">> & Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">) | (",
           "DisambiguateSet",
-          "<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">, React.ButtonHTMLAttributes<HTMLButtonElement>> & React.ButtonHTMLAttributes<HTMLButtonElement>)> & ",
+          "<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">, React.ButtonHTMLAttributes<HTMLButtonElement>> & React.ButtonHTMLAttributes<HTMLButtonElement>)> & ",
           "DisambiguateSet",
-          "<React.ButtonHTMLAttributes<HTMLButtonElement>, Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">> & Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">) | (",
+          "<React.ButtonHTMLAttributes<HTMLButtonElement>, Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">> & Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">) | (",
           "DisambiguateSet",
           "<React.HTMLAttributes<HTMLSpanElement>, (",
           "DisambiguateSet",
-          "<React.ButtonHTMLAttributes<HTMLButtonElement>, Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">> & Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">) | (",
+          "<React.ButtonHTMLAttributes<HTMLButtonElement>, Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">> & Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">) | (",
           "DisambiguateSet",
-          "<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">, React.ButtonHTMLAttributes<HTMLButtonElement>> & React.ButtonHTMLAttributes<HTMLButtonElement>)> & ",
+          "<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">, React.ButtonHTMLAttributes<HTMLButtonElement>> & React.ButtonHTMLAttributes<HTMLButtonElement>)> & ",
           "DisambiguateSet",
-          "<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">, React.ButtonHTMLAttributes<HTMLButtonElement>> & React.ButtonHTMLAttributes<HTMLButtonElement>), \"children\" | \"type\" | \"onChange\" | \"onKeyDown\" | \"id\" | \"title\" | \"security\" | \"name\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"autoFocus\" | \"disabled\" | \"form\" | \"formAction\" | \"formEncType\" | \"formMethod\" | \"formNoValidate\" | \"formTarget\" | \"value\" | \"media\" | \"download\" | \"ping\" | \"hrefLang\" | \"referrerPolicy\"> & { size?: \"m\" | \"s\" | \"l\" | \"xs\" | undefined; color?: \"text\" | \"primary\" | \"inherit\" | \"ghost\" | \"subdued\" | undefined; label: React.ReactNode; isActive?: boolean | undefined; isDisabled?: boolean | undefined; href?: string | undefined; target?: string | undefined; rel?: string | undefined; iconType?: string | React.ComponentClass<{}, any> | React.FunctionComponent<{}> | undefined; iconProps?: Pick<",
+          "<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"media\" | \"target\" | \"download\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">, React.ButtonHTMLAttributes<HTMLButtonElement>> & React.ButtonHTMLAttributes<HTMLButtonElement>), \"children\" | \"onChange\" | \"onKeyDown\" | \"type\" | \"id\" | \"title\" | \"security\" | \"name\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"autoFocus\" | \"disabled\" | \"form\" | \"formAction\" | \"formEncType\" | \"formMethod\" | \"formNoValidate\" | \"formTarget\" | \"value\" | \"media\" | \"download\" | \"ping\" | \"hrefLang\" | \"referrerPolicy\"> & { size?: \"m\" | \"s\" | \"l\" | \"xs\" | undefined; color?: \"text\" | \"primary\" | \"inherit\" | \"ghost\" | \"subdued\" | undefined; label: React.ReactNode; isActive?: boolean | undefined; isDisabled?: boolean | undefined; href?: string | undefined; target?: string | undefined; rel?: string | undefined; iconType?: string | React.ComponentClass<{}, any> | React.FunctionComponent<{}> | undefined; iconProps?: Pick<",
           "EuiIconProps",
-          ", \"string\" | \"children\" | \"from\" | \"origin\" | \"cursor\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"y\" | \"d\" | \"x\" | \"id\" | \"title\" | \"operator\" | \"name\" | \"version\" | \"filter\" | \"size\" | \"format\" | \"order\" | \"className\" | \"lang\" | \"style\" | \"tabIndex\" | \"role\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"data-test-subj\" | \"height\" | \"max\" | \"media\" | \"method\" | \"min\" | \"target\" | \"width\" | \"crossOrigin\" | \"accentHeight\" | \"accumulate\" | \"additive\" | \"alignmentBaseline\" | \"allowReorder\" | \"alphabetic\" | \"amplitude\" | \"arabicForm\" | \"ascent\" | \"attributeName\" | \"attributeType\" | \"autoReverse\" | \"azimuth\" | \"baseFrequency\" | \"baselineShift\" | \"baseProfile\" | \"bbox\" | \"begin\" | \"bias\" | \"by\" | \"calcMode\" | \"capHeight\" | \"clip\" | \"clipPath\" | \"clipPathUnits\" | \"clipRule\" | \"colorInterpolation\" | \"colorInterpolationFilters\" | \"colorProfile\" | \"colorRendering\" | \"contentScriptType\" | \"contentStyleType\" | \"cx\" | \"cy\" | \"decelerate\" | \"descent\" | \"diffuseConstant\" | \"direction\" | \"display\" | \"divisor\" | \"dominantBaseline\" | \"dur\" | \"dx\" | \"dy\" | \"edgeMode\" | \"elevation\" | \"enableBackground\" | \"end\" | \"exponent\" | \"externalResourcesRequired\" | \"fill\" | \"fillOpacity\" | \"fillRule\" | \"filterRes\" | \"filterUnits\" | \"floodColor\" | \"floodOpacity\" | \"focusable\" | \"fontFamily\" | \"fontSize\" | \"fontSizeAdjust\" | \"fontStretch\" | \"fontStyle\" | \"fontVariant\" | \"fontWeight\" | \"fx\" | \"fy\" | \"g1\" | \"g2\" | \"glyphName\" | \"glyphOrientationHorizontal\" | \"glyphOrientationVertical\" | \"glyphRef\" | \"gradientTransform\" | \"gradientUnits\" | \"hanging\" | \"horizAdvX\" | \"horizOriginX\" | \"href\" | \"ideographic\" | \"imageRendering\" | \"in2\" | \"in\" | \"intercept\" | \"k1\" | \"k2\" | \"k3\" | \"k4\" | \"k\" | \"kernelMatrix\" | \"kernelUnitLength\" | \"kerning\" | \"keyPoints\" | \"keySplines\" | \"keyTimes\" | \"lengthAdjust\" | \"letterSpacing\" | \"lightingColor\" | \"limitingConeAngle\" | \"local\" | \"markerEnd\" | \"markerHeight\" | \"markerMid\" | \"markerStart\" | \"markerUnits\" | \"markerWidth\" | \"mask\" | \"maskContentUnits\" | \"maskUnits\" | \"mathematical\" | \"mode\" | \"numOctaves\" | \"offset\" | \"opacity\" | \"orient\" | \"orientation\" | \"overflow\" | \"overlinePosition\" | \"overlineThickness\" | \"paintOrder\" | \"panose1\" | \"path\" | \"pathLength\" | \"patternContentUnits\" | \"patternTransform\" | \"patternUnits\" | \"pointerEvents\" | \"points\" | \"pointsAtX\" | \"pointsAtY\" | \"pointsAtZ\" | \"preserveAlpha\" | \"preserveAspectRatio\" | \"primitiveUnits\" | \"r\" | \"radius\" | \"refX\" | \"refY\" | \"renderingIntent\" | \"repeatCount\" | \"repeatDur\" | \"requiredExtensions\" | \"requiredFeatures\" | \"restart\" | \"result\" | \"rotate\" | \"rx\" | \"ry\" | \"scale\" | \"seed\" | \"shapeRendering\" | \"slope\" | \"spacing\" | \"specularConstant\" | \"specularExponent\" | \"speed\" | \"spreadMethod\" | \"startOffset\" | \"stdDeviation\" | \"stemh\" | \"stemv\" | \"stitchTiles\" | \"stopColor\" | \"stopOpacity\" | \"strikethroughPosition\" | \"strikethroughThickness\" | \"stroke\" | \"strokeDasharray\" | \"strokeDashoffset\" | \"strokeLinecap\" | \"strokeLinejoin\" | \"strokeMiterlimit\" | \"strokeOpacity\" | \"strokeWidth\" | \"surfaceScale\" | \"systemLanguage\" | \"tableValues\" | \"targetX\" | \"targetY\" | \"textAnchor\" | \"textDecoration\" | \"textLength\" | \"textRendering\" | \"to\" | \"transform\" | \"u1\" | \"u2\" | \"underlinePosition\" | \"underlineThickness\" | \"unicode\" | \"unicodeBidi\" | \"unicodeRange\" | \"unitsPerEm\" | \"vAlphabetic\" | \"values\" | \"vectorEffect\" | \"vertAdvY\" | \"vertOriginX\" | \"vertOriginY\" | \"vHanging\" | \"vIdeographic\" | \"viewBox\" | \"viewTarget\" | \"visibility\" | \"vMathematical\" | \"widths\" | \"wordSpacing\" | \"writingMode\" | \"x1\" | \"x2\" | \"xChannelSelector\" | \"xHeight\" | \"xlinkActuate\" | \"xlinkArcrole\" | \"xlinkHref\" | \"xlinkRole\" | \"xlinkShow\" | \"xlinkTitle\" | \"xlinkType\" | \"xmlBase\" | \"xmlLang\" | \"xmlns\" | \"xmlnsXlink\" | \"xmlSpace\" | \"y1\" | \"y2\" | \"yChannelSelector\" | \"z\" | \"zoomAndPan\" | \"titleId\" | \"onIconLoad\"> | undefined; icon?: React.ReactElement<any, string | ((props: any) => React.ReactElement<any, string | any | (new (props: any) => React.Component<any, any, any>)> | null) | (new (props: any) => React.Component<any, any, any>)> | undefined; showToolTip?: boolean | undefined; extraAction?: ({ type?: \"reset\" | \"button\" | \"submit\" | undefined; } & ",
+          ", \"string\" | \"children\" | \"cursor\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"y\" | \"d\" | \"x\" | \"id\" | \"title\" | \"operator\" | \"name\" | \"version\" | \"filter\" | \"from\" | \"size\" | \"format\" | \"order\" | \"className\" | \"lang\" | \"style\" | \"tabIndex\" | \"role\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"data-test-subj\" | \"height\" | \"max\" | \"media\" | \"method\" | \"min\" | \"target\" | \"width\" | \"crossOrigin\" | \"accentHeight\" | \"accumulate\" | \"additive\" | \"alignmentBaseline\" | \"allowReorder\" | \"alphabetic\" | \"amplitude\" | \"arabicForm\" | \"ascent\" | \"attributeName\" | \"attributeType\" | \"autoReverse\" | \"azimuth\" | \"baseFrequency\" | \"baselineShift\" | \"baseProfile\" | \"bbox\" | \"begin\" | \"bias\" | \"by\" | \"calcMode\" | \"capHeight\" | \"clip\" | \"clipPath\" | \"clipPathUnits\" | \"clipRule\" | \"colorInterpolation\" | \"colorInterpolationFilters\" | \"colorProfile\" | \"colorRendering\" | \"contentScriptType\" | \"contentStyleType\" | \"cx\" | \"cy\" | \"decelerate\" | \"descent\" | \"diffuseConstant\" | \"direction\" | \"display\" | \"divisor\" | \"dominantBaseline\" | \"dur\" | \"dx\" | \"dy\" | \"edgeMode\" | \"elevation\" | \"enableBackground\" | \"end\" | \"exponent\" | \"externalResourcesRequired\" | \"fill\" | \"fillOpacity\" | \"fillRule\" | \"filterRes\" | \"filterUnits\" | \"floodColor\" | \"floodOpacity\" | \"focusable\" | \"fontFamily\" | \"fontSize\" | \"fontSizeAdjust\" | \"fontStretch\" | \"fontStyle\" | \"fontVariant\" | \"fontWeight\" | \"fx\" | \"fy\" | \"g1\" | \"g2\" | \"glyphName\" | \"glyphOrientationHorizontal\" | \"glyphOrientationVertical\" | \"glyphRef\" | \"gradientTransform\" | \"gradientUnits\" | \"hanging\" | \"horizAdvX\" | \"horizOriginX\" | \"href\" | \"ideographic\" | \"imageRendering\" | \"in2\" | \"in\" | \"intercept\" | \"k1\" | \"k2\" | \"k3\" | \"k4\" | \"k\" | \"kernelMatrix\" | \"kernelUnitLength\" | \"kerning\" | \"keyPoints\" | \"keySplines\" | \"keyTimes\" | \"lengthAdjust\" | \"letterSpacing\" | \"lightingColor\" | \"limitingConeAngle\" | \"local\" | \"markerEnd\" | \"markerHeight\" | \"markerMid\" | \"markerStart\" | \"markerUnits\" | \"markerWidth\" | \"mask\" | \"maskContentUnits\" | \"maskUnits\" | \"mathematical\" | \"mode\" | \"numOctaves\" | \"offset\" | \"opacity\" | \"orient\" | \"orientation\" | \"origin\" | \"overflow\" | \"overlinePosition\" | \"overlineThickness\" | \"paintOrder\" | \"panose1\" | \"path\" | \"pathLength\" | \"patternContentUnits\" | \"patternTransform\" | \"patternUnits\" | \"pointerEvents\" | \"points\" | \"pointsAtX\" | \"pointsAtY\" | \"pointsAtZ\" | \"preserveAlpha\" | \"preserveAspectRatio\" | \"primitiveUnits\" | \"r\" | \"radius\" | \"refX\" | \"refY\" | \"renderingIntent\" | \"repeatCount\" | \"repeatDur\" | \"requiredExtensions\" | \"requiredFeatures\" | \"restart\" | \"result\" | \"rotate\" | \"rx\" | \"ry\" | \"scale\" | \"seed\" | \"shapeRendering\" | \"slope\" | \"spacing\" | \"specularConstant\" | \"specularExponent\" | \"speed\" | \"spreadMethod\" | \"startOffset\" | \"stdDeviation\" | \"stemh\" | \"stemv\" | \"stitchTiles\" | \"stopColor\" | \"stopOpacity\" | \"strikethroughPosition\" | \"strikethroughThickness\" | \"stroke\" | \"strokeDasharray\" | \"strokeDashoffset\" | \"strokeLinecap\" | \"strokeLinejoin\" | \"strokeMiterlimit\" | \"strokeOpacity\" | \"strokeWidth\" | \"surfaceScale\" | \"systemLanguage\" | \"tableValues\" | \"targetX\" | \"targetY\" | \"textAnchor\" | \"textDecoration\" | \"textLength\" | \"textRendering\" | \"to\" | \"transform\" | \"u1\" | \"u2\" | \"underlinePosition\" | \"underlineThickness\" | \"unicode\" | \"unicodeBidi\" | \"unicodeRange\" | \"unitsPerEm\" | \"vAlphabetic\" | \"values\" | \"vectorEffect\" | \"vertAdvY\" | \"vertOriginX\" | \"vertOriginY\" | \"vHanging\" | \"vIdeographic\" | \"viewBox\" | \"viewTarget\" | \"visibility\" | \"vMathematical\" | \"widths\" | \"wordSpacing\" | \"writingMode\" | \"x1\" | \"x2\" | \"xChannelSelector\" | \"xHeight\" | \"xlinkActuate\" | \"xlinkArcrole\" | \"xlinkHref\" | \"xlinkRole\" | \"xlinkShow\" | \"xlinkTitle\" | \"xlinkType\" | \"xmlBase\" | \"xmlLang\" | \"xmlns\" | \"xmlnsXlink\" | \"xmlSpace\" | \"y1\" | \"y2\" | \"yChannelSelector\" | \"z\" | \"zoomAndPan\" | \"titleId\" | \"onIconLoad\"> | undefined; icon?: React.ReactElement<any, string | ((props: any) => React.ReactElement<any, string | any | (new (props: any) => React.Component<any, any, any>)> | null) | (new (props: any) => React.Component<any, any, any>)> | undefined; showToolTip?: boolean | undefined; extraAction?: ({ type?: \"reset\" | \"button\" | \"submit\" | undefined; } & ",
           "EuiButtonIconProps",
           " & { onClick?: ((event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void) | undefined; } & React.ButtonHTMLAttributes<HTMLButtonElement> & { buttonRef?: ((instance: HTMLButtonElement | null) => void) | React.RefObject<HTMLButtonElement> | null | undefined; } & { alwaysShow?: boolean | undefined; }) | undefined; onClick?: ((event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void) | undefined; wrapText?: boolean | undefined; buttonRef?: ((instance: HTMLButtonElement | null) => void) | React.RefObject<HTMLButtonElement> | null | undefined; }"
         ],
@@ -3420,7 +3420,7 @@
       "label": "ObservabilityPublicSetup",
       "description": [],
       "signature": [
-        "{ dashboard: { register: <T extends \"apm\" | \"infra_metrics\" | \"infra_logs\" | \"synthetics\" | \"ux\">({ appName, fetchData, hasData, }: { appName: T; } & ",
+        "{ dashboard: { register: <T extends \"apm\" | \"synthetics\" | \"infra_metrics\" | \"infra_logs\" | \"ux\">({ appName, fetchData, hasData, }: { appName: T; } & ",
         {
           "pluginId": "observability",
           "scope": "public",
@@ -3683,7 +3683,7 @@
                 "signature": [
                   "Pick<",
                   "KibanaClient",
-                  ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                  ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                   "TransportRequestParams",
                   ", options?: ",
                   "TransportRequestOptions",
diff --git a/api_docs/plugin_directory.mdx b/api_docs/plugin_directory.mdx
index 6380831a8c6c3..19e3bc08a5361 100644
--- a/api_docs/plugin_directory.mdx
+++ b/api_docs/plugin_directory.mdx
@@ -12,13 +12,13 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Count | Plugins or Packages with a <br /> public API | Number of teams | 
 |--------------|----------|------------------------|
-| 202 | 158 | 32 |
+| 200 | 157 | 32 |
 
 ### Public API health stats
 
 | API Count | Any Count | Missing comments | Missing exports | 
 |--------------|----------|-----------------|--------|
-| 24409 | 277 | 19821 | 1585 |
+| 24459 | 276 | 19826 | 1583 |
 
 ## Plugin Directory
 
@@ -26,27 +26,26 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 |--------------|----------------|-----------|--------------|----------|---------------|--------|
 | <DocLink id="kibActionsPluginApi" text="actions"/> | [Kibana Alerting](https://github.com/orgs/elastic/teams/kibana-alerting-services) | - | 125 | 0 | 125 | 8 |
 | <DocLink id="kibAdvancedSettingsPluginApi" text="advancedSettings"/> | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | - | 23 | 0 | 22 | 1 |
-| <DocLink id="kibAlertingPluginApi" text="alerting"/> | [Kibana Alerting](https://github.com/orgs/elastic/teams/kibana-alerting-services) | - | 249 | 0 | 241 | 17 |
-| <DocLink id="kibApmPluginApi" text="apm"/> | [APM UI](https://github.com/orgs/elastic/teams/apm-ui) | The user interface for Elastic APM | 42 | 0 | 42 | 37 |
-| <DocLink id="kibApmOssPluginApi" text="apmOss"/> | [APM UI](https://github.com/orgs/elastic/teams/apm-ui) | - | 6 | 0 | 6 | 0 |
+| <DocLink id="kibAlertingPluginApi" text="alerting"/> | [Kibana Alerting](https://github.com/orgs/elastic/teams/kibana-alerting-services) | - | 257 | 0 | 249 | 17 |
+| <DocLink id="kibApmPluginApi" text="apm"/> | [APM UI](https://github.com/orgs/elastic/teams/apm-ui) | The user interface for Elastic APM | 39 | 0 | 39 | 37 |
 | <DocLink id="kibBannersPluginApi" text="banners"/> | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 9 | 0 | 9 | 0 |
-| <DocLink id="kibBfetchPluginApi" text="bfetch"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Considering using bfetch capabilities when fetching large amounts of data. This services supports batching HTTP requests and streaming responses back. | 77 | 1 | 66 | 2 |
+| <DocLink id="kibBfetchPluginApi" text="bfetch"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Considering using bfetch capabilities when fetching large amounts of data. This services supports batching HTTP requests and streaming responses back. | 76 | 1 | 67 | 2 |
 | <DocLink id="kibCanvasPluginApi" text="canvas"/> | [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds Canvas application to Kibana | 9 | 0 | 8 | 3 |
-| <DocLink id="kibCasesPluginApi" text="cases"/> | [Security Solution Threat Hunting](https://github.com/orgs/elastic/teams/security-threat-hunting) | The Case management system in Kibana | 475 | 0 | 431 | 14 |
+| <DocLink id="kibCasesPluginApi" text="cases"/> | [Security Solution Threat Hunting](https://github.com/orgs/elastic/teams/security-threat-hunting) | The Case management system in Kibana | 476 | 0 | 432 | 14 |
 | <DocLink id="kibChartsPluginApi" text="charts"/> | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | - | 285 | 4 | 253 | 3 |
 | <DocLink id="kibCloudPluginApi" text="cloud"/> | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 22 | 0 | 22 | 0 |
 | <DocLink id="kibConsolePluginApi" text="console"/> | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 9 | 0 | 9 | 1 |
-| <DocLink id="kibCorePluginApi" text="core"/> | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 2300 | 27 | 1019 | 29 |
+| <DocLink id="kibCorePluginApi" text="core"/> | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 2298 | 27 | 1018 | 29 |
 | crossClusterReplication | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 0 | 0 | 0 | 0 |
-| <DocLink id="kibCustomIntegrationsPluginApi" text="customIntegrations"/> | [Fleet](https://github.com/orgs/elastic/teams/fleet) | Add custom data integrations so they can be displayed in the Fleet integrations app | 85 | 1 | 78 | 1 |
+| <DocLink id="kibCustomIntegrationsPluginApi" text="customIntegrations"/> | [Fleet](https://github.com/orgs/elastic/teams/fleet) | Add custom data integrations so they can be displayed in the Fleet integrations app | 91 | 1 | 75 | 1 |
 | <DocLink id="kibDashboardPluginApi" text="dashboard"/> | [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds the Dashboard app to Kibana | 145 | 1 | 132 | 10 |
 | <DocLink id="kibDashboardEnhancedPluginApi" text="dashboardEnhanced"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | - | 51 | 0 | 50 | 0 |
-| <DocLink id="kibDataPluginApi" text="data"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | 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. | 3192 | 43 | 2807 | 48 |
+| <DocLink id="kibDataPluginApi" text="data"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | 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. | 3193 | 43 | 2807 | 48 |
 | <DocLink id="kibDataEnhancedPluginApi" text="dataEnhanced"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Enhanced data plugin. (See src/plugins/data.) Enhances the main data plugin with a search session management UI. Includes a reusable search session indicator component to use in other applications. Exposes routes for managing search sessions. Includes a service that monitors, updates, and cleans up search session saved objects. | 16 | 0 | 16 | 2 |
-| <DocLink id="kibDataViewsPluginApi" text="dataViews"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | 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. | 681 | 6 | 541 | 5 |
+| <DocLink id="kibDataViewsPluginApi" text="dataViews"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | 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. | 683 | 6 | 541 | 5 |
 | <DocLink id="kibDataVisualizerPluginApi" text="dataVisualizer"/> | [Machine Learning 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. | 80 | 5 | 80 | 0 |
 | <DocLink id="kibDevToolsPluginApi" text="devTools"/> | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 10 | 0 | 8 | 2 |
-| <DocLink id="kibDiscoverPluginApi" text="discover"/> | [Data Discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | This plugin contains the Discover application and the saved search embeddable. | 82 | 0 | 56 | 6 |
+| <DocLink id="kibDiscoverPluginApi" text="discover"/> | [Data Discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | This plugin contains the Discover application and the saved search embeddable. | 103 | 0 | 77 | 7 |
 | <DocLink id="kibDiscoverEnhancedPluginApi" text="discoverEnhanced"/> | [Data Discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 37 | 0 | 35 | 2 |
 | <DocLink id="kibEmbeddablePluginApi" text="embeddable"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Adds embeddables service to Kibana | 469 | 5 | 393 | 3 |
 | <DocLink id="kibEmbeddableEnhancedPluginApi" text="embeddableEnhanced"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Extends embeddable plugin with more functionality | 14 | 0 | 14 | 0 |
@@ -62,11 +61,11 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibExpressionRevealImagePluginApi" text="expressionRevealImage"/> | [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds 'revealImage' function and renderer to expressions | 12 | 0 | 12 | 3 |
 | <DocLink id="kibExpressionShapePluginApi" text="expressionShape"/> | [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds 'shape' function and renderer to expressions | 143 | 0 | 143 | 0 |
 | <DocLink id="kibExpressionTagcloudPluginApi" text="expressionTagcloud"/> | [Vis Editors](https://github.com/orgs/elastic/teams/kibana-vis-editors) | Expression Tagcloud plugin adds a `tagcloud` renderer and function to the expression plugin. The renderer will display the `Wordcloud` chart. | 5 | 0 | 5 | 0 |
-| <DocLink id="kibExpressionsPluginApi" text="expressions"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Adds expression runtime to Kibana | 2095 | 27 | 1646 | 4 |
+| <DocLink id="kibExpressionsPluginApi" text="expressions"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Adds expression runtime to Kibana | 2086 | 27 | 1640 | 4 |
 | <DocLink id="kibFeaturesPluginApi" text="features"/> | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 216 | 0 | 98 | 2 |
 | <DocLink id="kibFieldFormatsPluginApi" text="fieldFormats"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Index pattern fields and ambiguous values formatters | 288 | 7 | 250 | 3 |
 | <DocLink id="kibFileUploadPluginApi" text="fileUpload"/> | [Machine Learning UI](https://github.com/orgs/elastic/teams/ml-ui) | 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. | 129 | 4 | 129 | 1 |
-| <DocLink id="kibFleetPluginApi" text="fleet"/> | [Fleet](https://github.com/orgs/elastic/teams/fleet) | - | 1207 | 15 | 1107 | 10 |
+| <DocLink id="kibFleetPluginApi" text="fleet"/> | [Fleet](https://github.com/orgs/elastic/teams/fleet) | - | 1210 | 15 | 1110 | 10 |
 | <DocLink id="kibGlobalSearchPluginApi" text="globalSearch"/> | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 68 | 0 | 14 | 5 |
 | globalSearchBar | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 |
 | globalSearchProviders | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 |
@@ -105,11 +104,11 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibObservabilityPluginApi" text="observability"/> | [Observability UI](https://github.com/orgs/elastic/teams/observability-ui) | - | 258 | 1 | 257 | 12 |
 | <DocLink id="kibOsqueryPluginApi" text="osquery"/> | [Security asset management](https://github.com/orgs/elastic/teams/security-asset-management) | - | 11 | 0 | 11 | 0 |
 | painlessLab | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 0 | 0 | 0 | 0 |
-| <DocLink id="kibPresentationUtilPluginApi" text="presentationUtil"/> | [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). | 178 | 3 | 151 | 5 |
+| <DocLink id="kibPresentationUtilPluginApi" text="presentationUtil"/> | [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). | 178 | 3 | 151 | 6 |
 | <DocLink id="kibRemoteClustersPluginApi" text="remoteClusters"/> | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 4 | 0 | 4 | 0 |
 | <DocLink id="kibReportingPluginApi" text="reporting"/> | [Kibana Reporting Services](https://github.com/orgs/elastic/teams/kibana-reporting-services) | Reporting Services enables applications to feature reports that the user can automate with Watcher and download later. | 135 | 0 | 134 | 12 |
 | <DocLink id="kibRollupPluginApi" text="rollup"/> | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 20 | 0 | 20 | 0 |
-| <DocLink id="kibRuleRegistryPluginApi" text="ruleRegistry"/> | [RAC](https://github.com/orgs/elastic/teams/rac) | - | 132 | 0 | 109 | 7 |
+| <DocLink id="kibRuleRegistryPluginApi" text="ruleRegistry"/> | [RAC](https://github.com/orgs/elastic/teams/rac) | - | 136 | 0 | 113 | 7 |
 | <DocLink id="kibRuntimeFieldsPluginApi" text="runtimeFields"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | - | 24 | 0 | 19 | 2 |
 | <DocLink id="kibSavedObjectsPluginApi" text="savedObjects"/> | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 221 | 3 | 207 | 4 |
 | <DocLink id="kibSavedObjectsManagementPluginApi" text="savedObjectsManagement"/> | [Kibana Core](https://github.com/orgs/elastic/teams/kibana-core) | - | 103 | 0 | 90 | 0 |
@@ -131,7 +130,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibTimelinesPluginApi" text="timelines"/> | [Security solution](https://github.com/orgs/elastic/teams/security-solution) | - | 968 | 6 | 847 | 25 |
 | <DocLink id="kibTransformPluginApi" text="transform"/> | [Machine Learning UI](https://github.com/orgs/elastic/teams/ml-ui) | This plugin provides access to the transforms features provided by Elastic. Transforms enable you to convert existing Elasticsearch indices into summarized indices, which provide opportunities for new insights and analytics. | 4 | 0 | 4 | 1 |
 | translations | [Kibana Localization](https://github.com/orgs/elastic/teams/kibana-localization) | - | 0 | 0 | 0 | 0 |
-| <DocLink id="kibTriggersActionsUiPluginApi" text="triggersActionsUi"/> | [Kibana Alerting](https://github.com/orgs/elastic/teams/kibana-alerting-services) | - | 239 | 1 | 230 | 18 |
+| <DocLink id="kibTriggersActionsUiPluginApi" text="triggersActionsUi"/> | [Kibana Alerting](https://github.com/orgs/elastic/teams/kibana-alerting-services) | - | 238 | 1 | 229 | 18 |
 | <DocLink id="kibUiActionsPluginApi" text="uiActions"/> | [App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Adds UI Actions service to Kibana | 127 | 0 | 88 | 11 |
 | <DocLink id="kibUiActionsEnhancedPluginApi" text="uiActionsEnhanced"/> | [Kibana App Services](https://github.com/orgs/elastic/teams/kibana-app-services) | Extends UI Actions plugin with more functionality | 203 | 2 | 145 | 9 |
 | upgradeAssistant | [Stack Management](https://github.com/orgs/elastic/teams/kibana-stack-management) | - | 0 | 0 | 0 | 0 |
@@ -158,7 +157,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Package name &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;  | Maintaining team | Description | API Cnt | Any Cnt | Missing<br />comments | Missing<br />exports | 
 |--------------|----------------|-----------|--------------|----------|---------------|--------|
-| <DocLink id="kibElasticApmGeneratorPluginApi" text="@elastic/apm-generator"/> | [Owner missing] | Elastic APM trace data generator | 15 | 0 | 15 | 2 |
+| <DocLink id="kibElasticApmGeneratorPluginApi" text="@elastic/apm-generator"/> | [Owner missing] | Elastic APM trace data generator | 17 | 0 | 17 | 2 |
 | <DocLink id="kibElasticDatemathPluginApi" text="@elastic/datemath"/> | [Owner missing] | elasticsearch datemath parser, used in kibana | 44 | 0 | 43 | 0 |
 | <DocLink id="kibKbnAcePluginApi" text="@kbn/ace"/> | [Owner missing] | - | 11 | 5 | 11 | 0 |
 | <DocLink id="kibKbnAlertsPluginApi" text="@kbn/alerts"/> | [Owner missing] | Alerts components and hooks | 9 | 1 | 9 | 0 |
@@ -169,7 +168,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibKbnConfigPluginApi" text="@kbn/config"/> | [Owner missing] | - | 66 | 0 | 46 | 1 |
 | <DocLink id="kibKbnConfigSchemaPluginApi" text="@kbn/config-schema"/> | [Owner missing] | - | 109 | 3 | 107 | 18 |
 | <DocLink id="kibKbnCryptoPluginApi" text="@kbn/crypto"/> | [Owner missing] | - | 13 | 0 | 7 | 0 |
-| <DocLink id="kibKbnDevUtilsPluginApi" text="@kbn/dev-utils"/> | [Owner missing] | - | 258 | 7 | 231 | 4 |
+| <DocLink id="kibKbnDevUtilsPluginApi" text="@kbn/dev-utils"/> | [Owner missing] | - | 280 | 6 | 214 | 0 |
 | <DocLink id="kibKbnDocsUtilsPluginApi" text="@kbn/docs-utils"/> | [Owner missing] | - | 1 | 0 | 1 | 0 |
 | <DocLink id="kibKbnEsArchiverPluginApi" text="@kbn/es-archiver"/> | [Owner missing] | - | 25 | 0 | 12 | 1 |
 | <DocLink id="kibKbnEsQueryPluginApi" text="@kbn/es-query"/> | [Owner missing] | - | 205 | 2 | 153 | 14 |
@@ -196,7 +195,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibKbnSecuritysolutionListHooksPluginApi" text="@kbn/securitysolution-list-hooks"/> | [Owner missing] | Security solution list ReactJS hooks | 56 | 0 | 44 | 0 |
 | <DocLink id="kibKbnSecuritysolutionListUtilsPluginApi" text="@kbn/securitysolution-list-utils"/> | [Owner missing] | security solution list utilities | 222 | 0 | 177 | 0 |
 | <DocLink id="kibKbnSecuritysolutionTGridPluginApi" text="@kbn/securitysolution-t-grid"/> | [Owner missing] | security solution t-grid packages will allow sharing components between timelines and security_solution plugin until we transfer all functionality to timelines plugin | 120 | 0 | 116 | 0 |
-| <DocLink id="kibKbnSecuritysolutionUtilsPluginApi" text="@kbn/securitysolution-utils"/> | [Owner missing] | security solution utilities to use across plugins such lists, security_solution, cases, etc... | 4 | 0 | 2 | 0 |
+| <DocLink id="kibKbnSecuritysolutionUtilsPluginApi" text="@kbn/securitysolution-utils"/> | [Owner missing] | security solution utilities to use across plugins such lists, security_solution, cases, etc... | 6 | 0 | 4 | 0 |
 | <DocLink id="kibKbnServerHttpToolsPluginApi" text="@kbn/server-http-tools"/> | [Owner missing] | - | 53 | 0 | 50 | 1 |
 | <DocLink id="kibKbnServerRouteRepositoryPluginApi" text="@kbn/server-route-repository"/> | [Owner missing] | - | 28 | 0 | 27 | 1 |
 | <DocLink id="kibKbnStdPluginApi" text="@kbn/std"/> | [Owner missing] | - | 96 | 1 | 63 | 2 |
diff --git a/api_docs/presentation_util.json b/api_docs/presentation_util.json
index ecec195628cf6..50a4540b3af40 100644
--- a/api_docs/presentation_util.json
+++ b/api_docs/presentation_util.json
@@ -1238,7 +1238,7 @@
         "label": "SolutionToolbarPopover",
         "description": [],
         "signature": [
-          "({ label, iconType, primary, iconSide, ...popover }: ",
+          "({ label, iconType, primary, iconSide, children, ...popover }: ",
           "Props",
           ") => JSX.Element"
         ],
@@ -1250,7 +1250,7 @@
             "id": "def-public.SolutionToolbarPopover.$1",
             "type": "CompoundType",
             "tags": [],
-            "label": "{\n  label,\n  iconType,\n  primary,\n  iconSide,\n  ...popover\n}",
+            "label": "{\n  label,\n  iconType,\n  primary,\n  iconSide,\n  children,\n  ...popover\n}",
             "description": [],
             "signature": [
               "Props"
@@ -1870,19 +1870,6 @@
             "deprecated": false,
             "children": [],
             "returnComment": []
-          },
-          {
-            "parentPluginId": "presentationUtil",
-            "id": "def-public.QuickButtonProps.isDarkModeEnabled",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "isDarkModeEnabled",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "path": "src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.tsx",
-            "deprecated": false
           }
         ],
         "initialIsOpen": false
@@ -2402,6 +2389,19 @@
           ],
           "path": "src/plugins/presentation_util/public/types.ts",
           "deprecated": false
+        },
+        {
+          "parentPluginId": "presentationUtil",
+          "id": "def-public.PresentationUtilPluginStart.controlsService",
+          "type": "Object",
+          "tags": [],
+          "label": "controlsService",
+          "description": [],
+          "signature": [
+            "PresentationControlsService"
+          ],
+          "path": "src/plugins/presentation_util/public/types.ts",
+          "deprecated": false
         }
       ],
       "lifecycle": "start",
diff --git a/api_docs/presentation_util.mdx b/api_docs/presentation_util.mdx
index 4c31547582b17..9ff91703a0916 100644
--- a/api_docs/presentation_util.mdx
+++ b/api_docs/presentation_util.mdx
@@ -18,7 +18,7 @@ Contact [Kibana Presentation](https://github.com/orgs/elastic/teams/kibana-prese
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 178 | 3 | 151 | 5 |
+| 178 | 3 | 151 | 6 |
 
 ## Client
 
diff --git a/api_docs/reporting.json b/api_docs/reporting.json
index 8843a7ed21b92..4296dfad34b3f 100644
--- a/api_docs/reporting.json
+++ b/api_docs/reporting.json
@@ -925,7 +925,7 @@
                     "section": "def-server.PluginInitializerContext",
                     "text": "PluginInitializerContext"
                   },
-                  "<Readonly<{ encryptionKey?: string | undefined; } & { enabled: boolean; capture: Readonly<{} & { browser: Readonly<{} & { type: string; chromium: Readonly<{ inspect?: boolean | undefined; disableSandbox?: boolean | undefined; } & { proxy: Readonly<{ server?: string | undefined; bypass?: string[] | undefined; } & { enabled: boolean; }>; }>; autoDownload: boolean; }>; zoom: number; timeouts: Readonly<{} & { openUrl: number | moment.Duration; waitForElements: number | moment.Duration; renderComplete: number | moment.Duration; }>; networkPolicy: Readonly<{} & { enabled: boolean; rules: Readonly<{ host?: string | undefined; protocol?: string | undefined; } & { allow: boolean; }>[]; }>; viewport: Readonly<{} & { height: number; width: number; }>; loadDelay: number | moment.Duration; maxAttempts: number; }>; roles: Readonly<{} & { enabled: boolean; allow: string[]; }>; kibanaServer: Readonly<{ hostname?: string | undefined; port?: number | undefined; protocol?: string | undefined; } & {}>; queue: Readonly<{} & { timeout: number | moment.Duration; pollInterval: number | moment.Duration; indexInterval: string; pollEnabled: boolean; pollIntervalErrorMultiplier: number; }>; csv: Readonly<{} & { scroll: Readonly<{} & { size: number; duration: string; }>; checkForFormulas: boolean; escapeFormulaValues: boolean; enablePanelActionDownload: boolean; maxSizeBytes: number | ",
+                  "<Readonly<{ encryptionKey?: string | undefined; } & { enabled: boolean; capture: Readonly<{} & { browser: Readonly<{} & { type: string; chromium: Readonly<{ inspect?: boolean | undefined; disableSandbox?: boolean | undefined; } & { proxy: Readonly<{ server?: string | undefined; bypass?: string[] | undefined; } & { enabled: boolean; }>; }>; autoDownload: boolean; }>; zoom: number; timeouts: Readonly<{} & { openUrl: number | moment.Duration; waitForElements: number | moment.Duration; renderComplete: number | moment.Duration; }>; networkPolicy: Readonly<{} & { enabled: boolean; rules: Readonly<{ host?: string | undefined; protocol?: string | undefined; } & { allow: boolean; }>[]; }>; loadDelay: number | moment.Duration; maxAttempts: number; }>; roles: Readonly<{} & { enabled: boolean; allow: string[]; }>; kibanaServer: Readonly<{ hostname?: string | undefined; port?: number | undefined; protocol?: string | undefined; } & {}>; queue: Readonly<{} & { timeout: number | moment.Duration; pollInterval: number | moment.Duration; indexInterval: string; pollEnabled: boolean; pollIntervalErrorMultiplier: number; }>; csv: Readonly<{} & { scroll: Readonly<{} & { size: number; duration: string; }>; checkForFormulas: boolean; escapeFormulaValues: boolean; enablePanelActionDownload: boolean; maxSizeBytes: number | ",
                   {
                     "pluginId": "@kbn/config-schema",
                     "scope": "server",
@@ -1323,7 +1323,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => Promise<",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">) => Promise<",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -1352,7 +1352,7 @@
                     "section": "def-server.SavedObjectsClient",
                     "text": "SavedObjectsClient"
                   },
-                  ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
+                  ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">"
                 ],
                 "path": "x-pack/plugins/reporting/server/core.ts",
                 "deprecated": false,
@@ -1771,7 +1771,7 @@
                     "section": "def-server.PluginInitializerContext",
                     "text": "PluginInitializerContext"
                   },
-                  "<Readonly<{ encryptionKey?: string | undefined; } & { enabled: boolean; capture: Readonly<{} & { browser: Readonly<{} & { type: string; chromium: Readonly<{ inspect?: boolean | undefined; disableSandbox?: boolean | undefined; } & { proxy: Readonly<{ server?: string | undefined; bypass?: string[] | undefined; } & { enabled: boolean; }>; }>; autoDownload: boolean; }>; zoom: number; timeouts: Readonly<{} & { openUrl: number | moment.Duration; waitForElements: number | moment.Duration; renderComplete: number | moment.Duration; }>; networkPolicy: Readonly<{} & { enabled: boolean; rules: Readonly<{ host?: string | undefined; protocol?: string | undefined; } & { allow: boolean; }>[]; }>; viewport: Readonly<{} & { height: number; width: number; }>; loadDelay: number | moment.Duration; maxAttempts: number; }>; roles: Readonly<{} & { enabled: boolean; allow: string[]; }>; kibanaServer: Readonly<{ hostname?: string | undefined; port?: number | undefined; protocol?: string | undefined; } & {}>; queue: Readonly<{} & { timeout: number | moment.Duration; pollInterval: number | moment.Duration; indexInterval: string; pollEnabled: boolean; pollIntervalErrorMultiplier: number; }>; csv: Readonly<{} & { scroll: Readonly<{} & { size: number; duration: string; }>; checkForFormulas: boolean; escapeFormulaValues: boolean; enablePanelActionDownload: boolean; maxSizeBytes: number | ",
+                  "<Readonly<{ encryptionKey?: string | undefined; } & { enabled: boolean; capture: Readonly<{} & { browser: Readonly<{} & { type: string; chromium: Readonly<{ inspect?: boolean | undefined; disableSandbox?: boolean | undefined; } & { proxy: Readonly<{ server?: string | undefined; bypass?: string[] | undefined; } & { enabled: boolean; }>; }>; autoDownload: boolean; }>; zoom: number; timeouts: Readonly<{} & { openUrl: number | moment.Duration; waitForElements: number | moment.Duration; renderComplete: number | moment.Duration; }>; networkPolicy: Readonly<{} & { enabled: boolean; rules: Readonly<{ host?: string | undefined; protocol?: string | undefined; } & { allow: boolean; }>[]; }>; loadDelay: number | moment.Duration; maxAttempts: number; }>; roles: Readonly<{} & { enabled: boolean; allow: string[]; }>; kibanaServer: Readonly<{ hostname?: string | undefined; port?: number | undefined; protocol?: string | undefined; } & {}>; queue: Readonly<{} & { timeout: number | moment.Duration; pollInterval: number | moment.Duration; indexInterval: string; pollEnabled: boolean; pollIntervalErrorMultiplier: number; }>; csv: Readonly<{} & { scroll: Readonly<{} & { size: number; duration: string; }>; checkForFormulas: boolean; escapeFormulaValues: boolean; enablePanelActionDownload: boolean; maxSizeBytes: number | ",
                   {
                     "pluginId": "@kbn/config-schema",
                     "scope": "server",
@@ -1968,7 +1968,7 @@
             "section": "def-server.ReportingConfig",
             "text": "ReportingConfig"
           },
-          " extends Config<Readonly<{ encryptionKey?: string | undefined; } & { enabled: boolean; capture: Readonly<{} & { browser: Readonly<{} & { type: string; chromium: Readonly<{ inspect?: boolean | undefined; disableSandbox?: boolean | undefined; } & { proxy: Readonly<{ server?: string | undefined; bypass?: string[] | undefined; } & { enabled: boolean; }>; }>; autoDownload: boolean; }>; zoom: number; timeouts: Readonly<{} & { openUrl: number | moment.Duration; waitForElements: number | moment.Duration; renderComplete: number | moment.Duration; }>; networkPolicy: Readonly<{} & { enabled: boolean; rules: Readonly<{ host?: string | undefined; protocol?: string | undefined; } & { allow: boolean; }>[]; }>; viewport: Readonly<{} & { height: number; width: number; }>; loadDelay: number | moment.Duration; maxAttempts: number; }>; roles: Readonly<{} & { enabled: boolean; allow: string[]; }>; kibanaServer: Readonly<{ hostname?: string | undefined; port?: number | undefined; protocol?: string | undefined; } & {}>; queue: Readonly<{} & { timeout: number | moment.Duration; pollInterval: number | moment.Duration; indexInterval: string; pollEnabled: boolean; pollIntervalErrorMultiplier: number; }>; csv: Readonly<{} & { scroll: Readonly<{} & { size: number; duration: string; }>; checkForFormulas: boolean; escapeFormulaValues: boolean; enablePanelActionDownload: boolean; maxSizeBytes: number | ",
+          " extends Config<Readonly<{ encryptionKey?: string | undefined; } & { enabled: boolean; capture: Readonly<{} & { browser: Readonly<{} & { type: string; chromium: Readonly<{ inspect?: boolean | undefined; disableSandbox?: boolean | undefined; } & { proxy: Readonly<{ server?: string | undefined; bypass?: string[] | undefined; } & { enabled: boolean; }>; }>; autoDownload: boolean; }>; zoom: number; timeouts: Readonly<{} & { openUrl: number | moment.Duration; waitForElements: number | moment.Duration; renderComplete: number | moment.Duration; }>; networkPolicy: Readonly<{} & { enabled: boolean; rules: Readonly<{ host?: string | undefined; protocol?: string | undefined; } & { allow: boolean; }>[]; }>; loadDelay: number | moment.Duration; maxAttempts: number; }>; roles: Readonly<{} & { enabled: boolean; allow: string[]; }>; kibanaServer: Readonly<{ hostname?: string | undefined; port?: number | undefined; protocol?: string | undefined; } & {}>; queue: Readonly<{} & { timeout: number | moment.Duration; pollInterval: number | moment.Duration; indexInterval: string; pollEnabled: boolean; pollIntervalErrorMultiplier: number; }>; csv: Readonly<{} & { scroll: Readonly<{} & { size: number; duration: string; }>; checkForFormulas: boolean; escapeFormulaValues: boolean; enablePanelActionDownload: boolean; maxSizeBytes: number | ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "server",
@@ -2187,7 +2187,7 @@
               "TaskScheduling",
               ", \"schedule\" | \"runNow\" | \"ephemeralRunNow\" | \"ensureScheduled\"> & Pick<",
               "TaskStore",
-              ", \"remove\" | \"get\" | \"fetch\"> & { removeIfExists: (id: string) => Promise<void>; } & { supportsEphemeralTasks: () => boolean; }"
+              ", \"remove\" | \"fetch\" | \"get\"> & { removeIfExists: (id: string) => Promise<void>; } & { supportsEphemeralTasks: () => boolean; }"
             ],
             "path": "x-pack/plugins/reporting/server/types.ts",
             "deprecated": false
diff --git a/api_docs/rule_registry.json b/api_docs/rule_registry.json
index 2d9e79f727c0e..89c359461c72f 100644
--- a/api_docs/rule_registry.json
+++ b/api_docs/rule_registry.json
@@ -878,6 +878,87 @@
           }
         ],
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "ruleRegistry",
+        "id": "def-server.RuleDataWriterInitializationError",
+        "type": "Class",
+        "tags": [],
+        "label": "RuleDataWriterInitializationError",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "ruleRegistry",
+            "scope": "server",
+            "docId": "kibRuleRegistryPluginApi",
+            "section": "def-server.RuleDataWriterInitializationError",
+            "text": "RuleDataWriterInitializationError"
+          },
+          " extends Error"
+        ],
+        "path": "x-pack/plugins/rule_registry/server/rule_data_plugin_service/errors.ts",
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "ruleRegistry",
+            "id": "def-server.RuleDataWriterInitializationError.Unnamed",
+            "type": "Function",
+            "tags": [],
+            "label": "Constructor",
+            "description": [],
+            "signature": [
+              "any"
+            ],
+            "path": "x-pack/plugins/rule_registry/server/rule_data_plugin_service/errors.ts",
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "ruleRegistry",
+                "id": "def-server.RuleDataWriterInitializationError.Unnamed.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "resourceType",
+                "description": [],
+                "signature": [
+                  "\"index\" | \"namespace\""
+                ],
+                "path": "x-pack/plugins/rule_registry/server/rule_data_plugin_service/errors.ts",
+                "deprecated": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "ruleRegistry",
+                "id": "def-server.RuleDataWriterInitializationError.Unnamed.$2",
+                "type": "string",
+                "tags": [],
+                "label": "registrationContext",
+                "description": [],
+                "signature": [
+                  "string"
+                ],
+                "path": "x-pack/plugins/rule_registry/server/rule_data_plugin_service/errors.ts",
+                "deprecated": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "ruleRegistry",
+                "id": "def-server.RuleDataWriterInitializationError.Unnamed.$3",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "error",
+                "description": [],
+                "signature": [
+                  "string | Error"
+                ],
+                "path": "x-pack/plugins/rule_registry/server/rule_data_plugin_service/errors.ts",
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
       }
     ],
     "functions": [
@@ -1085,10 +1166,10 @@
       },
       {
         "parentPluginId": "ruleRegistry",
-        "id": "def-server.createPersistenceRuleTypeFactory",
+        "id": "def-server.createPersistenceRuleTypeWrapper",
         "type": "Function",
         "tags": [],
-        "label": "createPersistenceRuleTypeFactory",
+        "label": "createPersistenceRuleTypeWrapper",
         "description": [],
         "signature": [
           "({ logger, ruleDataClient }: { ruleDataClient: ",
@@ -1107,23 +1188,15 @@
             "section": "def-server.Logger",
             "text": "Logger"
           },
-          "; }) => <TState extends Record<string, unknown>, TParams extends Record<string, unknown>, TServices extends ",
+          "; }) => <TParams extends Record<string, unknown>, TState extends Record<string, unknown>, TInstanceContext extends { [x: string]: unknown; } = {}, TActionGroupIds extends string = never>(type: ",
           {
             "pluginId": "ruleRegistry",
             "scope": "server",
             "docId": "kibRuleRegistryPluginApi",
-            "section": "def-server.PersistenceServices",
-            "text": "PersistenceServices"
+            "section": "def-server.PersistenceAlertType",
+            "text": "PersistenceAlertType"
           },
-          "<TAlertInstanceContext>, TAlertInstanceContext extends { [x: string]: unknown; } = {}>(type: ",
-          {
-            "pluginId": "ruleRegistry",
-            "scope": "server",
-            "docId": "kibRuleRegistryPluginApi",
-            "section": "def-server.AlertTypeWithExecutor",
-            "text": "AlertTypeWithExecutor"
-          },
-          "<TState, TParams, TAlertInstanceContext, TServices>) => { executor: (options: ",
+          "<TParams, TState, TInstanceContext, TActionGroupIds>) => { executor: (options: ",
           {
             "pluginId": "alerting",
             "scope": "server",
@@ -1131,7 +1204,15 @@
             "section": "def-server.AlertExecutorOptions",
             "text": "AlertExecutorOptions"
           },
-          "<TParams, TState, { [x: string]: unknown; }, TAlertInstanceContext, never> & { services: TServices; }) => Promise<void | TState>; id: string; name: string; validate?: { params?: ",
+          "<TParams, TState, { [x: string]: unknown; }, TInstanceContext, ",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.WithoutReservedActionGroups",
+            "text": "WithoutReservedActionGroups"
+          },
+          "<TActionGroupIds, never>>) => Promise<void | TState>; id: string; name: string; validate?: { params?: ",
           "AlertTypeParamsValidator",
           "<TParams> | undefined; } | undefined; actionGroups: ",
           {
@@ -1141,7 +1222,7 @@
             "section": "def-common.ActionGroup",
             "text": "ActionGroup"
           },
-          "<string>[]; defaultActionGroupId: string; recoveryActionGroup?: ",
+          "<TActionGroupIds>[]; defaultActionGroupId: TActionGroupIds; recoveryActionGroup?: ",
           {
             "pluginId": "alerting",
             "scope": "common",
@@ -1149,7 +1230,7 @@
             "section": "def-common.ActionGroup",
             "text": "ActionGroup"
           },
-          "<string> | undefined; producer: string; actionVariables?: { context?: ",
+          "<never> | undefined; producer: string; actionVariables?: { context?: ",
           {
             "pluginId": "alerting",
             "scope": "common",
@@ -1183,14 +1264,14 @@
           },
           "<TParams>; injectReferences: (params: TParams, references: ",
           "SavedObjectReference",
-          "[]) => TParams; } | undefined; isExportable: boolean; ruleTaskTimeout?: string | undefined; }"
+          "[]) => TParams; } | undefined; isExportable: boolean; defaultScheduleInterval?: string | undefined; minimumScheduleInterval?: string | undefined; ruleTaskTimeout?: string | undefined; }"
         ],
-        "path": "x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_factory.ts",
+        "path": "x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_wrapper.ts",
         "deprecated": false,
         "children": [
           {
             "parentPluginId": "ruleRegistry",
-            "id": "def-server.createPersistenceRuleTypeFactory.$1",
+            "id": "def-server.createPersistenceRuleTypeWrapper.$1",
             "type": "Object",
             "tags": [],
             "label": "{ logger, ruleDataClient }",
@@ -1214,7 +1295,7 @@
               },
               "; }"
             ],
-            "path": "x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_factory.ts",
+            "path": "x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_wrapper.ts",
             "deprecated": false,
             "isRequired": true
           }
@@ -1725,7 +1806,7 @@
               "ApiResponse",
               "<",
               "BulkResponse",
-              ", unknown>>"
+              ", unknown> | undefined>"
             ],
             "path": "x-pack/plugins/rule_registry/server/rule_data_client/types.ts",
             "deprecated": false,
@@ -1812,16 +1893,6 @@
         "tags": [],
         "label": "PersistenceServices",
         "description": [],
-        "signature": [
-          {
-            "pluginId": "ruleRegistry",
-            "scope": "server",
-            "docId": "kibRuleRegistryPluginApi",
-            "section": "def-server.PersistenceServices",
-            "text": "PersistenceServices"
-          },
-          "<TAlertInstanceContext>"
-        ],
         "path": "x-pack/plugins/rule_registry/server/utils/persistence_types.ts",
         "deprecated": false,
         "children": [
@@ -1839,7 +1910,7 @@
               "ApiResponse",
               "<",
               "BulkResponse",
-              ", unknown>>"
+              ", unknown> | undefined>"
             ],
             "path": "x-pack/plugins/rule_registry/server/utils/persistence_types.ts",
             "deprecated": false,
@@ -1945,7 +2016,7 @@
             "section": "def-server.AlertType",
             "text": "AlertType"
           },
-          "<TParams, TParams, TState, { [x: string]: unknown; }, TAlertInstanceContext, string, string>, \"id\" | \"name\" | \"validate\" | \"actionGroups\" | \"defaultActionGroupId\" | \"recoveryActionGroup\" | \"producer\" | \"actionVariables\" | \"minimumLicenseRequired\" | \"useSavedObjectReferences\" | \"isExportable\" | \"ruleTaskTimeout\"> & { executor: ",
+          "<TParams, TParams, TState, { [x: string]: unknown; }, TAlertInstanceContext, string, string>, \"id\" | \"name\" | \"validate\" | \"actionGroups\" | \"defaultActionGroupId\" | \"recoveryActionGroup\" | \"producer\" | \"actionVariables\" | \"minimumLicenseRequired\" | \"useSavedObjectReferences\" | \"isExportable\" | \"defaultScheduleInterval\" | \"minimumScheduleInterval\" | \"ruleTaskTimeout\"> & { executor: ",
           "AlertTypeExecutor",
           "<TState, TParams, TAlertInstanceContext, TServices>; }"
         ],
@@ -1955,10 +2026,10 @@
       },
       {
         "parentPluginId": "ruleRegistry",
-        "id": "def-server.CreatePersistenceRuleTypeFactory",
+        "id": "def-server.CreatePersistenceRuleTypeWrapper",
         "type": "Type",
         "tags": [],
-        "label": "CreatePersistenceRuleTypeFactory",
+        "label": "CreatePersistenceRuleTypeWrapper",
         "description": [],
         "signature": [
           "(options: { ruleDataClient: ",
@@ -1977,31 +2048,23 @@
             "section": "def-server.Logger",
             "text": "Logger"
           },
-          "; }) => <TState extends Record<string, unknown>, TParams extends Record<string, unknown>, TServices extends ",
-          {
-            "pluginId": "ruleRegistry",
-            "scope": "server",
-            "docId": "kibRuleRegistryPluginApi",
-            "section": "def-server.PersistenceServices",
-            "text": "PersistenceServices"
-          },
-          "<TAlertInstanceContext>, TAlertInstanceContext extends { [x: string]: unknown; } = {}>(type: ",
+          "; }) => <TParams extends Record<string, unknown>, TState extends Record<string, unknown>, TInstanceContext extends { [x: string]: unknown; } = {}, TActionGroupIds extends string = never>(type: ",
           {
             "pluginId": "ruleRegistry",
             "scope": "server",
             "docId": "kibRuleRegistryPluginApi",
-            "section": "def-server.AlertTypeWithExecutor",
-            "text": "AlertTypeWithExecutor"
+            "section": "def-server.PersistenceAlertType",
+            "text": "PersistenceAlertType"
           },
-          "<TState, TParams, TAlertInstanceContext, TServices>) => ",
+          "<TParams, TState, TInstanceContext, TActionGroupIds>) => ",
           {
-            "pluginId": "ruleRegistry",
+            "pluginId": "alerting",
             "scope": "server",
-            "docId": "kibRuleRegistryPluginApi",
-            "section": "def-server.AlertTypeWithExecutor",
-            "text": "AlertTypeWithExecutor"
+            "docId": "kibAlertingPluginApi",
+            "section": "def-server.AlertType",
+            "text": "AlertType"
           },
-          "<TState, TParams, TAlertInstanceContext, TServices>"
+          "<TParams, TParams, TState, { [x: string]: unknown; }, TInstanceContext, TActionGroupIds, never>"
         ],
         "path": "x-pack/plugins/rule_registry/server/utils/persistence_types.ts",
         "deprecated": false,
@@ -2009,7 +2072,7 @@
         "children": [
           {
             "parentPluginId": "ruleRegistry",
-            "id": "def-server.CreatePersistenceRuleTypeFactory.$1",
+            "id": "def-server.CreatePersistenceRuleTypeWrapper.$1",
             "type": "Object",
             "tags": [],
             "label": "options",
@@ -2209,38 +2272,6 @@
         "deprecated": false,
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "ruleRegistry",
-        "id": "def-server.PersistenceAlertQueryService",
-        "type": "Type",
-        "tags": [],
-        "label": "PersistenceAlertQueryService",
-        "description": [],
-        "signature": [
-          "(query: ",
-          "SearchRequest",
-          ") => Promise<Record<string, unknown>[]>"
-        ],
-        "path": "x-pack/plugins/rule_registry/server/utils/persistence_types.ts",
-        "deprecated": false,
-        "returnComment": [],
-        "children": [
-          {
-            "parentPluginId": "ruleRegistry",
-            "id": "def-server.PersistenceAlertQueryService.$1",
-            "type": "Object",
-            "tags": [],
-            "label": "query",
-            "description": [],
-            "signature": [
-              "SearchRequest"
-            ],
-            "path": "x-pack/plugins/rule_registry/server/utils/persistence_types.ts",
-            "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "ruleRegistry",
         "id": "def-server.PersistenceAlertService",
@@ -2255,7 +2286,7 @@
           "ApiResponse",
           "<",
           "BulkResponse",
-          ", unknown>>"
+          ", unknown> | undefined>"
         ],
         "path": "x-pack/plugins/rule_registry/server/utils/persistence_types.ts",
         "deprecated": false,
@@ -2290,6 +2321,52 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "ruleRegistry",
+        "id": "def-server.PersistenceAlertType",
+        "type": "Type",
+        "tags": [],
+        "label": "PersistenceAlertType",
+        "description": [],
+        "signature": [
+          "Pick<",
+          {
+            "pluginId": "alerting",
+            "scope": "server",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-server.AlertType",
+            "text": "AlertType"
+          },
+          "<TParams, TParams, TState, { [x: string]: unknown; }, TInstanceContext, TActionGroupIds, never>, \"id\" | \"name\" | \"validate\" | \"actionGroups\" | \"defaultActionGroupId\" | \"recoveryActionGroup\" | \"producer\" | \"actionVariables\" | \"minimumLicenseRequired\" | \"useSavedObjectReferences\" | \"isExportable\" | \"defaultScheduleInterval\" | \"minimumScheduleInterval\" | \"ruleTaskTimeout\"> & { executor: (options: ",
+          {
+            "pluginId": "alerting",
+            "scope": "server",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-server.AlertExecutorOptions",
+            "text": "AlertExecutorOptions"
+          },
+          "<TParams, TState, { [x: string]: unknown; }, TInstanceContext, ",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.WithoutReservedActionGroups",
+            "text": "WithoutReservedActionGroups"
+          },
+          "<TActionGroupIds, never>> & { services: ",
+          {
+            "pluginId": "ruleRegistry",
+            "scope": "server",
+            "docId": "kibRuleRegistryPluginApi",
+            "section": "def-server.PersistenceServices",
+            "text": "PersistenceServices"
+          },
+          "; }) => Promise<void | TState>; }"
+        ],
+        "path": "x-pack/plugins/rule_registry/server/utils/persistence_types.ts",
+        "deprecated": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "ruleRegistry",
         "id": "def-server.RuleRegistryPluginConfig",
diff --git a/api_docs/rule_registry.mdx b/api_docs/rule_registry.mdx
index 5bd8aeff7d1b2..7e05924fca263 100644
--- a/api_docs/rule_registry.mdx
+++ b/api_docs/rule_registry.mdx
@@ -18,7 +18,7 @@ Contact [RAC](https://github.com/orgs/elastic/teams/rac) for questions regarding
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 132 | 0 | 109 | 7 |
+| 136 | 0 | 113 | 7 |
 
 ## Server
 
diff --git a/api_docs/runtime_fields.json b/api_docs/runtime_fields.json
index 83618b64aca36..e89ac78622778 100644
--- a/api_docs/runtime_fields.json
+++ b/api_docs/runtime_fields.json
@@ -330,7 +330,7 @@
             "label": "type",
             "description": [],
             "signature": [
-              "\"boolean\" | \"date\" | \"keyword\" | \"ip\" | \"long\" | \"double\""
+              "\"boolean\" | \"keyword\" | \"date\" | \"ip\" | \"long\" | \"double\""
             ],
             "path": "x-pack/plugins/runtime_fields/public/types.ts",
             "deprecated": false
@@ -363,7 +363,7 @@
         "description": [],
         "signature": [
           "ComboBoxOption",
-          "<\"boolean\" | \"date\" | \"keyword\" | \"ip\" | \"long\" | \"double\">[]"
+          "<\"boolean\" | \"keyword\" | \"date\" | \"ip\" | \"long\" | \"double\">[]"
         ],
         "path": "x-pack/plugins/runtime_fields/public/constants.ts",
         "deprecated": false,
@@ -377,7 +377,7 @@
         "label": "RuntimeType",
         "description": [],
         "signature": [
-          "\"boolean\" | \"date\" | \"keyword\" | \"ip\" | \"long\" | \"double\""
+          "\"boolean\" | \"keyword\" | \"date\" | \"ip\" | \"long\" | \"double\""
         ],
         "path": "x-pack/plugins/runtime_fields/public/types.ts",
         "deprecated": false,
diff --git a/api_docs/saved_objects.json b/api_docs/saved_objects.json
index af63ad120a8c0..9cb53a0ada85b 100644
--- a/api_docs/saved_objects.json
+++ b/api_docs/saved_objects.json
@@ -562,11 +562,11 @@
         "references": [
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/saved_searches/saved_searches.ts"
+            "path": "src/plugins/discover/public/saved_searches/legacy/saved_searches.ts"
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/saved_searches/saved_searches.ts"
+            "path": "src/plugins/discover/public/saved_searches/legacy/saved_searches.ts"
           },
           {
             "plugin": "discover",
@@ -596,14 +596,6 @@
             "plugin": "visualizations",
             "path": "src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts"
           },
-          {
-            "plugin": "visualizations",
-            "path": "src/plugins/visualizations/public/services.ts"
-          },
-          {
-            "plugin": "visualizations",
-            "path": "src/plugins/visualizations/public/services.ts"
-          },
           {
             "plugin": "dashboard",
             "path": "src/plugins/dashboard/public/services/saved_objects.ts"
@@ -734,7 +726,7 @@
                     "section": "def-public.SavedObjectsClient",
                     "text": "SavedObjectsClient"
                   },
-                  ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"bulkUpdate\">"
+                  ", \"create\" | \"bulkCreate\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"bulkUpdate\">"
                 ],
                 "path": "src/plugins/saved_objects/public/saved_object/saved_object_loader.ts",
                 "deprecated": false,
@@ -1487,7 +1479,7 @@
             "section": "def-public.SavedObjectsClient",
             "text": "SavedObjectsClient"
           },
-          ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"bulkUpdate\">; overlays: ",
+          ", \"create\" | \"bulkCreate\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"bulkUpdate\">; overlays: ",
           {
             "pluginId": "core",
             "scope": "public",
@@ -1613,17 +1605,7 @@
                 "label": "savedObjectsClient",
                 "description": [],
                 "signature": [
-                  "{ get: <T = unknown>(type: string, id: string) => Promise<",
-                  {
-                    "pluginId": "core",
-                    "scope": "public",
-                    "docId": "kibCoreSavedObjectsPluginApi",
-                    "section": "def-public.SimpleSavedObject",
-                    "text": "SimpleSavedObject"
-                  },
-                  "<T>>; delete: (type: string, id: string, options?: ",
-                  "SavedObjectsDeleteOptions",
-                  " | undefined) => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+                  "{ create: <T = unknown>(type: string, attributes: T, options?: ",
                   {
                     "pluginId": "core",
                     "scope": "public",
@@ -1663,7 +1645,9 @@
                     "section": "def-public.SavedObjectsBatchResponse",
                     "text": "SavedObjectsBatchResponse"
                   },
-                  "<unknown>>; find: <T = unknown, A = unknown>(options: Pick<",
+                  "<unknown>>; delete: (type: string, id: string, options?: ",
+                  "SavedObjectsDeleteOptions",
+                  " | undefined) => Promise<{}>; find: <T = unknown, A = unknown>(options: Pick<",
                   {
                     "pluginId": "core",
                     "scope": "server",
@@ -1695,7 +1679,15 @@
                     "section": "def-public.ResolvedSimpleSavedObject",
                     "text": "ResolvedSimpleSavedObject"
                   },
-                  "<T>[]; }>; resolve: <T = unknown>(type: string, id: string) => Promise<",
+                  "<T>[]; }>; get: <T = unknown>(type: string, id: string) => Promise<",
+                  {
+                    "pluginId": "core",
+                    "scope": "public",
+                    "docId": "kibCoreSavedObjectsPluginApi",
+                    "section": "def-public.SimpleSavedObject",
+                    "text": "SimpleSavedObject"
+                  },
+                  "<T>>; resolve: <T = unknown>(type: string, id: string) => Promise<",
                   {
                     "pluginId": "core",
                     "scope": "public",
@@ -2094,29 +2086,17 @@
         "path": "src/plugins/saved_objects/public/types.ts",
         "deprecated": true,
         "references": [
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/main/discover_main_route.tsx"
-          },
           {
             "plugin": "savedObjectsTaggingOss",
             "path": "src/plugins/saved_objects_tagging_oss/public/api.ts"
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/saved_searches/_saved_search.ts"
+            "path": "src/plugins/discover/public/saved_searches/legacy/_saved_search.ts"
           },
           {
             "plugin": "discover",
-            "path": "src/plugins/discover/public/saved_searches/_saved_search.ts"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/main/discover_main_route.tsx"
-          },
-          {
-            "plugin": "discover",
-            "path": "src/plugins/discover/public/application/apps/main/discover_main_route.tsx"
+            "path": "src/plugins/discover/public/saved_searches/legacy/_saved_search.ts"
           },
           {
             "plugin": "visualizations",
@@ -2181,98 +2161,6 @@
           {
             "plugin": "dashboard",
             "path": "src/plugins/dashboard/public/application/actions/clone_panel_action.tsx"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/public/application/types.ts"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/public/application/types.ts"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/public/application/types.ts"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/public/application/types.ts"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/public/application/utils/get_visualization_instance.ts"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/public/application/utils/get_visualization_instance.ts"
-          },
-          {
-            "plugin": "visDefaultEditor",
-            "path": "src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx"
-          },
-          {
-            "plugin": "visDefaultEditor",
-            "path": "src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx"
-          },
-          {
-            "plugin": "visDefaultEditor",
-            "path": "src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx"
-          },
-          {
-            "plugin": "visDefaultEditor",
-            "path": "src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx"
-          },
-          {
-            "plugin": "visDefaultEditor",
-            "path": "src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/target/types/public/application/types.d.ts"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/target/types/public/application/types.d.ts"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/target/types/public/application/types.d.ts"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/target/types/public/application/types.d.ts"
-          },
-          {
-            "plugin": "visDefaultEditor",
-            "path": "src/plugins/vis_default_editor/target/types/public/components/sidebar/sidebar.d.ts"
-          },
-          {
-            "plugin": "visDefaultEditor",
-            "path": "src/plugins/vis_default_editor/target/types/public/components/sidebar/sidebar.d.ts"
-          },
-          {
-            "plugin": "visDefaultEditor",
-            "path": "src/plugins/vis_default_editor/target/types/public/components/sidebar/sidebar_title.d.ts"
-          },
-          {
-            "plugin": "visDefaultEditor",
-            "path": "src/plugins/vis_default_editor/target/types/public/components/sidebar/sidebar_title.d.ts"
-          },
-          {
-            "plugin": "visDefaultEditor",
-            "path": "src/plugins/vis_default_editor/target/types/public/components/sidebar/sidebar_title.d.ts"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/target/types/public/application/utils/get_visualization_instance.d.ts"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/target/types/public/application/utils/get_visualization_instance.d.ts"
-          },
-          {
-            "plugin": "visualize",
-            "path": "src/plugins/visualize/target/types/public/application/utils/get_visualization_instance.d.ts"
           }
         ],
         "children": [
@@ -3819,7 +3707,7 @@
           "references": [
             {
               "plugin": "discover",
-              "path": "src/plugins/discover/public/saved_searches/_saved_search.ts"
+              "path": "src/plugins/discover/public/saved_searches/legacy/_saved_search.ts"
             },
             {
               "plugin": "visualizations",
diff --git a/api_docs/saved_objects_management.json b/api_docs/saved_objects_management.json
index e06c7faada71f..72f9ca569cc59 100644
--- a/api_docs/saved_objects_management.json
+++ b/api_docs/saved_objects_management.json
@@ -819,7 +819,7 @@
             "label": "euiColumn",
             "description": [],
             "signature": [
-              "{ children?: React.ReactNode; headers?: string | undefined; onClick?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onChange?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; color?: string | undefined; onKeyDown?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; id?: string | undefined; title?: string | undefined; description?: string | undefined; security?: string | undefined; name: React.ReactNode; field: string; defaultChecked?: boolean | undefined; defaultValue?: string | number | string[] | undefined; suppressContentEditableWarning?: boolean | undefined; suppressHydrationWarning?: boolean | undefined; accessKey?: string | undefined; className?: string | undefined; contentEditable?: boolean | \"true\" | \"false\" | \"inherit\" | undefined; contextMenu?: string | undefined; dir?: string | undefined; draggable?: boolean | \"true\" | \"false\" | undefined; hidden?: boolean | undefined; lang?: string | undefined; placeholder?: string | undefined; slot?: string | undefined; spellCheck?: boolean | \"true\" | \"false\" | undefined; style?: React.CSSProperties | undefined; tabIndex?: number | undefined; translate?: \"yes\" | \"no\" | undefined; radioGroup?: string | undefined; role?: string | undefined; about?: string | undefined; datatype?: string | undefined; inlist?: any; prefix?: string | undefined; property?: string | undefined; resource?: string | undefined; typeof?: string | undefined; vocab?: string | undefined; autoCapitalize?: string | undefined; autoCorrect?: string | undefined; autoSave?: string | undefined; itemProp?: string | undefined; itemScope?: boolean | undefined; itemType?: string | undefined; itemID?: string | undefined; itemRef?: string | undefined; results?: number | undefined; unselectable?: \"on\" | \"off\" | undefined; inputMode?: \"none\" | \"search\" | \"email\" | \"text\" | \"tel\" | \"url\" | \"numeric\" | \"decimal\" | undefined; is?: string | undefined; 'aria-activedescendant'?: string | undefined; 'aria-atomic'?: boolean | \"true\" | \"false\" | undefined; 'aria-autocomplete'?: \"none\" | \"list\" | \"inline\" | \"both\" | undefined; 'aria-busy'?: boolean | \"true\" | \"false\" | undefined; 'aria-checked'?: boolean | \"mixed\" | \"true\" | \"false\" | undefined; 'aria-colcount'?: number | undefined; 'aria-colindex'?: number | undefined; 'aria-colspan'?: number | undefined; 'aria-controls'?: string | undefined; 'aria-current'?: boolean | \"date\" | \"location\" | \"page\" | \"time\" | \"true\" | \"false\" | \"step\" | undefined; 'aria-describedby'?: string | undefined; 'aria-details'?: string | undefined; 'aria-disabled'?: boolean | \"true\" | \"false\" | undefined; 'aria-dropeffect'?: \"none\" | \"copy\" | \"link\" | \"execute\" | \"move\" | \"popup\" | undefined; 'aria-errormessage'?: string | undefined; 'aria-expanded'?: boolean | \"true\" | \"false\" | undefined; 'aria-flowto'?: string | undefined; 'aria-grabbed'?: boolean | \"true\" | \"false\" | undefined; 'aria-haspopup'?: boolean | \"grid\" | \"menu\" | \"true\" | \"false\" | \"listbox\" | \"tree\" | \"dialog\" | undefined; 'aria-hidden'?: boolean | \"true\" | \"false\" | undefined; 'aria-invalid'?: boolean | \"true\" | \"false\" | \"grammar\" | \"spelling\" | undefined; 'aria-keyshortcuts'?: string | undefined; 'aria-label'?: string | undefined; 'aria-labelledby'?: string | undefined; 'aria-level'?: number | undefined; 'aria-live'?: \"off\" | \"assertive\" | \"polite\" | undefined; 'aria-modal'?: boolean | \"true\" | \"false\" | undefined; 'aria-multiline'?: boolean | \"true\" | \"false\" | undefined; 'aria-multiselectable'?: boolean | \"true\" | \"false\" | undefined; 'aria-orientation'?: \"horizontal\" | \"vertical\" | undefined; 'aria-owns'?: string | undefined; 'aria-placeholder'?: string | undefined; 'aria-posinset'?: number | undefined; 'aria-pressed'?: boolean | \"mixed\" | \"true\" | \"false\" | undefined; 'aria-readonly'?: boolean | \"true\" | \"false\" | undefined; 'aria-relevant'?: \"all\" | \"text\" | \"additions\" | \"additions text\" | \"removals\" | undefined; 'aria-required'?: boolean | \"true\" | \"false\" | undefined; 'aria-roledescription'?: string | undefined; 'aria-rowcount'?: number | undefined; 'aria-rowindex'?: number | undefined; 'aria-rowspan'?: number | undefined; 'aria-selected'?: boolean | \"true\" | \"false\" | undefined; 'aria-setsize'?: number | undefined; 'aria-sort'?: \"none\" | \"ascending\" | \"descending\" | \"other\" | undefined; 'aria-valuemax'?: number | undefined; 'aria-valuemin'?: number | undefined; 'aria-valuenow'?: number | undefined; 'aria-valuetext'?: string | undefined; dangerouslySetInnerHTML?: { __html: string; } | undefined; onCopy?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCopyCapture?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCut?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCutCapture?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onPaste?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onPasteCapture?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionEnd?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionEndCapture?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionStart?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionStartCapture?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionUpdate?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionUpdateCapture?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onFocus?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onFocusCapture?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onBlur?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onBlurCapture?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onChangeCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onBeforeInput?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onBeforeInputCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInput?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInputCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onReset?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onResetCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onSubmit?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onSubmitCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInvalid?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInvalidCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onLoad?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onError?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onErrorCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onKeyDownCapture?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyPress?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyPressCapture?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyUp?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyUpCapture?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onAbort?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onAbortCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlay?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlayCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlayThrough?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlayThroughCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onDurationChange?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onDurationChangeCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEmptied?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEmptiedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEncrypted?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEncryptedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEnded?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEndedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedData?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedDataCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedMetadata?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedMetadataCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadStart?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadStartCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPause?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPauseCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlay?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlayCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlaying?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlayingCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onProgress?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onProgressCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onRateChange?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onRateChangeCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeeked?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeekedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeeking?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeekingCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onStalled?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onStalledCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSuspend?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSuspendCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onTimeUpdate?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onTimeUpdateCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onVolumeChange?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onVolumeChangeCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onWaiting?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onWaitingCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onAuxClick?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onAuxClickCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onClickCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onContextMenu?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onContextMenuCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onDoubleClick?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onDoubleClickCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onDrag?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEnd?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEndCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEnter?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEnterCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragExit?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragExitCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragLeave?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragLeaveCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragOver?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragOverCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragStart?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragStartCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDrop?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDropCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onMouseDown?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseDownCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseEnter?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseLeave?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseMove?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseMoveCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOut?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOutCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOver?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOverCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseUp?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseUpCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onSelect?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSelectCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onTouchCancel?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchCancelCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchEnd?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchEndCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchMove?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchMoveCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchStart?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchStartCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerDown?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerDownCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerMove?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerMoveCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerUp?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerUpCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerCancel?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerCancelCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerEnter?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerEnterCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerLeave?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerLeaveCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOver?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOverCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOut?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOutCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onGotPointerCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onGotPointerCaptureCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onLostPointerCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onLostPointerCaptureCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onScroll?: ((event: React.UIEvent<HTMLTableDataCellElement, UIEvent>) => void) | undefined; onScrollCapture?: ((event: React.UIEvent<HTMLTableDataCellElement, UIEvent>) => void) | undefined; onWheel?: ((event: React.WheelEvent<HTMLTableDataCellElement>) => void) | undefined; onWheelCapture?: ((event: React.WheelEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationStart?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationStartCapture?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationEnd?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationEndCapture?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationIteration?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationIterationCapture?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onTransitionEnd?: ((event: React.TransitionEvent<HTMLTableDataCellElement>) => void) | undefined; onTransitionEndCapture?: ((event: React.TransitionEvent<HTMLTableDataCellElement>) => void) | undefined; 'data-test-subj'?: string | undefined; width?: string | undefined; readOnly?: boolean | undefined; render?: ((value: any, record: ",
+              "{ children?: React.ReactNode; onClick?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onChange?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; color?: string | undefined; onKeyDown?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; id?: string | undefined; title?: string | undefined; description?: string | undefined; security?: string | undefined; name: React.ReactNode; field: string; defaultChecked?: boolean | undefined; defaultValue?: string | number | string[] | undefined; suppressContentEditableWarning?: boolean | undefined; suppressHydrationWarning?: boolean | undefined; accessKey?: string | undefined; className?: string | undefined; contentEditable?: boolean | \"true\" | \"false\" | \"inherit\" | undefined; contextMenu?: string | undefined; dir?: string | undefined; draggable?: boolean | \"true\" | \"false\" | undefined; hidden?: boolean | undefined; lang?: string | undefined; placeholder?: string | undefined; slot?: string | undefined; spellCheck?: boolean | \"true\" | \"false\" | undefined; style?: React.CSSProperties | undefined; tabIndex?: number | undefined; translate?: \"yes\" | \"no\" | undefined; radioGroup?: string | undefined; role?: string | undefined; about?: string | undefined; datatype?: string | undefined; inlist?: any; prefix?: string | undefined; property?: string | undefined; resource?: string | undefined; typeof?: string | undefined; vocab?: string | undefined; autoCapitalize?: string | undefined; autoCorrect?: string | undefined; autoSave?: string | undefined; itemProp?: string | undefined; itemScope?: boolean | undefined; itemType?: string | undefined; itemID?: string | undefined; itemRef?: string | undefined; results?: number | undefined; unselectable?: \"on\" | \"off\" | undefined; inputMode?: \"none\" | \"search\" | \"email\" | \"text\" | \"tel\" | \"url\" | \"numeric\" | \"decimal\" | undefined; is?: string | undefined; 'aria-activedescendant'?: string | undefined; 'aria-atomic'?: boolean | \"true\" | \"false\" | undefined; 'aria-autocomplete'?: \"none\" | \"list\" | \"inline\" | \"both\" | undefined; 'aria-busy'?: boolean | \"true\" | \"false\" | undefined; 'aria-checked'?: boolean | \"mixed\" | \"true\" | \"false\" | undefined; 'aria-colcount'?: number | undefined; 'aria-colindex'?: number | undefined; 'aria-colspan'?: number | undefined; 'aria-controls'?: string | undefined; 'aria-current'?: boolean | \"date\" | \"page\" | \"time\" | \"true\" | \"false\" | \"step\" | \"location\" | undefined; 'aria-describedby'?: string | undefined; 'aria-details'?: string | undefined; 'aria-disabled'?: boolean | \"true\" | \"false\" | undefined; 'aria-dropeffect'?: \"none\" | \"copy\" | \"link\" | \"execute\" | \"move\" | \"popup\" | undefined; 'aria-errormessage'?: string | undefined; 'aria-expanded'?: boolean | \"true\" | \"false\" | undefined; 'aria-flowto'?: string | undefined; 'aria-grabbed'?: boolean | \"true\" | \"false\" | undefined; 'aria-haspopup'?: boolean | \"grid\" | \"menu\" | \"true\" | \"false\" | \"listbox\" | \"tree\" | \"dialog\" | undefined; 'aria-hidden'?: boolean | \"true\" | \"false\" | undefined; 'aria-invalid'?: boolean | \"true\" | \"false\" | \"grammar\" | \"spelling\" | undefined; 'aria-keyshortcuts'?: string | undefined; 'aria-label'?: string | undefined; 'aria-labelledby'?: string | undefined; 'aria-level'?: number | undefined; 'aria-live'?: \"off\" | \"assertive\" | \"polite\" | undefined; 'aria-modal'?: boolean | \"true\" | \"false\" | undefined; 'aria-multiline'?: boolean | \"true\" | \"false\" | undefined; 'aria-multiselectable'?: boolean | \"true\" | \"false\" | undefined; 'aria-orientation'?: \"horizontal\" | \"vertical\" | undefined; 'aria-owns'?: string | undefined; 'aria-placeholder'?: string | undefined; 'aria-posinset'?: number | undefined; 'aria-pressed'?: boolean | \"mixed\" | \"true\" | \"false\" | undefined; 'aria-readonly'?: boolean | \"true\" | \"false\" | undefined; 'aria-relevant'?: \"all\" | \"text\" | \"additions\" | \"additions text\" | \"removals\" | undefined; 'aria-required'?: boolean | \"true\" | \"false\" | undefined; 'aria-roledescription'?: string | undefined; 'aria-rowcount'?: number | undefined; 'aria-rowindex'?: number | undefined; 'aria-rowspan'?: number | undefined; 'aria-selected'?: boolean | \"true\" | \"false\" | undefined; 'aria-setsize'?: number | undefined; 'aria-sort'?: \"none\" | \"other\" | \"ascending\" | \"descending\" | undefined; 'aria-valuemax'?: number | undefined; 'aria-valuemin'?: number | undefined; 'aria-valuenow'?: number | undefined; 'aria-valuetext'?: string | undefined; dangerouslySetInnerHTML?: { __html: string; } | undefined; onCopy?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCopyCapture?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCut?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCutCapture?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onPaste?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onPasteCapture?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionEnd?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionEndCapture?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionStart?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionStartCapture?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionUpdate?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionUpdateCapture?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onFocus?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onFocusCapture?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onBlur?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onBlurCapture?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onChangeCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onBeforeInput?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onBeforeInputCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInput?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInputCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onReset?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onResetCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onSubmit?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onSubmitCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInvalid?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInvalidCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onLoad?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onError?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onErrorCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onKeyDownCapture?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyPress?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyPressCapture?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyUp?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyUpCapture?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onAbort?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onAbortCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlay?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlayCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlayThrough?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlayThroughCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onDurationChange?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onDurationChangeCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEmptied?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEmptiedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEncrypted?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEncryptedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEnded?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEndedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedData?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedDataCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedMetadata?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedMetadataCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadStart?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadStartCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPause?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPauseCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlay?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlayCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlaying?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlayingCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onProgress?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onProgressCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onRateChange?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onRateChangeCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeeked?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeekedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeeking?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeekingCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onStalled?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onStalledCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSuspend?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSuspendCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onTimeUpdate?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onTimeUpdateCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onVolumeChange?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onVolumeChangeCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onWaiting?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onWaitingCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onAuxClick?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onAuxClickCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onClickCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onContextMenu?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onContextMenuCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onDoubleClick?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onDoubleClickCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onDrag?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEnd?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEndCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEnter?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEnterCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragExit?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragExitCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragLeave?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragLeaveCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragOver?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragOverCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragStart?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragStartCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDrop?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDropCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onMouseDown?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseDownCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseEnter?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseLeave?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseMove?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseMoveCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOut?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOutCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOver?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOverCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseUp?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseUpCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onSelect?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSelectCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onTouchCancel?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchCancelCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchEnd?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchEndCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchMove?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchMoveCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchStart?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchStartCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerDown?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerDownCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerMove?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerMoveCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerUp?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerUpCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerCancel?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerCancelCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerEnter?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerEnterCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerLeave?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerLeaveCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOver?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOverCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOut?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOutCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onGotPointerCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onGotPointerCaptureCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onLostPointerCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onLostPointerCaptureCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onScroll?: ((event: React.UIEvent<HTMLTableDataCellElement, UIEvent>) => void) | undefined; onScrollCapture?: ((event: React.UIEvent<HTMLTableDataCellElement, UIEvent>) => void) | undefined; onWheel?: ((event: React.WheelEvent<HTMLTableDataCellElement>) => void) | undefined; onWheelCapture?: ((event: React.WheelEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationStart?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationStartCapture?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationEnd?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationEndCapture?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationIteration?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationIterationCapture?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onTransitionEnd?: ((event: React.TransitionEvent<HTMLTableDataCellElement>) => void) | undefined; onTransitionEndCapture?: ((event: React.TransitionEvent<HTMLTableDataCellElement>) => void) | undefined; 'data-test-subj'?: string | undefined; width?: string | undefined; readOnly?: boolean | undefined; render?: ((value: any, record: ",
               {
                 "pluginId": "savedObjectsManagement",
                 "scope": "public",
@@ -837,7 +837,7 @@
                 "section": "def-public.SavedObjectsManagementRecord",
                 "text": "SavedObjectsManagementRecord"
               },
-              ">) => React.ReactNode) | undefined; colSpan?: number | undefined; rowSpan?: number | undefined; scope?: string | undefined; valign?: \"top\" | \"bottom\" | \"baseline\" | \"middle\" | undefined; dataType?: \"string\" | \"number\" | \"boolean\" | \"date\" | \"auto\" | undefined; isExpander?: boolean | undefined; textOnly?: boolean | undefined; truncateText?: boolean | undefined; isMobileHeader?: boolean | undefined; mobileOptions?: { show?: boolean | undefined; only?: boolean | undefined; render?: ((item: ",
+              ">) => React.ReactNode) | undefined; colSpan?: number | undefined; headers?: string | undefined; rowSpan?: number | undefined; scope?: string | undefined; valign?: \"top\" | \"bottom\" | \"baseline\" | \"middle\" | undefined; dataType?: \"string\" | \"number\" | \"boolean\" | \"date\" | \"auto\" | undefined; isExpander?: boolean | undefined; textOnly?: boolean | undefined; truncateText?: boolean | undefined; isMobileHeader?: boolean | undefined; mobileOptions?: { show?: boolean | undefined; only?: boolean | undefined; render?: ((item: ",
               {
                 "pluginId": "savedObjectsManagement",
                 "scope": "public",
diff --git a/api_docs/security_solution.json b/api_docs/security_solution.json
index ebff5a94fbe2c..b16ae8334f1b0 100644
--- a/api_docs/security_solution.json
+++ b/api_docs/security_solution.json
@@ -3162,7 +3162,7 @@
                 "section": "def-common.DataProvider",
                 "text": "DataProvider"
               },
-              ", \"type\" | \"enabled\" | \"id\" | \"name\" | \"excluded\" | \"kqlQuery\" | \"queryMatch\">[]"
+              ", \"type\" | \"id\" | \"name\" | \"enabled\" | \"excluded\" | \"kqlQuery\" | \"queryMatch\">[]"
             ],
             "path": "x-pack/plugins/timelines/common/types/timeline/data_provider/index.ts",
             "deprecated": false
@@ -10228,7 +10228,7 @@
             "section": "def-common.RequestBasicOptions",
             "text": "RequestBasicOptions"
           },
-          ", \"id\" | \"params\" | \"defaultIndex\" | \"filterQuery\" | \"docValueFields\" | \"factoryQueryType\" | \"indexType\">"
+          ", \"id\" | \"defaultIndex\" | \"params\" | \"filterQuery\" | \"docValueFields\" | \"factoryQueryType\" | \"indexType\">"
         ],
         "path": "x-pack/plugins/security_solution/common/search_strategy/security_solution/network/details/index.ts",
         "deprecated": false,
@@ -15658,7 +15658,7 @@
             "section": "def-common.TimelineEventsAllRequestOptions",
             "text": "TimelineEventsAllRequestOptions"
           },
-          ", \"id\" | \"sort\" | \"fields\" | \"timerange\" | \"language\" | \"defaultIndex\" | \"pagination\" | \"filterQuery\" | \"docValueFields\" | \"factoryQueryType\" | \"indexType\" | \"entityType\" | \"fieldRequested\" | \"excludeEcsData\" | \"authFilter\">"
+          ", \"id\" | \"sort\" | \"fields\" | \"defaultIndex\" | \"timerange\" | \"language\" | \"pagination\" | \"filterQuery\" | \"docValueFields\" | \"factoryQueryType\" | \"indexType\" | \"entityType\" | \"fieldRequested\" | \"excludeEcsData\" | \"authFilter\">"
         ],
         "path": "x-pack/plugins/timelines/common/search_strategy/timeline/events/eql/index.ts",
         "deprecated": false,
@@ -16280,7 +16280,7 @@
             "section": "def-common.TimelineRequestBasicOptions",
             "text": "TimelineRequestBasicOptions"
           },
-          ", \"id\" | \"params\" | \"defaultIndex\" | \"docValueFields\" | \"factoryQueryType\" | \"indexType\" | \"entityType\">"
+          ", \"id\" | \"defaultIndex\" | \"params\" | \"docValueFields\" | \"factoryQueryType\" | \"indexType\" | \"entityType\">"
         ],
         "path": "x-pack/plugins/timelines/common/search_strategy/timeline/events/last_event_time/index.ts",
         "deprecated": false,
@@ -19509,7 +19509,7 @@
             "section": "def-common.DataProviderType",
             "text": "DataProviderType"
           },
-          " | undefined; enabled: boolean; id: string; name: string; excluded: boolean; kqlQuery: string; queryMatch: ",
+          " | undefined; id: string; name: string; enabled: boolean; excluded: boolean; kqlQuery: string; queryMatch: ",
           {
             "pluginId": "timelines",
             "scope": "common",
@@ -19961,7 +19961,7 @@
             "section": "def-common.HostsKpiAuthenticationsStrategyResponse",
             "text": "HostsKpiAuthenticationsStrategyResponse"
           },
-          ", \"warning\" | \"id\" | \"inspect\" | \"total\" | \"authenticationsSuccess\" | \"authenticationsSuccessHistogram\" | \"authenticationsFailure\" | \"authenticationsFailureHistogram\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\"> | Pick<",
+          ", \"id\" | \"inspect\" | \"warning\" | \"total\" | \"authenticationsSuccess\" | \"authenticationsSuccessHistogram\" | \"authenticationsFailure\" | \"authenticationsFailureHistogram\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\"> | Pick<",
           {
             "pluginId": "securitySolution",
             "scope": "common",
@@ -19969,7 +19969,7 @@
             "section": "def-common.HostsKpiHostsStrategyResponse",
             "text": "HostsKpiHostsStrategyResponse"
           },
-          ", \"warning\" | \"id\" | \"inspect\" | \"total\" | \"hosts\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"hostsHistogram\"> | Pick<",
+          ", \"id\" | \"inspect\" | \"warning\" | \"total\" | \"hosts\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"hostsHistogram\"> | Pick<",
           {
             "pluginId": "securitySolution",
             "scope": "common",
@@ -19977,7 +19977,7 @@
             "section": "def-common.HostsKpiUniqueIpsStrategyResponse",
             "text": "HostsKpiUniqueIpsStrategyResponse"
           },
-          ", \"warning\" | \"id\" | \"inspect\" | \"total\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"uniqueSourceIps\" | \"uniqueSourceIpsHistogram\" | \"uniqueDestinationIps\" | \"uniqueDestinationIpsHistogram\">"
+          ", \"id\" | \"inspect\" | \"warning\" | \"total\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"uniqueSourceIps\" | \"uniqueSourceIpsHistogram\" | \"uniqueDestinationIps\" | \"uniqueDestinationIpsHistogram\">"
         ],
         "path": "x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/index.ts",
         "deprecated": false,
@@ -20486,7 +20486,7 @@
             "section": "def-common.NetworkKpiDnsStrategyResponse",
             "text": "NetworkKpiDnsStrategyResponse"
           },
-          ", \"warning\" | \"id\" | \"inspect\" | \"total\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"dnsQueries\"> | Pick<",
+          ", \"id\" | \"inspect\" | \"warning\" | \"total\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"dnsQueries\"> | Pick<",
           {
             "pluginId": "securitySolution",
             "scope": "common",
@@ -20494,7 +20494,7 @@
             "section": "def-common.NetworkKpiNetworkEventsStrategyResponse",
             "text": "NetworkKpiNetworkEventsStrategyResponse"
           },
-          ", \"warning\" | \"id\" | \"inspect\" | \"total\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"networkEvents\"> | Pick<",
+          ", \"id\" | \"inspect\" | \"warning\" | \"total\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"networkEvents\"> | Pick<",
           {
             "pluginId": "securitySolution",
             "scope": "common",
@@ -20502,7 +20502,7 @@
             "section": "def-common.NetworkKpiTlsHandshakesStrategyResponse",
             "text": "NetworkKpiTlsHandshakesStrategyResponse"
           },
-          ", \"warning\" | \"id\" | \"inspect\" | \"total\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"tlsHandshakes\"> | Pick<",
+          ", \"id\" | \"inspect\" | \"warning\" | \"total\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"tlsHandshakes\"> | Pick<",
           {
             "pluginId": "securitySolution",
             "scope": "common",
@@ -20510,7 +20510,7 @@
             "section": "def-common.NetworkKpiUniqueFlowsStrategyResponse",
             "text": "NetworkKpiUniqueFlowsStrategyResponse"
           },
-          ", \"warning\" | \"id\" | \"inspect\" | \"total\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"uniqueFlowId\"> | Pick<",
+          ", \"id\" | \"inspect\" | \"warning\" | \"total\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"uniqueFlowId\"> | Pick<",
           {
             "pluginId": "securitySolution",
             "scope": "common",
@@ -20518,7 +20518,7 @@
             "section": "def-common.NetworkKpiUniquePrivateIpsStrategyResponse",
             "text": "NetworkKpiUniquePrivateIpsStrategyResponse"
           },
-          ", \"warning\" | \"id\" | \"inspect\" | \"total\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"uniqueSourcePrivateIps\" | \"uniqueSourcePrivateIpsHistogram\" | \"uniqueDestinationPrivateIps\" | \"uniqueDestinationPrivateIpsHistogram\">"
+          ", \"id\" | \"inspect\" | \"warning\" | \"total\" | \"loaded\" | \"isRunning\" | \"isPartial\" | \"isRestored\" | \"uniqueSourcePrivateIps\" | \"uniqueSourcePrivateIpsHistogram\" | \"uniqueDestinationPrivateIps\" | \"uniqueDestinationPrivateIpsHistogram\">"
         ],
         "path": "x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/index.ts",
         "deprecated": false,
diff --git a/api_docs/spaces.json b/api_docs/spaces.json
index b391ca6ea0dbb..fc7550b607c66 100644
--- a/api_docs/spaces.json
+++ b/api_docs/spaces.json
@@ -3185,7 +3185,7 @@
             "section": "def-server.SavedObjectsRepository",
             "text": "SavedObjectsRepository"
           },
-          ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">"
+          ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"deleteByNamespace\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"incrementCounter\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\">"
         ],
         "path": "x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts",
         "deprecated": false,
diff --git a/api_docs/task_manager.json b/api_docs/task_manager.json
index 4b7f6dc95e740..4542cdc6fe3f1 100644
--- a/api_docs/task_manager.json
+++ b/api_docs/task_manager.json
@@ -1245,7 +1245,7 @@
         "TaskScheduling",
         ", \"schedule\" | \"runNow\" | \"ephemeralRunNow\" | \"ensureScheduled\"> & Pick<",
         "TaskStore",
-        ", \"remove\" | \"get\" | \"fetch\"> & { removeIfExists: (id: string) => Promise<void>; } & { supportsEphemeralTasks: () => boolean; }"
+        ", \"remove\" | \"fetch\" | \"get\"> & { removeIfExists: (id: string) => Promise<void>; } & { supportsEphemeralTasks: () => boolean; }"
       ],
       "path": "x-pack/plugins/task_manager/server/plugin.ts",
       "deprecated": false,
diff --git a/api_docs/telemetry_collection_manager.json b/api_docs/telemetry_collection_manager.json
index 39189b20705ae..7b8178d4499b7 100644
--- a/api_docs/telemetry_collection_manager.json
+++ b/api_docs/telemetry_collection_manager.json
@@ -74,7 +74,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"monitoring\" | \"security\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+              ", \"monitoring\" | \"security\" | \"create\" | \"index\" | \"delete\" | \"get\" | \"update\" | \"closePointInTime\" | \"search\" | \"transform\" | \"eql\" | \"helpers\" | \"emit\" | \"on\" | \"once\" | \"off\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"count\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
               "TransportRequestParams",
               ", options?: ",
               "TransportRequestOptions",
@@ -95,25 +95,7 @@
             "label": "soClient",
             "description": [],
             "signature": [
-              "{ get: <T = unknown>(type: string, id: string, options?: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsBaseOptions",
-                "text": "SavedObjectsBaseOptions"
-              },
-              ") => Promise<",
-              "SavedObject",
-              "<T>>; delete: (type: string, id: string, options?: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsDeleteOptions",
-                "text": "SavedObjectsDeleteOptions"
-              },
-              ") => Promise<{}>; create: <T = unknown>(type: string, attributes: T, options?: ",
+              "{ create: <T = unknown>(type: string, attributes: T, options?: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -171,7 +153,15 @@
                 "section": "def-server.SavedObjectsCheckConflictsResponse",
                 "text": "SavedObjectsCheckConflictsResponse"
               },
-              ">; find: <T = unknown, A = unknown>(options: ",
+              ">; delete: (type: string, id: string, options?: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-server.SavedObjectsDeleteOptions",
+                "text": "SavedObjectsDeleteOptions"
+              },
+              ") => Promise<{}>; find: <T = unknown, A = unknown>(options: ",
               {
                 "pluginId": "core",
                 "scope": "server",
@@ -235,6 +225,16 @@
                 "section": "def-server.SavedObjectsBulkResolveResponse",
                 "text": "SavedObjectsBulkResolveResponse"
               },
+              "<T>>; get: <T = unknown>(type: string, id: string, options?: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreSavedObjectsPluginApi",
+                "section": "def-server.SavedObjectsBaseOptions",
+                "text": "SavedObjectsBaseOptions"
+              },
+              ") => Promise<",
+              "SavedObject",
               "<T>>; resolve: <T = unknown>(type: string, id: string, options?: ",
               {
                 "pluginId": "core",
diff --git a/api_docs/timelines.json b/api_docs/timelines.json
index 416f623520394..f9ae6f615d1a7 100644
--- a/api_docs/timelines.json
+++ b/api_docs/timelines.json
@@ -6361,7 +6361,7 @@
                 "section": "def-common.DataProvider",
                 "text": "DataProvider"
               },
-              ", \"type\" | \"enabled\" | \"id\" | \"name\" | \"excluded\" | \"kqlQuery\" | \"queryMatch\">[]"
+              ", \"type\" | \"id\" | \"name\" | \"enabled\" | \"excluded\" | \"kqlQuery\" | \"queryMatch\">[]"
             ],
             "path": "x-pack/plugins/timelines/common/types/timeline/data_provider/index.ts",
             "deprecated": false
@@ -9924,7 +9924,7 @@
             "section": "def-common.TimelineEventsAllRequestOptions",
             "text": "TimelineEventsAllRequestOptions"
           },
-          ", \"id\" | \"sort\" | \"fields\" | \"timerange\" | \"language\" | \"defaultIndex\" | \"pagination\" | \"filterQuery\" | \"docValueFields\" | \"factoryQueryType\" | \"indexType\" | \"entityType\" | \"fieldRequested\" | \"excludeEcsData\" | \"authFilter\">"
+          ", \"id\" | \"sort\" | \"fields\" | \"defaultIndex\" | \"timerange\" | \"language\" | \"pagination\" | \"filterQuery\" | \"docValueFields\" | \"factoryQueryType\" | \"indexType\" | \"entityType\" | \"fieldRequested\" | \"excludeEcsData\" | \"authFilter\">"
         ],
         "path": "x-pack/plugins/timelines/common/search_strategy/timeline/events/eql/index.ts",
         "deprecated": false,
@@ -10546,7 +10546,7 @@
             "section": "def-common.TimelineRequestBasicOptions",
             "text": "TimelineRequestBasicOptions"
           },
-          ", \"id\" | \"params\" | \"defaultIndex\" | \"docValueFields\" | \"factoryQueryType\" | \"indexType\" | \"entityType\">"
+          ", \"id\" | \"defaultIndex\" | \"params\" | \"docValueFields\" | \"factoryQueryType\" | \"indexType\" | \"entityType\">"
         ],
         "path": "x-pack/plugins/timelines/common/search_strategy/timeline/events/last_event_time/index.ts",
         "deprecated": false,
@@ -12807,7 +12807,7 @@
             "section": "def-common.DataProviderType",
             "text": "DataProviderType"
           },
-          " | undefined; enabled: boolean; id: string; name: string; excluded: boolean; kqlQuery: string; queryMatch: ",
+          " | undefined; id: string; name: string; enabled: boolean; excluded: boolean; kqlQuery: string; queryMatch: ",
           {
             "pluginId": "timelines",
             "scope": "common",
diff --git a/api_docs/triggers_actions_ui.json b/api_docs/triggers_actions_ui.json
index b7e953917aaad..3b5de759e97ee 100644
--- a/api_docs/triggers_actions_ui.json
+++ b/api_docs/triggers_actions_ui.json
@@ -1353,7 +1353,7 @@
             "label": "setAlertProperty",
             "description": [],
             "signature": [
-              "<Prop extends \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">(key: Prop, value: Pick<",
+              "<Prop extends \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">(key: Prop, value: Pick<",
               {
                 "pluginId": "alerting",
                 "scope": "common",
@@ -1361,7 +1361,7 @@
                 "section": "def-common.Alert",
                 "text": "Alert"
               },
-              "<Params>, \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[Prop] | null) => void"
+              "<Params>, \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[Prop] | null) => void"
             ],
             "path": "x-pack/plugins/triggers_actions_ui/public/types.ts",
             "deprecated": false,
@@ -1396,7 +1396,7 @@
                     "section": "def-common.Alert",
                     "text": "Alert"
                   },
-                  "<Params>, \"enabled\" | \"id\" | \"name\" | \"tags\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[Prop] | null"
+                  "<Params>, \"id\" | \"name\" | \"tags\" | \"enabled\" | \"params\" | \"actions\" | \"throttle\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[Prop] | null"
                 ],
                 "path": "x-pack/plugins/triggers_actions_ui/public/types.ts",
                 "deprecated": false,
@@ -2115,7 +2115,7 @@
         "label": "Alert",
         "description": [],
         "signature": [
-          "{ enabled: boolean; id: string; name: string; tags: string[]; params: Record<string, unknown>; actions: ",
+          "{ id: string; name: string; tags: string[]; enabled: boolean; params: Record<string, unknown>; actions: ",
           {
             "pluginId": "alerting",
             "scope": "common",
@@ -2187,20 +2187,6 @@
         "deprecated": false,
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "triggersActionsUi",
-        "id": "def-public.DEFAULT_HIDDEN_ONLY_ON_ALERTS_ACTION_TYPES",
-        "type": "Array",
-        "tags": [],
-        "label": "DEFAULT_HIDDEN_ONLY_ON_ALERTS_ACTION_TYPES",
-        "description": [],
-        "signature": [
-          "string[]"
-        ],
-        "path": "x-pack/plugins/triggers_actions_ui/public/common/constants/index.ts",
-        "deprecated": false,
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "triggersActionsUi",
         "id": "def-public.RuleTypeRegistryContract",
@@ -3216,7 +3202,7 @@
           "signature": [
             "(props: Pick<",
             "AlertAddProps",
-            "<Record<string, any>>, \"onClose\" | \"metadata\" | \"onSave\" | \"alertTypeId\" | \"consumer\" | \"canChangeTrigger\" | \"initialValues\" | \"reloadAlerts\">) => React.ReactElement<",
+            "<Record<string, any>>, \"onClose\" | \"metadata\" | \"onSave\" | \"alertTypeId\" | \"consumer\" | \"canChangeTrigger\" | \"initialValues\" | \"reloadAlerts\" | \"ruleTypeIndex\">) => React.ReactElement<",
             "AlertAddProps",
             "<Record<string, any>>, string | ((props: any) => React.ReactElement<any, string | any | (new (props: any) => React.Component<any, any, any>)> | null) | (new (props: any) => React.Component<any, any, any>)>"
           ],
@@ -3233,7 +3219,7 @@
               "signature": [
                 "Pick<",
                 "AlertAddProps",
-                "<Record<string, any>>, \"onClose\" | \"metadata\" | \"onSave\" | \"alertTypeId\" | \"consumer\" | \"canChangeTrigger\" | \"initialValues\" | \"reloadAlerts\">"
+                "<Record<string, any>>, \"onClose\" | \"metadata\" | \"onSave\" | \"alertTypeId\" | \"consumer\" | \"canChangeTrigger\" | \"initialValues\" | \"reloadAlerts\" | \"ruleTypeIndex\">"
               ],
               "path": "x-pack/plugins/triggers_actions_ui/public/plugin.ts",
               "deprecated": false,
@@ -3252,7 +3238,7 @@
           "signature": [
             "(props: Pick<",
             "AlertEditProps",
-            "<Record<string, any>>, \"onClose\" | \"metadata\" | \"onSave\" | \"reloadAlerts\" | \"initialAlert\">) => React.ReactElement<",
+            "<Record<string, any>>, \"onClose\" | \"metadata\" | \"onSave\" | \"reloadAlerts\" | \"initialAlert\" | \"ruleType\">) => React.ReactElement<",
             "AlertEditProps",
             "<Record<string, any>>, string | ((props: any) => React.ReactElement<any, string | any | (new (props: any) => React.Component<any, any, any>)> | null) | (new (props: any) => React.Component<any, any, any>)>"
           ],
@@ -3269,7 +3255,7 @@
               "signature": [
                 "Pick<",
                 "AlertEditProps",
-                "<Record<string, any>>, \"onClose\" | \"metadata\" | \"onSave\" | \"reloadAlerts\" | \"initialAlert\">"
+                "<Record<string, any>>, \"onClose\" | \"metadata\" | \"onSave\" | \"reloadAlerts\" | \"initialAlert\" | \"ruleType\">"
               ],
               "path": "x-pack/plugins/triggers_actions_ui/public/plugin.ts",
               "deprecated": false,
diff --git a/api_docs/triggers_actions_ui.mdx b/api_docs/triggers_actions_ui.mdx
index 0b6139e8ae9db..e626b24432246 100644
--- a/api_docs/triggers_actions_ui.mdx
+++ b/api_docs/triggers_actions_ui.mdx
@@ -18,7 +18,7 @@ Contact [Kibana Alerting](https://github.com/orgs/elastic/teams/kibana-alerting-
 
 | Public API count  | Any count | Items lacking comments | Missing exports | 
 |-------------------|-----------|------------------------|-----------------|
-| 239 | 1 | 230 | 18 |
+| 238 | 1 | 229 | 18 |
 
 ## Client
 
diff --git a/api_docs/usage_collection.json b/api_docs/usage_collection.json
index d091924dd664f..c7fb02b1dc378 100644
--- a/api_docs/usage_collection.json
+++ b/api_docs/usage_collection.json
@@ -461,7 +461,7 @@
                     "section": "def-server.SavedObjectsClient",
                     "text": "SavedObjectsClient"
                   },
-                  ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; } & (WithKibanaRequest extends true ? { kibanaRequest?: ",
+                  ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; } & (WithKibanaRequest extends true ? { kibanaRequest?: ",
                   {
                     "pluginId": "core",
                     "scope": "server",
@@ -701,7 +701,7 @@
           "\nPossible type values in the schema"
         ],
         "signature": [
-          "\"boolean\" | \"date\" | \"keyword\" | \"long\" | \"double\" | \"text\" | \"short\" | \"float\" | \"integer\" | \"byte\""
+          "\"boolean\" | \"keyword\" | \"date\" | \"long\" | \"double\" | \"text\" | \"short\" | \"float\" | \"integer\" | \"byte\""
         ],
         "path": "src/plugins/usage_collection/server/collector/types.ts",
         "deprecated": false,
@@ -733,7 +733,7 @@
             "section": "def-server.SavedObjectsClient",
             "text": "SavedObjectsClient"
           },
-          ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; } & (WithKibanaRequest extends true ? { kibanaRequest?: ",
+          ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; } & (WithKibanaRequest extends true ? { kibanaRequest?: ",
           {
             "pluginId": "core",
             "scope": "server",
@@ -803,7 +803,7 @@
                 "section": "def-server.SavedObjectsClient",
                 "text": "SavedObjectsClient"
               },
-              ", \"get\" | \"delete\" | \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; } & (WithKibanaRequest extends true ? { kibanaRequest?: ",
+              ", \"create\" | \"bulkCreate\" | \"checkConflicts\" | \"delete\" | \"find\" | \"bulkGet\" | \"bulkResolve\" | \"get\" | \"resolve\" | \"update\" | \"collectMultiNamespaceReferences\" | \"updateObjectsSpaces\" | \"bulkUpdate\" | \"removeReferencesTo\" | \"openPointInTimeForType\" | \"closePointInTime\" | \"createPointInTimeFinder\" | \"errors\">; } & (WithKibanaRequest extends true ? { kibanaRequest?: ",
               {
                 "pluginId": "core",
                 "scope": "server",
diff --git a/api_docs/vis_type_pie.json b/api_docs/vis_type_pie.json
index 66f8da4dc56fc..0bb24caeb5558 100644
--- a/api_docs/vis_type_pie.json
+++ b/api_docs/vis_type_pie.json
@@ -78,9 +78,9 @@
             "signature": [
               "{ id?: string | undefined; params?: ",
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
diff --git a/api_docs/visualizations.json b/api_docs/visualizations.json
index d131d522b3515..9877a9bc18321 100644
--- a/api_docs/visualizations.json
+++ b/api_docs/visualizations.json
@@ -1012,7 +1012,7 @@
                 "section": "def-public.SerializedVisData",
                 "text": "SerializedVisData"
               },
-              ">; }, never>, \"type\" | \"data\" | \"id\" | \"title\" | \"description\" | \"params\" | \"uiState\">) => Promise<void>"
+              ">; }, never>, \"data\" | \"type\" | \"id\" | \"title\" | \"description\" | \"params\" | \"uiState\">) => Promise<void>"
             ],
             "path": "src/plugins/visualizations/public/vis.ts",
             "deprecated": false,
@@ -1057,7 +1057,7 @@
                     "section": "def-public.SerializedVisData",
                     "text": "SerializedVisData"
                   },
-                  ">; }, never>, \"type\" | \"data\" | \"id\" | \"title\" | \"description\" | \"params\" | \"uiState\">"
+                  ">; }, never>, \"data\" | \"type\" | \"id\" | \"title\" | \"description\" | \"params\" | \"uiState\">"
                 ],
                 "path": "src/plugins/visualizations/public/vis.ts",
                 "deprecated": false,
@@ -1280,13 +1280,21 @@
           },
           "; field?: string | undefined; index?: string | undefined; params?: ",
           {
-            "pluginId": "expressions",
+            "pluginId": "fieldFormats",
             "scope": "common",
-            "docId": "kibExpressionsPluginApi",
+            "docId": "kibFieldFormatsPluginApi",
             "section": "def-common.SerializedFieldFormat",
             "text": "SerializedFieldFormat"
           },
-          "<Record<string, any>> | undefined; source?: string | undefined; sourceParams?: ",
+          "<",
+          {
+            "pluginId": "fieldFormats",
+            "scope": "common",
+            "docId": "kibFieldFormatsPluginApi",
+            "section": "def-common.FieldFormatParams",
+            "text": "FieldFormatParams"
+          },
+          "> | undefined; source?: string | undefined; sourceParams?: ",
           {
             "pluginId": "@kbn/utility-types",
             "scope": "server",
@@ -2100,13 +2108,21 @@
             "description": [],
             "signature": [
               {
-                "pluginId": "expressions",
+                "pluginId": "fieldFormats",
                 "scope": "common",
-                "docId": "kibExpressionsPluginApi",
+                "docId": "kibFieldFormatsPluginApi",
                 "section": "def-common.SerializedFieldFormat",
                 "text": "SerializedFieldFormat"
               },
-              "<Record<string, any>>"
+              "<",
+              {
+                "pluginId": "fieldFormats",
+                "scope": "common",
+                "docId": "kibFieldFormatsPluginApi",
+                "section": "def-common.FieldFormatParams",
+                "text": "FieldFormatParams"
+              },
+              ">"
             ],
             "path": "src/plugins/visualizations/public/vis_schemas.ts",
             "deprecated": false
@@ -4180,13 +4196,21 @@
           },
           "; format: ",
           {
-            "pluginId": "expressions",
+            "pluginId": "fieldFormats",
             "scope": "common",
-            "docId": "kibExpressionsPluginApi",
+            "docId": "kibFieldFormatsPluginApi",
             "section": "def-common.SerializedFieldFormat",
             "text": "SerializedFieldFormat"
           },
-          "<Record<string, any>>; }>)[] | undefined, string]"
+          "<",
+          {
+            "pluginId": "fieldFormats",
+            "scope": "common",
+            "docId": "kibFieldFormatsPluginApi",
+            "section": "def-common.FieldFormatParams",
+            "text": "FieldFormatParams"
+          },
+          ">; }>)[] | undefined, string]"
         ],
         "path": "src/plugins/visualizations/common/prepare_log_table.ts",
         "deprecated": false,
@@ -4238,13 +4262,21 @@
           },
           "; format: ",
           {
-            "pluginId": "expressions",
+            "pluginId": "fieldFormats",
             "scope": "common",
-            "docId": "kibExpressionsPluginApi",
+            "docId": "kibFieldFormatsPluginApi",
             "section": "def-common.SerializedFieldFormat",
             "text": "SerializedFieldFormat"
           },
-          "<Record<string, any>>; }"
+          "<",
+          {
+            "pluginId": "fieldFormats",
+            "scope": "common",
+            "docId": "kibFieldFormatsPluginApi",
+            "section": "def-common.FieldFormatParams",
+            "text": "FieldFormatParams"
+          },
+          ">; }"
         ],
         "path": "src/plugins/visualizations/common/expression_functions/xy_dimension.ts",
         "deprecated": false,
@@ -4602,7 +4634,7 @@
         "label": "VisualizeEmbeddableFactoryContract",
         "description": [],
         "signature": [
-          "{ readonly type: \"visualization\"; inject: (_state: ",
+          "{ inject: (_state: ",
           {
             "pluginId": "embeddable",
             "scope": "common",
@@ -4638,7 +4670,7 @@
           },
           "; references: ",
           "SavedObjectReference",
-          "[]; }; create: (input: ",
+          "[]; }; readonly type: \"visualization\"; create: (input: ",
           {
             "pluginId": "visualizations",
             "scope": "public",
@@ -5568,13 +5600,21 @@
           },
           "; field?: string | undefined; index?: string | undefined; params?: ",
           {
-            "pluginId": "expressions",
+            "pluginId": "fieldFormats",
             "scope": "common",
-            "docId": "kibExpressionsPluginApi",
+            "docId": "kibFieldFormatsPluginApi",
             "section": "def-common.SerializedFieldFormat",
             "text": "SerializedFieldFormat"
           },
-          "<Record<string, any>> | undefined; source?: string | undefined; sourceParams?: ",
+          "<",
+          {
+            "pluginId": "fieldFormats",
+            "scope": "common",
+            "docId": "kibFieldFormatsPluginApi",
+            "section": "def-common.FieldFormatParams",
+            "text": "FieldFormatParams"
+          },
+          "> | undefined; source?: string | undefined; sourceParams?: ",
           {
             "pluginId": "@kbn/utility-types",
             "scope": "server",
@@ -5994,13 +6034,21 @@
           },
           "; format: ",
           {
-            "pluginId": "expressions",
+            "pluginId": "fieldFormats",
             "scope": "common",
-            "docId": "kibExpressionsPluginApi",
+            "docId": "kibFieldFormatsPluginApi",
             "section": "def-common.SerializedFieldFormat",
             "text": "SerializedFieldFormat"
           },
-          "<Record<string, any>>; }>)[] | undefined, string]"
+          "<",
+          {
+            "pluginId": "fieldFormats",
+            "scope": "common",
+            "docId": "kibFieldFormatsPluginApi",
+            "section": "def-common.FieldFormatParams",
+            "text": "FieldFormatParams"
+          },
+          ">; }>)[] | undefined, string]"
         ],
         "path": "src/plugins/visualizations/common/prepare_log_table.ts",
         "deprecated": false,
diff --git a/api_docs/visualize.json b/api_docs/visualize.json
index 86196b0ba34c0..e1a0a134cde94 100644
--- a/api_docs/visualize.json
+++ b/api_docs/visualize.json
@@ -114,11 +114,11 @@
             "description": [],
             "signature": [
               {
-                "pluginId": "savedObjects",
+                "pluginId": "discover",
                 "scope": "public",
-                "docId": "kibSavedObjectsPluginApi",
-                "section": "def-public.SavedObject",
-                "text": "SavedObject"
+                "docId": "kibDiscoverPluginApi",
+                "section": "def-public.SavedSearch",
+                "text": "SavedSearch"
               },
               " | undefined"
             ],
diff --git a/packages/kbn-docs-utils/src/api_docs/build_api_docs_cli.ts b/packages/kbn-docs-utils/src/api_docs/build_api_docs_cli.ts
index 1f709a52a0fc1..4ef3039253e90 100644
--- a/packages/kbn-docs-utils/src/api_docs/build_api_docs_cli.ts
+++ b/packages/kbn-docs-utils/src/api_docs/build_api_docs_cli.ts
@@ -109,30 +109,36 @@ export function runBuildApiDocsCli() {
         const id = plugin.manifest.id;
         const pluginApi = pluginApiMap[id];
         const pluginStats = allPluginStats[id];
+        const pluginTeam = plugin.manifest.owner.name;
 
         reporter.metrics([
           {
             id,
+            meta: { pluginTeam },
             group: 'API count',
             value: pluginStats.apiCount,
           },
           {
             id,
+            meta: { pluginTeam },
             group: 'API count missing comments',
             value: pluginStats.missingComments.length,
           },
           {
             id,
+            meta: { pluginTeam },
             group: 'API count with any type',
             value: pluginStats.isAnyType.length,
           },
           {
             id,
+            meta: { pluginTeam },
             group: 'Non-exported public API item count',
             value: missingApiItems[id] ? Object.keys(missingApiItems[id]).length : 0,
           },
           {
             id,
+            meta: { pluginTeam },
             group: 'References to deprecated APIs',
             value: pluginStats.deprecatedAPIsReferencedCount,
           },

From 03fe419dd44a6401dde450fe2b8fc3bed43c1100 Mon Sep 17 00:00:00 2001
From: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
Date: Thu, 14 Oct 2021 11:21:55 -0500
Subject: [PATCH 083/117] [Stack Monitoring] Remove deprecation warning for
 Internal Monitoring (#114856)

* [Stack Monitoring] Remove deprecation warning for Internal Monitoring

* Fix i18n
---
 .../public/lib/internal_monitoring_toasts.tsx | 116 ------------------
 .../monitoring/public/services/clusters.js    |  39 ------
 .../translations/translations/ja-JP.json      |   6 -
 .../translations/translations/zh-CN.json      |   6 -
 4 files changed, 167 deletions(-)
 delete mode 100644 x-pack/plugins/monitoring/public/lib/internal_monitoring_toasts.tsx

diff --git a/x-pack/plugins/monitoring/public/lib/internal_monitoring_toasts.tsx b/x-pack/plugins/monitoring/public/lib/internal_monitoring_toasts.tsx
deleted file mode 100644
index b970ba5998ddf..0000000000000
--- a/x-pack/plugins/monitoring/public/lib/internal_monitoring_toasts.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiSpacer, EuiLink } from '@elastic/eui';
-import { Legacy } from '../legacy_shims';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
-import { isInSetupMode, toggleSetupMode } from './setup_mode';
-
-export interface MonitoringIndicesTypes {
-  legacyIndices: number;
-  metricbeatIndices: number;
-}
-
-const enterSetupModeLabel = () =>
-  i18n.translate('xpack.monitoring.internalMonitoringToast.enterSetupMode', {
-    defaultMessage: 'Enter setup mode',
-  });
-
-const learnMoreLabel = () =>
-  i18n.translate('xpack.monitoring.internalMonitoringToast.learnMoreAction', {
-    defaultMessage: 'Learn more',
-  });
-
-const showIfLegacyOnlyIndices = () => {
-  const blogUrl = Legacy.shims.docLinks.links.monitoring.metricbeatBlog;
-  const toast = Legacy.shims.toastNotifications.addWarning({
-    title: toMountPoint(
-      <FormattedMessage
-        id="xpack.monitoring.internalMonitoringToast.title"
-        defaultMessage="Internal Monitoring Detected"
-      />
-    ),
-    text: toMountPoint(
-      <div>
-        <p>
-          {i18n.translate('xpack.monitoring.internalMonitoringToast.description', {
-            defaultMessage: `It appears you are using "Legacy Collection" for Stack Monitoring.
-            This method of monitoring will no longer be supported in the next major release (8.0.0).
-            Please follow the steps in setup mode to start monitoring with Metricbeat.`,
-          })}
-        </p>
-        <EuiLink
-          onClick={() => {
-            Legacy.shims.toastNotifications.remove(toast);
-            toggleSetupMode(true);
-          }}
-        >
-          {enterSetupModeLabel()}
-        </EuiLink>
-
-        <EuiSpacer />
-        <EuiLink href={blogUrl} external target="_blank">
-          {learnMoreLabel()}
-        </EuiLink>
-      </div>
-    ),
-  });
-};
-
-const showIfLegacyAndMetricbeatIndices = () => {
-  const blogUrl = Legacy.shims.docLinks.links.monitoring.metricbeatBlog;
-  const toast = Legacy.shims.toastNotifications.addWarning({
-    title: toMountPoint(
-      <FormattedMessage
-        id="xpack.monitoring.internalAndMetricbeatMonitoringToast.title"
-        defaultMessage="Partial Legacy Monitoring Detected"
-      />
-    ),
-    text: toMountPoint(
-      <div>
-        <p>
-          {i18n.translate('xpack.monitoring.internalAndMetricbeatMonitoringToast.description', {
-            defaultMessage: `It appears you are using both Metricbeat and "Legacy Collection" for Stack Monitoring.
-            In 8.0.0, you must use Metricbeat to collect monitoring data.
-            Please follow the steps in setup mode to migrate the rest of the monitoring to Metricbeat.`,
-          })}
-        </p>
-        <EuiLink
-          onClick={() => {
-            Legacy.shims.toastNotifications.remove(toast);
-            toggleSetupMode(true);
-          }}
-        >
-          {enterSetupModeLabel()}
-        </EuiLink>
-
-        <EuiSpacer />
-        <EuiLink href={blogUrl} external target="_blank">
-          {learnMoreLabel()}
-        </EuiLink>
-      </div>
-    ),
-  });
-};
-
-export const showInternalMonitoringToast = ({
-  legacyIndices,
-  metricbeatIndices,
-}: MonitoringIndicesTypes) => {
-  if (isInSetupMode()) {
-    return;
-  }
-
-  if (legacyIndices && !metricbeatIndices) {
-    showIfLegacyOnlyIndices();
-  } else if (legacyIndices && metricbeatIndices) {
-    showIfLegacyAndMetricbeatIndices();
-  }
-};
diff --git a/x-pack/plugins/monitoring/public/services/clusters.js b/x-pack/plugins/monitoring/public/services/clusters.js
index 937a69cbbc32d..b19d0ea56765f 100644
--- a/x-pack/plugins/monitoring/public/services/clusters.js
+++ b/x-pack/plugins/monitoring/public/services/clusters.js
@@ -8,7 +8,6 @@
 import { ajaxErrorHandlersProvider } from '../lib/ajax_error_handler';
 import { Legacy } from '../legacy_shims';
 import { STANDALONE_CLUSTER_CLUSTER_UUID } from '../../common/constants';
-import { showInternalMonitoringToast } from '../lib/internal_monitoring_toasts';
 
 function formatClusters(clusters) {
   return clusters.map(formatCluster);
@@ -21,8 +20,6 @@ function formatCluster(cluster) {
   return cluster;
 }
 
-let once = false;
-
 export function monitoringClustersProvider($injector) {
   return async (clusterUuid, ccs, codePaths) => {
     const { min, max } = Legacy.shims.timefilter.getBounds();
@@ -57,42 +54,6 @@ export function monitoringClustersProvider($injector) {
       }
     }
 
-    async function ensureMetricbeatEnabled() {
-      if (Legacy.shims.isCloud) {
-        return;
-      }
-      const globalState = $injector.get('globalState');
-      try {
-        const response = await $http.post(
-          '../api/monitoring/v1/elasticsearch_settings/check/internal_monitoring',
-          {
-            ccs: globalState.ccs,
-          }
-        );
-        const { data } = response;
-        showInternalMonitoringToast({
-          legacyIndices: data.legacy_indices,
-          metricbeatIndices: data.mb_indices,
-        });
-      } catch (err) {
-        const Private = $injector.get('Private');
-        const ajaxErrorHandlers = Private(ajaxErrorHandlersProvider);
-        return ajaxErrorHandlers(err);
-      }
-    }
-
-    if (!once) {
-      once = true;
-      const clusters = await getClusters();
-      if (clusters.length) {
-        try {
-          await ensureMetricbeatEnabled();
-        } catch (_err) {
-          // Intentionally swallow the error as this will retry the next page load
-        }
-      }
-      return clusters;
-    }
     return await getClusters();
   };
 }
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index ab62d33fce5f5..583085879af93 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -17880,12 +17880,6 @@
     "xpack.monitoring.healthCheck.unableToDisableWatches.action": "詳細情報",
     "xpack.monitoring.healthCheck.unableToDisableWatches.text": "レガシークラスターアラートを削除できませんでした。Kibanaサーバーログで詳細を確認するか、しばらくたってから再試行してください。",
     "xpack.monitoring.healthCheck.unableToDisableWatches.title": "レガシークラスターアラートはまだ有効です",
-    "xpack.monitoring.internalAndMetricbeatMonitoringToast.description": "スタック監視で、Metricbeatと「レガシー収集」の両方を使用している可能性があります。\n            8.0.0では、Metricbeatを使用して、監視データを収集する必要があります。\n            セットアップモードの手順に従い、残りの監視をMetricbeatに移行してください。",
-    "xpack.monitoring.internalAndMetricbeatMonitoringToast.title": "一部のレガシー監視が検出されました",
-    "xpack.monitoring.internalMonitoringToast.description": "スタック監視で、「レガシー収集」の両方を使用している可能性があります。\n            この監視方法は、次のメジャーリリース（8.0.0）ではサポートされていません。\n            セットアップモードの手順に従い、Metricbeatで監視を開始してください。",
-    "xpack.monitoring.internalMonitoringToast.enterSetupMode": "設定モードにする",
-    "xpack.monitoring.internalMonitoringToast.learnMoreAction": "詳細",
-    "xpack.monitoring.internalMonitoringToast.title": "内部監視が検出されました",
     "xpack.monitoring.kibana.clusterStatus.connectionsLabel": "接続",
     "xpack.monitoring.kibana.clusterStatus.instancesLabel": "インスタンス",
     "xpack.monitoring.kibana.clusterStatus.maxResponseTimeLabel": "最高応答時間",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 1271e3a32a0d3..efffec39ed98c 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -18154,12 +18154,6 @@
     "xpack.monitoring.healthCheck.unableToDisableWatches.action": "了解详情。",
     "xpack.monitoring.healthCheck.unableToDisableWatches.text": "我们移除旧版集群告警。请查看 Kibana 服务器日志以获取更多信息，或稍后重试。",
     "xpack.monitoring.healthCheck.unableToDisableWatches.title": "旧版集群告警仍有效",
-    "xpack.monitoring.internalAndMetricbeatMonitoringToast.description": "似乎您正在同时使用 Metricbeat 和“Legacy Collection”进行堆栈监测。\n            在 8.0.0 中，必须使用 Metricbeat 收集监测数据。\n            请在设置模式下按照相关步骤将监测的其余部分迁移到 Metricbeat。",
-    "xpack.monitoring.internalAndMetricbeatMonitoringToast.title": "检测到部分旧版监测",
-    "xpack.monitoring.internalMonitoringToast.description": "似乎您正在使用“Legacy Collection”进行堆栈监测。\n            下一主要版本 (8.0.0) 将不再支持这种监测方法。\n            请在设置模式下按照相关步骤使用 Metricbeat 开始监测。",
-    "xpack.monitoring.internalMonitoringToast.enterSetupMode": "进入设置模式",
-    "xpack.monitoring.internalMonitoringToast.learnMoreAction": "了解详情",
-    "xpack.monitoring.internalMonitoringToast.title": "检测到内部监测",
     "xpack.monitoring.kibana.clusterStatus.connectionsLabel": "连接",
     "xpack.monitoring.kibana.clusterStatus.instancesLabel": "实例",
     "xpack.monitoring.kibana.clusterStatus.maxResponseTimeLabel": "最大响应时间",

From b204a20b45bd9f3a4b70e95db79646c2312ce62d Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Thu, 14 Oct 2021 10:35:25 -0600
Subject: [PATCH 084/117] [Stack Monitoring] Convert Access Denied page to
 React (#114887)

* [Stack Monitoring] Convert Access Denied page to React

* Adding data-test-subj
---
 .../hooks/use_request_error_handler.tsx       |  6 +-
 .../monitoring/public/application/index.tsx   |  2 +
 .../application/pages/access_denied/index.tsx | 76 +++++++++++++++++++
 3 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 x-pack/plugins/monitoring/public/application/pages/access_denied/index.tsx

diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_request_error_handler.tsx b/x-pack/plugins/monitoring/public/application/hooks/use_request_error_handler.tsx
index 3a64531844451..6c7c86a330135 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_request_error_handler.tsx
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_request_error_handler.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import React, { useCallback } from 'react';
+import { useHistory } from 'react-router-dom';
 import { includes } from 'lodash';
 import { IHttpFetchError } from 'kibana/public';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -34,11 +35,12 @@ export function formatMonitoringError(err: IHttpFetchError) {
 
 export const useRequestErrorHandler = () => {
   const { services } = useKibana<MonitoringStartPluginDependencies>();
+  const history = useHistory();
   return useCallback(
     (err: IHttpFetchError) => {
       if (err.response?.status === 403) {
         // redirect to error message view
-        history.replaceState(null, '', '#/access-denied');
+        history.push('/access-denied');
       } else if (err.response?.status === 404 && !includes(window.location.hash, 'no-data')) {
         // pass through if this is a 404 and we're already on the no-data page
         const formattedError = formatMonitoringError(err);
@@ -74,6 +76,6 @@ export const useRequestErrorHandler = () => {
         });
       }
     },
-    [services.notifications]
+    [history, services.notifications?.toasts]
   );
 };
diff --git a/x-pack/plugins/monitoring/public/application/index.tsx b/x-pack/plugins/monitoring/public/application/index.tsx
index 2caead4f963a1..f18201110eddc 100644
--- a/x-pack/plugins/monitoring/public/application/index.tsx
+++ b/x-pack/plugins/monitoring/public/application/index.tsx
@@ -55,6 +55,7 @@ import { LogStashNodeAdvancedPage } from './pages/logstash/advanced';
 // import { LogStashNodePipelinesPage } from './pages/logstash/node_pipelines';
 import { LogStashNodePage } from './pages/logstash/node';
 import { LogStashNodePipelinesPage } from './pages/logstash/node_pipelines';
+import { AccessDeniedPage } from './pages/access_denied';
 
 export const renderApp = (
   core: CoreStart,
@@ -101,6 +102,7 @@ const MonitoringApp: React.FC<{
               <BreadcrumbContainer.Provider history={history}>
                 <Router history={history}>
                   <Switch>
+                    <Route path="/access-denied" component={AccessDeniedPage} />
                     <Route path="/no-data" component={NoDataPage} />
                     <Route path="/loading" component={LoadingPage} />
                     <RouteInit
diff --git a/x-pack/plugins/monitoring/public/application/pages/access_denied/index.tsx b/x-pack/plugins/monitoring/public/application/pages/access_denied/index.tsx
new file mode 100644
index 0000000000000..d578f797946eb
--- /dev/null
+++ b/x-pack/plugins/monitoring/public/application/pages/access_denied/index.tsx
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiPanel, EuiCallOut, EuiButton } from '@elastic/eui';
+import useInterval from 'react-use/lib/useInterval';
+import { Redirect } from 'react-router-dom';
+import { ComponentProps } from '../../route_init';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { MonitoringStartPluginDependencies } from '../../../types';
+
+export const AccessDeniedPage: React.FC<ComponentProps> = () => {
+  const { services } = useKibana<MonitoringStartPluginDependencies>();
+  const [hasAccess, setHasAccess] = useState<boolean>(false);
+
+  useInterval(() => {
+    async function tryPrivilege() {
+      if (services.http?.fetch) {
+        try {
+          const response = await services.http?.fetch<{ has_access: boolean }>(
+            '../api/monitoring/v1/check_access'
+          );
+          setHasAccess(response.has_access);
+        } catch (e) {
+          setHasAccess(false);
+        }
+      }
+    }
+    tryPrivilege();
+  }, 5000);
+
+  const title = i18n.translate('xpack.monitoring.accessDeniedTitle', {
+    defaultMessage: 'Access Denied',
+  });
+
+  if (hasAccess) {
+    return <Redirect to="/home" />;
+  }
+  return (
+    <EuiPanel paddingSize="m">
+      <EuiCallOut title={title} color="danger" iconType="alert" data-test-subj="accessDeniedTitle">
+        <p>
+          <FormattedMessage
+            id="xpack.monitoring.accessDenied.notAuthorizedDescription"
+            defaultMessage="You are not authorized to access Monitoring. To use Monitoring, you
+        need the privileges granted by both the `{kibanaAdmin}` and
+        `{monitoringUser}` roles."
+            values={{ kibanaAdmin: 'kibana_admin', monitoringUser: 'monitoring_user ' }}
+          />
+        </p>
+        <p>
+          <FormattedMessage
+            id="xpack.monitoring.accessDenied.clusterNotConfiguredDescription"
+            defaultMessage="If you are attempting to access a dedicated monitoring cluster, this
+        might be because you are logged in as a user that is not configured on
+        the monitoring cluster."
+          />
+        </p>
+        <p>
+          <EuiButton href="../app/home">
+            <FormattedMessage
+              id="xpack.monitoring.accessDenied.backToKibanaButtonLabel"
+              defaultMessage="Back to Kibana"
+            />
+          </EuiButton>
+        </p>
+      </EuiCallOut>
+    </EuiPanel>
+  );
+};

From 81a84a863b78ff0c477d886d5db14c4d3c2d55b6 Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Thu, 14 Oct 2021 12:39:40 -0400
Subject: [PATCH 085/117] [Security Solution][Endpoint] Unit tests for Policy
 Details Remove Modal (#115005)

* test: refactor trusted apps http mocks to top-level `mocks` directory
* Completed tests for Remove modal
* improvements to UT code
---
 .../public/management/pages/mocks/index.ts    |   1 +
 .../pages/mocks/trusted_apps_http_mocks.ts    |  90 +++++++++++
 .../pages/policy/test_utils/mocks.ts          |  61 ++------
 .../list/policy_trusted_apps_list.test.tsx    |   2 +-
 ...ove_trusted_app_from_policy_modal.test.tsx | 145 +++++++++++++++---
 .../remove_trusted_app_from_policy_modal.tsx  |   5 +-
 6 files changed, 227 insertions(+), 77 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts

diff --git a/x-pack/plugins/security_solution/public/management/pages/mocks/index.ts b/x-pack/plugins/security_solution/public/management/pages/mocks/index.ts
index c7388cad5696f..e1f793f6087dc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/mocks/index.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/mocks/index.ts
@@ -6,3 +6,4 @@
  */
 
 export * from './fleet_mocks';
+export * from './trusted_apps_http_mocks';
diff --git a/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts b/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts
new file mode 100644
index 0000000000000..6f90fcd629485
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts
@@ -0,0 +1,90 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { HttpFetchOptionsWithPath } from 'kibana/public';
+import {
+  httpHandlerMockFactory,
+  ResponseProvidersInterface,
+} from '../../../common/mock/endpoint/http_handler_mock_factory';
+import {
+  GetTrustedAppsListRequest,
+  GetTrustedAppsListResponse,
+  PutTrustedAppUpdateRequest,
+  PutTrustedAppUpdateResponse,
+} from '../../../../common/endpoint/types';
+import {
+  TRUSTED_APPS_LIST_API,
+  TRUSTED_APPS_UPDATE_API,
+} from '../../../../common/endpoint/constants';
+import { TrustedAppGenerator } from '../../../../common/endpoint/data_generators/trusted_app_generator';
+
+export type PolicyDetailsGetTrustedAppsListHttpMocksInterface = ResponseProvidersInterface<{
+  trustedAppsList: (options: HttpFetchOptionsWithPath) => GetTrustedAppsListResponse;
+}>;
+/**
+ * HTTP mock for retrieving list of Trusted Apps
+ */
+export const trustedAppsGetListHttpMocks =
+  httpHandlerMockFactory<PolicyDetailsGetTrustedAppsListHttpMocksInterface>([
+    {
+      id: 'trustedAppsList',
+      path: TRUSTED_APPS_LIST_API,
+      method: 'get',
+      handler: ({ query }): GetTrustedAppsListResponse => {
+        const apiQueryParams = query as GetTrustedAppsListRequest;
+        const generator = new TrustedAppGenerator('seed');
+        const perPage = apiQueryParams.per_page ?? 10;
+        const data = Array.from({ length: Math.min(perPage, 50) }, () => generator.generate());
+
+        // Change the 3rd entry (index 2) to be policy specific
+        data[2].effectScope = {
+          type: 'policy',
+          policies: [
+            // IDs below are those generated by the `fleetGetEndpointPackagePolicyListHttpMock()` mock
+            'ddf6570b-9175-4a6d-b288-61a09771c647',
+            'b8e616ae-44fc-4be7-846c-ce8fa5c082dd',
+          ],
+        };
+
+        return {
+          page: apiQueryParams.page ?? 1,
+          per_page: perPage,
+          total: 20,
+          data,
+        };
+      },
+    },
+  ]);
+
+export type TrustedAppPutHttpMocksInterface = ResponseProvidersInterface<{
+  trustedAppUpdate: (options: HttpFetchOptionsWithPath) => PutTrustedAppUpdateResponse;
+}>;
+/**
+ * HTTP mocks that support updating a single Trusted Apps
+ */
+export const trustedAppPutHttpMocks = httpHandlerMockFactory<TrustedAppPutHttpMocksInterface>([
+  {
+    id: 'trustedAppUpdate',
+    path: TRUSTED_APPS_UPDATE_API,
+    method: 'put',
+    handler: ({ body, path }): PutTrustedAppUpdateResponse => {
+      const response: PutTrustedAppUpdateResponse = {
+        data: {
+          ...(body as unknown as PutTrustedAppUpdateRequest),
+          id: path.split('/').pop()!,
+          created_at: '2021-10-12T16:02:55.856Z',
+          created_by: 'elastic',
+          updated_at: '2021-10-13T16:02:55.856Z',
+          updated_by: 'elastic',
+          version: 'abc',
+        },
+      };
+
+      return response;
+    },
+  },
+]);
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts b/x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts
index aca0971621863..707f75913c7ed 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts
@@ -5,20 +5,12 @@
  * 2.0.
  */
 
-import { HttpFetchOptionsWithPath } from 'kibana/public';
+import { composeHttpHandlerMocks } from '../../../../common/mock/endpoint/http_handler_mock_factory';
 import {
-  composeHttpHandlerMocks,
-  httpHandlerMockFactory,
-  ResponseProvidersInterface,
-} from '../../../../common/mock/endpoint/http_handler_mock_factory';
-import {
-  GetTrustedAppsListRequest,
   GetTrustedAppsListResponse,
   PostTrustedAppCreateResponse,
 } from '../../../../../common/endpoint/types';
-import { TRUSTED_APPS_LIST_API } from '../../../../../common/endpoint/constants';
-import { TrustedAppGenerator } from '../../../../../common/endpoint/data_generators/trusted_app_generator';
-import { createSampleTrustedApps, createSampleTrustedApp } from '../../trusted_apps/test_utils';
+import { createSampleTrustedApp, createSampleTrustedApps } from '../../trusted_apps/test_utils';
 import {
   PolicyDetailsArtifactsPageListLocationParams,
   PolicyDetailsArtifactsPageLocation,
@@ -30,6 +22,10 @@ import {
   FleetGetEndpointPackagePolicyHttpMockInterface,
   fleetGetEndpointPackagePolicyListHttpMock,
   FleetGetEndpointPackagePolicyListHttpMockInterface,
+  trustedAppsGetListHttpMocks,
+  PolicyDetailsGetTrustedAppsListHttpMocksInterface,
+  trustedAppPutHttpMocks,
+  TrustedAppPutHttpMocksInterface,
 } from '../../mocks';
 
 export const getMockListResponse: () => GetTrustedAppsListResponse = () => ({
@@ -71,54 +67,17 @@ export const getAPIError = () => ({
   message: 'Something is not right',
 });
 
-type PolicyDetailsTrustedAppsHttpMocksInterface = ResponseProvidersInterface<{
-  policyTrustedAppsList: (options: HttpFetchOptionsWithPath) => GetTrustedAppsListResponse;
-}>;
-
-/**
- * HTTP mocks that support the Trusted Apps tab of the Policy Details page
- */
-export const policyDetailsTrustedAppsHttpMocks =
-  httpHandlerMockFactory<PolicyDetailsTrustedAppsHttpMocksInterface>([
-    {
-      id: 'policyTrustedAppsList',
-      path: TRUSTED_APPS_LIST_API,
-      method: 'get',
-      handler: ({ query }): GetTrustedAppsListResponse => {
-        const apiQueryParams = query as GetTrustedAppsListRequest;
-        const generator = new TrustedAppGenerator('seed');
-        const perPage = apiQueryParams.per_page ?? 10;
-        const data = Array.from({ length: Math.min(perPage, 50) }, () => generator.generate());
-
-        // Change the 3rd entry (index 2) to be policy specific
-        data[2].effectScope = {
-          type: 'policy',
-          policies: [
-            // IDs below are those generated by the `fleetGetEndpointPackagePolicyListHttpMock()` mock
-            'ddf6570b-9175-4a6d-b288-61a09771c647',
-            'b8e616ae-44fc-4be7-846c-ce8fa5c082dd',
-          ],
-        };
-
-        return {
-          page: apiQueryParams.page ?? 1,
-          per_page: perPage,
-          total: 20,
-          data,
-        };
-      },
-    },
-  ]);
-
 export type PolicyDetailsPageAllApiHttpMocksInterface =
   FleetGetEndpointPackagePolicyHttpMockInterface &
     FleetGetAgentStatusHttpMockInterface &
     FleetGetEndpointPackagePolicyListHttpMockInterface &
-    PolicyDetailsTrustedAppsHttpMocksInterface;
+    PolicyDetailsGetTrustedAppsListHttpMocksInterface &
+    TrustedAppPutHttpMocksInterface;
 export const policyDetailsPageAllApiHttpMocks =
   composeHttpHandlerMocks<PolicyDetailsPageAllApiHttpMocksInterface>([
     fleetGetEndpointPackagePolicyHttpMock,
     fleetGetAgentStatusHttpMock,
     fleetGetEndpointPackagePolicyListHttpMock,
-    policyDetailsTrustedAppsHttpMocks,
+    trustedAppsGetListHttpMocks,
+    trustedAppPutHttpMocks,
   ]);
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.test.tsx
index 83709c50b76fa..ff94e3befe8c8 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.test.tsx
@@ -282,7 +282,7 @@ describe('when rendering the PolicyTrustedAppsList', () => {
   it('should show toast message if trusted app list api call fails', async () => {
     const error = new Error('oh no');
     // @ts-expect-error
-    mockedApis.responseProvider.policyTrustedAppsList.mockRejectedValue(error);
+    mockedApis.responseProvider.trustedAppsList.mockRejectedValue(error);
     await render(false);
     await act(async () => {
       await waitForAction('assignedTrustedAppsListStateChanged', {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx
index fc2926bc65d3a..0411751685a90 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx
@@ -10,7 +10,7 @@ import {
   createAppRootMockRenderer,
 } from '../../../../../../common/mock/endpoint';
 import { getPolicyDetailsArtifactsListPath } from '../../../../../common/routing';
-import { isLoadedResourceState } from '../../../../../state';
+import { isFailedResourceState, isLoadedResourceState } from '../../../../../state';
 import React from 'react';
 import { fireEvent, act } from '@testing-library/react';
 import { policyDetailsPageAllApiHttpMocks } from '../../../test_utils';
@@ -18,7 +18,10 @@ import {
   RemoveTrustedAppFromPolicyModal,
   RemoveTrustedAppFromPolicyModalProps,
 } from './remove_trusted_app_from_policy_modal';
-import { PolicyArtifactsUpdateTrustedApps } from '../../../store/policy_details/action/policy_trusted_apps_action';
+import {
+  PolicyArtifactsUpdateTrustedApps,
+  PolicyDetailsTrustedAppsRemoveListStateChanged,
+} from '../../../store/policy_details/action/policy_trusted_apps_action';
 import { Immutable } from '../../../../../../../common/endpoint/types';
 import { HttpFetchOptionsWithPath } from 'kibana/public';
 
@@ -37,10 +40,19 @@ describe('When using the RemoveTrustedAppFromPolicyModal component', () => {
     onCloseHandler = jest.fn();
     mockedApis = policyDetailsPageAllApiHttpMocks(appTestContext.coreStart.http);
     trustedApps = [
-      mockedApis.responseProvider.policyTrustedAppsList({ query: {} } as HttpFetchOptionsWithPath)
-        .data[0],
+      // The 3rd trusted app generated by the HTTP mock is a Policy Specific one
+      mockedApis.responseProvider.trustedAppsList({ query: {} } as HttpFetchOptionsWithPath)
+        .data[2],
     ];
 
+    // Delay the Update Trusted App API response so that we can test UI states while the update is underway.
+    mockedApis.responseProvider.trustedAppUpdate.mockDelay.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          setTimeout(resolve, 20);
+        })
+    );
+
     render = async (waitForLoadedState: boolean = true) => {
       const pendingDataLoadState = waitForLoadedState
         ? Promise.all([
@@ -70,19 +82,48 @@ describe('When using the RemoveTrustedAppFromPolicyModal component', () => {
     renderResult.getByTestId('confirmModalConfirmButton') as HTMLButtonElement;
 
   const clickConfirmButton = async (
-    waitForActionDispatch: boolean = false
-  ): Promise<Immutable<PolicyArtifactsUpdateTrustedApps> | undefined> => {
+    /* wait for the UI action to the store middleware to initialize the remove */
+    waitForUpdateRequestActionDispatch: boolean = false,
+    /* wait for the removal to succeed */
+    waitForRemoveSuccessActionDispatch: boolean = false
+  ): Promise<
+    Immutable<
+      Array<PolicyArtifactsUpdateTrustedApps | PolicyDetailsTrustedAppsRemoveListStateChanged>
+    >
+  > => {
     const pendingConfirmStoreAction = waitForAction('policyArtifactsUpdateTrustedApps');
+    const pendingRemoveSuccessAction = waitForAction(
+      'policyDetailsTrustedAppsRemoveListStateChanged',
+      {
+        validate({ payload }) {
+          return isLoadedResourceState(payload);
+        },
+      }
+    );
 
     act(() => {
       fireEvent.click(getConfirmButton());
     });
 
-    let response: PolicyArtifactsUpdateTrustedApps | undefined;
+    let response: Array<
+      PolicyArtifactsUpdateTrustedApps | PolicyDetailsTrustedAppsRemoveListStateChanged
+    > = [];
+
+    if (waitForUpdateRequestActionDispatch || waitForRemoveSuccessActionDispatch) {
+      const pendingActions: Array<
+        Promise<PolicyArtifactsUpdateTrustedApps | PolicyDetailsTrustedAppsRemoveListStateChanged>
+      > = [];
+
+      if (waitForUpdateRequestActionDispatch) {
+        pendingActions.push(pendingConfirmStoreAction);
+      }
+
+      if (waitForRemoveSuccessActionDispatch) {
+        pendingActions.push(pendingRemoveSuccessAction);
+      }
 
-    if (waitForActionDispatch) {
       await act(async () => {
-        response = await pendingConfirmStoreAction;
+        response = await Promise.all(pendingActions);
       });
     }
 
@@ -113,7 +154,7 @@ describe('When using the RemoveTrustedAppFromPolicyModal component', () => {
 
   it('should dispatch action when confirmed', async () => {
     await render();
-    const confirmedAction = await clickConfirmButton(true);
+    const confirmedAction = (await clickConfirmButton(true))[0];
 
     expect(confirmedAction!.payload).toEqual({
       action: 'remove',
@@ -121,17 +162,11 @@ describe('When using the RemoveTrustedAppFromPolicyModal component', () => {
     });
   });
 
-  it.skip('should disable and show loading state on confirm button while update is underway', async () => {
+  it('should disable and show loading state on confirm button while update is underway', async () => {
     await render();
     await clickConfirmButton(true);
     const confirmButton = getConfirmButton();
 
-    // FIXME:PT will finish test in a subsequent PR (issue created #1876)
-    //  GETTING ERROR:
-    //  Error: current policy id not found
-    //     //     at removeTrustedAppsFromPolicy (.../x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_trusted_apps_middleware.ts:368:13)
-    //     //     at policyTrustedAppsMiddlewareRunner (.../x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_trusted_apps_middleware.ts:93:9)
-
     expect(confirmButton.disabled).toBe(true);
     expect(confirmButton.querySelector('.euiLoadingSpinner')).not.toBeNull();
   });
@@ -141,16 +176,80 @@ describe('When using the RemoveTrustedAppFromPolicyModal component', () => {
     ['close', clickCloseButton],
   ])(
     'should prevent dialog dismissal if %s button is clicked while update is underway',
-    (__, clickButton) => {
-      // TODO: implement test
+    async (__, clickButton) => {
+      await render();
+      await clickConfirmButton(true);
+      clickButton();
+
+      expect(onCloseHandler).not.toHaveBeenCalled();
     }
   );
 
-  it.todo('should show error toast if removal failed');
+  it('should show error toast if removal failed', async () => {
+    const error = new Error('oh oh');
+    mockedApis.responseProvider.trustedAppUpdate.mockImplementation(() => {
+      throw error;
+    });
+    await render();
+    await clickConfirmButton(true);
+    await act(async () => {
+      await waitForAction('policyDetailsTrustedAppsRemoveListStateChanged', {
+        validate({ payload }) {
+          return isFailedResourceState(payload);
+        },
+      });
+    });
 
-  it.todo('should show success toast and close modal when removed is successful');
+    expect(appTestContext.coreStart.notifications.toasts.addError).toHaveBeenCalledWith(
+      expect.objectContaining({ message: expect.stringContaining('oh oh') }),
+      expect.objectContaining({ title: expect.any(String) })
+    );
+  });
 
-  it.todo('should show single removal success message');
+  it('should show success toast and close modal when removed is successful', async () => {
+    await render();
+    await clickConfirmButton(true, true);
 
-  it.todo('should show multiples removal success message');
+    expect(appTestContext.coreStart.notifications.toasts.addSuccess).toHaveBeenCalledWith({
+      text: '"Avast Business Antivirus" has been removed from Endpoint Policy policy',
+      title: 'Successfully removed',
+    });
+  });
+
+  it('should show multiples removal success message', async () => {
+    trustedApps = [
+      ...trustedApps,
+      {
+        ...trustedApps[0],
+        id: '123',
+        name: 'trusted app 2',
+      },
+    ];
+
+    await render();
+    await clickConfirmButton(true, true);
+
+    expect(appTestContext.coreStart.notifications.toasts.addSuccess).toHaveBeenCalledWith({
+      text: '2 trusted applications have been removed from Endpoint Policy policy',
+      title: 'Successfully removed',
+    });
+  });
+
+  it('should trigger a refresh of trusted apps list data on successful removal', async () => {
+    await render();
+    const pendingActions = Promise.all([
+      // request list refresh
+      waitForAction('policyDetailsTrustedAppsForceListDataRefresh'),
+
+      // list data refresh received
+      waitForAction('assignedTrustedAppsListStateChanged', {
+        validate({ payload }) {
+          return isLoadedResourceState(payload);
+        },
+      }),
+    ]);
+    await clickConfirmButton(true, true);
+
+    await expect(pendingActions).resolves.toHaveLength(2);
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.tsx
index c43c28ec82829..fec9ae4d7a09b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.tsx
@@ -48,7 +48,8 @@ export const RemoveTrustedAppFromPolicyModal = memo<RemoveTrustedAppFromPolicyMo
         return i18n.translate(
           'xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.successMultiplesToastText',
           {
-            defaultMessage: '{count} trusted apps have been removed from {policyName} policy',
+            defaultMessage:
+              '{count} trusted applications have been removed from {policyName} policy',
             values: { count, policyName },
           }
         );
@@ -57,7 +58,7 @@ export const RemoveTrustedAppFromPolicyModal = memo<RemoveTrustedAppFromPolicyMo
       return i18n.translate(
         'xpack.securitySolution.endpoint.policy.trustedApps.list.removeDialog.successToastText',
         {
-          defaultMessage: '"{trustedAppName}" has been removed from "{policyName}" policy',
+          defaultMessage: '"{trustedAppName}" has been removed from {policyName} policy',
           values: { trustedAppName: trustedApps[0].name, policyName },
         }
       );

From dfbb397696d23274ca92f095cb014a4b2d8681a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= <patryk.kopycinski@elastic.co>
Date: Thu, 14 Oct 2021 18:43:14 +0200
Subject: [PATCH 086/117] [Osquery] Fix sql query parser logic (#114932)

---
 .../queries/ecs_mapping_editor_field.tsx      | 219 +++++++++++-------
 1 file changed, 134 insertions(+), 85 deletions(-)

diff --git a/x-pack/plugins/osquery/public/scheduled_query_groups/queries/ecs_mapping_editor_field.tsx b/x-pack/plugins/osquery/public/scheduled_query_groups/queries/ecs_mapping_editor_field.tsx
index 34d7dd755e2b9..8a5fa0e2066f2 100644
--- a/x-pack/plugins/osquery/public/scheduled_query_groups/queries/ecs_mapping_editor_field.tsx
+++ b/x-pack/plugins/osquery/public/scheduled_query_groups/queries/ecs_mapping_editor_field.tsx
@@ -6,7 +6,7 @@
  */
 
 import { produce } from 'immer';
-import { isEmpty, find, orderBy, sortedUniqBy, isArray, map } from 'lodash';
+import { each, isEmpty, find, orderBy, sortedUniqBy, isArray, map, reduce, get } from 'lodash';
 import React, {
   forwardRef,
   useCallback,
@@ -624,30 +624,47 @@ export const ECSMappingEditorField = ({ field, query, fieldRef }: ECSMappingEdit
         return currentValue;
       }
 
-      const tablesOrderMap =
-        ast?.from?.value?.reduce(
-          (
-            acc: { [x: string]: number },
-            table: { value: { alias?: { value: string }; value: { value: string } } },
-            index: number
-          ) => {
-            acc[table.value.alias?.value ?? table.value.value.value] = index;
-            return acc;
-          },
-          {}
-        ) ?? {};
-
-      const astOsqueryTables: Record<string, OsqueryColumn[]> =
+      const astOsqueryTables: Record<
+        string,
+        {
+          columns: OsqueryColumn[];
+          order: number;
+        }
+      > =
         ast?.from?.value?.reduce(
           (
-            acc: { [x: string]: OsqueryColumn[] },
-            table: { value: { alias?: { value: string }; value: { value: string } } }
-          ) => {
-            const osqueryTable = find(osquerySchema, ['name', table.value.value.value]);
-
-            if (osqueryTable) {
-              acc[table.value.alias?.value ?? table.value.value.value] = osqueryTable.columns;
+            acc: {
+              [x: string]: {
+                columns: OsqueryColumn[];
+                order: number;
+              };
+            },
+            table: {
+              value: {
+                left?: { value: { value: string }; alias?: { value: string } };
+                right?: { value: { value: string }; alias?: { value: string } };
+                value?: { value: string };
+                alias?: { value: string };
+              };
             }
+          ) => {
+            each(['value.left', 'value.right', 'value'], (valueKey) => {
+              if (valueKey) {
+                const osqueryTable = find(osquerySchema, [
+                  'name',
+                  get(table, `${valueKey}.value.value`),
+                ]);
+
+                if (osqueryTable) {
+                  acc[
+                    get(table, `${valueKey}.alias.value`) ?? get(table, `${valueKey}.value.value`)
+                  ] = {
+                    columns: osqueryTable.columns,
+                    order: Object.keys(acc).length,
+                  };
+                }
+              }
+            });
 
             return acc;
           },
@@ -659,75 +676,107 @@ export const ECSMappingEditorField = ({ field, query, fieldRef }: ECSMappingEdit
         return currentValue;
       }
 
-      /*
-        Simple query
-        select * from users;
-      */
-      if (
-        ast?.selectItems?.value?.length &&
-        ast?.selectItems?.value[0].value === '*' &&
-        ast.from?.value?.length &&
-        ast?.from.value[0].value?.value?.value &&
-        astOsqueryTables[ast.from.value[0].value.value.value]
-      ) {
-        const tableName =
-          ast.from.value[0].value.alias?.value ?? ast.from.value[0].value.value.value;
-
-        return astOsqueryTables[ast.from.value[0].value.value.value].map((osqueryColumn) => ({
-          label: osqueryColumn.name,
-          value: {
-            name: osqueryColumn.name,
-            description: osqueryColumn.description,
-            table: tableName,
-            tableOrder: tablesOrderMap[tableName],
-            suggestion_label: osqueryColumn.name,
-          },
-        }));
-      }
-
-      /*
-       Advanced query
-       select i.*, p.resident_size, p.user_time, p.system_time, time.minutes as counter from osquery_info i, processes p, time where p.pid = i.pid;
-      */
       const suggestions =
         isArray(ast?.selectItems?.value) &&
         ast?.selectItems?.value
-          // @ts-expect-error update types
-          ?.map((selectItem) => {
-            const [table, column] = selectItem.value?.split('.');
-
-            if (column === '*' && astOsqueryTables[table]) {
-              return astOsqueryTables[table].map((osqueryColumn) => ({
-                label: osqueryColumn.name,
-                value: {
-                  name: osqueryColumn.name,
-                  description: osqueryColumn.description,
-                  table,
-                  tableOrder: tablesOrderMap[table],
-                  suggestion_label: `${osqueryColumn.name}`,
-                },
-              }));
-            }
+          ?.map((selectItem: { type: string; value: string; hasAs: boolean; alias?: string }) => {
+            if (selectItem.type === 'Identifier') {
+              /*
+                select * from routes, uptime;
+              */
+              if (ast?.selectItems?.value.length === 1 && selectItem.value === '*') {
+                return reduce(
+                  astOsqueryTables,
+                  (acc, { columns: osqueryColumns, order: tableOrder }, table) => {
+                    acc.push(
+                      ...osqueryColumns.map((osqueryColumn) => ({
+                        label: osqueryColumn.name,
+                        value: {
+                          name: osqueryColumn.name,
+                          description: osqueryColumn.description,
+                          table,
+                          tableOrder,
+                          suggestion_label: osqueryColumn.name,
+                        },
+                      }))
+                    );
+                    return acc;
+                  },
+                  [] as OsquerySchemaOption[]
+                );
+              }
 
-            if (astOsqueryTables && astOsqueryTables[table]) {
-              const osqueryColumn = find(astOsqueryTables[table], ['name', column]);
-
-              if (osqueryColumn) {
-                const label = selectItem.hasAs ? selectItem.alias : column;
-
-                return [
-                  {
-                    label,
-                    value: {
-                      name: osqueryColumn.name,
-                      description: osqueryColumn.description,
-                      table,
-                      tableOrder: tablesOrderMap[table],
-                      suggestion_label: `${label}`,
-                    },
+              /*
+                select i.*, p.resident_size, p.user_time, p.system_time, time.minutes as counter from osquery_info i, processes p, time where p.pid = i.pid;
+              */
+
+              const [table, column] = selectItem.value.includes('.')
+                ? selectItem.value?.split('.')
+                : [Object.keys(astOsqueryTables)[0], selectItem.value];
+
+              if (column === '*' && astOsqueryTables[table]) {
+                const { columns: osqueryColumns, order: tableOrder } = astOsqueryTables[table];
+                return osqueryColumns.map((osqueryColumn) => ({
+                  label: osqueryColumn.name,
+                  value: {
+                    name: osqueryColumn.name,
+                    description: osqueryColumn.description,
+                    table,
+                    tableOrder,
+                    suggestion_label: `${osqueryColumn.name}`,
                   },
-                ];
+                }));
               }
+
+              if (astOsqueryTables[table]) {
+                const osqueryColumn = find(astOsqueryTables[table].columns, ['name', column]);
+
+                if (osqueryColumn) {
+                  const label = selectItem.hasAs ? selectItem.alias : column;
+
+                  return [
+                    {
+                      label,
+                      value: {
+                        name: osqueryColumn.name,
+                        description: osqueryColumn.description,
+                        table,
+                        tableOrder: astOsqueryTables[table].order,
+                        suggestion_label: `${label}`,
+                      },
+                    },
+                  ];
+                }
+              }
+            }
+
+            /*
+              SELECT pid, uid, name, ROUND((
+                (user_time + system_time) / (cpu_time.tsb - cpu_time.itsb)
+              ) * 100, 2) AS percentage
+              FROM processes, (
+              SELECT (
+                SUM(user) + SUM(nice) + SUM(system) + SUM(idle) * 1.0) AS tsb,
+                SUM(COALESCE(idle, 0)) + SUM(COALESCE(iowait, 0)) AS itsb
+                FROM cpu_time
+              ) AS cpu_time
+              ORDER BY user_time+system_time DESC
+              LIMIT 5;
+            */
+
+            if (selectItem.type === 'FunctionCall' && selectItem.hasAs) {
+              return [
+                {
+                  label: selectItem.alias,
+                  value: {
+                    name: selectItem.alias,
+                    description: '',
+                    table: '',
+                    tableOrder: -1,
+                    suggestion_label: selectItem.alias,
+                  },
+                },
+              ];
             }
 
             return [];

From e4e7a1ced14565923a5948f2f985c90c21a46bc5 Mon Sep 17 00:00:00 2001
From: Dominique Clarke <doclarke71@gmail.com>
Date: Thu, 14 Oct 2021 12:43:39 -0400
Subject: [PATCH 087/117] [Observability] [Exploratory view] remove the filter
 buttons from the exploratory view legend (#114908)

---
 .../components/shared/exploratory_view/exploratory_view.tsx   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.tsx
index 9870d88d1220a..f3f332b5094b6 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.tsx
@@ -183,6 +183,10 @@ const Wrapper = styled(EuiPanel)`
   width: 100%;
   overflow-x: auto;
   position: relative;
+
+  .echLegendItem__action {
+    display: none;
+  }
 `;
 
 const ShowPreview = styled(EuiButtonEmpty)`

From d0e19e49602b92abd1c255ed51eebfc578c21c5d Mon Sep 17 00:00:00 2001
From: Marco Liberati <dej611@users.noreply.github.com>
Date: Thu, 14 Oct 2021 18:45:31 +0200
Subject: [PATCH 088/117] [Lens][Inspector] Close the inspector on Lens unmount
 (#114317)

* :bug: First attempt to close the inspector automatically on app unmount

* :ok_hand: Integrate feedback

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../__snapshots__/app.test.tsx.snap           | 35 ++-----------------
 .../lens/public/app_plugin/app.test.tsx       |  2 +-
 x-pack/plugins/lens/public/app_plugin/app.tsx |  6 ++--
 .../lens/public/app_plugin/mounter.tsx        |  4 ++-
 .../plugins/lens/public/app_plugin/types.ts   |  3 +-
 .../lens/public/lens_inspector_service.ts     | 13 ++++++-
 x-pack/plugins/lens/public/mocks.tsx          |  7 +++-
 x-pack/test/functional/apps/lens/inspector.ts |  6 ++++
 8 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/x-pack/plugins/lens/public/app_plugin/__snapshots__/app.test.tsx.snap b/x-pack/plugins/lens/public/app_plugin/__snapshots__/app.test.tsx.snap
index 51adf7737fd4b..ca14bc908eb80 100644
--- a/x-pack/plugins/lens/public/app_plugin/__snapshots__/app.test.tsx.snap
+++ b/x-pack/plugins/lens/public/app_plugin/__snapshots__/app.test.tsx.snap
@@ -28,39 +28,8 @@ Array [
             Symbol(kCapture): false,
           },
         },
-        "inspect": [Function],
-      },
-      "showNoDataPopover": [Function],
-    },
-    Object {},
-  ],
-  Array [
-    Object {
-      "lensInspector": Object {
-        "adapters": Object {
-          "expression": ExpressionsInspectorAdapter {
-            "_ast": Object {},
-            "_events": Object {},
-            "_eventsCount": 0,
-            "_maxListeners": undefined,
-            Symbol(kCapture): false,
-          },
-          "requests": RequestAdapter {
-            "_events": Object {},
-            "_eventsCount": 0,
-            "_maxListeners": undefined,
-            "requests": Map {},
-            Symbol(kCapture): false,
-          },
-          "tables": TablesAdapter {
-            "_events": Object {},
-            "_eventsCount": 0,
-            "_maxListeners": undefined,
-            "_tables": Object {},
-            Symbol(kCapture): false,
-          },
-        },
-        "inspect": [Function],
+        "close": [MockFunction],
+        "inspect": [MockFunction],
       },
       "showNoDataPopover": [Function],
     },
diff --git a/x-pack/plugins/lens/public/app_plugin/app.test.tsx b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
index 0b800940e1787..b55d424c0db48 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.test.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
@@ -812,7 +812,7 @@ describe('Lens App', () => {
 
       await runInspect(instance);
 
-      expect(services.inspector.open).toHaveBeenCalledTimes(1);
+      expect(services.inspector.inspect).toHaveBeenCalledTimes(1);
     });
   });
 
diff --git a/x-pack/plugins/lens/public/app_plugin/app.tsx b/x-pack/plugins/lens/public/app_plugin/app.tsx
index ae2edaa1b98d3..5638a35d1cc6d 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.tsx
@@ -37,7 +37,7 @@ import {
   getLastKnownDocWithoutPinnedFilters,
   runSaveLensVisualization,
 } from './save_modal_container';
-import { getLensInspectorService, LensInspector } from '../lens_inspector_service';
+import { LensInspector } from '../lens_inspector_service';
 import { getEditPath } from '../../common';
 
 export type SaveProps = Omit<OnSaveProps, 'onTitleDuplicate' | 'newDescription'> & {
@@ -66,7 +66,7 @@ export function App({
     data,
     chrome,
     uiSettings,
-    inspector,
+    inspector: lensInspector,
     application,
     notifications,
     savedObjectsTagging,
@@ -101,8 +101,6 @@ export function App({
   const [isSaveModalVisible, setIsSaveModalVisible] = useState(false);
   const [lastKnownDoc, setLastKnownDoc] = useState<Document | undefined>(undefined);
 
-  const lensInspector = getLensInspectorService(inspector);
-
   useEffect(() => {
     if (currentDoc) {
       setLastKnownDoc(currentDoc);
diff --git a/x-pack/plugins/lens/public/app_plugin/mounter.tsx b/x-pack/plugins/lens/public/app_plugin/mounter.tsx
index 22b345a64fa22..d4bc59a1e9e2c 100644
--- a/x-pack/plugins/lens/public/app_plugin/mounter.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/mounter.tsx
@@ -41,6 +41,7 @@ import {
   LensState,
 } from '../state_management';
 import { getPreloadedState } from '../state_management/lens_slice';
+import { getLensInspectorService } from '../lens_inspector_service';
 
 export async function getLensServices(
   coreStart: CoreStart,
@@ -65,7 +66,7 @@ export async function getLensServices(
   return {
     data,
     storage,
-    inspector,
+    inspector: getLensInspectorService(inspector),
     navigation,
     fieldFormats,
     stateTransfer,
@@ -278,6 +279,7 @@ export async function mountApp(
   return () => {
     data.search.session.clear();
     unmountComponentAtNode(params.element);
+    lensServices.inspector.close();
     unlistenParentHistory();
     lensStore.dispatch(navigateAway());
   };
diff --git a/x-pack/plugins/lens/public/app_plugin/types.ts b/x-pack/plugins/lens/public/app_plugin/types.ts
index 8a3a848ffa204..a5cd8bfef71f3 100644
--- a/x-pack/plugins/lens/public/app_plugin/types.ts
+++ b/x-pack/plugins/lens/public/app_plugin/types.ts
@@ -21,7 +21,6 @@ import type {
 import type { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
 import type { UsageCollectionStart } from '../../../../../src/plugins/usage_collection/public';
 import type { DashboardStart } from '../../../../../src/plugins/dashboard/public';
-import type { Start as InspectorStart } from '../../../../../src/plugins/inspector/public';
 import type { LensEmbeddableInput } from '../embeddable/embeddable';
 import type { NavigationPublicPluginStart } from '../../../../../src/plugins/navigation/public';
 import type { LensAttributeService } from '../lens_attribute_service';
@@ -105,7 +104,7 @@ export interface LensAppServices {
   dashboard: DashboardStart;
   fieldFormats: FieldFormatsStart;
   data: DataPublicPluginStart;
-  inspector: InspectorStart;
+  inspector: LensInspector;
   uiSettings: IUiSettingsClient;
   application: ApplicationStart;
   notifications: NotificationsStart;
diff --git a/x-pack/plugins/lens/public/lens_inspector_service.ts b/x-pack/plugins/lens/public/lens_inspector_service.ts
index d9573962f12d4..6cac381871d73 100644
--- a/x-pack/plugins/lens/public/lens_inspector_service.ts
+++ b/x-pack/plugins/lens/public/lens_inspector_service.ts
@@ -8,6 +8,7 @@
 import type {
   Adapters,
   InspectorOptions,
+  InspectorSession,
   Start as InspectorStartContract,
 } from '../../../../src/plugins/inspector/public';
 
@@ -15,9 +16,19 @@ import { createDefaultInspectorAdapters } from '../../../../src/plugins/expressi
 
 export const getLensInspectorService = (inspector: InspectorStartContract) => {
   const adapters: Adapters = createDefaultInspectorAdapters();
+  let overlayRef: InspectorSession | undefined;
   return {
     adapters,
-    inspect: (options?: InspectorOptions) => inspector.open(adapters, options),
+    inspect: (options?: InspectorOptions) => {
+      overlayRef = inspector.open(adapters, options);
+      overlayRef.onClose.then(() => {
+        if (overlayRef) {
+          overlayRef = undefined;
+        }
+      });
+      return overlayRef;
+    },
+    close: () => overlayRef?.close(),
   };
 };
 
diff --git a/x-pack/plugins/lens/public/mocks.tsx b/x-pack/plugins/lens/public/mocks.tsx
index 3b48c13f2585a..989c858b1f29d 100644
--- a/x-pack/plugins/lens/public/mocks.tsx
+++ b/x-pack/plugins/lens/public/mocks.tsx
@@ -56,6 +56,7 @@ import {
   DatasourceMap,
   VisualizationMap,
 } from './types';
+import { getLensInspectorService } from './lens_inspector_service';
 
 export function mockDatasourceStates() {
   return {
@@ -417,7 +418,11 @@ export function makeDefaultServices(
     navigation: navigationStartMock,
     notifications: core.notifications,
     attributeService: makeAttributeService(),
-    inspector: inspectorPluginMock.createStartContract(),
+    inspector: {
+      adapters: getLensInspectorService(inspectorPluginMock.createStartContract()).adapters,
+      inspect: jest.fn(),
+      close: jest.fn(),
+    },
     dashboard: dashboardPluginMock.createStartContract(),
     presentationUtil: presentationUtilPluginMock.createStartContract(core),
     savedObjectsClient: core.savedObjects.client,
diff --git a/x-pack/test/functional/apps/lens/inspector.ts b/x-pack/test/functional/apps/lens/inspector.ts
index 0783124079d4c..9db804d324936 100644
--- a/x-pack/test/functional/apps/lens/inspector.ts
+++ b/x-pack/test/functional/apps/lens/inspector.ts
@@ -11,6 +11,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['visualize', 'lens', 'common', 'header']);
   const elasticChart = getService('elasticChart');
   const inspector = getService('inspector');
+  const testSubjects = getService('testSubjects');
 
   describe('lens inspector', () => {
     before(async () => {
@@ -55,5 +56,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await inspector.openInspectorRequestsView();
       expect(await inspector.getRequestNames()).to.be('Data,Other bucket');
     });
+
+    it('should close the inspector when navigating away from Lens', async () => {
+      await PageObjects.visualize.navigateToNewVisualization();
+      expect(await testSubjects.exists('inspectorPanel')).to.be(false);
+    });
   });
 }

From 57e3af77f04b04c16e8b6307684b9341434fb8ca Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Thu, 14 Oct 2021 09:57:54 -0700
Subject: [PATCH 089/117] [Reporting] Forward-port config deprecation fixes
 from 7.x (#114950)

* [Reporting] Forward-port config deprecation fixes from 7.x

* remove index deprecation

* fix test
---
 .../reporting/server/config/index.test.ts     | 13 +-----
 .../plugins/reporting/server/config/index.ts  | 46 ++++++++-----------
 2 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/x-pack/plugins/reporting/server/config/index.test.ts b/x-pack/plugins/reporting/server/config/index.test.ts
index f8426fd24852c..9e6c8f35308f9 100644
--- a/x-pack/plugins/reporting/server/config/index.test.ts
+++ b/x-pack/plugins/reporting/server/config/index.test.ts
@@ -36,22 +36,11 @@ const applyReportingDeprecations = (settings: Record<string, any> = {}) => {
 };
 
 describe('deprecations', () => {
-  ['.foo', '.reporting'].forEach((index) => {
-    it('logs a warning if index is set', () => {
-      const { messages } = applyReportingDeprecations({ index, roles: { enabled: false } });
-      expect(messages).toMatchInlineSnapshot(`
-        Array [
-          "Multitenancy by changing \\"kibana.index\\" will not be supported starting in 8.0. See https://ela.st/kbn-remove-legacy-multitenancy for more details",
-        ]
-      `);
-    });
-  });
-
   it('logs a warning if roles.enabled: true is set', () => {
     const { messages } = applyReportingDeprecations({ roles: { enabled: true } });
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "Granting reporting privilege through a \\"reporting_user\\" role will not be supported starting in 8.0. Please set \\"xpack.reporting.roles.enabled\\" to \\"false\\" and grant reporting privileges to users using Kibana application privileges **Management > Security > Roles**.",
+        "Use Kibana application privileges to grant reporting privileges. Using  \\"xpack.reporting.roles.allow\\" to grant reporting privileges prevents users from using API Keys to create reports. The \\"xpack.reporting.roles.enabled\\" setting will default to false in a future release.",
       ]
     `);
   });
diff --git a/x-pack/plugins/reporting/server/config/index.ts b/x-pack/plugins/reporting/server/config/index.ts
index 45a71d05165ba..91e5fbf572ecf 100644
--- a/x-pack/plugins/reporting/server/config/index.ts
+++ b/x-pack/plugins/reporting/server/config/index.ts
@@ -23,49 +23,39 @@ export const config: PluginConfigDescriptor<ReportingConfigType> = {
     unused('capture.viewport'), // deprecated as unused since 7.16
     (settings, fromPath, addDeprecation) => {
       const reporting = get(settings, fromPath);
-      if (reporting?.index) {
-        addDeprecation({
-          title: i18n.translate('xpack.reporting.deprecations.reportingIndex.title', {
-            defaultMessage: 'Setting "{fromPath}.index" is deprecated',
-            values: { fromPath },
-          }),
-          message: i18n.translate('xpack.reporting.deprecations.reportingIndex.description', {
-            defaultMessage: `Multitenancy by changing "kibana.index" will not be supported starting in 8.0. See https://ela.st/kbn-remove-legacy-multitenancy for more details`,
-          }),
-          correctiveActions: {
-            manualSteps: [
-              i18n.translate('xpack.reporting.deprecations.reportingIndex.manualStepOne', {
-                defaultMessage: `If you rely on this setting to achieve multitenancy you should use Spaces, cross-cluster replication, or cross-cluster search instead.`,
-              }),
-              i18n.translate('xpack.reporting.deprecations.reportingIndex.manualStepTwo', {
-                defaultMessage: `To migrate to Spaces, we encourage using saved object management to export your saved objects from a tenant into the default tenant in a space.`,
-              }),
-            ],
-          },
-        });
-      }
-
       if (reporting?.roles?.enabled !== false) {
         addDeprecation({
+          level: 'warning',
           title: i18n.translate('xpack.reporting.deprecations.reportingRoles.title', {
             defaultMessage: 'Setting "{fromPath}.roles" is deprecated',
             values: { fromPath },
           }),
+          // TODO: once scheduled reports is released, restate this to say that we have no access to scheduled reporting.
+          // https://github.com/elastic/kibana/issues/79905
           message: i18n.translate('xpack.reporting.deprecations.reportingRoles.description', {
             defaultMessage:
-              `Granting reporting privilege through a "reporting_user" role will not be supported` +
-              ` starting in 8.0. Please set "xpack.reporting.roles.enabled" to "false" and grant reporting privileges to users` +
-              ` using Kibana application privileges **Management > Security > Roles**.`,
+              `Use Kibana application privileges to grant reporting privileges.` +
+              ` Using  "{fromPath}.roles.allow" to grant reporting privileges` +
+              ` prevents users from using API Keys to create reports.` +
+              ` The "{fromPath}.roles.enabled" setting will default to false` +
+              ` in a future release.`,
+            values: { fromPath },
           }),
           correctiveActions: {
             manualSteps: [
               i18n.translate('xpack.reporting.deprecations.reportingRoles.manualStepOne', {
-                defaultMessage: `Set 'xpack.reporting.roles.enabled' to 'false' in your kibana configs.`,
+                defaultMessage: `Set "xpack.reporting.roles.enabled" to "false" in kibana.yml.`,
               }),
               i18n.translate('xpack.reporting.deprecations.reportingRoles.manualStepTwo', {
                 defaultMessage:
-                  `Grant reporting privileges to users using Kibana application privileges` +
-                  ` under **Management > Security > Roles**.`,
+                  `Create one or more roles that grant the Kibana application` +
+                  ` privilege for reporting from **Management > Security > Roles**.`,
+              }),
+              i18n.translate('xpack.reporting.deprecations.reportingRoles.manualStepThree', {
+                defaultMessage:
+                  `Grant reporting privileges to users by assigning one of the new roles.` +
+                  ` Users assigned a reporting role specified in "xpack.reporting.roles.allow"` +
+                  ` will no longer have reporting privileges, they must be assigned an application privilege based role.`,
               }),
             ],
           },

From dafd9d4e60d3996b5c4e3f9622b1340db18dd0fe Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Thu, 14 Oct 2021 13:16:28 -0400
Subject: [PATCH 090/117] [Fleet] Add File upload (#114934)

---
 .../apis/custom_integration/integrations.ts   |  2 +-
 .../data_visualizer/common/constants.ts       | 11 ++++++++
 x-pack/plugins/data_visualizer/kibana.json    |  3 ++-
 .../data_visualizer/public/register_home.ts   | 21 ++++++++-------
 .../plugins/data_visualizer/server/plugin.ts  |  6 +++++
 .../server/register_custom_integration.ts     | 27 +++++++++++++++++++
 .../data_visualizer/server/types/deps.ts      |  4 +++
 x-pack/plugins/data_visualizer/tsconfig.json  |  1 +
 8 files changed, 63 insertions(+), 12 deletions(-)
 create mode 100644 x-pack/plugins/data_visualizer/server/register_custom_integration.ts

diff --git a/test/api_integration/apis/custom_integration/integrations.ts b/test/api_integration/apis/custom_integration/integrations.ts
index 4b0745574b521..816e360c5a30b 100644
--- a/test/api_integration/apis/custom_integration/integrations.ts
+++ b/test/api_integration/apis/custom_integration/integrations.ts
@@ -23,7 +23,7 @@ export default function ({ getService }: FtrProviderContext) {
         expect(resp.body).to.be.an('array');
 
         // sample data
-        expect(resp.body.length).to.be.above(13); // at least the language clients + tutorials + sample data
+        expect(resp.body.length).to.be.above(14); // at least the language clients + sample data + add data
 
         ['flights', 'logs', 'ecommerce'].forEach((sampleData) => {
           expect(resp.body.findIndex((c: { id: string }) => c.id === sampleData)).to.be.above(-1);
diff --git a/x-pack/plugins/data_visualizer/common/constants.ts b/x-pack/plugins/data_visualizer/common/constants.ts
index f7bea807c3e61..5a3a1d8f2e5bf 100644
--- a/x-pack/plugins/data_visualizer/common/constants.ts
+++ b/x-pack/plugins/data_visualizer/common/constants.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { i18n } from '@kbn/i18n';
 import { KBN_FIELD_TYPES } from '../../../../src/plugins/data/common';
 
 export const UI_SETTING_MAX_FILE_SIZE = 'fileUpload:maxFileSize';
@@ -39,3 +40,13 @@ export const NON_AGGREGATABLE_FIELD_TYPES = new Set<string>([
   KBN_FIELD_TYPES.GEO_SHAPE,
   KBN_FIELD_TYPES.HISTOGRAM,
 ]);
+
+export const FILE_DATA_VIS_TAB_ID = 'fileDataViz';
+export const applicationPath = `/app/home#/tutorial_directory/${FILE_DATA_VIS_TAB_ID}`;
+export const featureTitle = i18n.translate('xpack.dataVisualizer.title', {
+  defaultMessage: 'Upload a file',
+});
+export const featureDescription = i18n.translate('xpack.dataVisualizer.description', {
+  defaultMessage: 'Import your own CSV, NDJSON, or log file.',
+});
+export const featureId = `file_data_visualizer`;
diff --git a/x-pack/plugins/data_visualizer/kibana.json b/x-pack/plugins/data_visualizer/kibana.json
index e7f2d71313abf..e63a6b4fa2100 100644
--- a/x-pack/plugins/data_visualizer/kibana.json
+++ b/x-pack/plugins/data_visualizer/kibana.json
@@ -17,7 +17,8 @@
     "maps",
     "home",
     "lens",
-    "indexPatternFieldEditor"
+    "indexPatternFieldEditor",
+    "customIntegrations"
   ],
   "requiredBundles": [
     "home",
diff --git a/x-pack/plugins/data_visualizer/public/register_home.ts b/x-pack/plugins/data_visualizer/public/register_home.ts
index 3e8973784433c..4f4601ae76977 100644
--- a/x-pack/plugins/data_visualizer/public/register_home.ts
+++ b/x-pack/plugins/data_visualizer/public/register_home.ts
@@ -9,8 +9,13 @@ import { i18n } from '@kbn/i18n';
 import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
 import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
 import { FileDataVisualizerWrapper } from './lazy_load_bundle/component_wrapper';
-
-const FILE_DATA_VIS_TAB_ID = 'fileDataViz';
+import {
+  featureDescription,
+  featureTitle,
+  FILE_DATA_VIS_TAB_ID,
+  applicationPath,
+  featureId,
+} from '../common';
 
 export function registerHomeAddData(home: HomePublicPluginSetup) {
   home.addData.registerAddDataTab({
@@ -24,15 +29,11 @@ export function registerHomeAddData(home: HomePublicPluginSetup) {
 
 export function registerHomeFeatureCatalogue(home: HomePublicPluginSetup) {
   home.featureCatalogue.register({
-    id: `file_data_visualizer`,
-    title: i18n.translate('xpack.dataVisualizer.title', {
-      defaultMessage: 'Upload a file',
-    }),
-    description: i18n.translate('xpack.dataVisualizer.description', {
-      defaultMessage: 'Import your own CSV, NDJSON, or log file.',
-    }),
+    id: featureId,
+    title: featureTitle,
+    description: featureDescription,
     icon: 'document',
-    path: `/app/home#/tutorial_directory/${FILE_DATA_VIS_TAB_ID}`,
+    path: applicationPath,
     showOnHomePage: true,
     category: FeatureCatalogueCategory.DATA,
     order: 520,
diff --git a/x-pack/plugins/data_visualizer/server/plugin.ts b/x-pack/plugins/data_visualizer/server/plugin.ts
index 9db580959b116..e2e0637ef8f3f 100644
--- a/x-pack/plugins/data_visualizer/server/plugin.ts
+++ b/x-pack/plugins/data_visualizer/server/plugin.ts
@@ -8,12 +8,18 @@
 import { CoreSetup, CoreStart, Plugin } from 'src/core/server';
 import { StartDeps, SetupDeps } from './types';
 import { dataVisualizerRoutes } from './routes';
+import { registerWithCustomIntegrations } from './register_custom_integration';
 
 export class DataVisualizerPlugin implements Plugin {
   constructor() {}
 
   setup(coreSetup: CoreSetup<StartDeps, unknown>, plugins: SetupDeps) {
     dataVisualizerRoutes(coreSetup);
+
+    // home-plugin required
+    if (plugins.home && plugins.customIntegrations) {
+      registerWithCustomIntegrations(plugins.customIntegrations);
+    }
   }
 
   start(core: CoreStart) {}
diff --git a/x-pack/plugins/data_visualizer/server/register_custom_integration.ts b/x-pack/plugins/data_visualizer/server/register_custom_integration.ts
new file mode 100644
index 0000000000000..86aa3cd96d613
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/register_custom_integration.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 { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
+import { applicationPath, featureDescription, featureId, featureTitle } from '../common';
+
+export function registerWithCustomIntegrations(customIntegrations: CustomIntegrationsPluginSetup) {
+  customIntegrations.registerCustomIntegration({
+    id: featureId,
+    title: featureTitle,
+    description: featureDescription,
+    uiInternalPath: applicationPath,
+    isBeta: false,
+    icons: [
+      {
+        type: 'eui',
+        src: 'addDataApp',
+      },
+    ],
+    categories: ['upload_file'],
+    shipper: 'other',
+  });
+}
diff --git a/x-pack/plugins/data_visualizer/server/types/deps.ts b/x-pack/plugins/data_visualizer/server/types/deps.ts
index fe982b1fa5e1a..1f6dba0592f6f 100644
--- a/x-pack/plugins/data_visualizer/server/types/deps.ts
+++ b/x-pack/plugins/data_visualizer/server/types/deps.ts
@@ -7,10 +7,14 @@
 
 import type { SecurityPluginStart } from '../../../security/server';
 import type { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
+import { CustomIntegrationsPluginSetup } from '../../../../../src/plugins/custom_integrations/server';
+import { HomeServerPluginSetup } from '../../../../../src/plugins/home/server';
 
 export interface StartDeps {
   security?: SecurityPluginStart;
 }
 export interface SetupDeps {
   usageCollection: UsageCollectionSetup;
+  customIntegrations?: CustomIntegrationsPluginSetup;
+  home?: HomeServerPluginSetup;
 }
diff --git a/x-pack/plugins/data_visualizer/tsconfig.json b/x-pack/plugins/data_visualizer/tsconfig.json
index ee5f894305d5a..3b424ef8b9f65 100644
--- a/x-pack/plugins/data_visualizer/tsconfig.json
+++ b/x-pack/plugins/data_visualizer/tsconfig.json
@@ -11,6 +11,7 @@
     { "path": "../../../src/core/tsconfig.json" },
     { "path": "../../../src/plugins/data/tsconfig.json" },
     { "path": "../../../src/plugins/usage_collection/tsconfig.json" },
+    { "path": "../../../src/plugins/custom_integrations/tsconfig.json" },
     { "path": "../security/tsconfig.json" },
     { "path": "../file_upload/tsconfig.json" },
     { "path": "../lens/tsconfig.json" },

From 45a0032e7352bf3873ef0e93bc0d463e6bf5ce1b Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Thu, 14 Oct 2021 19:21:57 +0200
Subject: [PATCH 091/117] [Discover] Persist hide chart option to local storage
 (#114534)

* Persist hide chart to local storage

* [Discover] Persist hide chart option to local storage

* Fix state

* Fix dependency check

* Set chart state to undefined

* Update unit test

* Do not override saved search preferences

* Fix missing import

* Add a functional test

* Add a functional test

* Fix functional test

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../main/components/chart/discover_chart.tsx  |  7 +-
 .../apps/main/services/use_discover_state.ts  | 11 +--
 .../main/utils/get_state_defaults.test.ts     |  5 ++
 .../apps/main/utils/get_state_defaults.ts     |  9 ++-
 .../functional/apps/discover/_chart_hidden.ts | 71 +++++++++++++++++++
 test/functional/apps/discover/index.ts        |  1 +
 test/functional/page_objects/discover_page.ts | 11 +++
 7 files changed, 107 insertions(+), 8 deletions(-)
 create mode 100644 test/functional/apps/discover/_chart_hidden.ts

diff --git a/src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx b/src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx
index 8039cb06e49b3..b6509356c8c41 100644
--- a/src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx
@@ -25,6 +25,7 @@ import { DiscoverServices } from '../../../../../build_services';
 import { useChartPanels } from './use_chart_panels';
 
 const DiscoverHistogramMemoized = memo(DiscoverHistogram);
+export const CHART_HIDDEN_KEY = 'discover:chartHidden';
 
 export function DiscoverChart({
   resetSavedSearch,
@@ -47,7 +48,8 @@ export function DiscoverChart({
 }) {
   const [showChartOptionsPopover, setShowChartOptionsPopover] = useState(false);
 
-  const { data } = services;
+  const { data, storage } = services;
+
   const chartRef = useRef<{ element: HTMLElement | null; moveFocus: boolean }>({
     element: null,
     moveFocus: false,
@@ -71,7 +73,8 @@ export function DiscoverChart({
     const newHideChart = !state.hideChart;
     stateContainer.setAppState({ hideChart: newHideChart });
     chartRef.current.moveFocus = !newHideChart;
-  }, [state, stateContainer]);
+    storage.set(CHART_HIDDEN_KEY, newHideChart);
+  }, [state.hideChart, stateContainer, storage]);
 
   const timefilterUpdateHandler = useCallback(
     (ranges: { from: number; to: number }) => {
diff --git a/src/plugins/discover/public/application/apps/main/services/use_discover_state.ts b/src/plugins/discover/public/application/apps/main/services/use_discover_state.ts
index ce30c0749b938..a1d58fdd6090e 100644
--- a/src/plugins/discover/public/application/apps/main/services/use_discover_state.ts
+++ b/src/plugins/discover/public/application/apps/main/services/use_discover_state.ts
@@ -34,7 +34,7 @@ export function useDiscoverState({
   savedSearch: SavedSearch;
   history: History;
 }) {
-  const { uiSettings: config, data, filterManager, indexPatterns } = services;
+  const { uiSettings: config, data, filterManager, indexPatterns, storage } = services;
   const useNewFieldsApi = useMemo(() => !config.get(SEARCH_FIELDS_FROM_SOURCE), [config]);
   const { timefilter } = data.query.timefilter;
 
@@ -53,13 +53,14 @@ export function useDiscoverState({
             config,
             data,
             savedSearch,
+            storage,
           }),
         storeInSessionStorage: config.get('state:storeInSessionStorage'),
         history,
         toasts: services.core.notifications.toasts,
         uiSettings: config,
       }),
-    [config, data, history, savedSearch, services.core.notifications.toasts]
+    [config, data, history, savedSearch, services.core.notifications.toasts, storage]
   );
 
   const { appStateContainer } = stateContainer;
@@ -160,11 +161,12 @@ export function useDiscoverState({
         config,
         data,
         savedSearch: newSavedSearch,
+        storage,
       });
       await stateContainer.replaceUrlAppState(newAppState);
       setState(newAppState);
     },
-    [indexPattern, services, config, data, stateContainer]
+    [services, indexPattern, config, data, storage, stateContainer]
   );
 
   /**
@@ -209,10 +211,11 @@ export function useDiscoverState({
       config,
       data,
       savedSearch,
+      storage,
     });
     stateContainer.replaceUrlAppState(newAppState);
     setState(newAppState);
-  }, [config, data, savedSearch, reset, stateContainer]);
+  }, [config, data, savedSearch, reset, stateContainer, storage]);
 
   /**
    * Trigger data fetching on indexPattern or savedSearch changes
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.test.ts b/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.test.ts
index 04ee5f414e7f4..45447fe642ad4 100644
--- a/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.test.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.test.ts
@@ -12,14 +12,18 @@ import { uiSettingsMock } from '../../../../__mocks__/ui_settings';
 import { indexPatternWithTimefieldMock } from '../../../../__mocks__/index_pattern_with_timefield';
 import { savedSearchMock } from '../../../../__mocks__/saved_search';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
+import { discoverServiceMock } from '../../../../__mocks__/services';
 
 describe('getStateDefaults', () => {
+  const storage = discoverServiceMock.storage;
+
   test('index pattern with timefield', () => {
     savedSearchMock.searchSource = createSearchSourceMock({ index: indexPatternWithTimefieldMock });
     const actual = getStateDefaults({
       config: uiSettingsMock,
       data: dataPluginMock.createStartContract(),
       savedSearch: savedSearchMock,
+      storage,
     });
     expect(actual).toMatchInlineSnapshot(`
       Object {
@@ -49,6 +53,7 @@ describe('getStateDefaults', () => {
       config: uiSettingsMock,
       data: dataPluginMock.createStartContract(),
       savedSearch: savedSearchMock,
+      storage,
     });
     expect(actual).toMatchInlineSnapshot(`
       Object {
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts b/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts
index f2f6e4a002aaf..6fa4dda2eab19 100644
--- a/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts
@@ -18,6 +18,8 @@ import { DataPublicPluginStart } from '../../../../../../data/public';
 
 import { AppState } from '../services/discover_state';
 import { getDefaultSort, getSortArray } from '../components/doc_table';
+import { CHART_HIDDEN_KEY } from '../components/chart/discover_chart';
+import { Storage } from '../../../../../../kibana_utils/public';
 
 function getDefaultColumns(savedSearch: SavedSearch, config: IUiSettingsClient) {
   if (savedSearch.columns && savedSearch.columns.length > 0) {
@@ -33,10 +35,12 @@ export function getStateDefaults({
   config,
   data,
   savedSearch,
+  storage,
 }: {
   config: IUiSettingsClient;
   data: DataPublicPluginStart;
   savedSearch: SavedSearch;
+  storage: Storage;
 }) {
   const { searchSource } = savedSearch;
   const indexPattern = searchSource.getField('index');
@@ -44,6 +48,7 @@ export function getStateDefaults({
   const query = searchSource.getField('query') || data.query.queryString.getDefaultQuery();
   const sort = getSortArray(savedSearch.sort ?? [], indexPattern!);
   const columns = getDefaultColumns(savedSearch, config);
+  const chartHidden = Boolean(storage.get(CHART_HIDDEN_KEY));
 
   const defaultState = {
     query,
@@ -54,13 +59,13 @@ export function getStateDefaults({
     index: indexPattern?.id,
     interval: 'auto',
     filters: cloneDeep(searchSource.getOwnField('filter')),
-    hideChart: undefined,
+    hideChart: chartHidden ? chartHidden : undefined,
     savedQuery: undefined,
   } as AppState;
   if (savedSearch.grid) {
     defaultState.grid = savedSearch.grid;
   }
-  if (savedSearch.hideChart) {
+  if (savedSearch.hideChart !== undefined) {
     defaultState.hideChart = savedSearch.hideChart;
   }
 
diff --git a/test/functional/apps/discover/_chart_hidden.ts b/test/functional/apps/discover/_chart_hidden.ts
new file mode 100644
index 0000000000000..a9179fd234905
--- /dev/null
+++ b/test/functional/apps/discover/_chart_hidden.ts
@@ -0,0 +1,71 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const log = getService('log');
+  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
+  const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']);
+
+  const defaultSettings = {
+    defaultIndex: 'logstash-*',
+  };
+
+  describe('discover show/hide chart test', function () {
+    before(async function () {
+      log.debug('load kibana index with default index pattern');
+
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
+
+      // and load a set of makelogs data
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await kibanaServer.uiSettings.replace(defaultSettings);
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.timePicker.setDefaultAbsoluteRange();
+    });
+
+    after(async () => {
+      await kibanaServer.uiSettings.unset('defaultIndex');
+    });
+
+    it('shows chart by default', async function () {
+      expect(await PageObjects.discover.isChartVisible()).to.be(true);
+    });
+
+    it('hiding the chart persists the setting', async function () {
+      await PageObjects.discover.toggleChartVisibility();
+      expect(await PageObjects.discover.isChartVisible()).to.be(false);
+
+      await PageObjects.common.navigateToApp('dashboard');
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.timePicker.setDefaultAbsoluteRange();
+      await PageObjects.header.waitUntilLoadingHasFinished();
+
+      expect(await PageObjects.discover.isChartVisible()).to.be(false);
+    });
+
+    it('persists hidden chart option on the saved search ', async function () {
+      const savedSearchTitle = 'chart hidden';
+      await PageObjects.discover.saveSearch(savedSearchTitle);
+
+      await PageObjects.discover.toggleChartVisibility();
+      expect(await PageObjects.discover.isChartVisible()).to.be(true);
+
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.timePicker.setDefaultAbsoluteRange();
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      expect(await PageObjects.discover.isChartVisible()).to.be(true);
+
+      await PageObjects.discover.loadSavedSearch(savedSearchTitle);
+      expect(await PageObjects.discover.isChartVisible()).to.be(false);
+    });
+  });
+}
diff --git a/test/functional/apps/discover/index.ts b/test/functional/apps/discover/index.ts
index 59191b489f4c7..13658215e9e59 100644
--- a/test/functional/apps/discover/index.ts
+++ b/test/functional/apps/discover/index.ts
@@ -52,5 +52,6 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./_huge_fields'));
     loadTestFile(require.resolve('./_date_nested'));
     loadTestFile(require.resolve('./_search_on_page_load'));
+    loadTestFile(require.resolve('./_chart_hidden'));
   });
 }
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index 497c5c959ee0d..a6ee65e0febb5 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -178,6 +178,17 @@ export class DiscoverPageObject extends FtrService {
     return await this.globalNav.getLastBreadcrumb();
   }
 
+  public async isChartVisible() {
+    return await this.testSubjects.exists('discoverChart');
+  }
+
+  public async toggleChartVisibility() {
+    await this.testSubjects.click('discoverChartOptionsToggle');
+    await this.testSubjects.exists('discoverChartToggle');
+    await this.testSubjects.click('discoverChartToggle');
+    await this.header.waitUntilLoadingHasFinished();
+  }
+
   public async getChartInterval() {
     await this.testSubjects.click('discoverChartOptionsToggle');
     await this.testSubjects.click('discoverTimeIntervalPanel');

From ebb9e24b61f99807fb3f2f9abe054c0e4ac329c1 Mon Sep 17 00:00:00 2001
From: Josh Dover <1813008+joshdover@users.noreply.github.com>
Date: Thu, 14 Oct 2021 20:13:24 +0200
Subject: [PATCH 092/117] Fix bug in handling preconfiguration input overrides
 (#115030)

---
 .../server/services/package_policy.test.ts    | 99 +++++++++++++++++++
 .../fleet/server/services/package_policy.ts   | 10 +-
 2 files changed, 106 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/fleet/server/services/package_policy.test.ts b/x-pack/plugins/fleet/server/services/package_policy.test.ts
index 8b5a46dc675fc..0b6b3579f7b87 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.test.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.test.ts
@@ -1273,6 +1273,105 @@ describe('Package policy service', () => {
       });
     });
 
+    describe('when variable is undefined in original object and policy_template is undefined', () => {
+      it('adds the variable definition to the resulting object', () => {
+        const basePackagePolicy: NewPackagePolicy = {
+          name: 'base-package-policy',
+          description: 'Base Package Policy',
+          namespace: 'default',
+          enabled: true,
+          policy_id: 'xxxx',
+          output_id: 'xxxx',
+          package: {
+            name: 'test-package',
+            title: 'Test Package',
+            version: '0.0.1',
+          },
+          inputs: [
+            {
+              type: 'logs',
+              policy_template: 'template_1',
+              enabled: true,
+              vars: {
+                path: {
+                  type: 'text',
+                  value: ['/var/log/logfile.log'],
+                },
+              },
+              streams: [],
+            },
+          ],
+        };
+
+        const packageInfo: PackageInfo = {
+          name: 'test-package',
+          description: 'Test Package',
+          title: 'Test Package',
+          version: '0.0.1',
+          latestVersion: '0.0.1',
+          release: 'experimental',
+          format_version: '1.0.0',
+          owner: { github: 'elastic/fleet' },
+          policy_templates: [
+            {
+              name: 'template_1',
+              title: 'Template 1',
+              description: 'Template 1',
+              inputs: [
+                {
+                  type: 'logs',
+                  title: 'Log',
+                  description: 'Log Input',
+                  vars: [
+                    {
+                      name: 'path',
+                      type: 'text',
+                    },
+                    {
+                      name: 'path_2',
+                      type: 'text',
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+          // @ts-ignore
+          assets: {},
+        };
+
+        const inputsOverride: NewPackagePolicyInput[] = [
+          {
+            type: 'logs',
+            enabled: true,
+            streams: [],
+            policy_template: undefined, // preconfigured input overrides don't have a policy_template
+            vars: {
+              path: {
+                type: 'text',
+                value: '/var/log/new-logfile.log',
+              },
+              path_2: {
+                type: 'text',
+                value: '/var/log/custom.log',
+              },
+            },
+          },
+        ];
+
+        const result = overridePackageInputs(
+          basePackagePolicy,
+          packageInfo,
+          // TODO: Update this type assertion when the `InputsOverride` type is updated such
+          // that it no longer causes unresolvable type errors when used directly
+          inputsOverride as InputsOverride[],
+          false
+        );
+
+        expect(result.inputs[0]?.vars?.path_2.value).toEqual('/var/log/custom.log');
+      });
+    });
+
     describe('when an input of the same type exists under multiple policy templates', () => {
       it('adds variable definitions to the proper streams', () => {
         const basePackagePolicy: NewPackagePolicy = {
diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
index 546e267b8402b..b7772892f542a 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.ts
@@ -996,9 +996,13 @@ export function overridePackageInputs(
   ];
 
   for (const override of inputsOverride) {
-    let originalInput = inputs.find(
-      (i) => i.type === override.type && i.policy_template === override.policy_template
-    );
+    // Preconfiguration does not currently support multiple policy templates, so overrides will have an undefined
+    // policy template, so we only match on `type` in that case.
+    let originalInput = override.policy_template
+      ? inputs.find(
+          (i) => i.type === override.type && i.policy_template === override.policy_template
+        )
+      : inputs.find((i) => i.type === override.type);
 
     // If there's no corresponding input on the original package policy, just
     // take the override value from the new package as-is. This case typically

From 025861c1895f8c211e140792e420eec864bee731 Mon Sep 17 00:00:00 2001
From: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Date: Thu, 14 Oct 2021 20:14:01 +0200
Subject: [PATCH 093/117] Add API integration tests for Interactive Setup.
 (#111879)

---
 .eslintrc.js                                  |   2 +
 .github/CODEOWNERS                            |   5 +-
 .../kbn-crypto/src/__fixtures__/no_ca.p12     | Bin 2431 -> 2431 bytes
 .../kbn-crypto/src/__fixtures__/no_cert.p12   | Bin 2217 -> 2219 bytes
 .../kbn-crypto/src/__fixtures__/no_key.p12    | Bin 1939 -> 1939 bytes
 .../kbn-crypto/src/__fixtures__/two_cas.p12   | Bin 4215 -> 4215 bytes
 .../kbn-crypto/src/__fixtures__/two_keys.p12  | Bin 4781 -> 4850 bytes
 packages/kbn-dev-utils/certs/README.md        |   8 +-
 packages/kbn-dev-utils/certs/ca.crt           |  42 ++---
 .../kbn-dev-utils/certs/elasticsearch.crt     |  44 ++---
 .../kbn-dev-utils/certs/elasticsearch.key     |  50 +++---
 .../kbn-dev-utils/certs/elasticsearch.p12     | Bin 3501 -> 3654 bytes
 .../certs/elasticsearch_emptypassword.p12     | Bin 3333 -> 3333 bytes
 .../certs/elasticsearch_nopassword.p12        | Bin 3543 -> 3481 bytes
 packages/kbn-dev-utils/certs/kibana.crt       |  42 ++---
 packages/kbn-dev-utils/certs/kibana.key       |  50 +++---
 packages/kbn-dev-utils/certs/kibana.p12       | Bin 3463 -> 3608 bytes
 packages/kbn-es/src/cluster.js                |  10 +-
 packages/kbn-es/src/utils/native_realm.js     |  15 +-
 .../kbn-test/src/functional_tests/tasks.ts    |   2 +-
 .../src/kbn_client/kbn_client_plugins.ts      |   3 +-
 scripts/functional_tests.js                   |   5 +
 src/cli/serve/serve.js                        |   8 +-
 .../interactive_setup/server/plugin.ts        |   7 +-
 .../enrollment_flow.config.ts                 |  54 +++++++
 .../fixtures/README.md                        |  32 ++++
 .../fixtures/elasticsearch.p12                | Bin 0 -> 7131 bytes
 .../fixtures/test_endpoints/kibana.json       |  12 ++
 .../fixtures/test_endpoints/server/index.ts   |  42 +++++
 .../fixtures/test_endpoints/tsconfig.json     |  16 ++
 .../fixtures/test_helpers.ts                  |  39 +++++
 .../fixtures/tls_tools.ts                     |  30 ++++
 .../ftr_provider_context.d.ts                 |  13 ++
 .../manual_configuration_flow.config.ts       |  55 +++++++
 ...l_configuration_flow_without_tls.config.ts |  57 +++++++
 .../services.ts                               |  13 ++
 .../tests/enrollment_flow.ts                  | 151 ++++++++++++++++++
 .../tests/manual_configuration_flow.ts        | 136 ++++++++++++++++
 .../manual_configuration_flow_without_tls.ts  | 103 ++++++++++++
 test/tsconfig.json                            |   1 +
 .../fixtures/saml/saml_provider/metadata.xml  |  35 ++--
 .../fixtures/pki/README.md                    |   4 +-
 .../fixtures/pki/first_client.p12             | Bin 3467 -> 3620 bytes
 .../fixtures/pki/second_client.p12            | Bin 3477 -> 3622 bytes
 .../fixtures/saml/idp_metadata.xml            |  35 ++--
 .../fixtures/saml/idp_metadata_2.xml          |  35 ++--
 .../saml/idp_metadata_never_login.xml         |  35 ++--
 .../fixtures/saml/saml_provider/metadata.xml  |  35 ++--
 48 files changed, 998 insertions(+), 228 deletions(-)
 create mode 100644 test/interactive_setup_api_integration/enrollment_flow.config.ts
 create mode 100644 test/interactive_setup_api_integration/fixtures/README.md
 create mode 100644 test/interactive_setup_api_integration/fixtures/elasticsearch.p12
 create mode 100644 test/interactive_setup_api_integration/fixtures/test_endpoints/kibana.json
 create mode 100644 test/interactive_setup_api_integration/fixtures/test_endpoints/server/index.ts
 create mode 100644 test/interactive_setup_api_integration/fixtures/test_endpoints/tsconfig.json
 create mode 100644 test/interactive_setup_api_integration/fixtures/test_helpers.ts
 create mode 100644 test/interactive_setup_api_integration/fixtures/tls_tools.ts
 create mode 100644 test/interactive_setup_api_integration/ftr_provider_context.d.ts
 create mode 100644 test/interactive_setup_api_integration/manual_configuration_flow.config.ts
 create mode 100644 test/interactive_setup_api_integration/manual_configuration_flow_without_tls.config.ts
 create mode 100644 test/interactive_setup_api_integration/services.ts
 create mode 100644 test/interactive_setup_api_integration/tests/enrollment_flow.ts
 create mode 100644 test/interactive_setup_api_integration/tests/manual_configuration_flow.ts
 create mode 100644 test/interactive_setup_api_integration/tests/manual_configuration_flow_without_tls.ts

diff --git a/.eslintrc.js b/.eslintrc.js
index f45088f046bdd..c12cc7c1eb496 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -498,6 +498,7 @@ module.exports = {
         'x-pack/plugins/apm/**/*.js',
         'test/*/config.ts',
         'test/*/config_open.ts',
+        'test/*/*.config.ts',
         'test/*/{tests,test_suites,apis,apps}/**/*',
         'test/visual_regression/tests/**/*',
         'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',
@@ -1596,6 +1597,7 @@ module.exports = {
     {
       files: [
         'src/plugins/interactive_setup/**/*.{js,mjs,ts,tsx}',
+        'test/interactive_setup_api_integration/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/encrypted_saved_objects/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/security/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/spaces/**/*.{js,mjs,ts,tsx}',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1e0a8b187c778..ec03acc752d55 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -244,7 +244,6 @@
 /packages/kbn-std/ @elastic/kibana-core
 /packages/kbn-config/ @elastic/kibana-core
 /packages/kbn-logging/ @elastic/kibana-core
-/packages/kbn-crypto/ @elastic/kibana-core
 /packages/kbn-http-tools/ @elastic/kibana-core
 /src/plugins/saved_objects_management/ @elastic/kibana-core
 /src/dev/run_check_published_api_changes.ts @elastic/kibana-core
@@ -285,9 +284,11 @@
 /packages/kbn-i18n/  @elastic/kibana-localization @elastic/kibana-core
 #CC# /x-pack/plugins/translations/ @elastic/kibana-localization @elastic/kibana-core
 
-# Security
+# Kibana Platform Security
+/packages/kbn-crypto/ @elastic/kibana-security
 /src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
 /src/plugins/interactive_setup/ @elastic/kibana-security
+/test/interactive_setup_api_integration/ @elastic/kibana-security
 /x-pack/plugins/spaces/ @elastic/kibana-security
 /x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
 /x-pack/plugins/security/ @elastic/kibana-security
diff --git a/packages/kbn-crypto/src/__fixtures__/no_ca.p12 b/packages/kbn-crypto/src/__fixtures__/no_ca.p12
index 1e6df9a0f71c54158e7dbf3b6cad2a062ae3a9d0..c4beef55cf3b64d3ed7e8affd4a4a2e7b7980c43 100644
GIT binary patch
delta 2297
zcmV<V2nP5668{pAU4L)Q@dC*_T-X8u0f2%7p!02AnD@WK4N$>{tNyQnzE?I%Y^#DI
zLy8S|(E$CxVTX?{*IPbQ!;}r7(&5K{{*^PNHVyum9YG}>P;J4B>wh+RuJ+upvz@?a
z37EJRVbrN&aNkkp26mUiIwri=6nKE~2sRqW@r&X|&1u3j>3@-!yJ;?d)*T^LWr6#s
z$MjKs@3FffrC+H^M}|4dvNV5gYI{zocNrlsYJRnr&%h5BfFL1k>@{a-ghFQqlX%(N
zHjqRt*Wa5V`mVnTKO8qiq{&GD?zMkLSPNFE6nTz@M+B?Ov9hR06X*|%<+q9B_Yz&j
zoj7G}6xrm<8h?xGyBe;kBaLrI5Vm(3=-lG?Vv<o@OAn9*jhv-3hbfv69FnbaK4!8o
zwiC)K*$0fz!z3?HS8n_)0UrV;;5m=I6wA_32I1%R#?X<UpEHjHhl)Z7ij<p<JsaI#
zO->6jd|KpX7dCvQMPFQ+L9a3O1r73dqYq!zmwAe;kAJ;@hEmG$Y349<AUOO75a^S+
zE>~r2<u)9%UtxDUutZ(hL!Ii>p{$P0rRt=L=OOAuz<YUuNdFdemz>ke`3~6U>yb#G
zE5!#=QShO0V;Igf74pVtFw%41)C#D-NKOvfptGD@BA<u8M~xsobo)LY_@ZMilD%V}
z$IXl;Lw~p%aOR&mP6Al+U*Zq)qjVYhU>t$PjV-oU+Y&(sfU_v|S81yG%RAHafpj>o
zkVwz>Z^j~-n0X0==2eYNt6lbQ*??wy-u{^8uB8MsN%)Xg_0-pGGX%e0kLNiUiM~rd
zh1E&U9!<WoL!qKshIu0=rjSyJTdC--d5E-brhk5l$hyFrXg$p;^mUk;<XDzzPH=T)
z+~VPT3Q!%N0@Q^93KNDA4Uy8aozv5us}Voujes9^3z^~9+fS0#tk31z9(P)sc|at(
z?=7mroc$XZYW8;2wmjA<N%l=w=yhr?<ywXxi}0(npAo&PvA%_wk4s>Z2IhS|=KcMH
ztA8LxHR%Z&u~6775d%CQ=tP?y2m=;*Cw(27snE?eqCta%a+eYB2h8(d*#89s?<gYY
zZfNb6R{vYRmqzY9kC@XM1X!Z70R6)s0K6tSrzh{#i)_C(C}hwc$T_$Ue>Gbv?VgBS
z;)fs_v^AFuKj42e(*|qhJv724>2I~AS2pc?B_V=*;#T2RsOG!fx<7BbS1q1KclD{(
zQ@AWOg2Gc-oY){G4am)&Rn@UVdtOreVLz;6lMDn#e_^Rq3;adkr~&~21cC&}{zLo!
z$r#T5^O>Xc(|?OKJsT)>Idrf<ZP1vL_<+x6OMq5?4|zo=W<i$jSB2AjhYdnLO4?+N
zjMdN`2ea=}0GyCCmTGd-Ex0E=rt~Hi(M{Q1Tgbre3)B?&_M-rS#+ZorQaTq5?~j*S
zp^Vd#e~9ULhOywg&E#kr$%VR{9o^FQrZqadhBYU`G+);LUY3xy;?GmDP%P2k`dn1$
zm?;ljB#rJ(;i-q&ROxudPHo=lxWTa!nMjRgZ^<)(X<mAS-{=vSfW=vi_jTw^FkSxY
zU_&T>*ROw)>LkNJe3qq5?Zb?ASOT`$@r$x&e^v)Ru#&pY03D5Ku&1J<Fe~2r5=dcu
zQ9cgO2d~>J&1Mo^9`2>{aBLj5B;f<ZvMC{H_+2j`A24~1|F4(cCrUw7T!2n@zH|^g
zNnK6%Ix`WKy*rGnaM5~0-Tbhh<|$6O0T9fkwlw^CwHMK_C&+3RNxaWU{Lt*6Nhfs#
ze_>T62;vQW53r!I9pdryc1|Lb*t#ML1+58=p4{8*NS{z?$=<ptXpxeqEHOQ>pYWWp
zgnMGYOjnj2C^gQ()h8zC4_MVhR#<OfT(QG`XV<{|!SzX^qjRMYAd&z=JIBQr3xSTG
zbXI@V&olMu_iY_PvGe=ra#9ztAlgFjf6K`4k+&rB%drY}9kpWD<N`R&2F+XfoZ-VH
ztDPC1Z=n_So+n_g9F;MG!?9bxHbVf`cm7|Z?qZ_08O<zybj|5hwiV}Cv?V1(GYeZd
zt97vg((gR>rSOe_Gf!eJ$eo2`*w4Zv%k13J6*w_q-mxsN<FUH(7UUKZVnADxe;QB)
zFZ$J>4`dg>tZ}7F*>)<F>SZOU!l;YBN6ZA=x1<Xb<L)|BeIck&*<jRikcz&c5lLpF
z|1hJZ&eg2&C9RPDHa@c5m)VDNPtI>hO5I}5()5(qqEjD#YNO9<5euh$w&rO)qn4SA
zd=$_ifgpeQ$D`KJ^GXkF_UEzSfAkf3%q@(Afbn8q*kQfiZ}zT;&b5y9ysssogmTg8
zT)#1U*UVr7Tl+nt^U<@5ZMR+ePam=Eu+dLB`Rl`ytYE}e?PGQcSpRzLjGRS)H>(G}
zKBS1+OTDRCy{Jz{ipLUDoX69|ytYi1_%y?P?R6(+1cTl^D7jePL(Bmsf88D8o?2G+
zyy<};hY}TbI4k<YP!(-lt*PcA2qku@>bVN9B+CH2UJ&9tdFL3Y_fUezIA9N1dUs7)
zTn>;!eE1{FRC%iCQ4LZiXPxNzy5O|6HS!hUbJ|@hx-#6=riSXolu$4A+^?pfu?J7W
zJ)wG`*zcr!5SiP6et4Y+e=_V#@^0l(V(PB#unDZb0fg%A>P27z8o}qogZ3zX0b2j)
zGV~9YlbO5-z0qgsNotV&s2`=Cg=y;|S1u(cFHPsYDIuLv0E3g1&V0Ptj0APC_~1eq
zriOy@PU;v!dC~-!3p&=RDlf{y4wH*>N;jxdj3CnhUbG#YMo}YEe@#{O7uNDrxKhak
z>z@jwuI2vBqru9XPii)AioozQoEi-|xH<3sm`CB%rTi}^g&h;=FUOJ<aIt#*(yK}k
zduIcf$!<jQ+F-?`2aN}q^=pO9ebKnr&z9c@CSD)&uQ4SsBL)d7hDe6@4FL%iF%|?A
zcMQvte!O$}m2^R!H|QyMMWYsdfiNvFAutIB1uG5%0vZJX1QcY2K;dw9uK!zwB0U(!
T+eKoMX#4~S2~2dI&|jVrL9>3?

delta 2297
zcmV<V2nP5668{pAU4NHHm3yev!czhP0f2%7paMH}<70#tt7Gh%nf?p@28J?9Z*Tm3
zX?lx&IMME+?7Bfu(`&^oxS5qIrv#B9NcF60KO672CXeyQ42T!Sg%IfLIN3BJh)<#6
zSyI{|AXi2ssdhoi<GTT=ADyJ;*l;;ZB<B(0ALyVpMKJ(p*?;;0uDA>JqxY!iYLIC9
z%~>)k>mJi}WRjHh6K%`RA3Qy;Z&3mQcqwynaE-=|RwVqwKToGGj!?2_k*}(JhS=2u
zGo6Ml7ndG_X3g>DEHs86{GRYU)tH(4ZV|b%NDaPWau{B1m7m(fNDaj>KsnY8v)fLM
z5s~QP2mMe(Eq@9;IG3m;KG&1T<U=@hiD&4oG<kniw06YOSV@Hu$N8nV6%gI^WVZi&
z&G=_ReIw0F16S2$2N0c-uZXJZl|(S&H!#3kdg)>Wl<|W>($(n?q5qsQx1$$WE=Ts_
zbk&Y5{#`bTXXhM9!bw@1Tu~nJL1PUaprg4>dW6Ihc7L!B7BL`uPk)Atzm#y=ZEJX`
zGIVI1)Lq_zFSTD<!iYarwh=M|r@!+*E7@EKL6J~w{iL+Ha*C&(T*qi}7~Xnt+z@m8
z+Qt5jAgax(KO>uauJ>X;&p*f(kxVobjVon%VHn;X+{BKP9gI$KLvq?>d*P+U?6`tq
z{f#`OIDb!rKN#~vWn>tUkyJb=aQkAXW9G_Z3wv@o=^?f)9)TYfgNs$=>FU(r(F2}Z
zOLaT3U9X$4P@9)CrT%DAH<)<QnQ?AxJEY+5vMTVj02TjxcHyg&^R0^@_R?-6aBM<&
zGZ=T*U=m>8qrntC619TInB9WCM8?sm0adQ&dVi=;ox=~?cl94E<rCF0;&=;*I-WwJ
z$eN`V4}$6Dq87qjSC9YI$N1q)u~|iGaN6PW5$=ms@rlF835GHMyCR4ooyt9!<|ph`
zE>GPK8MFgqJI@u-!t}cX7ez16(az9zCw6Ym?vm`0euj<S{g^q-0kO!Y@MSm<WwH_W
z$$$1mDVYms{N>t6bnu!dfg96fBX$<fc@Hdy9R{nOET$M!$k{dEw5xvNi<S=-$aWyr
zEHj~Am=q(*t-;CT{e(BrwOmr>Rdcr$Gi;oCbAV-(K_Q&#I8h*I8=7h;aHSUQ=Q}1r
zr{^>wo;)_kZQ5tA3)k%Mtde*lkbm*jD>m!TauBT#(bp$`fGH9x;ZKV8jRS=0Tfz`j
zOtQ2>_h$Hr$EX1IdNy}c+GK9VRQ@ZGWxC6BlMDn#e~B}mfDVCo!vX;T1cC&}9Mo^8
zjBlJ~*lzO(a^P@kk5!9xL?^hr1aFD_zj6%t33?_i42)#GXq>tC+{=abs<vrRPDJ?h
zz3~N!S#H!T!xGBSu;qHO%u_l_3VVc*|E8XYlrCBbF-=8gJ~j|Ev&X*RV{mhz=Q)j{
zov0~Of8O?9cD4;drmd<Bz6Azx#rfIeL&$N^Z(C%<EYfwQ>Up9J>rMuTc*6~?3gE~P
z7c2pd;96Y+)dFzb%}aU_%=KXsHLnL$Tg~$RnUa;G?nJZ<p{Lm(KFm~itICu;oEChQ
zmo#oILnfPk(*Gg4w)}=d^T?@pWtdE>UWblze`cj3U#c09>cBXQ?KG=zViNjKJr98%
z8dff^rFU`I*3yR|GSnWnNC9q7Qc;3ZDZVH_bje10q0C{EE}Iq(Uf%wgP0PW@>C&L0
zaLkA&mm_Xlyi}SylTASSyu^h|tHzc<s7&+8-YXw&H*~8_Yb}(KFcJRdNz1X(Q=!84
ze~g=bQxf?;q-fJi=yCvymgRNW%7hIHucIZxYpoA4HTVSh8y;1o7DWnLdQ1326|ewf
z=x2OM9DE}Uw!&8>!izl2C2ey!PnT;JFX=>D>8jFsOWzQ3XUx=(^UZVn?pHYBH0R4L
zDiD(>y|K+QR(-<9RbAa`ehk_vLSffwe`sSX>n^5D5Shy7%RLS&E;%(Xw|1U(-#G=p
z1$^>bPg-y&gUVV4{AK=(oG$7-kO~jRCou4}kQU<%6{4)TUn9iA#4j@Uu)+ihrv84`
zJ_%N!>Xa7`+UnTyg<-ekOR2PLWRQv8r%mIRMP#y99`ye-|4AG7Kg(KgO6cPpf9hNn
zP{6_S-GL)thw2e!hA_&4`v|V$L!@|yo-+3Mi{>jW3xdxoQ<yu*R9{Rty#7Keq7c`m
z-P!fujesL5wH7p}^C661L+&R1zD)U~l(R-M4<#ZsBfQvYl>JMdQS-ak+!kgpuC6vd
zgr(z?;v_vA@o>`G2|f){a@!+5e^Ytk>03eW$b_d1Ga1Z;nZ-MB60-F)B5Tu9Z-XJ~
zz|<6p+nD=-de<>JQ4t|h`}DpJNW1gqbM8Gp=pwL1cFBm0N3gsf-2L5Iig0p>x~;P#
z6o+cM8{f*Iw!%vvyiVM`N=U9yKNf%o=WJTcoxiB5BH;EWD*h*QAOoCHe?)m%EbzTq
zfI=pPBW*&FM_$9DSS`f(J)r~Cd%ZA{u0@gG6qF)Bc!Xyb=`8Kb6@KXrH=j}G&7EwP
zMWzI)0d3iQ84SY?Y&J;E<@jHRb6&X8x)10YDs@>$8G6`Oro03x@z(ZySxW?qzGF5m
z4jgM30<5wwRy$gX0*jAmf6Uh9@p^>A=kM7l06_ZI2<ik6sMLD~tj%q;cNdEo#>$qZ
z_a)|`|2i4a$-12~@pgvD;79#Ny>5VX^lR|v-#}MBRY9MrL7-E=@&Wo_uA^Wfgd79_
z5ZEj~sO0H<i78=Aap+&a%Jzb5v2Oi4^p8U6EY6OPC6~l7tV<fVf4NHH1Y`K!;y5Ap
zMVS6l{AEQdmk7|j3MNh2<VrrDQCXII1M9iKWTmiSPotXeB7%fd)%VcT1Xc%cU0INe
zuIzO2yyD<ymZYDCJN3-w9^+SfR6;EVJy;xGl#TY(Ofe-eBL)d7hDe6@4FL%iF%|?A
zL8{D4gW+5Y39qN%H(Sf;4t+nE`7kXoAutIB1uG5%0vZJX1QeuK8cihhT+5vRikV=`
T5^^M-g%|_~UGelqHV^lr#`|Zx

diff --git a/packages/kbn-crypto/src/__fixtures__/no_cert.p12 b/packages/kbn-crypto/src/__fixtures__/no_cert.p12
index 8453fe878e7856f2a81e2ccd3cd993a7bf4c1d94..40e4da49f22743cbd22fe775c110fe3d73da1c3f 100644
GIT binary patch
delta 2058
zcmZvado<JkAIE*RnIW{5YkcYJeyN5=^o?SQ%&ocWVy-14v2txTwckX9RYcM(8s(Dv
zH7ul(+$mBRa+h3({pNSR=XZYJbAEq3&-<Lm^Zk6E*Ll64On5$=h$O>uK>(O{WI+Wr
zDCU$k5kLUQBEym(WY|3(jzyBew0~IOI}kFM#KTcMg+Yb?PVEr_z*%JQWghf`3jGZQ
zC3tUv?Rf!P9>*Zbprct}5C8&+^F5H5eOV^<%IUS|0Yq<ShGfuSj>T-!J&Qkdw6&4i
zx;&wdYP(8_=^*ua0J#fyK~jc(iYA~yEWNK;YTO{fJ``%Y<a1tjPNl(=swHkGc&{kv
z&o8kR%PlKhgg7S^I`ye2E79B<<LG_U5Fv+lNi9<?9W$%LIJU{n)A;8FHv?O!5gQ(k
zt{X?w-%-c?7d?=v&-QjkS1%i3&zXHAR|V)!tTYuHeT=uRqXH@y{zxZWq|}KJ$N3!u
z?X^~iq5WFwp)sgv*Vg{ZA;Ly#+l4XXPzwP9bOK7Mj;G_Fs5`|6&JHr@Tj^XGQk$~T
zz^RZzXIHO>bF7qpBk|n5*~VdV_g9$Z`IUKPXLX=c70)WJwKIA+Pal`T1=1#_aLx^|
zWw*{~sI#vuR2d+wz;yesZCVl*Kwy9m$i^b=kaAG4gPbTt0<s^8(P&6;``n_gFDoPa
z6w5mI^IIlTe%DrnNFgPn|L=tq8c3Na`P<ikRdc28pbN(u(GmDS5W6`TYXE<@lksB7
ztV|1OtrD^hsmg)hacbp$y7s2HS+6GZE$9;1Mdi6NtzW5?5kR^Ubse*B@$3xUu(5}3
z^=tcg=)f8J!29Fl7iD13{e)00REJ=#f`6ye!khL4uVTuEw3vUY>l$W2gY=bnL?*Z`
zM$;jfBXw~S^{52#>xAuk@()IQ&YrB;0fk$wemAmOG*oc@WgW0?qe7p7`1aY?-PLy&
z+!7*<%zA<rcWO8zAM+m;v^N0TQSIE$<@pG;ZaJkx8cL+7cJ<q)x>grES`*NAcDSc~
z3JO6a^Xzdj4J3S{165CV_d*jznvrD4+&_vA`350FzVL7#PhJ08bY7_;jXYQf0{D<3
z{|x~EKOZlW%X6}M4u}i@e6gD3I7<tJLPsXETVpi1EVt_OEML!gieebzv9KyawMLP<
zZDuw=T-8H-CG|WSw4>T(B(Uz{Svf7)Cy#3$M34RH5)$aMVO#c>lhUvcl>ju~l-d(p
zcp;RuRBVN|zE)}U;X-naw9liB%^}3p0`~H4HCjL}T+P42dgG1H+6PlpxsPYvzT+)L
zYGhBbuS?l%o3Gz_j^W!cb7y&ryc0+ZPc9!zAi7K=Vt_D-P*6DLmiIJ_m?7@6gtA1k
zv9GzxeWEXgZrvX#kC|9!zTa_OvVvg_P;@+Rj`S*I2CteZs=(_yupYE^J2Py{XlU2e
z7Pe|F8}CURc_k3_aPU7p<?Vt`z=S(pJt6s1@@<vKH>chb=PHb3o_9)tyD3hFXpla8
z`I)GqQ$=1T!P@<<Hg4Ea#@{39Wrc>fKdLCvYawIB4_`dwKs;>CPW599d7B&=I5dN8
zIhI@E8a97iWB61D2mPwa&BwOXOPHGTy`U=X&`gb(`;>X@JSI?@T{Hat;8jbV_;F|H
zM*H^!uE?*^i4Q#qJ+B?mC^a=2QT<;>^T$hG^A9gz-3yln&%_Q1MT6YJ-!Q5}085r9
zMq1}2$RK|;{qrg)#KwQKfwRFm?8@pMWm&WYO+<<g8}j>%v+N>n9x#(IW60+zNWcB6
z_iQZV3n(+%#P=_{+7_aH%NRr=@zu7y3d+c5eHgu!vNkx~B_LPd$iWW~@1KzV>Oz|h
z*g4%NU)11R?~X(N&O8G<UDIHhWa5}Y-P`9;fi|xdb=S243eM`KBH$;XA6>832bbDI
zDCNzz&B=xV<<gE;MoXSnz5cWx%u|(Fg(XU~^liyb-S`^>39Y31kNbquB=vWPs0OeV
z+ro)skIu|7uj`JpU5Lf;n(Hl8D}(3jxJ=`h1p=F}x;U*HBmQr>wsRdc(%4MVv}^=e
zWQJ{n>s>9dd8K)__K6T&T_RVW(Ib1ccrvK?#vXk<oR|hZY3jS8ua%j~NKorqjC-t+
zhATDZ#H|toH+=Gz-!;XlMt;i+1d*cUVZm#DqM54W)xq;FL{*U_C$?8gGrak{IGg`N
z6KWuXZhsKHK>frP^{$~$#^Xej<p_mGo}RF>4IgYQ+$%kSGK(k7K8XI(u{V)lXrC|@
zCj1y5un5R#hqJ=%o32heBa=}L@{wwXDcFc`y~!j$>7m<KuEn%JVKFWqn`iCL;9F%;
zsRv&r*%5yn3mL(L>>Rs)ycS18hYj(MQ6dc+KhdM5yP2TSr*Tl#QGGWh>~$&#HO*yD
zD@JskdmMd9e#Yk9@`A(*F-1moLIKc?zB#wW+(?GbI~*{=DzegH-INvVjv=mm0(ANM
zG6x~^OLfq`cUYFibo4yE_EYo1?q@t#iYkeWU>4m<P{DJvG;v;#@4wb_UepUL9BbD2
zIhI@5cjZOU?0ZUtx|rnos*J4P?Ad;)YJiRxtawgIbhCNaG-;P+?l!XgX{6TMZ~g=}
zMw~f%m7S-|sW|RIh9+KuxR@yYXzp@_QJ$~@o;7#18?>G_yfps>uUYkVv8_D)-zg`*
A%m4rY

delta 2056
zcmZvac{J4fAI4|LAja0jWSg?5nIXnSmJwr%p#>8~B88iZ$nrIV%2JjwVy2kM$f1R4
z%B7?Tm5^nWC6T2r$(pQj=l)LTckVss{_#HVb6(Hqd7tNe&T|J<h5~SO@e&9aDq4jI
z3B60?OH0yVF))WNo(ZFir;G4q939H|mjq3Q(V>YV94DG+gyb)m6cP;O(4oO1cpQQJ
z1tpY3x1gRPgPVvu<LD404io~0KoqF<Uz44^w&=$mfTte5X<r9=op`h?`<kOF-V9G5
znBq-w1S5hET84l#5dpmMFOYrHlwkl?2X1@Tu$l7<DAX%yE0x>~lW$pm4qdC^eJ);I
ztPgreE6KuZSIF1UFB<V}4eE}31XGXwt*X#%*h-j-?LxTfOtggE9bf&k$Bq@6z>Z0E
z)+X(AOZiloT|Xu^b10iJ9PERzBc0x)sq}bg*=**wWHxzNZCwJw{KM1|v_WM6y<%ZQ
z+9&Hk*re`)B)H0DZKx5McYMqURIT_VW#C6!?SQ~`jEZgwvYfj0G=~z0lhScH>4&2m
z26d(M5+iM<Jofl`BQ6Tk2hvXOo#)2?erYP^ZcYT$)ie6Y=Mc4IvWJl^t;>DFX%*5u
zK6BJ$HFUzf@v>L(XmxF*##3EqSvCX;27!w`aTMHk1oYtcEifgRg7P=5EwL}`&-fan
zYGp7ok;nAK9C2!Y%UBp1r<C}g4;W0yPQYoi>DZK#@_GGez>wJ#&I>Nc4ENPE38*f8
z&3f%H2L(#pue3_J2H}g5Is8x-<O$P~qD5;t^eIh@w!^8qAxK`ZnE50<p8y)|XppRq
zF5QRZpePTkLCtdDAB8a%(w{A8lFhtacjbd^`YqJeth;Zxag4Ry=r1&5tCN+$1)&5*
z=X2y}!u?cn>c!;s*c?BNq2(pX4CyzsGe05HQH-hUoYJj+9gAwdU-zXvyZY?5V=UDx
zv{mD2LXsmfk6jbo!&%v_EB+^PVdN1TNY+XTgjauGNjxN1Cxz4?4W4k#Cl#b!=AH|%
zGuEW+tu-_3WX^L;SevzteMc;S5H^kuoBCJJVS_L_tWSh{MAP}to{KsSdoF^t5HJWQ
z{eKe}3<rrUw?)b=kpiKE!JuA8nS?phz-}x?T{cLW%u1;jPr9gkXJ)5X&vq5(R(SoW
zQ~+(J0#JmrM<&WGKdBx_XsUaHDvz&zL`G=ZbAA+An<Mb?jZ4p<r_NL~ws-A3Mm6s*
z$WP)M2`b8Wz3n9n7=y(+7|u)i!G(7w;!?qw7Cie|cW4xdZE)tht7JKQdP0AfOAtM%
zt87^}gP0w~JJ3_o9Bz+Au0JlZdXeUTUl&6J#>*Yd@nU+ir!2}0hKbQu(>`ZST0=8Q
zhV=|(Z2GQHfi*L)CN3@?lVK=B><@aUC3KAM;ugu=Vsxjda_ZJ~Y*Q)s(yN!P?(h>P
zHx64*&hEc*hBRL%%l%(ZMSlTOyE}SGv9ko0u+o?4>iJxmLJs-<GQ@AbQ(d72fW;nl
z8&3D#ShC}SnOcwho>{IxCmgTJGxR(QDb9*PefVOkR_Xv5oH@vn(4teXQQV5pUJiI;
z)*uw?K;0~C+hb#JFo5Hu5t+(6T#=>k?0)Z?eD}0s6f5c_?fdkeH+jMCD{u$BJ*{n=
zSj9=n6ePNGe_fwhO-p84>Ta=cAng*`=OQt%+JKQ<MCH79*B{cAFY@mg?C0O_5E4lW
zOQazXKjt*kRvwO+uqG460vU2@%X}s5uy9-X1t@QMD?5zm-(y~vc>Is`>96H_J>fjv
zEfUXH9-Irj(xt@OxIriML1;A4=B^n*5v5M>TXXK(^x-uh9Xa>|FbUY2CJ@@2B%L<_
zK01(gTEh`e$9P$!8}6r>go`?3rRE=!Hc3aXeX`+v`)My|C{&npC;UDep}EF=(&<z6
zK#2M6mYn>K)dGLk?8j|9Vr!rwTll)S!t|gvyV9@Sh_zz1VODa%N*!IZ_IHThH5KO<
zS;=0^(2){+QepTUPzQ;&Zq3g*^wrX#`^X{vA07K2S)za3n>Af(@hU0OZsO@i_&-=)
zC<u3<AX$Av|FQa${Um+$=wY_jrZ(x6#@McH65Ptk!=KYbu6BRi*jvN5cEiq&6c544
z6E!2^elu^yng`pDcs~7@`|!E9JcO2b61tRRPo3+VkO*^i0nirn^@!4<vS^9>d74Ae
z#j6)0ir=13Au~x&b?=n7B*&@%o>5ZUh-PEKHiG`PSF@-jyi`t4Mf-{CaP;ok{Zd5L
z*~KJn-;p~5ucEx2BGpu}#!XI($&yG+sjBvnvGMz^16jCKyQ~-)*IL6*0p4@tq6`*x
zPOl3hRA{FGhcsEkt?7?vV78CE=gsENU0*Z_U5hDg58w37=C}Gp-VB2DPloZ2yRXL!
zvoO?$qp}l`47UD0e;{DZxcuEHM*9ZBt~t92p_Fmsg%vfpwtcUGS^84kUM}$2{FHC+
zx)Ug#UiIp1xV*z8KWDmCjQ<#+6!1lq!QZSq;#llrxdApbH|E3u4?@rzdXI?si8k}F
zP33y5vAff%X1fznwI4Dn6fNYKuJ0P?qrM@D1LN#l1v}z2Qxx2}nYq~DFEh<AVL*J3
z_=$T)?GrffmzB6x%zQIPldQNpF4XCqhP=PAt)+3x&p$lJOpCh5<)ziIbNNzW@xK6N
C9HNT=

diff --git a/packages/kbn-crypto/src/__fixtures__/no_key.p12 b/packages/kbn-crypto/src/__fixtures__/no_key.p12
index 1bffb7a301b2e12fea69955d1d614f96b7060997..7192bbc7de5598a7ee8eb12356cf4c49b65ffe00 100644
GIT binary patch
delta 1867
zcmV-R2ekN;50ej&U4Ji#Vf9cPQZoVp0f2%A_^DF)X)34-J58&%tnoosez{+cn!y{T
zj{dV=#?fd}zt28AAxTUUAd{zFJ4bep(q8gjyJF~d?rF&8(6H6_C0Xf<T#<5GIy|T}
zG=i8!n+i06tvS-{?`mFoqyVnbWhZ>9%(nn8fiFCdoJit>$bZlrE!VfAuKON84DLnH
zTi0z8<1iWwqV<iBfDLh&KVBA~NK$X};Fu9|?FR02K`Q18Fe+gUR5w}SE6eROFr&if
zU8-RpFV_>?l<@6H#j^NKyF7O0@h_NQdkXf<v-e%>f-fVHpvPb2*=o87*mBESj43?@
zl~|9ouiQj8EPr^uEEvCUvYt5{TJaSsCYL2gu_a$HFt$mt4)NpKw3?xcgVxcG;9Gs<
zPU&P4_kDHQCYk$7M3vU;AK}Iod>%ZceTD&6gH~VjGV~g<)Q)=-73n8iMpbIS8AS?X
z8&Bu$O$-T!hN)Nj(SUufEAd!;0yFa@2OH|zWdm_JVt={b`a)86wIs}Kq|KtFDYFbX
zO)9i5ewgEh$94<flb)DN9e&`@(8SM|c6iaMGxkoBtX<(uI%BRZ*yX~<@~oa1M|o2Q
zz~BzV*=ha3U_o_dwB&UkmXF(t6ivU!GjmcO?Dg^ra)Cq;6ZG0vJZNZi&ZMFjT&_}C
z8u%C$z<<3kjiE7pY-0MPJUjgGicSi%ve{Z^L~FEth=|v6_->XlGEFOoO$)ttYbt!}
zIg*bJ4br3@uM4S&KR*PM)Derjdn?|}jxD0sRAZ_X8BRM?afLA359v%xj9Y{o@v3W6
zdao@e{r#v(Jvs^C^TqM|Oy8;*<97kYWTc(FIDcbGtYUbi%%9<_E+ut1&Rxr^hlT+a
zLt;2=#*WkMkzSj&!M4M*vRXC&3<G7?q-h()STrveR`3FQ#cH+9MJsgC3|D=t_Ewsq
zMz~pBY#K<Uyuw_3G~2l~2U^`GJ9<j2K}}#cHG2PR5JW%3)9cC~i_3FGzAofiioypQ
zc7JDO?xldQh>~69mJCO$m~%&z+=qV?xfI6T?}Zl`ZWD$Tl#x)n`yZg<_EDl$RN&la
zmgMlX9$MhJgDFycevW+hrUSkf26R2tX3Bp<6w5`@je;K@%*L7@uOKmbd7v=8EgjUh
zVI`rpLLRkt9e`i#-t5)`P@#{1)cO<q4}ZyPr28CX@bE-|Ax7&&MnmNa9;f1_N!IF&
zt@?k`cbOwmOOc;jrC+_tf8lX)*N%}vA2N<m&zORcEOX0>L1`qfG<?<&)cX|RT9Az{
zB^Go_S_`d|JxABUIIUzOn4WQ_CwI+Uu9tbF`(&AP!<(6(ml{;@{7mUNX#`E3M1N60
zk+^E90)~xl-HS4RsuDtwWmhiZl;*Z?e4;A5qQqD>dD4jaL=OGxBVx8(9dII{CE%N=
z7Ep4`P|w1IISAu21moGDS*lcp?u*+<i{n3RqqDtdF>hE}E9SwF2DQ2*rP!Xu2itv|
zcTl>hG{zpTnG=t*N_jT<1Kj9qe1FsmqQK-J7*+YT#4p$fn{l>l_j)!k2uY@+bY)3R
z^;g6ne6Y0ve%~eoX@!|i*-MJ$;eKu)wDIB-U4Axz($s0wmdjl=g_;<13gRSI<s1UH
z-JZ)`9TF$r0nT&RzgU<#$Grl2`85~`BzNd*UX^DXkLa=O5<U+efIUf$$$wy+WzOH=
z$s5^I2Gd$3rxE3$IcgXt?r5*{bO^6M;D#?O$Pu+G&V#WthqUoF<{cH<MQ=nb`W^T;
zb;L0;mQ3~*2i$c5bS8s(vA#RVe~ET_H0tT!xCGCurqPhRL{u6ejVinsi^h{1Si0BZ
zbr9qK5L3@3qbE_OTN(-;#($qT8Kp_Mz1s>3-HA9_k^~Mu2<e+x>#5LG*pR4*l$@G2
zvT7sq3kbe=vRG_{Z(^0g_=BraX52<+63kcS<kT;g&3Y|@>rRIjzOM9pl>9Ez0+52X
z1Xu>rSsz*Knc<h6a;C<K*V45Nq#=wTOwY}{5|imu9_=3CRibr+f`9f^(Q^XQ06;d>
zb-Hsjm%1a2x`83_PK?oNQQURE_I%Ez#k5~8(s)QZyh6%ygz{C$gx;-O%&$dPk>4%_
z<b?B5n!8J<{8arcqjVK2neVcLV-Gq%=r93sNaJM=ZZJbJI$%LUqW}zW`O8_?>fDNr
zn0g`BCSG^S0ycY8ntzj0r>bg76qQQ(s1p)X1p&C|Ge&e%Q&63qC^kpXoq~%tFi}+<
zR4hQ<J(Rw$!RgL<ZTmRSDhvke^hD2G%{_`&UF5j?3Q`oau7EP@J6yHEnd<hWJmb|a
z>syLL;2nc@(j_%^AI!}x3*}WLL||Yf8?uL__mXOi<#~4cr9>DzM$VOwml_rcTx>TW
zrU@Durt4ZTEifT42?hl#4g&%j1povT`ECUt6?jOe3aa>L@MxOq9&}iG1PHee1g)#Z
FJI?=iiaY=S

delta 1867
zcmV-R2ekN;50ej&U4Iet9zSi_D-r?$0f2%A_=+QhuRaB~6Jg6nv2S3{6osP5kE-N%
zQiq?%u4B>=X!QZ05J@OOfs1XfCC6P}BbGu>RLFXlOeL^WghVwod*xcQg*OL$3(bD5
zbH$t52r06sv@M~8J_a+Mq0L$*Dc=R|V~F@c@-7jra75Ed8GoMpbx-36Uhv2zI``u6
z>CHT6lE#_`B`Kp<=JAjH^SA7bvFdsJ3DN*dFuAA_hVvWy`jypBq@X;)QQuEt8+S}0
z+T`S14E=A90-@VkFtA*@ID?A_5Fb#?kr7kTP*afD#cC?CD+oh$VOJP;uo$jK)wN{F
zodG!)u{-7+IDcSQI37CXL%4`bYng_~z*n?3MIl%2j7m#=CQOk}xho-w^6+uSc;@3q
z1Yn^gv3=^vpth42S5@ue9d^s#Qe-L}qDZ71y4@(}2a7u_i0p^}nHU&5-sV8vE@GBI
z$H_G9c{d_%IkDyXTiN{RI_Ie+l6`EddG08CY_V0p&VTg21+w}BRZ|}Xw}qSRXPjw}
zx3f>};w|R0_L97U;$#m%KVyDkY}SgLcDdV#7tlN3+|l8%IQ9iHCbk$qk29f=h&PO>
z5PmXovPNh4J?8+~I;<#reqw3RNIHwT=mw^yIF~4M;z4NSBlUzQO05WYYyK>O8*8EQ
zFW9B=lYjC|BK@#Ty8#uXKI=PT)IE1jO?OmbijTqnlix$>!RDiXWkZymiFyOso;;H0
z)!>BaSmLk;y4Xo(;TzHdA87l|6J3O>0)IXnc-J^U2F)qV_xl&j6plIdx63DRDH(DZ
zp@r=p71Fze`+K(|8ZmBsh}A>X8F|B3;JF}Kk$-N~b34wh07#m~R8qq9Jkk&)^M??I
z^cLd?EBCxKM<Ps*YsqL1COzxh#AQ_Gv?pTisBKHog+}A$k*~R>N+pGHdgw}q`N6!#
z6%*{NNvj|?qRT^v4!6TW5N&98ubMAA7Cg_b8LJIu{j-vOh1p1~DNL2+*avQNx3jpO
z%YVi_W6*>Pjj%W>#F!$<N}-gTGore&ak&0F@h`(oUi1*Iggh+@@&dE%c1%CDj}ls2
z^`3dYaR76&{}-X)-><-7Lx)&cfKLTeB^0Pnmofbj3Wq}Ndq*u5GCch<LOU`7iGSu@
zC>wQWNYLC43zcbD_=+$PRF&eMhDSuyZGXEi#`vH3vZatz*l`twtU3=f`@0TZr?zo@
zK#1-4w_QwPlk9Mrd><yOgl@J?@G9!L_6&Y~X9_&8BS&($er!qg8M9qNltQz%&PUaf
zSSKDt9bS#GKFS`oF!>NYm`;64D7bFQy%e1dQW;SKKj_>hx``FIM-siZk8RQm(SIV?
z3JbV2{Ek~v2;cGA*B!|(*NvIZWdGp!Y&u;J?E<#}d-NY(lSUy~Ki1p^!Ylyas$oQ*
zn+r&uk$zT@xe_eM{abrPGm2#a-pxT4DZ{D(spb>1KjfwDK$8ILzM2ar{~U~EKkr$Q
zYL~I8YM&(5*2Fww!PafSu<ni>_J7ZLqsyp%M_HWDa!6R4XW9OWN;Z3pO0_d%UgZpk
zt_ZHT$)bR{?*+;~;1fZ{Z-bUL@ZONyz9;nkvc#U%2F}C61jtx;*`**p)O9=I;>7(0
z!jlw02-WX$H)*DFxx>9@#<luCOY$5`0R?%09r1Q}Q$?6J#Nf}etH}zG$$uh{JGIE?
zNp`|PDdeDu24sFuSdj(WVOOzCg2o}=u$YLL44s)}b4>uGPa`rTtn{U|rH;V!YeV0>
z)w?d}x*X6<(jNqhFWHwPFuRG<3;yL-XPdJBd^_<0q8Nuii$3Bm3?#}&iQXP&i3Wxm
z?nYlw;GdMlE1#mW^tK932!AfQtb$#-FWl?W{e$RvQ%g9sGCb#J)4QQF%W3Dmr@hDF
z&5SWwG!H5ua`iBL`hb$3ujuV`tr8k8B(F<=5QACUQXTT)zMgN;J&|1dhXbUFZ1>jt
zX=y+*X_-7*vh~`F=iUB(_`YaUHv#oG8-32}*V*tGCT<wfRlT=ax_=gclb(Zq3~yi6
zC=6SEaabZZaxl_O?75eOnhKiz2AOvMn8Y+pW*0k#bb!0%UdVg-JTVfM3g$XXYIp6J
z!D<c2vo&AKqU~twQ9Quw@qg!+3j><ebTs!aw_`eBjU(n>5^mNnSc`9ww2Kc3QSskG
zBBwuwWhqpYYr<lc!hd}VG3!h65#5t=tv)^TT?-(VI@dYA*}RaYb$JekAU2P6QMr`F
znYuL@y1mR9RsTjSCM4C>2mE=itZD<ON$j1wqRFmj;6}upkxcrTS?dCuVfi>)Mq{uC
zi!?!iVF@*6Q8#bLGsYMU2@4L{DmbH(#PygNQHiD!xg^r5FhqnfWy#vL&TCZ}H5y_s
zRY!vkOaTKhEifT42?hl#4g&%j1povTMY%SG6m!hQETkc{C_ohZo?Bmz1PH?Q6<RDL
F8_VMMj9&l%

diff --git a/packages/kbn-crypto/src/__fixtures__/two_cas.p12 b/packages/kbn-crypto/src/__fixtures__/two_cas.p12
index 25784a6fb9a948654c0686ff087d1eed975f9b7e..2de839be3e41c8c5647d984668b8680060974f5d 100644
GIT binary patch
delta 4080
zcmV<M4-fG7Aon1UU4MMZ01Ah%$+!Xm0f2%Em~94+xyN{xI;QuUdJt!!=7d7_JUmV>
zrpH;C?Nj@Ya}{PeKS*v7Ar*X7?wcdhc0v~DhrO?NGv3?JpL8Lj{Qh_Lv*9Q{tEPXL
z@IHND?yO?7I+!A#NZ>f;=)G6fz84DbmZKoX`+D53ZnIZt{C@=Xuuv~x{%cl$$vhir
z(MZF<tD6Uepin82*;=a@M56tiF?50@X<#uL02K!r8Hk$`Yh{*^hx&lNM;P%}k(MZu
zZGB+70jE5<S0Br^Wu4n(MYD#Wz%opc55kO6REQWH5JKM`sL0+la$;5rfjSbW=7)69
z1Ru<NhU~ZF^M53qJ)mbI_fG?n?xf)w20!EK%D)NI{vrBJ<?5idl0tW5MJ=*!K9D|F
z>Gx9^GXWo?HHDY;_gIQQ_%#9E_RZs>s`}SPlsQB~FoKgrnOcPeql~X8``V4d%zPOL
z3*wf~`HHQrnl8;O;}WR8Yg`?u>$N@eud&U|y;@*<JAe3R^r<G@F?%0NDI;MUX5tVq
z7C=T_UX#z?S~t^?<jC9q#D&3uO33Cj7W(qTr36Lt<jM{^fxTM!=3a1^sVt*Zk#xnE
z_WRH-_pQ|3?CUyPz7e+TWXkSPY}9v8XD2ID&e+8_MD1fadin2P;C}Cr4{)#MsUHmY
z!WN}<tbeow#qoeH#XDzJsMuevFg`6$o=gWA57Dj6r79Wd?ONZP|1+j5add57-Qc%O
zynpA%sj#3TO?7nR08~DMd7l`hbK%sl2h6oaRHx-8{%J|MfN}=~EY*8bpxW68^%9+5
zkG5?R=CROL-kunG$<jm(@Z1m*`sXcvTLC(v(tiZcopCOnalI3*k^0dFe>dm5I80*?
zc0`XrGRnVKGSQ@TmO?}@Dt#1r*nxT9ijA91(y@l&Rq7t;4!t`OvM~|ex}3Y=#*f%r
z6TIJaWB4B92e}Eov#T505~+ET{|q4T+G?cnmZT5!LP{T~<jIaTds5plMaf9M1X<8v
zF@M6-eg`~%vdy&}1e2|~Is{jyJmw{04qvXFulfn*^D?BSy~C8}$pnZZ--%a^#J~6T
z3~N$KC3u<l1Onbpa|VUmlW;&{em1e~ZkXVSW*k+UgmwrmCigOQjyZq*f1_b+<abPO
z0FPNZ&8sj=Ui+l7tX+q(`3Lli(u7+qY=7|9BpI#sC}=WZMQLbA>+m`^9Vu{x+AiM*
zzKL(rIH$`5^?A7j?Vj)F3)1Z4&1H&e_h1Z@j4i+T@Sxd2v@fIkvf)A4tgL}{OY7A$
zWrB$b@33R0GM{%<6J!t#q-I5TkCPVz6Bu;{3kAhmsu^qZ*ptB2dhs~7&BFnDtbdou
z?vt*B%+LrL7^kRQSjc;RGO`7S|K4DI=MHXv=yU&qcQCkAepeIk>q`pjgpoj$KHGD)
zY$xj>%j&|H;AfCaTz5OYci4vC2n<(VtRA!hh&J5b9E0C;r<_)Q<;VR5jAs{x7;{Qb
z8LMu#^$&=HXe74g0Jf6h0MNV*vwt1YFVhIU-<LN%dmdVIe~0t|K2ii+l)TcJKl;kX
zyI{w6wER|K$Ae&ithG`&8#MXQ+#<}G@$0A<B5WE<MmZkep%wa-!(tHj-IX=4?L!Ub
zWXnIz9-`xomiYaPrPOzvgIznB(H?jUeWhAol-yP+-M^&9^wUiV_jYPs_J4-ZcP}O6
z9I2V^xn)5SMIzbB*$qQ{N-u^q3*CWEnB$w!U{i;5%|TB(n|310+Tj#MxA}@cN6~8T
zokJv6KUduo!Mv*QlAgY(!5?1z#B?&C2QKvtWXX~<_;~kkG*$5Nqz66;Pw2qh59>-&
z$5F7wr(KV!@!|+?p|C$8FMlrSJ34TZWYl-GlN^I`TDU*(UCLPChN;mDn@iZ;RRhu>
zQ!|%_3Dx!iF0t21dgX_0fvHw^>@w9NvRe$MUW%qoTxh44MQB)Lj-0Ew-P{#(y-`%3
z05&Y4!qJHBH(8<s0TtbLlR2tk22PQj-z(;}Wipm|mwLUij+wIJ8h^$djtAo5X&gw=
z1(0M!6#6<1^Z&M=$@Q{`_(#=ZJo}j2kpbQBeXBZZ+0T((^tOwojRxxZNBfr$WDyv+
z)kGTN2ZljD(yFxqnxm0R{siDePXR$Q&R|9Oe5%w<U&w@rUzQxra4+liIcJ+JMu=kN
z0RS_(g<7Lm{Gp3yoPR^W%LSDU(10Jg3=(u-tqp#IooH_ykQSQ?Cl&b>ooG-FDrN1+
zPl1#$R6im?xTb02c%<Va{ghJlePE->LcGQup7?sYf5fwS{A}paMPB(X*j$cwWz2?k
zUM2OkajqLfwPo@Ne^ZE4HX=)T4*%sh=%7ltNb2hY{Vme!dVlyC>dy;Wj^2AEd59I^
z;^RY}aQ8T4$ARs*hua`+AXZtChs8d-gkQF0I`{L_bz$BA%@|hS#Jx`lS~av39vxEB
zQHZa?1<c0rYU$$?4{g<;<^!0tZ;Ps^q!*eHWX|Dulpu}Hm~9|1Y`M&B-j?ZGvQNJS
z8|TuynfoeoSbqaWyEBfqbE=`}7M<=fg7;PQDSnDFi{Ta<RuUl`M=XbQiKThkE9PEp
zir2Erx0Yd}@fSavn_qM0i0sY6VuLbh2bCR3-#{xQ7Mbrr@<5oO8lik3;4Aw5sg*7U
zSJ|l>l80W9G8oZbrN2Co&bYne51wa2SIOIz1z+E|3x8iYhZndV^W+j%90OewqW*hD
z+;Wr*iTWKixe3o;24K-2Jy-hKI1|8l<8)w_rV3DT;5~R=H)7{!HV#6HUrq9}hayaN
z`XU44t~8ul{<SU&Fb?bfmTG0%mWm<EE=MGaAf$&=(~3JqR?FQ&>DeUTc`jv=@6siA
zxEv7ANPqG9*0tpt!k{4T8Ce=#xU0*71z$k#^w<Z589eaBo07iYR_wSeWe^H3z0d|N
zI9NM#5D@nnEcJ0FBwZj`w<O<TVTt^wP>PmuU|-jfat2!h<d<m&hh3#`VVIzyro37@
z{?6-(VJ2y+E8?j?Tv~W*zqm@1DNp*yli6i~rGEh_9i%VSuGeGYNrM~G+nr|Tgfrc=
z^ea>9D=gHRe7lHcqu%$Q3n}5lTA%#Sx}3h@0GJJnAiw*onQSy^i>+r?hC@jW;5xkJ
zqVM;CS}e!)+OQE{#d?0PBC`y_Ni0Df$h>9yz~BXL6l#nKUC_<tPe&F@((82eMqjJF
z)qmy?MW@>%{rp2;+6{L;E%%0Tmhg=&?i{_g$TSFASqRLy+=&Kw8o1ZAKbg?HJhEXQ
zP$$2{=w4VwEE^*>+`c(*P=0^{C47P$vgSFQA!(+2d7x4AX=!m|D&)|d0=>$YUE=+2
z9q;xISx!J*AR-&EwP|Q`S+<5j_-$q<B!8E$Ef&1Ny9D)^I*=s>mj1TclO8B>Hi)t|
zy4mIV*U6<0GhK%*rtth!!H-p-+KfvXPAGr+6IC;k*YfNSbW}_AXAE>JUGMOrfd`--
z%P$(qa@F;nxrLQvh=MoFoaP9*k}5{b0fLpPzROdL*UO_yk~9g|KrF;DV=GB|&^&t+
z$YK|<6+4b27<r!(2E^#IU4;lwq4*><*w#pc>=^!vazMi|dg{rz>3nDPVtp7uY&Z5F
z@pN#}7#EWS3r2stg}#n}r$u`L0RaSp1jv>_sBPEzja=EN@kJ1QPG>=Q{tEdg7(}wV
zizC5vQMYGoXKy8^EvpYy<MtIc&i+M6n9sW^cDz{`McE)9E#htzXxX{gykNpSS(p9!
z+Ql;*w+aPdhTDg}prL2NW|Td&a}>}BTeA!|F$KO8m@$9m`E&XC+g*A&R<vV{zVIQ@
zpOV{_>^T_4pP)>NCK3lxScscE8ClE0(W3{~***s59Kc?!4*`dn=r<A3lMhULH}G8J
z*q!<8*dVeBNcQ7DusMFyc<f+2aSRPjNMX*LD4{&V0^!75jd09IZabInmg&>yF7mO<
z-^fI6>D+&vUgU>oKiia+DjGsHjcd=kvS~q2yzA3cg1p%I#;FoRFB)v#61A)}ykbNi
z<JhQrZuqC*q;PIMhWz~qEg;{etOU*Vhd_5w)^SEWjdQjTW?k|!p_M}%K+uXDUM0z$
zG}bAVx;6K9bnS3Ll)qp)-3#i_&j81CK8Aj8agTqRCIQXP{VMROGr<#wU|ZHvgxu14
zgXva|54#jRVc;}i?0boVUWfMe0JYvZiAvPVs5C1DA6{Aq^@YuZArOU(wIyuGjJA!_
zMG!WZa^7x7c@kDb#Q4ZP?Wf>eg*`i{>L_$`WFG4%o1G$>vt|q)g`J4oD<;#HdY`Nj
z^csK3z_J&`rx{L7;#?REXn^6-L{y(DkwwY7&Z)0*EUB|d%<XRo`mJv!eNF<esRc0$
zI(9afMwQLs^@%lntuC+4zEa1gN-R6Q$1k`EbBsV)@5o``aIZfd<_;*kHs=2amGL>;
z-<1>I^f<pHQDhurkXUYK@u3(I)ag8my{CWo`dsb9ydk7``i@1I#j$N<$E72kc7&9E
zN^LY%xOWpTOQ7NXt{e}u7`W5gr)SG0G0AE0bj7g+@BR7T{Eda6fVtmDEtu-B;>OrG
z6#gN?5B4ML_0}*(LuL1w6ZVCD)0P`D1rWngNPtsUHOQ5mfA%J)F+GZ}5MyhVp67oP
zIsk%z#tU>r3CI$j_;9u&Jo6mF{U-+EQDq<M^2EWIveU@|2FY6+&(0=o_J6}!2x%&X
z7xwZp80c7`uHE^AzY~!zlVpt46Va6&^^8&!7t8-Y;Kd<jS?=)$0)s)o{LkO~oveIZ
z$U=nMfT=*PJ(YF74+u-%<$Y*~E<1l0QUK;j+E|{?>~NUyPX?G?7m@w{>41Xqc&~+x
z_fAe+Z85{!$xM@A43(-n7_<6BJj3D)HJbJdJGvx7&OkX|ezF+8)vAwi1U_OFwzk3$
z*G(?u0%5HMo214%*D0e8O_z<bQ`5Ays1_t{Bi-Tj2foFtk+l!@njM5R^*(<Iew%a2
z8mOmJhNnro1n9<Slm;Y#VzHw0gRH4TW6w7`r46^`1u5<>?fpG`x!@!|B06XBq>_ar
zz0!rKp=f_<i&ibyV(+_0Qq5`0^7g*JUkl{mU7LIx18gP4$5;iW=j!GOMvROphSig5
zQ-tpuVvK9;`;zYZUSqwPwIpCDdFmGLm8bOx;!^k%8N8kq_Z$mzMBt{C6MXnKO*#+e
z`7>3wPEuG^;peUqKXUn>UrsB4{bnES1vio?;x}XlxhO$65Jew|0+O88ntl%_sKN~n
zZmG`cxV<{6FqKb}ArKQocMQvte!O$}m2^R!=qYzaqZWOEFfA}4FbM_)D-Ht!8U+9Z
i6i_RGj0K$|Ewa6-_X0Z@XK6AtZ3GAhn1f(C8A}kAaP(3D

delta 4080
zcmV<M4-fG7Aon1UU4QfWra5l3M*RW-0f2%Em~{}ez~p}kJk2XvZ(AM?y<piMefF!G
zQ)r-Mpgjxb1L6b~PA-C{V;8z_t5;R$hk@9+jyG~U<`#e}*V0bVQ>1Q|ilV<ABLt;z
z=p88Vn*znzhHn*%iale0Fi@s-VQpxAPm(U3216ftH<GrKMSp)mflmA45U}DM5?6VD
z;TB}qL%gB_$3?_MjdQw>eh<tVW)88SptznQo^#^iIhudi+c^ARW>O5^V<$1NmWKlo
zdn0d_MM>RbZB7qY7<IbADSc*KWCSi8%ZuNCPtgJ6z?5OUHRsB!x86q#LpcOkECGR}
znhT+oO6=i-5`RhzkIoK9KgVUBdXBw=GLrsGmRisd#QmyjwNIQrS4g?!5B`)}gB|9d
z9n6Bz!NNa-CUxZnIwarwZmz^lKz+8bxt=>G<Ws~~@~THwi1XeT3Qa=elMdz^g|Zxf
zz9ieZ1#tz>g`ySr%i+RxC^RMLH~&{?h|hwDE>a!(@_)oXTB*T1z`*~JVHZ-(0DGsk
z@#$F!RYs_>(@x*pnQ4hE!ky|@&AP!t<c^-Z67oLNo~%sbqxK|qt@|{zq@hg%is#)v
z#pilQnkPPv6S_V|mA>Y_c9qMAO;d}OyRM}2>11-&5{LcvBG-CzU+zFe9A-Bb$e;=n
z1$D1Ug@5Nke8|2_MhpP&RdSG639@|?nil7_h2-cx?6+AEoO`EHI#A#f52gkx9xi!?
z!8(<8Q^S&&vqO}}r`Yc%=@5(Y@PN%kXR71)m`l9n5}#l~aB(KdCO(D-#vkG6-3Qn+
z4U9FsJT=km9n~q%b^71+<kyp+L`SjrY+8k@s(&Ml0AUfO<1GO1B8gX>^FbM_p20mO
zj$7PmgT&UUGP*`udXXT>a^Y7@7EyjqJ$Qk<$bQ=}r+oSDaq4@9Xe^&^*Y-@+%?i$=
zK}GVgn*aQGaQ9mRGPF2bQG}|%SXxSm<+g%Ys+dz?rh(j^4tLV`8)-eq81JnYyrcdX
z0Dp#QqXijy&Zgk2&yftt<)`=nFM2q(gG(e<425G$D8@=4n}$dq%lPt32etq5bjRWW
zwv9n04dER->?9LfDmD3F>xv189OsGvRsmwsENQcK#X$9%+Jv4$pt;DaW}d1372H5<
zsUC-(Y(Kk2DmS;&>Dug!3#OyEVPx~!8Gq$zBFXo5`qC9XGM_?u?+Gh}0*4jdFj=Q0
zHtFN9j@_r73y>QNUI*l=e6iu?!GN=T4rKZo!CO}A3`$(3i>-e6IIe?|2|NNV&Q|zu
zNJ~cteUs36GodIsNn<X<WlW=#QR6>B$8=Fc?J$28@zIx&a@*P!Mkah%14mxl{(saf
zu~}Xq)EOYR1fNocR#C4EG(rq#ki>DcHWyY}TW?O4QQYu0Xot<e8u^metch59;ex;<
z0KNjjhUVv0hrMS7Lm-~f=I1lT`B3#s=GI(?uU;BX{!+B(ifaQceM8&?Z9yuP2@%CT
zM4c+LgjA(Q9+Bt6u`RJZkf+oG>VK<-kf5=G&Z+j4HVRD{EN_cura68}M`x_ZBuUNl
z&M-7Jv#l6lx}5QPogub`rQrSDVN-u^XG9PzXMRyER>rvxbA3G0>DF7~YFCNfYk`Td
zYzGq`XeJo^t{;63ZmrzS-5cMN!j}B8ao8LJ6I7SI*`8JW6fO2ASV33XM}O26>=8Gy
z>0CLu@{4jFe>U|Mj{qj$dvTM!R-7nx^&Q^yO<aqWi!QvFibLhdP3>}vVigZN>M$?%
zTp3XOtp<Y;qpE79d?fk%A$@v%EJ`qh{g|`*i+ICZOj6Z>sCtSXZfS#0j<l*@<VYNz
zwMA1Ff&vm)C00ppjP+t^xPPmT-ZBAVCj$Gbhf4z?aM*Ms!;`hd<i@U3Ql0%lK5Ye3
zxmv4Qv|&Hs8t5kr(tPPN<ALiug|V9@7<caHnkL#cBY$Nz-Asn_CH31C$=M~!#y*jc
z{@NQwgfzt&@%d<gWrLidT_tkKHUM6^BX_24TBbbR77rrf!k|Y^H-G=JnLI*4*@CTj
zSnOR5yHPr5-*8JPA2TT7xazg;>XnLfS&v@ss@%TVC32EGHB^hd-DkpMNrIW^v&Pnv
z{C=of4lFy#OA}P_-qThlBTXb<uT_18FLt6p-;%A=h6X{j0#+dc6d*IOF--Wgs3y-%
zCJ(C7>R`;Fo&zL0w0})6Ot}7wk@oAxu1Y?(_qPQV2!hA##&UT@=&9WhuhF~q&qq){
z2S#<KsM!3LII4L~k0qO8MhIIN3kKhs_jco!=ooW2RKv`c=$BeDAu}U6q;$jY2(dQ?
z=+!l_Ae$gTbFmb=o2+o;8*jeXr9z6z0zNS&+hQIo#`oJTZhs7XpNO{VXy^l<)=N5{
zV4R&4v?f^0LuS}V!*zRHU)VJX(Vt@gY_HBto*4k-+E0g>J}Nek9s$WTbSiG}o*94$
zXevafCzPa8wF}m<bLZ*W;F9d9<yKC9$zDWVVK@e<Oym+$Igvb5H&*v_D{E|7Z>7Eq
zGE+qVpUa2?BY*d)DX*$h48NZDs2}!YZ)o;paiD<Z^gqdfGZm3$QTL1!)<Eqp#a<-g
z1d+XK^9`1{v<`!RC9{tbFBiPQNh=&(&f1jo+h=8N{2P6!Na7dpvLqCea^!_!wWH#`
z{&?A))6hI=S-QZTh+w6x%$+`VITJ<6tFar!V1`6m7Jny0EA#*(it8%x9n&IPS<yYj
z5J8wmW6HS{642xJmpa#<bbNjtFG&l9|3n(XB-(|?rB<AYgy`e#LlviaieUxVa<;a-
z^?FpLV59BUcaVeZ(tQ6wJ6izZMxcP(*f2Xmsh^OKTmk+WV@7kW#bn~s24KF>(^N~L
z7^#S+r+-bw5U0^6nmuKKy9W?qgjj5d{Huq1d=DjSGB(tAZNy&v7fg>(DB{+b%m<cJ
zzfkP~pn6L6p~Rd?%Atn;0l)$6C_7|ZUd1Cj+P^re+k_Sn9ioFOlyIR9wO%-YvkOlv
zCDfHGP^qwDFmaB+apJDyVn%avg<gmr|I`IrHGkWm1fNFhxy0=$I9(P0NhR$if$TLe
zgqzGzMgTY!AIEZ8=NLTt;`Aj|@GYn@<{NaC9qc|wsFeUh&HjT2lQ`rOH-tTf{ZpXk
z8&wTq&qx{}!(+^$3yV$74jTqX5?k$9V+e3pIAow^yb+Hwo0I%u;o&PEszm8X3`#q^
zKYzK)IEi)A{nf&=YZK@*HgsATyQHkEbRUzYHn$=4IW5D(0Qp?0Gh#Q}X62TtR68=~
z#IBg}nUom)?&_*~_s{>uJH`qY*-~iePBqu=V<6`{NceX>3_+hai;hCEJDTVP6U})b
zM1R$yiaS`Y6YWwTxS)uU`0`81?nkgsI)CI9WTQPC-mAg`Z_D4LlRkP_DFd7{j`3=?
z|JU7lnRfdaz)O!$1G&<yG|7o@t>LZ0fURW3?Yd97tLvbsz2ILc)5GN8VovrP6E`$U
z6l4E`=Ajw)^BV`~YP!p&js?;vBOgoNmed}=LmD;ZZ>yq$A9U1Sf6hd40~h`{3_J#)
z5nf9TsSV0iofV%6;Rs>Eec$Rc4`d?xLc*;#f}FqjGCzA7_stLw^!NywT;AFz=)qb7
z=AC2-Kn{}x3r2qj*2VL59O1_T0RaSp1jzOmzHz8gsmEsiW*;H;P$r*4VI@5x(X`x>
zc241IlcL07Qxuy@E{N}*lv-#)zN_qTP(|$vK-lMuhJw#c8dJh<+9{X?#SsH?m)DO;
zUU1>~y##R?7ETmvF)Cs+Xx!FGG@R>KCx!qYmC?FZ!>fPE=ozl(Rl{w4%`@fZw7D5?
zX<?8ZlzS3cl5MKAdIuq{%lqWZQn(<2YE<kzQ=oqp?ecefGGgo#7sJuv|J?2L=P>3V
z9J6itB|Uoa@`33iOhr_xyC&DrZW~r4CQfb+)MIl!H4S`9GXVTE-isL;0A5Vd(9+cU
zAwP$q-IIUgt*PNWU)S*yD^tGtRkp3qF|;68Zfvc`PP4Bwb>2|OH<h+Bh|O)(5=$~=
z0y(?eTW|}lN2ADd=T8&sy$kY1=?brS-MDLpi9#|s3a2?D=3;39KA~uYk6V`2zq2nD
zE(x1y?wf4`tuyaQ<_5`hN<=GW*C1^jCN<+d4EKLgPbg=XzQtu=DZJh75(*h|rkvq)
zp>(Ol+1QG$*PDoA*nxwgvfA--$Qd}aAOI{s_6PO8;b;q>B+uBJPH~(bjM7$J-I6we
zU3CbE=QX$~%sZO<0GG=Un6L)OZtg$lcByBc>FA%FhN9+RZVc{>E+E)nB@)E}5?5?6
zZ-akIt^Y@PwJu~<3?x#II(kAjjnBQFFGQOXVl<d+=4d`XPH)hwQw0sJU#|gmf4+Mf
zjg9u|sWEuN(xgl1hIEx}zi3+2D5|%BMBi-~(sqdMe?K8bTA=V1>Ro@FP#+KC^mKk&
zR0M|rA`d{g$vb>!m|&SRcA9wREt^L7<XnFeLEBWbapxP=QXppS?7fu=!Ay|{z2WQl
zI)@%(oN|QrHSuMi(0DqzgyTB_@@rtY+y54r@V4jKTiG#P=_GzM5*c=qd~bh&zePVK
z^F|rh+?C^7p8&fL^s6#M?9>Gn00olsMQ)XOj5Nz>0qdtbDZh!vA}FWl8b4$MOt^no
zu|P|H0j8%(B|k`b4E!k!z1>&E97z!KMbkDD4$@yM4Aav?h%dWBfK1yXaZ$LSX)=2y
z_EfF3w)}3$#z<*sa1^Q6=YkhlP0VTC!4iLSG5;@FZ&+}k`?_4AtjS?fD~TP4{fxJf
zt3tsFOE58L^5iOL>nOnLE5N_!x!ivgBQ50RZfj;AhE$czmggCAwmFLGg8*R%UPe7#
zta=<Us+o&bsXmf!9>{MJY`|U+vi0I}@9pdJeK@;#-lXLJ6Rc|C8G!m={Tc7LLh<M$
zoAyN0j|AZyNJRk5^$dR#tviw^cL+!Jat}=jP1}39ISkGzjk9@IWUd&>rd)psZHxQU
zK-zO$V4^%Emu>(%`z%6M;;`6j{HZE1avffAt(e~xAyUptue?#>4e|0mp(08$q_GQz
z?S$V$Ef2FzSYkn7_gD|kLp}4`Y1B*iy<!j1Jd5jfQ}%aR&Q4xi4``o#&sl`W)H(QL
za(Hu7>fcOzWmlG?7vQQW|EXX|;nHtwhimE|zP<I%`tBJYh+vorQonpf-S7N$#8oGN
z?e29sCuXIj0%ZOIuRO}x%NTR7wXXwTmf{7ra~3zSzYy?-DCNyaT<RPe3Gt86Yh_iz
zt90+TPdgrv9BdhrArKQoL8{D4gW+5Y39qN%Tg&MVeLtA_FfA}4FbM_)D-Ht!8U+9Z
i6rZZ=dli^>j*{ZGEfHS}nPdRfYy=251c!Mwc*xyZHO4~#

diff --git a/packages/kbn-crypto/src/__fixtures__/two_keys.p12 b/packages/kbn-crypto/src/__fixtures__/two_keys.p12
index c934b34901a9368db3283b3f295ccdec1fa185fd..784b3033ebf645db2df932291b613b63e2cdaa70 100644
GIT binary patch
delta 4736
zcmV-`5`XQjCGsUbFoF{90s#Xsf)c3)2`Yw2hW8Bt2LYgh5}E{p5|%K65|S{23g89_
zDuzgg_YDCD0ic2k(FB4D%`k!r$&o!Pf0HU3-nN1sUjhLE1cC&}_4O=$Sv;RB6|jL#
zZXq^^j2}f7Kbx?7AFZl~261sa=&#X>;7O3-iyMQ4vVSf7bWIU7I^9}YshKd>N6bFe
z&}juv_lkFpY|!$<)}S^bff3_+u@q;8N49m_X_fkKmxAq`(T0C&7<AzyXM@N&e~8cO
z^*pBHcs!N;5f5D1?Qm*TtZ#j16fZd7)z>4Hp0;ze%>0#6TyiS2H0-qR4tq??;)=VP
zHahl%jUue1O-lgVJio#y8nEIOKJ&TZz5_TpGGYrxP%5=i`WU_5>p@FFAeA7SH7A$6
zkDT?k_Krsn<v}MtN6l<gnDvm?e;RO(;<ux!a&b*yDjepi0Pz-U)gcJ+*3PvLaThj3
zBT#RZwBv%0gyv-KH^;jyy4TcNHzGvq+ngaa$p5IH2BPtG{&yY_T?hXa`<6=PH%@Z;
z!9o^VERsSxqe_MVQcT7ctKHb5?o98di*UaKTJlb@(6LgXEKtPx^db(^f4PH$@LEu`
zG`eF90v12D0-X7#Lv_|=wFF6L?^T!q<=b2I>K`HPW8aYzIYB{eRWwGvpvu<qtE$eE
znJ4uqZv~)m;8=M~A2hx7C9<q|z?r?)%^wOvIoYmx+p|N&j}2lKE;bGx<i0sXxj((l
zdBc}(n#rn7iRPUd1spt!e^dW!-zI*l<LKwtC~Mki$*M%6HBs^|6ue)d&TvET6=^{9
zNRD~*a+;KCaB@5_zuUa)kSy6)08rP--SXRSb8av{5=f6?12qK1hfdB!>7Z-~<hZuA
z8&!op#}H&|zsvGO5XuN;R(rnupcNT9&?iz;Y+r^S7loZ2iFo-Jf5iHxi(S(?L2P>b
z8hu^<5<a6fu!)!BoLL9(6QXP;6jRLMKBty^PI~zuRn-e)h_Q$q>Y(7<)U=CXimzPe
z+?t)3XU@Ul@SE>2Euf=i4tP6o(Ow22UwBpgnawXJmT%GmY#i1R_V;=NFiuC$83Gcj
zG+O(gO##o<K%l<df5rd;lBoZbFS!T27Ga!KXnLS(V%Gye+xHjmzdbYUMn+p6wkgAo
zdZ}XIQZt_aO<^;I&r20f#DW-4F3PW{y2wLhgs>?<^C2^4m!Sjr9c1YZtbF**NS$Jl
zfqUpb8XyMEhXkOuEe6uJ^$$s}DFLvh)&3EHGS=xUv5Ur|f4A`2o$SEU?ZxplRph6L
z+8$qUX{`VHP^l4T$wVkcO6^~UuNX*a!kg@oTPYhPv;olL!3T{TS0dC6H1`lRwE@;z
zJ$0uVNo7SN6KXzmTqm>7$rm2nCuXwb0OTaLxoQjgnz#~msp&|Y$bM;<o(oZZSo!c_
zZLFVzDk|M{f2~{gDMnU8$xC0OimBjYF%xP`JhWVL$1DZTu<$2>#brP^6W~SSax>c7
z5WfBo*-%_x9$G-~vi;PSRQcC4OlSSV05TVDeCA_Y3GS^#x29b*Ua<BVM`;twX)H|=
zaBv`oOLA7@8F^{!aVtI#CF{ul=iRh}%Or<pN^R!IV23*t)9>Cgnch4`hWIep33>)?
z7=4~c0FypQwQ#VpFOE$~NTln7nZ~Dtxlzl@n<=NrF#DD`Foji90a@|GuG4=PK#=wJ
z=Hedy37jHZ99oewB-{{{HaqLgwyhk^i<3VECVzJf%aVS)bNQ8YL7nI+cSWNXeSt87
z1&Ia=Duzgg_YDCI3IPJ3f(1Y@f(1M<W(El=hDe6@4FLrWFj+7-1_>&LNQU<f0R;>&
zD+CnUuHBhzT4C5hhfk871q;ys$o!-N0w)jx0U$681_&yKNQU<f0tp2GFdYU7V1`Hm
zWq$(%0V)I#(f`6m)zDtOf(8HDUKJu11cC(6Y8SL+rP;(T8J14*!Y#nC)gM%hldq(*
z?7MB5-Uwob(ykLgUZuq<5k*#9IScXV8v@-9K!Z1zzx`e`Ba%}C1GhEJ9i7JlphNIV
zo)U8ljCE4gP?0)v_$iiiZgA4;?x44TNPojcRfTGu8CbWS$}z1RLT+A&zFzKN;iaFv
zP}CNRRJNxy`~*PvT4kkL^QrwqC=Cj!#i=Y`CvYUVJZJW*{8m~}qg;!{)AvoJnEQ_~
zXl(06h#VDrHr5%xT_km7LY;LFR$@}pyXOXbvq2FD%;jYv8N1x<81AL_{HoC<GJj7M
z>M_3${Xrz59X&j~b$e3(jTM%3W~cdV&Vh3GrP@<ehk^51sH3#**zbzwlxt{Z_3qyq
zIEbYC)B#rW4s|$h1uqBlZ^!2Gt<u9n5#ZpT#cC-d6B&>PA3Al1I+BkgN%Tdbdw4a&
zVLjR;c7UxRsVAYNHI7g-e!JV^w|{W?#6t<}u{)eMUx&a<{(|AC6^+@;n>6F?qi;~6
z&{%uP_LxgGVDwdXT8S*X4{;V2A|LDZ1}id<0)3TrhNGRF90_fy(>d1~!k~G_ra9`@
zjj7e+CAy>WDcUo2qGLGflrt=3L+{ftveu#^2m!<<#8}b%X_3b*A8c@T4S!vCq<z#?
z3iNY(F>5p@#718zVLWSGe=XiKlx`3Q!fNC~FN*lWPESFAi>U$|KcquwU0OjhH>ylT
z&(7l~ejhD=oKa@>|005kby$dL1u~T&?@dj}V$(G@ryY@cpO8g1ulMe+A4jhaf6UjG
z`}d4@Pc8M`qPiah>Qa^$&42H0p)lUaH<hZ{_+~#wTv#r*R}9fA;Ge4xLmdDEk3o%j
zTYiln5WmM4VGrvSG<^sK$n31nY*ibW1baN(+_>tlmL2x6Z~~rjy=%AO4@f=59aESI
z&r-4|$9@u?ZgC7ek8tOPuLToe(dBWbBA6KkJT5tro26P+B6H*nD1QcBeJ8{MuXW-6
zzv15VXxh@8?#@9tWM2<gh$48}_(uSznN7*4tA6V>+z)_)moIJ`Mfg@kt3h1-wsaMz
z3!TVwcZ=d-U<uD!obTPtU~s9!Uh=W=Y(LFldt#?qG+@Z&$S9`^`y&BBzAYajY=?OU
zE$=YOL+Rv(>rf{YWq<INF8NPqEf(HUpgB$lwIeJ)b4Qvy!dCYl5kWs?K*eNPvZZSq
zceu#x{bM<z%<l!mG=n=~Ufvqa{h(Qz=LPLV<+==!as}ArJWM}+s1I&5>t8!(x2OAc
zK<#xi9p^<xBtyeS2e;aeWeXbxs2gw^8NbDeVjozmMe^iU*nc~q$WI5M{MW15+xLjF
zywIajr95|+%a>z!(A4|OgJuRf;~1qS+Nw<-)@Rm=;IGLIeNcAMGfFNTXsf1O#+&iP
zWN1%qRZ%InFOz1x90N98yN@$EjXETXzK&X~Gmj~)WB*tjySq?h>Q`gGcxkN^L**5<
z@`~rAw&g09KY#WJx3cGZ+exi-4jAnow1JNmPIXKczyCYH7rNp;**~%KxJZ|rKW0cf
z7oibCVs%TJL!L!5tGGc-qOP(Ou2ZE22u^>8I-js2E#x5``;3d^oM5CWwCs+noFqUF
ztOUfM*`>5r48NjT3oCHUyx`Kv<}o%f5e5k=hDe6@4U?4$APhD$G%+$UGd4CdG&GaJ
z3Oj$s|5}xv$s8z<&1a|8)2Nra@CfMw0Re!52UzPkxQhX@f%NE_5;H0&RE|qN$>d8E
zhIO!a!mMrYEKXOmZG0)5&#%9Pe&RhI$!pW<)&H9Bg8>VeqSyz#zaqq&Zv9{<3%}&V
zna}_}nz-jc{1`n49|qM4t5PBMaE)E!A~JvF_mm^3gwn+EIBFx8aV;_zEJ*jSFzG?E
z6@g&jv5dHOjyQcLbvkcm(wG;d1Qn`k5dlEMG@W3V&(AMHEahZ?0M>~Hh+Koea+N%*
z$&k+*TpPNQi0)iRPLm&U8~161bgpIyqn?6TlM4^bB+A}9YdIdYK=ewu*K|R@??->3
zLLnnp_tRnyL@8~!s#%JXoaqSCEhLT~CA5TJkn2o^S=K_j7JHLyEk}4$TD>S+L4|-q
zWU4d<;>4+VCGXxU{?cc}4K?QH1so+J!TllJXn6mo4ns#57BrkppoIwLL(VGXzlpXK
z!_QhnrSh2u`jPis4{4v@MM0LmL6LubfspbQoh8Yc?1vbDi0k%UO}Rx+jvMwvC7iwG
z`7!j4DhQa#&`p)Jkxf)3BK)P)fV~S$DU7g`J|st3-}?4D95!f%KU6p#pHj5u{Xo5T
z2RfIQ%HX&*j3EBtK&HD%t-b>gGnUqyjj@&w1}+JHSjd0#k-}-S%5A<!;8cG^*pgFA
zjOy;RDJ#3}P0Wmp7hpKV*~^zXkJzEeyc)?|gWu^rjRkL>r5H<aZKyg<$eoZ3RnYbk
z2ApF)SWX{tY^Dr~Vmr48M2D}M*lJ9lU#dKYX;l4WVju2uPW8+>H4e!G1JobP2w!pD
znvIDesae2@bDPOhoB1wDE0}*tZsQ$YsZK;$^1GD-naZ9<Z)^U5#1HXVp6EDlNyOfi
zz9>nBq^2eF|Ku5|tp_#6<tpos7fwkE2+n@Ih73^=K<Fng*dzQ5un<U8Qz|L;VCug#
zMQE`?#|FaihOHhF5szNJ9`n4~5Fp{gX!I*rq`!UyMX&n@NQu8SGU<QX3D1vi0aNRX
zUa~AVlVDuFS8DCd8?^Cx;jZ~2dqa`G)9+@{!d^i!HU>x$#ya5Wy{u!aKj-7Cy?%3E
zcb<CV3`GjlQ+g34AePzMG?0@@P%^T~^%pX|MB{bW^#VeakbMq_?uW6wG2h7!7V}fh
zUjE~C_PZPQL5rXXKHh(9hMWA}F^>N~qbHLFU($$zfzP$T%=nZNIj0PT7{SR9NDm~)
zwWfXbtqwRLB;jBD8)U}sy|3D7LHWv8<e&R4J=6|L^RgOhQywWaXK9PfQxtgDE23iQ
zS~5aVjw4KCg$a1Yi#^wc0Zn0Xqn(mfm2b;LD@Mv~#Pz?a69a$OP+aZ(3BX{WXh9>g
zsbFHvq|U;|@peEdbBIC|d^gIfIuTvbEI7(glup`3Sau0`JkjiX0;bZ6ZOY$b;4sn+
z4YdK(6?LxM4BTf6K@VoD{P=LMV-s#?P}&f|bjh#yg|R;TEj-`1^`~HISscNH|COdj
z^=3gz^TfB}N+o||hSSzZdS`{4s~N&GtS$R(Y5CH&V5$*kHAO}9el5)>%<t8Om(Frl
z60y^1^Z>*{j6Ib*CcU<_c`Ra>cEY%)*fpAs8weKBNAtiyK5p&~v&ucuK-%Q_`g>a2
zJiFubSt9cWMR`=jub?KUJ+7MNx>G7hdeGzfBdhnOd*^=+j#l8LRzYk{mSKb|eX)Sm
zMA(@a>fxEF(~>;2F6oF$D*&Rkxz|FO?RmE*wnK_@u7XE_ww|W;z0<mHc~MW3SO{Qu
zsJ$Xx2Dz>5sA3Cb9T>@+a(*B-Y@L}p%p4gkz{r4``@S}LQhf0#XnGgPI+iPf(-zFE
zAzRu{99e%8>NnOZR}U7dNnxVb4#}uX#DBgVB{eSV%hlcIeHX@C7gEoNLI)EY^SI;P
zl3Brmh%L)pRi~xFUyFW$8o0f*`dy8*FNT*EgHHfpQjnepLv!fNkTxg1lz#|<3Atwv
z4+>#fUH)h&rXa+TVoB=f?dnLi&7a+6mBv{du1|l>D>QFA{EBQ=d<3nt1nbL#uFc<-
zYz#NL(5mFA)?CyNqSI{WD_RJ_?hGT<A86CbcdSn|SwYmf6>zT2l4~0U!3t)Snn{ML
ztg!mo`PDT^y>iOQEfJlTL5UF<q-Uo!DTlazSMET2aR6q=oh5ckE3Xb&jDXCBFt{Yy
zT|9pu{!`}J!Ly;TbRzO$=tI&c5Rrt8w8{sAi8b^azJ$-I-7OMgT;1&a5uSU+_L-`6
zRv#5e5SLodSjiLi<pFbITYh|@sB}#+l+fV^AZg&$u9>V6@4wO_OS2Pb9$elam%oO4
z-H0@7@a~o17p@`%W0bDaa3{MIx&_Mw4yS+10anERe<Z5RAlZ|f`I(vdrVg0Muajmj
zxRC3CfpSYbU-$|-0E17new(Sn{3deH1)@=gj6IfoIHFlKR;FG66(7+QvyKP(P6^1e
ztI%S(S2hxo6CO@W+zd0n?7LUVI>DeI4{t95>;GWtfjbxeZm)z#+;^?!oi}--DK9|D
z0Wdr;AutIB1uG5%0vZJX1Qac&Xaa5-y<avNcpPQNP;;Gq3HbyR@r=mo^BpnTlG@yA
O3sGyNJW45&0s#S?5#Ck+

delta 4655
zcmV+~6434PC9NerFoF`P0s#Xsf)Zo~2`Yw2hW8Bt2LYgh5>*6(5>YUM5=}6I3Y!KA
zDuzgg_YDCD0ic2kj0A!Th%kZ*gpoZfe>+_R5(aqmJ^}#&1cC&}_~535c35sf)f`YK
z`gOdq3KCqW*|8)j97c}oy56+Eam~B!0T2@i7-UknS#dhp;>qk+LW8VMW9s}Ye`Ek9
z=A9IZ+)K*90R=4tt8?@EhjkID^YBj(j&;dgg}Ou48!fyF2Arrf^cAz@)n|PFe{`L+
z3dJRS<;5GEQE1@`_}nf8sBuq^lwEmPy#kH1C8+zQH*@Ia^{6@rK6Kh=#=)Vk+8G8e
zILO*?I6Yx0GS-|xvW69SiI!RON}!T_6)`}MNY@MqV|Zfs!XFPr`Fb;vFbUT%Giw{d
zJh-24F`+RJKodwqF`q8PDu~VSfAtzH3gfJkJEVj66VjWv1J#yYA8KCZ2=G)66(^fQ
zAs8}~@*&{!g!&V@_l6cTMqf$ABG#DKD$yfC?9(yeRlR8ZN}kZ^!x&XAQ2d`m`Frqb
zlYjqsIbFo?RZjK{um;y}ex>P(VEn`Ab8Z;HHzTj=A4yeJejf0i?e`!%e=uM!VID!U
zT1|;yGwMD;wI9qH&|fauw~{!0Be#I=L{gn52W~kz@)*mc0e%0z-w<=4FlyoI=ae$E
zIB5pN0UeRZYR%+DG(5rYJ1+7xcXRjeF+ezKc?yhim}B;33Zi-o4?1D6Ad+<^ei>D(
z3+qeq<Q%v*mxjs%C(drqf4I<nQ~!n7@&<kC?J*ofD=NScZPT#5-KpBxbV>n1avqrD
zH@)1eQOCp_BpF3u`rZJV@s)~gen}!?bJ_*LcK}`F1{8f{BctmzaKrEhM0`Aaj>WM;
zV?UVh&l-=B1s+-Z6OB+N1*OAjuiJ^h$ujX=C$b}5c%^BNwY~!Xe~o{?oMEhDKlum_
z6_W^80pTVa@Zh=?bg44vP&A;y$mM*-2i0B6*x~*_&gW~dh=mJO?9>)yg0wW+9+mkd
z#%KJkHc!t&FqbXc*&W(8S2d><*Y$!;WUbQ6Wi654>*4ty*n+T8?5qrjr__X?@>4Ln
z9B;)!YG(pG2sIGme-I_OrU;T#j2x8FNPyR|SHtT?@9Jdn_(7=i>5-SvsoB|^wG?(K
zzq9;teGce<B_lAiQqm@b-<Cw0Txwryb!WJ+^C;>>u<f}FA<V)o=ZLbZs=;3`<7n@u
z#>lHCG5eGWLzKRO6H-;O2+Ar#HX|>@Q!?ry3|MGR#vg2Pe=btin3Put*0GZD2s~AA
zK9WANdhKu%YB**?zh5Jg6(m)TcJp<LyelTKpsB&KN;q}+XvvM%R4;i|4rvFM#tLg4
zHp-)ePoJHhri%qa02Gptt(BZIeYEm|SN}H_YRq(QZQKze0D{cqT$eQ4NPVSX2a4KU
zVtCQHa!~cefByP&s)ua89`{lVrw-Rwh579)4br3f{~4dK>b-rbLx-g}ll#Q+#ed;7
zA4G=#_t#*aSyGV{$$1OT8hK~S=TPy@KorQc^E$j1V~qR*7@f`lI&iiKov|u)^j_sc
znNGL)c<e)P2RMt<+G&Y^AxPUIG+&#G79m0ZyZilIU^m7Ui?|`vUoC4&HfqZYWTO;-
zeFlPcmQtE29kg^b2kcL@oL^x`0H4_CfLduMZM9K?Bb3jcOz-;Qcsroln|?Iq>hvsK
znh_UKR~cTEbGKxl2@WQ{o*<83N1xsz=#xJMCVxSy%u9peTnh=Wr{G)5=?;BAnE5b*
z1w;l5Duzgg_YDCI3IPJ3f&}|8f&}+4DFzBEhDe6@4FL=R127u|6f~z~FXz^El7eI4
z!8mTIL)TlaX#xWP!%zf*1jxFo&^gJZByBc#0Q_24dU;+(3UGT8i=T6*9q>jKOP2I0
zS%2nVFBZ-pqa5O4*14%x6vn)3L)7qACv7!3d2%L`8u!U>pSxpjk-T1&>MMbCeLKK|
zgSD%I*nZWkLrJobgFVbB`dU@HHL)lI+lCOFWlXj=wd|Lh$iesqG~*jorZcz$-gmdT
z8l7p;Djt<3kw^XouYGaq+t@w0r`0+^kbec_-%+%q`(m!HX0s|<x<z^H?Si68a)s<c
z#5lgGATXl#mScV`Gz+fY>p`Do4+2Dhp?&Qz=N5i;!3NqmHIgy=A38Y~@)op#Zn!I{
zg9g2CvAmQ5IAtCSy5k6F(A%#lIm}CBwmz!XT3!MbO;BrCUETZ7zrD+ccbA`me}BQe
z7L-e$Zcv$C@@9K`dbF@JaO%Fwy(0nFKE&c<1%iyOtsdsr3KY`;;-%7NJ$Lky#Dpe^
z#CGBnU<+7#u#jQYYilg&LZsH&`r6~H+Qwdg)m{x~0HN2vbt)dfl_)Z~+&f|5GU2P%
zB_u@xhBG8u?sB}g-E*|ag2`m|A%8Jp%22Rn4{<#+aes_CzoXqJnY4SfBe@MrEIufE
z=@1R+_aZ}Jx{93A)yY^bl@Y>5Jk7?e$j9Q0vdirBpY~xQsCGb?zE(1eYG!UB9t7J2
zMy5R<(vlvg9ykta2*?Uy1{%8JVG^()Oadl%`ywK?NxgxYs7(4YzmDKu;(se7z?~v5
za*Q{QvsycoGk(TAZPELc45v)J#M9fuuza`prQ?cK2FIamfvc--o;@MEMcZ0ja(HPM
z8xlnnE{2DB%GpI$n?K*TB$8!5RscxsW!Bf^q}&m}!Om{yVFXv(r6$W#cMTP56oT#L
zCpPcn`ncnPlTb{b?Cv`!&wq*%_xbVLlsW5J-*~rFpKROuV3_J0?eaadT+PK0X;@r2
zJx>@MGqi;xlxaY8p}0Gka2oS8YL-hLg2F2aMSEkffNjP9)8;ihn`hdaHQ?w|`z{kh
z7!RictY#M3imW7Sm@ujg0DifgC~xr4m5aC~$qBz;5Z~9_!KamP`hWb|zP5Fenkm3Z
zj{Y)<?vQZXqNs>`a1)_zjR?gU%+%I6_RsEFj4~G^MEpT-`zL|%S})R-9X_KU6Ep$h
zFs1CXAs~Rq^SQ$c1OFWLK(zyR=QVQv)5iV(fo_{ramV0l<!&+o1K)W~>Z@fF5Av?I
zp9-QXoERqQcIAdZKYyLE*^e@*<-QQ8=__AH3ksWB@JD~HD0l3i2y{cmj~a$X59bR3
z*2{5bR0C1gUF_(51gNEduWy0G$7XA0e1VCk9XS8A7ggFI8M1$$;NXfh{KgfZ8l~?$
z`NST>O$iYgpWnr0ARNH-l9UWP0h^edtROgqjhUX_3-!<Wy?;GItprEIYybha>8iDH
z?6C%T->>?alTmjaxwmX!l9q?^sU`#O$d7dxk*RPpZKABlY6w$gAHu3uHU(^x;}{o+
z$p3*Rk;s#eCthpabpJ`b0}i}dlh1OgwrpFc0v{^ip<l8aX}MWCtBksUOy<rqm)@0!
zb71r3J-{VU?JjriYLvi{jz-xTFUf3Ccp9zzyM>+F_ZY{B?wivy$-K{X61^kfX^V<J
zoF%9Flg<h(3^g}6Gc++dHa0OiF_Q)hJAZO-NcP2q_TQ~cZfx5pwRp6)FU|r10f2%B
zSWaVKia1zhb3wDW3A{p)Qkn>EGr)GNX3%cpLfERMCr!$JAtSAx$%-S@j|Js=JL&P`
zI(s=RIH14rEL(hz*@g^!kX6e@0}kx_!#{+L_!Ctrz7hzJ^_>K-Uef;<Rnq7z4u1zo
zM?CaLJeEM}w6=-Ti{Yq;vzJNZuIV;Thh1lR(136wkU)!yaYq8GFJSiAx`ehY4v~Zq
ziJfSNU#x|Nu^+87e1wPeO+t~Zz4JOIeY9D?nCk~<r)f937{@LiVIonlE(PhTi`iKe
z`<w#pGz1%py7_9zD8w>u(M1KE^?!b(4DzIQzHC<MQq==$;r^&yS-L@kwmnf4!YF#v
zD};z1c=7m(TfUhF9QAS<t$m=>XFAtUd`8Yr)@s_G1H9I3=zjIU`cahsuH6oG%FYNp
z@-YnhS32l_GONQ0w4^62H(>qTJh7jV>)T({hFLH893~KEpj&#I-D6RIo`0ad+9GZ3
zv_}7HbJ(;r_9*NbX2V)q6SC2?x@scj-rsWcliqYxkk|l(IEX`X+L!Id_VVPf(+b&+
zJ1;~~Kf@*20J<<>_oL&9=T!$Orf~H(4=(gyv&c5KA55t+lCoYZ-lFknYhgY5gBG9=
zVM0EXH-(PcB<?o|aB)%lUVrL-gAbE&24|xK9xB#<0Oc=n8Vm<XSxS<L9<JlWSm`9V
zmh$1}_~d-(RaqgBB_sDI<pC}`n6fG&XNb;+lWi!#R$W1i*8ok<<tZ!8K68aTzWhU@
z6!Yk6T(cL0;l540)4_H>W%;8UX3F-k#}RJfC6Lul9P~Xmea0I32!Fn#deL^NH{ov=
zl}k%tse_!F`h3oX59tjL(7JLCTlxrcS!DWDoP(wJu=WDdv-lXV)k+u#M&!MHit!IM
zli2B^n!r8?u6!{`7zGa%LZ^DJJsxlqzO9Rm2J7aKw`<PM<)}ctSX}R`2>C8jAp@W{
zrMOn%AIUoV7x|-T_<znz&T{=f{)kH|93PGDynRabe(kW_Xn3aNTti1<AOAW;miQne
z3}`af>|8icRYxo3-M=XF@t7$+e4{IxEdRE+rgd*O`etuB@9wob=YnRPWMXU+S`Xhg
zOl@1q1W*$=)?cFo=(1g_fnDhbW!=9Sx@;&$dWZ6#IJs86Uw@_(6Y-mfZoRzO_Cdps
z=gaWIaJvIWR}yZtbbk#ElL(4o=_&d?8VV+MIiZ?ZFH1R)4MZG$VBW;r<HRy6iBNsP
zka~H+Zf3Y%2_m}<UxpD4kUOTewu;7yeoo~7ad7HACS?CEf)G}lJ<u7o=gj0P^EvHr
zK3JLRSqgms<bQ>1FGK2C8M`u&MU_+bw=jsGR57sHGls>(dEynn(^!>`kwI4uzo@N_
zGOv^S=3A7(_Vni0ndX8W>yf#*eja6I-wo=~Kr-mki)rxdU<m$77yiHZcn_hqR)4xJ
zi#$&^>tk>_c<R$Og{^nYXMD53O(Lk+Jw6i10yFE0_<ul)_A0Hir9#KzjbR;b7y^O9
z2>Odxy*!{K5n%-5-q+=BKV1D1Sn8*kvY}oj-yxP?&7IYX@cSTBN-H2Qg4|(qO89`_
zZOw7tA@N^ez$_P-zVP?^320xD#kc9mzxd(n5z?S|uF=u1sYiSWXKZBz6Tecvr3-QQ
zKaQM;8-IpRdDDv3`XsHTLYrR@bI8nek#L-d6Z>dyM4wY&^zsZjQ-58-`VsBU*qV=-
zw1(sz5AN&3KB&k0n}F$f#3obG80Jwf<1IieLC{R_-mmQm+0O7FiQ)t-Bek6TB{?km
z93pt7N8d+7Rn;dWIsrm!VSey|Dpj3#2_%|Fx_@<pEZhk^eMO#g><GlQ5?t53B`e~O
zg+Q_U%}5S?5Uhyq{&~kO26uTEQqMxN@(U|R%tj*f{d*DhUp4YwPegf4yA_BiwtAR-
zCW;3MG5-Bs?(ntF1nw545{(J+`&sU4h{_34gI=*zRWe;OY|{+c(TWrMdL4%)a!1)&
z+J9;;odBDb#LcDxBnf|FKCJT&sFZ!J2CS_I^^cF=LG*5;+t_B|dxf^Z%b^znQcN>8
z9vR`f7N>3Wgp>paxo&2&G#WK<z~c?41uJ)EZzcsm$|VW$XrHu71~ITlw;orlH`_g+
z%o3>Cr2%C^PQAGVP?4iRw{qc{L~<7MB7aDw;Xkgc>d5&zQ0PjibwUOP^QIZ#Y8b8M
zU%Q6Hq7{Bk`I>2)`?hPq=-kmG1V13cU|^s>=XJ*Nk<pDaq?~eM)p0t7tHHHXLCc@+
zyiH}X;DQrU6yF9;ar&0ZU|LHFL`>Zy07-Z}8uq=8z8hFFR`>jNWIZt{{j**MLVqN|
zedR!J!CS^+t9B!N2^N0qsmQB=P3Dz3^uT(694)XI4Uwq<$8=*+JUpSV@Tj~l&k$nr
z9~L;xQBPeFE9ww&<X9IVRo?bz99e7KkbX*h!<5nV|J)cC#33}D-g8He45`67zlctt
zFfeNzP83p}`{xXy1x-^cQ#r-<YCw)EFg!3JFbM_)D-Ht!8U+9Z6d$<1rTS~|6Q*Z$
lrOMoo`C%$Xu>=%Z&m_LrS&ZwbkT-ZUsK)_R|F*UQ0Rcg9+FJks

diff --git a/packages/kbn-dev-utils/certs/README.md b/packages/kbn-dev-utils/certs/README.md
index fdf7892789404..869f18ad2ed23 100644
--- a/packages/kbn-dev-utils/certs/README.md
+++ b/packages/kbn-dev-utils/certs/README.md
@@ -30,15 +30,17 @@ The password used for both of these is "storepass". Other copies are also provid
 
 [Elasticsearch cert-util](https://www.elastic.co/guide/en/elasticsearch/reference/current/certutil.html) and [OpenSSL](https://www.openssl.org/) were used to generate these certificates. The following commands were used from the root directory of Elasticsearch:
 
+__IMPORTANT:__ CA keystore (ca.p12) is not checked in intentionally, talk to @elastic/kibana-security if you need it to sign new certificates.
+
 ```
 # Generate the PKCS #12 keystore for a CA, valid for 50 years
-bin/elasticsearch-certutil ca -days 18250 --pass castorepass
+bin/elasticsearch-certutil ca --out ca.p12 -days 18250 --pass castorepass
 
 # Generate the PKCS #12 keystore for Elasticsearch and sign it with the CA
-bin/elasticsearch-certutil cert -days 18250 --ca elastic-stack-ca.p12 --ca-pass castorepass --name elasticsearch --dns localhost --pass storepass
+bin/elasticsearch-certutil cert --out elasticsearch.p12 -days 18250 --ca ca.p12 --ca-pass castorepass --name elasticsearch --dns localhost --pass storepass
 
 # Generate the PKCS #12 keystore for Kibana and sign it with the CA
-bin/elasticsearch-certutil cert -days 18250 --ca elastic-stack-ca.p12 --ca-pass castorepass --name kibana --dns localhost --pass storepass
+bin/elasticsearch-certutil cert --out kibana.p12 -days 18250 --ca ca.p12 --ca-pass castorepass --name kibana --dns localhost --pass storepass
 
 # Copy the PKCS #12 keystore for Elasticsearch with an empty password
 openssl pkcs12 -in elasticsearch.p12 -nodes -passin pass:"storepass" -passout pass:"" | openssl pkcs12 -export -out elasticsearch_emptypassword.p12 -passout pass:""
diff --git a/packages/kbn-dev-utils/certs/ca.crt b/packages/kbn-dev-utils/certs/ca.crt
index 217935b8d83f6..3a99c58d6b514 100644
--- a/packages/kbn-dev-utils/certs/ca.crt
+++ b/packages/kbn-dev-utils/certs/ca.crt
@@ -1,29 +1,29 @@
 Bag Attributes
     friendlyName: elasticsearch
-    localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 31 39 38 30 33 37 
+    localKeyID: 54 69 6D 65 20 31 36 33 34 31 32 30 31 35 32 31 39 33
 Key Attributes: <No Attributes>
 Bag Attributes
     friendlyName: ca
     2.16.840.1.113894.746875.1.1: <Unsupported tag 6>
-subject=/CN=Elastic Certificate Tool Autogenerated CA
-issuer=/CN=Elastic Certificate Tool Autogenerated CA
+subject=CN = Elastic Certificate Tool Autogenerated CA
+issuer=CN = Elastic Certificate Tool Autogenerated CA
 -----BEGIN CERTIFICATE-----
-MIIDSzCCAjOgAwIBAgIUW0brhEtYK3tUBYlXnUa+AMmAX6kwDQYJKoZIhvcNAQEL
-BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
-cmF0ZWQgQ0EwIBcNMTkxMjI3MTcwMjMyWhgPMjA2OTEyMTQxNzAyMzJaMDQxMjAw
-BgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2VuZXJhdGVkIENB
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAplO5m5Xy8xERyA0/G5SM
-Nu2QXkfS+m7ZTFjSmtwqX7BI1I6ISI4Yw8QxzcIgSbEGlSqb7baeT+A/1JQj0gZN
-KOnKbazl+ujVRJpsfpt5iUsnQyVPheGekcHkB+9WkZPgZ1oGRENr/4Eb1VImQf+Y
-yo/FUj8X939tYW0fficAqYKv8/4NWpBUbeop8wsBtkz738QKlmPkMwC4FbuF2/bN
-vNuzQuRbGMVmPeyivZJRfDAMKExoXjCCLmbShdg4dUHsUjVeWQZ6s4vbims+8qF9
-b4bseayScQNNU3hc5mkfhEhSM0KB0lDpSvoCxuXvXzb6bOk7xIdYo+O4vHUhvSkQ
-mwIDAQABo1MwUTAdBgNVHQ4EFgQUGu0mDnvDRnBdNBG8DxwPdWArB0kwHwYDVR0j
-BBgwFoAUGu0mDnvDRnBdNBG8DxwPdWArB0kwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAQEASv/FYOwWGnQreH8ulcVupGeZj25dIjZiuKfJmslH8QN/
-pVCIzAxNZjGjCpKxbJoCu5U9USaBylbhigeBJEq4wmYTs/WPu4uYMgDj0MILuHin
-RQqgEVG0uADGEgH2nnk8DeY8gQvGpJRQGlXNK8pb+pCsy6F8k/svGOeBND9osHfU
-CVEo5nXjfq6JCFt6hPx7kl4h3/j3C4wNy/Dv/QINdpPsl6CnF17Q9R9d60WFv42/
-pkl7W1hszCG9foNJOJabuWfVoPkvKQjoCvPitZt/hCaFZAW49PmAVhK+DAohQ91l
-TZhDmYqHoXNiRDQiUT68OS7RlfKgNpr/vMTZXDxpmw==
+MIIDTDCCAjSgAwIBAgIVAJUW7Ky1rVeyYxsS1dGcF3HZpknsMA0GCSqGSIb3DQEB
+CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
+ZXJhdGVkIENBMCAXDTIxMTAxMzEwMTU0MVoYDzIwNzExMDAxMTAxNTQxWjA0MTIw
+MAYDVQQDEylFbGFzdGljIENlcnRpZmljYXRlIFRvb2wgQXV0b2dlbmVyYXRlZCBD
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSQK7Q/wBblLXhD8WZc
+HO0mwEOILBVRCY2wcSLaibfzxvX/EhX7mAbozrCgj0hOTFZldzoSHURZmLUntONF
+vUxWyR3ulAXuCfpvxoh7+WJWWvk0m8iI5GzwYjCYoRDRgLrzPlNSRd6CuW4z5vXC
+sT7MjE69iAEmXR6bdV6GvQ3kBVUJVCz23QbXLCl4gzWAWsfXuNx1+ZjJXeM/eEkH
+dQbmBoG6jKJtnSlXjG/s2aSi/Jv/GoHJJT7YQXSvWFpklu3Dk9c+FacQoz95HZD1
+qbaruKq1SjIG6Leht3DNpNT7n5q1EQeZ5uhhWMAI81vRgAZYZxwGJQF19Qgz13D6
+de8CAwEAAaNTMFEwHQYDVR0OBBYEFDBMKsCOW9DGKTccGhyfU8NS6d6eMB8GA1Ud
+IwQYMBaAFDBMKsCOW9DGKTccGhyfU8NS6d6eMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQELBQADggEBABf0ZznDu2m9IVn7ThLPb5UJU/rZiTkRyP6cqPFFtSww
+TiZ0+AS5phGFV8f/znC/scU2u57EAl8DWSalJZTXJMekboFpfXJME/BK66I6wdSi
+TfL99HjYR6LYyjvkXhoIBhR1eCw1zwm8IGzRV++/zY5ksYb5GQ9smFr3TNgqgdsv
+GnPJgytVc/sYXuc1l7MS8j1Q+JLhpIymDKCJ2CB+x2p2oMYqJmFstc8I0z6vZtiM
+zeyy07qK71uOfD5F1HHw/rv738yrlq7NwAH9fc3/0fPueyjTHSQtKiSBfc0phEMz
+TV7Px45EUVFhn9YgIHGBSKPkA5QCC3bPNb6iYGREDcU=
 -----END CERTIFICATE-----
diff --git a/packages/kbn-dev-utils/certs/elasticsearch.crt b/packages/kbn-dev-utils/certs/elasticsearch.crt
index 87ba02019903f..a95b7c63ad5ec 100644
--- a/packages/kbn-dev-utils/certs/elasticsearch.crt
+++ b/packages/kbn-dev-utils/certs/elasticsearch.crt
@@ -1,29 +1,29 @@
 Bag Attributes
     friendlyName: elasticsearch
-    localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 31 39 38 30 33 37 
+    localKeyID: 54 69 6D 65 20 31 36 33 34 31 32 30 31 35 32 31 39 33
 Key Attributes: <No Attributes>
 Bag Attributes
     friendlyName: elasticsearch
-    localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 31 39 38 30 33 37 
-subject=/CN=elasticsearch
-issuer=/CN=Elastic Certificate Tool Autogenerated CA
+    localKeyID: 54 69 6D 65 20 31 36 33 34 31 32 30 31 35 32 31 39 33
+subject=CN = elasticsearch
+issuer=CN = Elastic Certificate Tool Autogenerated CA
 -----BEGIN CERTIFICATE-----
-MIIDQDCCAiigAwIBAgIVAI93OQE6tZffPyzenSg3ljE3JJBzMA0GCSqGSIb3DQEB
-CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
-ZXJhdGVkIENBMCAXDTE5MTIyNzE3MDMxN1oYDzIwNjkxMjE0MTcwMzE3WjAYMRYw
-FAYDVQQDEw1lbGFzdGljc2VhcmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2EkPfvE3ZNMjHCAQZhpImoXBCIN6KavvJSbVHRtLzAXB4wxige+vFQWb
-4umqPeEeVH7FvrsRqn24tUgGIkag9p9AOwYxfcT3vwNqcK/EztIlYFs72pmYg7Ez
-s6+qLc/YSLOT3aMoHKDHE93z1jYIDGccyjGbv9NsdgCbLHD0TQuqm+7pKy1MZoJm
-0qn4KYw4kXakVNWlxm5GIwr8uqU/w4phrikcOOWqRzsxByoQajypLOA4eD/uWnI2
-zGyPQy7Bkxojiy1ss0CVlrl8fJgcjC4PONpm1ibUSX3SoZ8PopPThR6gvvwoQolR
-rYu4+D+rsX7q/ldA6vBOiHBD8r4QoQIDAQABo2MwYTAdBgNVHQ4EFgQUSlIMCYYd
-e72A0rUqaCkjVPkGPIwwHwYDVR0jBBgwFoAUGu0mDnvDRnBdNBG8DxwPdWArB0kw
-FAYDVR0RBA0wC4IJbG9jYWxob3N0MAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQAD
-ggEBAImbzBVAEjiLRsNDLP7QAl0k7lVmfQRFz5G95ZTAUSUgbqqymDvry47yInFF
-3o12TuI1GxK5zHzi+qzpJLyrnGwGK5JBR+VGxIBBKFVcFh1WNGKV6kSO/zBzO7PO
-4Jw4G7By/ImWvS0RBhBUQ9XbQZN3WcVkVVV8UQw5Y7JoKtM+fzyEKXKRCTsvgH+h
-3+fUBgqwal2Mz4KPH57Jrtk209dtn7tnQxHTNLo0niHyEcfrpuG3YFqTwekr+5FF
-FniIcYHPGjag1WzLIdyhe88FFpuav19mlCaxBACc7t97v+euSVUWnsKpy4dLydpv
-NxJiI9eWbJZ7f5VM7o64pm7U1cU=
+MIIDPzCCAiegAwIBAgIUCTO1pAvYtfaJndsQwa9cS/AtoSowDQYJKoZIhvcNAQEL
+BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
+cmF0ZWQgQ0EwIBcNMjExMDEzMTAxNTUyWhgPMjA3MTEwMDExMDE1NTJaMBgxFjAU
+BgNVBAMTDWVsYXN0aWNzZWFyY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCJK4KLS0kSIM+eqdMq4nO1p7nQ7ADUXIYjeRKaCycSJ7sj//1FRdj2NhLb
+gdSX2VGIUZyOw4ptw6bGo0A7KyFE4yJZdG9m+VC1PFck3WaIdQHFdxgMia9deIHx
+sU1ETnC4PstdkrsZZpf5+twS6O9TaIQolG6nEShst075v2b3y0NDHcxKW+BtSw27
+HEHlchhP/Uj4haVMABQahfP8gv5vlHqStuOOWeoSgwF5FngCekx+ZeoIf5wVWfE1
+SzDlU7L/JdYOrAp+kN+2g+b4qcr+WvFNCEwbhjJjd9/VIJ5z9kIjJhG9z1NilPhR
+RVPG4njS6PxTufejbWN/360HfZbZAgMBAAGjYzBhMB0GA1UdDgQWBBR0kfoZtlNi
+ZKxVBPhhpipoXdTQMjAfBgNVHSMEGDAWgBQwTCrAjlvQxik3HBocn1PDUunenjAU
+BgNVHREEDTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOC
+AQEAkNcEM6mBzCdECFtuor3lfxrXzmrIo3wUspbv6Rrm4+n6TwJIYp6ydf4OcruR
+Uv5feevaYXwDRHBkIEGvhU5po6sGp6k7ppXS5bgrEtAhJSK8SOsLINnbJLnptmZQ
+Jharcks5STEqfJFB2QBZvFSLLpvO9g/N8sMro6ZvaUXhfW9DNpd6GIUXQiMhKLex
+t80Sb4zuahTRqUSi2j5Hoq8ouc7U9T/RmA3zXNmzq7YvL/gv2it67qdyKvpzoX7t
+HJaT1HU0o5Xi/Ol33C/wvfRe05UrHEUil148n/XWz3EJky7El2LYbg36/++mVTHX
+xUXS+FdZ1rBlGnGwOHTPHj5FMQ==
 -----END CERTIFICATE-----
diff --git a/packages/kbn-dev-utils/certs/elasticsearch.key b/packages/kbn-dev-utils/certs/elasticsearch.key
index 9ae4e314630d1..4a114a0458a82 100644
--- a/packages/kbn-dev-utils/certs/elasticsearch.key
+++ b/packages/kbn-dev-utils/certs/elasticsearch.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEA2EkPfvE3ZNMjHCAQZhpImoXBCIN6KavvJSbVHRtLzAXB4wxi
-ge+vFQWb4umqPeEeVH7FvrsRqn24tUgGIkag9p9AOwYxfcT3vwNqcK/EztIlYFs7
-2pmYg7Ezs6+qLc/YSLOT3aMoHKDHE93z1jYIDGccyjGbv9NsdgCbLHD0TQuqm+7p
-Ky1MZoJm0qn4KYw4kXakVNWlxm5GIwr8uqU/w4phrikcOOWqRzsxByoQajypLOA4
-eD/uWnI2zGyPQy7Bkxojiy1ss0CVlrl8fJgcjC4PONpm1ibUSX3SoZ8PopPThR6g
-vvwoQolRrYu4+D+rsX7q/ldA6vBOiHBD8r4QoQIDAQABAoIBAB+s44YV0aUEfvnZ
-gE1TwBpRSGn0x2le8tEgFMoEe19P4Itd/vdEoQGVJrVevz38wDJjtpYuU3ICo5B5
-EdznNx+nRwLd71WaCSaCW45RT6Nyh2LLOcLUB9ARnZ7NNUEsVWKgWiF1iaRXr5Ar
-S1Ct7RPT7hV2mnbHgfTuNcuWZ1D5BUcqNczNoHsV6guFChiwTr7ZObnKj4qJLwdu
-ioYYWno4ZLgsk4SfW6DXUCvfKROfYdDd2rGu0NQ4QxT3Q98AsXlrlUITBQbpQEgy
-5GSTEh/4sRYj4NQZqncDpPgXm22kYdU7voBjt/zu66oq1W6kKQ4JwPmyc2SI0haa
-/pyCMtkCgYEA/y3vs59RvrM6xpT77lf7WigSBbIBQxeKs9RGNoN0Nn/eR0MlQAUG
-SmCkkEOcUGuVMnoo5Kc73IP/Q1+O4UGg7f1Gs8KeFPFQMm/wcSL7obvRWray1Bw6
-ohITJPqZYZrw3hmkOMxkLpvUydivN1Unm7BezjOa+T/+OaV3PyAYufsCgYEA2Psb
-S8OQhFiVbOKlMYOebvG+AnhAzJiSVus9R9NcViv20E61PRj2rfA398pYpZ8nxaQp
-cWGy+POZbkxRCprZ1GHkwWjaQysgeOCbJv8nQ2oh5C0ZCaGw6lfmi2mN097+Prmx
-QE8j8OKj3wVI6bniCF7vzwfG3c5cU73elLTAWRMCgYBoA/eDRlvx2ekJbU1MGDzy
-wQann6l4Ca6WIt8D9Y13caPPdIVIlUO9KauqyoR7G39TdgwZODnkZ0Gz2s3I8BGD
-MQyS1a/OZZcFGC/wTgw4HvD1gydd4qvbyHZZSnUfHiM0xUr1hAsKHKceJ980NNfS
-VJAwiUSQeQ9NvC7hYlnx5QKBgDxESsmZcRuBa0eKEC4Xi7rvBEK1WfI58nOX9TZs
-+3mnzm7/XZGxzFp1nWYC2uptsWNQ/H3UkBxbtOMQ6XWTmytFYX9i+zSq1uMcJ5wG
-RMaRxQYWjJzDP1tnvM4+LDmL93w+oX/mO2pd2PxKAH2CtshybhNH6rGS7swHsboG
-FmLnAoGAYTnTcWD1qiwjbJR5ZdukAjIq39cGcf0YOVJCiaFS+5vTirbw04ARvNyM
-rxU8EpVN1sKC411pgNvlm6KZJHwihRRQoY+UI2fn78bHBH991QhlrTPO6TBZx7Aw
-+hzyxqAiSBX65dQo0e4C15wZysQO/bdT5Def0+UTDR8j8ZgMAQg=
+MIIEowIBAAKCAQEAiSuCi0tJEiDPnqnTKuJztae50OwA1FyGI3kSmgsnEie7I//9
+RUXY9jYS24HUl9lRiFGcjsOKbcOmxqNAOyshROMiWXRvZvlQtTxXJN1miHUBxXcY
+DImvXXiB8bFNRE5wuD7LXZK7GWaX+frcEujvU2iEKJRupxEobLdO+b9m98tDQx3M
+SlvgbUsNuxxB5XIYT/1I+IWlTAAUGoXz/IL+b5R6krbjjlnqEoMBeRZ4AnpMfmXq
+CH+cFVnxNUsw5VOy/yXWDqwKfpDftoPm+KnK/lrxTQhMG4YyY3ff1SCec/ZCIyYR
+vc9TYpT4UUVTxuJ40uj8U7n3o21jf9+tB32W2QIDAQABAoIBAAdC/+q65hfpF8S5
+Dd5X1bNYuUwXqmWTrmBDYRo5m+xooQ4jV7eqnnVOYIoxYd1WGmxikay3KmVsNbCP
+ZO+c9WptsdxVfy5O5ZhqpNxlQi/YLetTxjins1p57jsq3UHP+0StwltmULRkC4im
+4K65mS3ruw9g6Ei87kxvGeW73coha0syjORYGcFUynX/DfLi5svUjtSyVUQ1KCiU
+KYc0q+SzsgXd71Ngr/HZR4ncCoACW3q/pLp0AUvDY0wZMkACOav2m9D2AnRPbPrA
++/n7LlrD0+LDScZx5nwO3ToFZuTDUXt3G0UWRaQfqiAZxNs2oeOc2gKegEJnPKIo
+/BLN/D8CgYEAvMmtcZyrw8vifpP32erSBx2+wftt2JA9GdtZlOxu/kbWH7DAZ75g
+YUT0nkcIRrvAS5FCVpOIENZit0RIvA5gM08Brko2mBIRQAbMWmu+c7RUBIa2xVDF
+kjputhlWTT7xY03VbJThqUG4oK+zJJSb/RfRM4x2dRYskb7MEwqZFzcCgYEAugFT
+t/0Lj+OXR+2pcjPk5VmxjCv4xohNOaX4YZ4/rK4H+gi9iyx232zE/1Dtz5SB4+uw
+6hx7Aw3r5U9h1fauT60rSrydChEpFqcfpNQca7HncbF2DDdtEX+ZBkBDZ/U3LJ6Y
+pI4o0vCLmiqZYbQ/+4v2f2/5ZqrzyMKLJ3zeqm8CgYAfCHP3ag6eJ+S6c+5ZJw2R
+V+Vkk8URxVwV5QXLwjXYnKJUIUTviM7lDmW7oueMYQ6SHXWvL589TVB62cGvEBnm
+NUWMdeyVgNrPEI8FChMLiAgLmm1u8AEaMXrDelTCa+dYMJI1wB98KC6GU3t6NueR
+ahnchGlwg82dw6ReOO7DbwKBgGe5Sbg2EfaBUeE4dN9MdP44kDu8YZREedwF44Z8
+OsHOooAZ06kCeJ+LBifiN1skU3KIAjXq/+XqI3vSUpqAXx/rT1Lz7xaoDyOkuo6u
+AdNEd+38qfmSBu5VGz5TI8ObCNOG9VP+OmG25gJocvP7EhryJ9lU1d0cw6lWY0b3
+6StdAoGBAKUkfbN7qbB+jiZt/6ArYWQE4PL4pqi+B+84xSrp46e41mmocezKhnsp
+DxdcuZyg9OXs1xi6AaJtCbelho9bT8jC51GZSFvf887fvGVq7j1TgxWp4mvlqiX7
+tztiggaPXwRZQiThxdJaCIadw26hxdLNOcdGOl/u2m0rudvwybab
 -----END RSA PRIVATE KEY-----
diff --git a/packages/kbn-dev-utils/certs/elasticsearch.p12 b/packages/kbn-dev-utils/certs/elasticsearch.p12
index 02a9183cd8a50e166b7b0500caf215a0a8dcd6b6..9f88e6bd42a99785a0ee446d270e1f1c1bf90496 100644
GIT binary patch
literal 3654
zcma)9S5y-WlMOKmHB^ZbI)WO4kN{GoNe5{nO^Wnhq?ZI~0Td7jy(=9-MSAZY0R;>Q
zM39csMKBO4{_fd5-*@(D_hHVRxp!tB@0mg2=#_vJmryw94uo3psm9Y|C<P@&0S>wV
z!a?W$($gp$xcz@g;7Sk<T=ADK{Tqc4+W(oNqoDv6;J|nPlCmhre<r|ClqpK;-;xf6
z1YLgkS)?+*+IjnP&g-cUm^Dy;NLm9Bc!Lp0!GofMQ2qBtAT=0(;)GCJKh>acxCEjQ
z1Tiu=e=7H7dw$}=r&c}u@rwxv2b!oM#%H@x?J=GH;GB$F$J4h|SgbR%O@|=ILs$#@
zrfnHPLEs*%;%VMIO`GBhNrmeYrf07JmXBglI~C=Dr~N4UoQ9(Gj}*Z#-$>Nh5!gnL
zb9$Y1C)G;m=e-WJX-y<++P{=IF2{{1P$>^MZbn>$I6JmT#Ei(8cvp$Vd5!h+O{@^v
z)<!7WZ*crz!MuVU(bb{5I7yul>BMY%rrr%Bm|)5xU-A7Tugk3!Gd}}K?90)y+1Av7
zZ+4`AiS1Dom&B`a`@b5v;cy^#Ep12zrr{eGn%_@aZEV>MWq$pt!B3`~kU*Ls3_U5L
zE>Bv40c_3{_3eB@t#@~X67zfK@|6Wcf;w9T-YK$F)u|y`C&rfq>LL=7;#8ukG-*v%
zhAtw#FQ>M$v-*mHjwGa;R^w0JszGq4?d0lcef<T-qKe>s9LA!VX463R_xjOXis7~k
zkTHh5;M2oEhMRSn@mr&5jWkyN44#k%Y!hRhuA^~u1AU$JSZluEwRzKud}epRDM_W_
zrRBWkOcB@H7xHJ<E5=xwBNy}BZ9YB-&)Ruh$0*cqQ|XI;*&6&6P6xm=qc-0Mw911j
z3!fM%k-15e<1|`d&W(E|=O@n0jjR@z%=#7rh1+5cOADYRSSKTAx?P=N9cONwog%-Q
zxXL}<-S|lgMeGlSwTzL3kEL6ThXa`^AcXQxBpTVHV2`Em<DDTHhk&J&mFt0WaG_p#
zt0#8H{CF!uruOYB8kN(f4cM>dc3>(@4Gm&{H+LCJ+^)2FGXy(G$siZk5VVy-Z<6@8
z5`~vjn@o}|x7_q%o4yGC8O$Qkq&<Z*Jtn%Ol*nBvuV+&KM(`RVWpoe8rocEn4<FE4
zE=ay?ti$9L+WL$EqJ7^_d$V-3od+OTo9s2V1yJTIQh4O;I|;fdf9B)p)b{tANt=^K
z0=XjzHcBYo+OK>W)ZbJd`M%2JyRhU2H@I2j_#|#}Z&&dSrm11y{-QKDr<YM&`i<>)
zw#HC-D=#`MxvK25;TQ8~@eD7mHzLbo@^3VX*kA}K<=@9-_)A0CS^55~*Ym6Vz8a4J
z3OdkmZBB%#j`!#zvh$ryPQZHu?h6{!l?cJKSkt_xi&v>=ou{SVnj4PH?0Cujc3TQg
z?|O_t#n_%xv&H7K8|SXmt<fE3E~{C8h#HbpOYG<inS0>$f_XP%<9^fPD*kuJ(L+lo
z&zkldsQnZxW($5Bd`5~1)u-^;SR?2T%#ou;-_|i%Os$tKB<Qq%1WhIMK-2c2j%#t*
zb=NKWsgM3sxn+8}0@s=PS9Fb3H}FnIP4_RTF(L={exl`&8~uDlp=@V3?6#%k9ejN@
zxN>U<_=NqPkfy(|%5s?k*?14WhN+rZN;IJ@_FL6_u6j&?Wl#Kxa_87>+!pJH@Y}?E
zkW9*}ue<vcN)PMJI(Q$ceJ?7>q1sdGSJ$)ZCQHu&l<$aJ?!Xq(^A3DLUj$T+T#hwO
zd+oAPE2qr0G?+fOE`4VEK(*75q$f}VF@EEEU}Bup4p!Y&=#GxV@Z58FOvnvSmW$fk
zY3g0o5;Cu_mynZLE`#GQbkbmg$>Z(Uf@c$n>v4~=#C>ZnUcS1jG+aX#?XcMBn`dj$
z3bIy!p><J+f9#U_GMa-64sZat18e}k06%~W!0s<P{H=WcX3i+ye_L76mqE;iE*=g%
zXbCZKv?vOFTNEuVhQd)X{nJDVDZo(yQ8>yAAO+wr9RI6O{9mSxC`%kABIrMB-J+4q
z%MTdOtvgfs|Cn}QZxhc4IZt~k6P&a*66G3>qYNjlT|<bOH|r<m=()h_wga8cQf1j%
z)jc@^fAZh<=`6Zmax5)8O%aw%qnrb15!+oyi4<;L8ch|~DV^(1_#(I+(wKDrCUEjz
z;<01lWc;DLM2F+U@wQLSyb=N`jnmCvp0mxh*%2i0?LmX??(Oc>3KjT-_<Dqk>P&5!
z6Vgew^JsNT18P_lF|8RElrY_s9Hpk@VZcDhG|i<`o}kusbyoI(c*F(1XW{BR2(oiD
z|1<&jAt|3F-@aL9%tVs5)!WptX+!V3_MF_}3yrVh6HqzTD~xM18N9iWZDs)1rSX0+
zk>zqYuKEp&bnfJ)z2a6XUc7V5`?-QNWIzUQ2Y>E97;`JzM6XuY`B8usb-J+L9;Z3K
zIKzbnG`{msTi#fj0QEvZGC~>W@WG2sXoSz++FUiVq=lJP%Alif=X8)`-#v11c0>KD
zF?E${XuiAUv#TpB-wJx7q;7qvuGO<&(|<C-&LkA?Ge)PJs!EZjr4N<b^HXP6^wz6H
zx+V0q5`TP}BUV#&C01(9&yr43LM>SrhA&yR_w-m@AkecHxKa$aY)}bOzQiC5ih=AW
zSO+s$4o?MGBzK3Y%7mdNP<Rc-2<#R9jtt;P`iOc^EJ6b7)7GoXeeY3GdPu<dGBf|8
zBNdr$r^cB5`VbagX70G6jF*cWT=8L@a2p>a5)ZPVJck-fT$CGOxZOfZoMl`ipbm?g
z)@U`aB>11X{H(_0g?(8xhRV;F#`;O>&W9F7h_aewPVW`na-CdKU14e|<@q&O^2cRh
zylJ5_x>AkE&Nu8IGTYbYUVH$WxC3L_lN}X)Gb#_%cIvJzKYtyvtj?+sW7x%WQis-)
zI5oOfEZVT6bv;36$Y}jck}-~K$oHHov*RI0N_S1Ct^XcTMwim=jgxzMN&~Q}1Pdp%
z2QPme)id(?Y=-`dq`RchM}5x5zbM?pS1O<T^%1r=Ue-{vQ~Jf(oZ@#s+y28oP{L>p
zeppvb_qKkK_JV*&E3VLj<5$d0lHfw)ln1i{XpdVgsddDR#U*VFx_>3n@GSH&ds9T-
zPJ(QYq;6OTw|mW*u7nOh`9_&{iH6Fz`Kk*iSh@*Jjw;h8rsZr1eSh7?8>=T8_^|im
z_U89^U^;L11uUVdu7E5qzg<zmAa>5Y`j#^OdX|y)VY|3kHN!xo?=w@l)oFCJWn=ql
zob@Yze{L=}g&^>ebR#ohIH1FBV{N4Qwi5GTEyTk(u2-kiqZlZ^pBsFcpK^DUi5Ph!
zMcH`{UET}R!c5I(4j66-{|u6dND_KV=D59B5>)!E@VK%tNmqO7j9!v+hEtNze|i%A
zOIAovk=x)iVT9k%T=OYdz*Xq3VonPo<Lv!0*?v}_+5BN=fYw`Oy}shFUJ2~hJxaf>
z!o!DNL>(=Ajk>0-WBbyvIav0ly9t?<X3JEzqu10QO>G#c{%mDlJ3kLdW-0QUG`B40
zz<kH8H)w}obO;CMuV#1NPI|%7rNgv8MkttH4AeAeOAl|S(9+>m?S1mtXE{8B6KblS
zS@UYQ?Y*-QsaTO4>Zqbx;DMZ%V`?8e7`p8aX~4<aERvJTdP4i^^dDGcWRDh4tkn3D
zW&A~z9#HS7T}fJKQA^&};Hoc2T#>xxn5FZqxs}Y=xog(w(ZaLUzR_x!5$xcVofs{r
zGcnMtZe}*Hj1*dJV=VarT??4sdJfSMNNRz0POtyLy?s3e^Q$LaH1DfKs%Lb(9-WrR
zIrooVa@4Ot(pqZH;CSwi6+R{$&7yAo=4ETbG7rCGRJk@Jp_C;hT^KdTPCM>Z9{5Hi
z!HEuu*${Py<Q-Bu@&>Rf)fSll`6Sf@Bx29KYA=bK6oh{+?h#=6!p7qu$myujkgeh2
zBAEE_raUEDfoOvlBK|NH_kxf=#VQ$4DcG}!b|e~EFNa;CYqDA`+ev#Eu^4tZP$_!F
z;!b=$rm5tV)2Fr(8D%P7r)%W+XW|%OK<MM}G^p@>Ws<HNW6px?a;{f1aJ6W|YPXW+
z9^X}6Of+CE=SCk$U<h<9Lc{eHYG<j&ZQ%|<)q1N7!ci=ne!u@@MrB|hpktZe-R!p`
zb~mvhvNvcX)0SGP=yvo~K72GahIDQ^9bLy~yqk5uA#*ad=xc+6^*#R#Jje4E1O@uj
z=J@>Jl$n=8&*dMk)fCI8?W$nq%piSS!l;ykCwEtzDI6uW6rL<5j4dwdyvfb@C{lB0
z%O=wR%;0op@`uUd?zfq?s=2cMsu2rh1fq1^n7&PxEx#v-i@3Mv@0~2r(!(gT$x0k%
zE6lp52XyR2IDQ`mZ+Nn7q{#ZZw#kGrKtc&BZ7)ZS3iA^B0VGtmaGI*mZ&Mk)YtP1@
zY_W1$7|5AQw8-`wHvjt;^rM%$GH1wOH-Yez7g^g}0o{*N&$_#&U7o(Pl5s%@?r^DO
z-7B<U&n9gbsOzN<dN-vgzD9qtM|h~CnylDYh3#}@##0x3%VGO2I;K)KV#u!i$+P$K
z@_}U$&O$oIu81-|`p%D9`V*W>n=vlJnkXF<8U_95w*pdt0U#dlc`-X3{9dqVW~u3T
xF4U}a9yu@ec<*jF1KjOqRPP?>^4kFo&q#v8Z|e|&8&empV|LxG*#9~K{sRXDuw4KE

delta 3469
zcmV;84RZ3v9IYFFFoF%K0s#Xsf(>E@2`Yw2hW8Bt2LYgh4O0Yy4NowF4NEYB1$PDs
zDuzgg_YDCD0ic2fXas@<WH5pSU@(FOTm}m&hDe6@4FL=a0Ro_c1p6?81otp01_~;M
zNQU<f0So~HFdGCEh${TDW=_Qw#Ll=9h(4GrHkeuQ0s{bl!%zf*1jxzFcA&O<T<_iA
zc`0O|rRGjZ3=%v^4Fr~zSZ#!9S=xFaHzYm_8u#^z&aNQqtGTm|Qz9g`I1rOm1*hjX
zp9`h7Qs}i6Mr+F|$LexeFLbcLvtWaq0-z<Kw0W__yUdTxl|`O;4dG8Pn6Dn_jVwnW
zK#qRbe0$M<W{<s{f*vUvl!)Aijy3nsfx4VMH7umkYN?UlugCgj!Wto;BUMAlz<_7F
zr5XPhGvwOeHqEwX2wUihYf1f=;g`;(!<dkCWquBBb+fMQ!ZY81F(uR5uU3WEIk=T0
zTh;%XgYLXPJSYUkd2s>5)-NJA1`R&j(^tTxgjb<|ksMtB#5@~-9;9N)QcpXS`md6@
z(sSq8@cp<PAlvbsnezBEms$pAIz%oFX?HM$v$zy>^s}8atcd4hJCWTz8Y1kE5Wi6u
z;_*KUUP4HPRu(Z;rkcUovte+gX6I}k(4A3HApsA97)g+BQT+|fb?xpC9`P5FNoZC*
ze}{*EP_cY{|DuJeN8%2(kz<V^S*rb<mtb*qkB0x=$$Y|F#aB{JtuYrJM(EfDrr!M?
zvOj!fO>&O+@sQN-XFii~O2xuEdCMIj;TKYIVlUpz=T_5;Enm2u4caHP)&8R?9^wk3
zaj-8KH8<%;3IoB^PU#t|=->8Tyv`6i+WJ|474<E0759|(d7w<duzyQ-@MZb{t`g+Y
z<g<c7L$Hvm6$=^8FX}*=$?vE@_LqlMDXBmbi_8E*Rjy}~vnj%pA=GmMcAl`|?IDbC
zof96c8r->661%F-ZBY532@aDbXqJ~V#r&#zikJ_*B@BM0<#N9w5@{3EN#Djp8kX^Y
zt+jIB+39_&n}!&qtr#hDg3a7_p_g93pjN2;jek|Qnwj1cSrY@k9<$&8($&dj;^ac;
zx^#Ab7$uDr_8TooDQ$LX>4EDh1g%e`XcVJT1J$&j=fY#EodiLD*)nd&9gPu?1@TIA
zN6CxxENT2VB-V?sm6i5S`<CX5=}6&!M_v+$;%ZhnLkorv9ZTd{fOVLWc2=^`Omeo(
zBK-z2vSQ}utjDSS3uG!oOLpQ0ph6-M8XC-pQp9jiU;fuW+Z)8?i3u@)>|AcCP>+p~
zw#jA#)-IWyKS|<A1BXDq1e$EP!TdfgS$5gqfkqo<D_BUre0I?vfeKRc-%b~QsRFUF
z^6V9%&1?Q93Y#5a%#S!X_I8HI2CFk&vjxBL{n;C_*b8Jt64N^y1fd_Y{nW0qr+krE
zbvXtTRu*I1srS+Kp?&PbeWjis{Ko}hX;|x$rUKmMqnszst4s$aWnruX(tCc9Ch(0V
zW94~E9sKA;KVVPUGw3x>IpX4fISXifd@leY+h3Byh?Y{0qR3s^zuA(A4i16&pZkyU
zw3P0|#PfDpiODy6uSO7x!1^Sf<pxb$+7y~^5d?UU!BHF^<R{2wl&q$XM2S(P4P`~x
zI#NC^UfqL(yUJ%)5}J`dEBLy+<sC<jNSCCsLTQ7xn)}qrZ=YGTO7odlN~q0rp>tW6
zs5>;RzH{8<zv9U<1TSx|Jo4v01AsWMj5y_Hpyw=$SYJYRo*oZWl0`X2x6ERl;J#hN
zFaGt8lqnf^*K+RF(?!7^luE#0Q%a2ty^L^^k_AM6H8(djHa0OiI50CeFoFln1_>&L
zNQU<f0S5-4f(N}Yf(N+*0RS+92eJkUDuzgg_YDCD0Wc{B3Mz(3hW8Bt3;_l(8w3=&
zIU2j($=T(`Au@v&AurW-8IOko0|3KNfPx2jxu(l&PWk91EPddN<`6<}d|<!%IWY_O
zwyXbtS%!Wf@_9%A<;&K_H*QG)CMiC#A{Lb^hnG-lP7`N85_|R};ehk6$iXUe=2c=C
zbtc6R3yjtGk5PN@mKMl1a8=x0)#4}>by;1zdu7MCny42BKn+-yX9Bl$&hY0nz!*X}
z0vC{_V-HDJpI4hyep_yiuGM_IpAVIkV}*5pygv>o&BH&ij&531K}i7?6x$1MLp7iV
z%vg$akz&dzG9qGv*%|n;HVi>q2FI|6#h!3d4+qeR6JHW`f2Uu{{S5)s8XJ)7QO?_T
zivX}4h9VHX8GG^+>d?5Ri>5w%g$D##!}SV!c750u`3{F8UCTLFJ%ZR>ela0O!foS!
znnVuuEthVJ<;H@!elm(dkcYh)iF#*LgA}vk+rkDybnca1%RD;0iVsnX%K^CT)}}dd
z@Y^4`Z<#(s(SJn4n6cQ#Z%WF>3I}LWe|m6k&ADr4<YX8*Y`)$f>zX3g{72agE2C5O
z8j-=4;CIO<BeW=Qzu8YgizL?>LY?J*%u96wX1v^at$C3lm#TWJ;YvLUZ<}lIC~Hee
zAy$&lScix3=k2W|@^i!K6nJUR<Pv(t{xV#?f*0}mNX(TQDs+(N!70?5E(ua>6OWPn
zM9tlF#8nF!;3RnnT3=oQnYaFmBGW8B9rtawdUtM~*t_dyy-FZ`?VEHBXz%fVmhIR#
zfmE5&QGT8m6zUm59tQo`rCPSurjT9)KHl0^v!;*~%uyc}ua#ZpigK86#U}DPiOc?f
zAZ0w%gIM=GZY-qn(dYT}WeJvLt?fvrmxZ7qw<1!AtBy6Q##%z?S134Q!6$Cs+sYQg
z@4=O&L1DVtgu$@T(fXVF+EJ2!ftzeaSU+m&qHi+l*){akoNX+u+fj4ETBS2I7%6d>
zn7dy%<42x%dpLg}=j8gpodyOze28#>8$}me30rivf^zFrt4!W?R1i(90{>|Ph82<j
zSIsayNHrCABqDV#cjhZ-xUeOtwVAfy%Wlz31kTi^cU~NF?{p*K$~Z57J_Y7`3@48@
zJc0U_93o=ESu0j7!LMML%mE*ohzCtfIz1<OdMDZO8BC)~Ax@I9*a4eM|FmPkB}rKj
zss;2S)5OU_i*i+-Oh5ex+(*UP{pk7e-rZuYu&*=<B>RO!j=V+2K<UT>fOGaSk&!p8
zmB<7zAHhPoWTE>m`401chQ~yLJCbuK@V7<fR0RC;3~a2tCfv&)ivylNILmW22Qk{M
zKM$2x4cx+b+d2-4NpKBa%IO2JBPsH|S!SfCh+$?<{3w!;;Sl-ygq)W!Bzk*Jx_q<d
z2;b=TO8oRp9Hb~Ue$bt4CRfq-L+jbx(%W^(G7EP1fq3GNq)4iNjp#{H1mdA>iMhBH
zO%$2hOPhz7iI5?tuO%FOp|AFB@)Tf*Yey**jO>i_f9^iX+ZOgVBM|RkGtm|%t!?p6
za9rtk=_Q-EI`U(*7VQbTpSzmWF9)0Vib)h`;F@WWPk%Y#Zl-!qZW-x@+V%F3jmx$*
z%2ndzcVXwf`lIZBn<f+=pFTYnXH*jpe+=l~38t4sAjo!&-+c=VgV9fU>zJ#6!|%Z!
z-EIYZ928MIg|3Nt-i8iJgv|(XQd@`=x9`mwFjelFVYx8eD_bTrhKKZ|`!^#H_^Hju
zh@Ix4_{FH$VSh!JR`-v(F->+GdPwSv*=oqY&!Rc%4p)|cvUz7MBT!RWxXZ|b<)Vt;
zevz^b2h1@*fQ$B=HF{T3I}{GP_v0Y|%`PONY&gq)T_PGJW(;X)uAE-RZCt1NkiCMr
ziT@5nj=3r|2W{$~-7oBAyW2z@*c~F_Dzpcf@rvt$^Zq7D+73Y)hb}iD{i8R!JuX!B
zc{4*sWr#d~kU?}-9R)Rch2@y$D{a&m(s9F#CcT@V4HK??ARRRU=SpAMB9)YmZk|QB
zMsk<-1{6jM;4B|pha-ja#N|w(!TF>6P?ErYXT2?JMbFbt&W5CO_z+vrTqcPazjoEt
zV4cd%nzU?crh+f?NUMnEwNH)o>Nn3;Y6v{XX95O)iRsBzFP+;NR$t!7V+@aq)z_l2
zg1tuK82oO)zIrbN{gG~LQRI5(v6IYb{zlI_cPaGBgKQSG7=IOQD0BMiFb<Eii~#(4
z6>7^#E*pdT{6+$B2hR^8lJ?nUQAllC7F_t1P{4x|grj$;H3e0!fD?4SIr?D8Uwv&W
z$0^W%?&RKIcOEu6>v76X2;W>UUiqO(hci1#PB9e~Z+Xs<QRnj>)ujBo4`NFHeX524
zA{Yx7>7NW6Mhp1KmPT_OAuZC&)4aEWyUVcOrj4FmX?Otj0cma4Fo#$H>`JAlnd8Sg
z)4$iS!B#;RtScPQHYhvsv>b@-DL9P@UK^Bu!h@b({4Y|*`zj{;z;2bBIFN71lTqrT
zE=XCfTig+J%=`w^wi7cVL1A!MTW*&_OTB6(cYoW8!M=G`QP{{y-=liAPYXj<VHIs7
z+Y9lVsgl&>3K|9A2dtyaYbu)9oU`$_A(ybef+zPdJ}@CL2?hl#4g&%j1povTcj+rE
v|D5fV-(~D5-oe2xl44}m^aK<jy-6Lo{K`fS8&SqY5X!MHIa6E$0|ADhTpoT9

diff --git a/packages/kbn-dev-utils/certs/elasticsearch_emptypassword.p12 b/packages/kbn-dev-utils/certs/elasticsearch_emptypassword.p12
index 3162982ac635ad31f99dd2592062cbc40b9a51ea..32ba1781d05998ec174e123295d3ec6dab03250e 100644
GIT binary patch
delta 3206
zcmV;140-c~8ig8=U4J&_{Qm50Vs8Qh2mpYB2OuW?@5(|B=3}@J7}YVTw`>S=&h#d}
z?g(9u_u`Th#A5XF%g-2r*T%%R*u^b@t}+sF6uERP$7o4e`^TX?TPSMa_D)%6Ok5bV
z^<_zEcWaRx>SGm8;Ue^?Ctb}WCV^+;f&zF&xqi>l*MErbH-E&58AyeLYMw`dOtM>u
zgo6WVM`$f+e^6`;$N8UztF)A_(t|Q<;(*gb?CdbWb>yREja+>W<s)cm6Z0QIrfFq~
zU4IkRSu_%Cv>{(6@eWihD&iL1bq6^%!vd>yG6dP2JrNumq_0H#dHpc}LbVy|8p9ju
zUvt12145q-aeu~|`cp<601esH5#Mc>+fmnuP@fcr|M<I^z<`oYAnm$rU5Yt$WdxQ$
zyrNax-~=WIeNZ+1U5!@!&LoW(F^Z%a=qMkSX+?vZBni+f{xR?;Auwf1GHoOWr|V5;
z%KaG|k-5TB*W9!=Pc~?D>hc9}Rooi&eqNE7nQV?8>wo@=!&hRCRye{z$UB9qgQh<S
zg+v9l*iSG5d8BG%<YYIy?gmfE?RlwFZ4e%y-T10fl`kjAU6bahQiN*fn{wIiQCO5!
z0G9Q-eyiNDVy!$ZEwZ{wEj$@Wo=7ymxZmOxJ=wM)O<v7lqilNFHV9&U!R{zS#$xRF
zsFZ*h7k~Rx*F=;3I~uqEgSbsT0hZ2J^7dW5)zhSO#|4gJRjThXCAj@G0u}-xD>A=}
zuB#Z)!oh7N?d!*94C0GEAO-~LDxA&Kg!yzKuujfQ&Yv4d2U;*wtN;dko{YG{dHd@p
zLK@L0_<m+saRbwTB-<+5_^z=eCef)5_(@;(8Gm_z<DK8&6oV%c$L!Is#+tJ@@WaNr
zUtwD?gjbhEw_FpPi3T^beKNb_*s|8#^C9f3F7pO?AGk0fY<LTtauf}#E!UJ**H!W+
z!VmGR!)!SVnJ%c2b|R}){c7!fL!z1TUF7d@D{mOsy3jN_P-rNAfb99aNk@izXzY4Z
zW`Bx)qwXTP>raobYfMxnU6uChFnlTx$3Ts0%epm<)d(~!+I@|@qo^)(X17xpyqDz(
zMFMY`uaRyQPiY0*4&H2UkPPwc-r{;g^kVdFlqJ8O2{)(F$Z7&+^=qA;!PU&%(DDB7
z{v3`##N1*ZTqpiWba)eMT-5E|r_=N<p??QR+|RER;4Zl4=~<;`rWDj9##t`0Thtb8
zxNjGOu5)_<Ni?&9(=Kx$YKfAFacE+?9D_+foH!B^DHQ^)ZPT*0IWH?W3lT%aRN_`u
z#YrNr7w`B;rAl<mU1-iCOmAsTtjNV&k##MJK)^V0v7T%98G^`@A*;ikomW2m{C^Rm
zv;LQp1Z}0m!N##t_<^<3#%B$7o<3E!n_6)@NaP)q_R=PbriLQ;Sfap6A+i$!qKV8$
zI+>ofH?jhg-OY(U(~7!DyEL)9zCi`m5xjMsrR_-|+XhP;Q=W<c>hZsR;2u}iIo>gt
zTfPu})DHYV*^qqz;oafrVKH5T!+*52V3@7*(;|_nN*E#;=M>Q(sF((B0*-7nzco$v
zc#%dB<?9vLFCjb{$KS(SSuc3^#+pw?KAU8IgsBhLa?x8a<YG;Qx9q{5OFKO=8!-yR
z^*mckcE9;LF4?a+cw3SlFEUQ6uZwP2FN3MU!dBfiWUF7CbLfUGHhF~){C^s~79+0#
zHfhT=FQi6&Tp3z1EGuUHl&Y6IW98qzq0<uG<Tm`%YCG~S<k|8$fuQwJt1JC2XY~!-
zqTwF<3r;9*v&6_D9)*zZnElBK=dYMO5)pMOO3`j(Q~tCfXjBxmTj1eP&-lDKLO~cv
zqJp$L_tX!r!wrCjTP4(mYJap$)7p_b8EOV1*l>eJemmq>QG_EbsYXz>C8DxO4Vk%R
zhC{>0w>)a2{1s)E=hr)kIxQ4D56N|}b@6pzP4Jd$5Z+yGAM>4cc~2?(h3d}h`f;2(
zF3}0ba48D`9U{!tfIZ{30Nq;;S(7*zO!PDo=&KCKhZ&>kO*voOwSRK3ICL7C!V<=k
z<1bJ*EqTC|GMQgRP>qhx^IhP|C^{iu(h(z53~1Y9be(e3-`cY5+iIH<%=$~#2f9Kt
z2+YdvO*fdrk2_~h*fCFG>%V8&=>0dihrzbG(OM*zx{%!!I1UtNM<)m|5La)u7*$^z
zNK$H-ys1epFPWwp7Ju-}<|^8NOX>jy6Gb@eeqBU2vbu4=1EDsHPinvsizSHx@d#E8
z5{x0Qm-<<~<Gy^{B(KJ$pj#B0W>Ws&t0fiSsB%f!E2Mw*)sPZ4Gf;kFj~+-g!rsUX
zz0dx_-Pj+)!)!MJ|838gY0+KJml~?eV2^B91bMpx*vZT>%RZE-?tD&G(i$%jxaks^
zwbm+L;C7`4Wz!G~87I&~YBNWXq;^cxyjM6lp)61X#5rb?0egS1-5GXW#NN*QlZ^*P
zf0-bO+TWjPiUI-%00e>r$Xd1-W3Bp<>YzT>Vx;voV{iN0s-@s{bPCs*#oj|rvtm$)
z3eSC}=1q%*y6+M`q#%Dt275J+^5^&fE0AIJ^(}n|Dy0^32$heX1z@A7pN#sv48I#$
zf!{799Ip=O@f)sL+1P?Us2PeK^lwP|f0xks=A8qjruGfc^1+)zpKDxl-7PQsKbO?r
zO_{bZ(LN5pkvbU+mu&&I)>u=0Wyp}Iu}uIms?~Q*Hh3P+ho?TEDX^?7c>iHT0tX%l
zab%HyO=53CRsCTvh;@A#pOKXzrnmx+De;uP#AWc4phW|`j%vkWMn!PkhcK7VfAxIC
z?vqKXd$Z3QbXukXhw66bI!a%!B^|2tCaMnH6!%!K&^lApR-`t$hKUo$?32&XQ=h)`
z4MTeGGV*h<BH)vp0`Yl)aHU2cD0lu-+_V)-F5yti?Muqfv>b7#%QNfEw;J{=PJEUv
zqF0Q|iXft(*PDjuj9`9R+7Mcwf9R`<8@<lWVkj=)j>}u47K-A{l2?S;Fk0r%l*l$s
z)JX4qx8ZDTF8{8`eyA^AG>IXKSV+Q*Of*P{w0~koC!94u?m{*fd*B&VV8pjnAOJ+v
z^4u(2&G6<9)9-y*ck-t$dYt3o*<{bM+LupL0kY(e!bAfj6UYdEantk+e}*+Pn*E|<
zTjmuI-tmR*@wn|#W+M3xrMdRBtx`9!#@AW~ZLJ;2SU5g{jk9RGk$bA2HBWsBX&GrJ
z*PuOvFX~g)@7uu_ey2oT^(KkWrfA)+I?#fFc>`lrEu>O@abg<-ad$g_$2hdT@Pf>H
z&5?c$0Z73yVHTezh~6!?e-ZAL!Bp<G_2?WvPsK}3F=X@7Z05H8i@RRW&mv0i_?Tlf
z`%@2s+Bl_%(m^V}Q_j80pvg_4Ql(=O)R9Dg;c}_nj6kCc2Agy2A|Gmd^$RK)D!OYr
zOq|XL`xO=ZHrW`d#xO#k8Q4o(iO{X117nCEpAqDVRH*h#bNGMKe~xAhg0=y#-F)tE
zM!s>h`0eE&{0cfU=G(BNv5KI^xl0Dt^3fma{Zoz$nWXPZEc)rU68awX=X~n4q65dq
z@-@H<;l^YZGJeDFg0lzzZNL6ZBd=rd)|hkxwuOzZlG)_wpr){4kF>o*D7gLkD(C^+
z2uy1sC(XQSo)3?me{Lh*)yIj@(c{j=li->`@!wMGEa;8K&hoJmwTz7Q9)`PBS>S%g
z8wc^l{km!h^(@aH)hSvAmh$8Xtdvv`Pf37WRbE;^<-!*{ndXv3tQMa4Hd4@Y*qfgX
zPOpTs?Oa|gO)WB5wR{WANNGx0MQYq$zIyb%=O4Gs2?TI4f3z%)wRT{Cw<RJY0$>`t
zC5-nVamR&VU)(Df`JQdnprAQJd4nV_e*7y+Z)fMAM?-;2JfLIlFIIHCJ~UC=mX}6;
zkik+rzWsM;>QBoY=pZpuR+K&-z&AN7x%AY-jFnKd4Ii&c;zEg*4surFvD-M0qk#Lz
zqj%V3FH4!Ke^9p&5(^1bpRX$(zubqvqO}oo_$DsXyXxFKO?->d=g0W*I-Hz>NE`N#
z1M98WsSZetcFBlUWEKT=7xAhJaZ=t(m<xe^q9#Pye(L{747CvT(@r!veu9gv;69t;
zP}?yjFe3&DDuzgg_YDCF6)_eB6n6~El775%`IU4*Je}w%cSWNXeSt7BFd;Ar1_dh)
s0|FWa00b0PuuwwB)^9_;sm19$LG5>S-;{?02s$5SEX<Kgg#rQy0G3lH@Bjb+

delta 3206
zcmV;140-c~8ig8=U4O&QQ%;Vl_1Xdg2mpYB2OuLXpp8`$&d7@-g4!Ii$#<tCCz7b`
ze&F@~3@{XvEr5(DPIqtltWI(yp#Q_x*j3^6Ja82jacad2!&2~&uc?WcV^#y|<_2<#
zDu&xDe9w7N9<j3kh|qkJ084Vtcb$gx3smV584mEzG5>!k9)FbLk!e~h=QynzB%+nh
zM$=0ly=-^5LT%gdc*{59W<q(Uc^$yd*R$Uqsc*RQ_d8YD+Z(aWMP_jBlmseFqCC^O
z%M~t9b?l)qp9HRr$k5NbCyAwUP<60{tX;G94)BIsmu^7wu|>~%hQ`E?L9Q8>kKX4P
zJyPFZ;*cZE9e+zi+pS2&S3U>J)m1pQOi}vXULCJTX*Ak2+h${AT?Ezu+Fa*sMu{Sy
z05@@h9lI{d?S?K~IOGB5K%7+)>?_!dAwsYTgh9q8cbLHMgv<Wy;_?R=)_?%@Xe44h
zIvyI{C{rW4Y1!OzkxLb~P8@+ib%dxqD1}|j_$RCqhJUx}RH!SH#v3Ir`=GID%l1(a
zx-d`{aQ$YN=bV7A-TVIGciV8Bb{PI!{1v4Veu+iC*6U*7S^7340&}FYRJNHf7LNNM
zZWQUtPnw#*<N0@uaRwf0wkSNUB+61Vdm;y}0N-`eoyucHq6F}SRo)<QzUC=mTJ6PJ
zuZ%Mo2Y;sV{_w=XPFnPYcpE6u?Pyc8){TV_(sip$8?~BA#@L|h_V}wnQRB{~eG9#>
zL}HX`dK%%C`9|va(;@72++MQ`=UT3u62C=Q8J4<jg>7vE=<tsmIJ^t<%~`AL9=LLG
z1ZYdd$wVbd&t7fg=8cWoK|L31aV*8}IH*O?@P8WbVq0xIxW!r{5%)Z<v+92SfRX^J
zJ_W%+7KcLHFu)><?M(suW_klpTrMwiADbYP19zd_7;YNT&k^dmzj#kx+cnXgU5oL0
zU$P{HpG8PW{CMj!i^N4&&kJ3H=xX`h4<zxvm9-8j9D@65gMZvydGs1}Yn`&2+(108
z&3{Jkz3Fw7|D7j|9gQJ%zDZOS4`2|jeHq(CeMTcVX^90}X`z4ey=G{8%x7X=r}GEC
zC3=&C=tt^!;`-C&A@Q7QP_q*P&+Z^>@Kzjj(@Tl$7SY`Yqs!_CruM5>ex9iYiPD&`
zO6!{BzuH3|wUjqMCXw9W*6fhdt_-|6r+<}iSQ;zi`U!KZHa1S_zJ$p7!X;t;62jcO
zKeWdU<Dc>N)o))lF_9CY8h&yLEqY!dE~47^PANMG0BYmwSiUhG#kReY-aiQ#i#NkK
zq-RTNN8n>1jZ6`ra<!B?;!J1O1RwzOgkf2%c0yhbiy6ioy-kIaIPw1G!Kj1i@qa;&
z<=^aL!Xj4c29Ew+Yh}C)&JQtu<r90LNWpkZQ9`b^s3oIZ&sZNglI`<y^5Kqb>S4Eh
zlxTC_sNm!BHp9cc<W7*&oA<LyTa8y8%w4A#z{b|w%JbqC>Gr<Ddad1%#9t^q<dl}d
zTv+V2xQQCs^1inPcF>j<gR5o(O@GQBJ&geP*OXPxEhbqT1aA@LjM{8bQNz}%Uik0)
zcCf2)P(9)+{*+jdtHINIorDvNE*CWd;z}>q?|H|IoBT9CX)Emr-G=(NGVhk$k{LK=
z8LiUUwa73Yo;VW^Z=fNt*}6i{K3P+fOAy7LqAc7}k<1#^Ay`&>>sB+q8h={e2o5OM
zMbmEb;aCpCCdyP^9IALbV4W&!kYUCkTwcY?E9tFPIT+L{vWc#@L4(#00wNcn-A?an
zJwBpa`k70>D)SU$cIUHU)f70nh>B|}-uYUn3sh6-6OIVweNbcuX&KXq40V;jID#s-
zFTu+%hQ-?T_}n=)eTdW}Kz}lgvqSkqWQe+dLH+88kwldHzoyg2?3p9qLE=SqJi}ZF
zTR{{qehaAF1TQ><yRKwp5?AysCn(r|##$ma-X<+$^<ap7DoqRrO!--uNDU9c)?A^b
z!4<=7V@l){jJi9IpXKfN@MM#5?OC(iL<GW=bT|UJu<b$8mhRvv6n}l8-T$a<6%wA(
z0))Zbg;_x=fvq%kq<6>^&~bwteQs!&_nPiRb;kiL>g)9PS84vMbcqUDh)am7C|h~B
zeKE2Zs~FZhiyUTN+_;1{*FmT~$n{_7Mr4uJE*hlnltdzzj*ALwF;Eg|)>?yG+dH~6
zYDIhIYlsee1r3XrPJf4w@rIWD3ckE+19wx<zx`^QPx#F^{i}NPf7q8)U!rO9W42zv
zrFxGsRJsQd$Q%~9J#Z2TZn;whR~F>#x^F>T1>RExWPYTO&zNagV>QC9r+tF7_C1xg
z>=y(f8we_g3~<b2>akGrMb=E<D*LvSQ!;n|;czYV>c3Ampg#DS{!nXh?uLh&{8`_U
zZ*k<RW%@9gp5G02#MT`$qo}ggm>ZR2<kbskX6(jLp;P$HURT(y1w}_WJpw<#lZ^*P
ze@(ZmHZZ-|5&{AU00e>r$d=W6ufqZ0|9O(;$z7ePn5ol-rMuiT)tUKY#(8U<@Z5G(
z_;`qYB7b6P_6*Dl*d_lLCdBtO1TMkTn#&P7QM_IcTe;3sa+;bLUOG06^D-bhs8T%i
zCrAy`U6$zBdT6{wF>f2!a&&+t98tkVe-e07=hA6?I)kQxa);qm*S>Tb%5RgNyF$*w
zGKo34LBia#Swdf}ZX{^dDA7U=gm*6cl4dqKYAq|>)^FApv>vEG7vYuD5QN|gwQqGN
zIUtrPLkg=iNg(zKO3*l2UB+JHeo^YPh#GHdh;KOYBa_tdu$ETWZKCNt>cybje;zW8
z!pOT^GtiM61Uz2N)Uy5>oCfqO41)zeHI=k}(enFu%s1{M!`kw08g0_}kra3N5gISR
z>o26*pU*+>d6Dn2fu#H%l!U#KrDYx3L#TdNzwyf!gXAd;3;Ho>uKHFLMxY2R(;gfT
z<`;kXEr!*(0i8V;V}h9_N&B@>e~-a>#NT-SqkOVfllUPl2n}N0N%&^j$+O%S&VZHQ
z8X1`2_6)wh<1N>E@|tsF^(@{@`f!?+8c?eW4dTH5>3nR8OV$5Mfq_28`gbx`_iEH3
zx(mQ@!=~MANaU~8jL4he!_clnBYU{wN4|3+KY0Tqdyv10%dnc#L%{aEf04F6@4(}e
ztHF5VDO7Jxo+n2*j|6@8MDmMMQ{lEotCJ&G59y!~=~v&LvK-Xb2|^jSyH}hqf@K)e
z^Q<?zpSz(#{i_jyLC3#xOGodH^>+BI@&y=J-FRF{GtU%@qDhkw=N!9*wS3r!W=48m
zpqHrXaS06QTQ7336MRtDe@y&qr+mSOyQK`=!LC{x*U|^<3NMcvm%DjR{<y9a`^he7
zw#=l#t-4_#^Z}_M>ELG9^+*9%VfB9?nY;sRJc3J;B;&FD{8aCaaU;<pRDbF-W7}+&
zdS-ghve&0EgEadGhPw7ckE}%p1Q_f7+9zb5CRCNqt4qPc-u8QSe<jS4n<VQxA=Bi*
zp%iSAkE~ne>W!zVZ5kyx+ZprB29xsx4cl^r>3_~zMXXftG!q0YzBcMd3*R=Y#njJC
z!NE!6grLx2ivZ(2X0sU2MTNK+oQKpu>2oq*3k&8s_1LBF{I)4ekOEmUOa@KfX~>ee
z&Ey?r$_UrQ?`6yOe|q9E8(Fmnyx&w}vs3?cw#mr=Ld}8bQz{v?gjxeG(M3j8NV2(Z
zb|MW;1{6@Y%a^4j@QieD%ooce=p%N>r>Yt(B~A$a_!7J>4^JaxM}QQZV!v2%pmT2L
z%x!)vUv<Xk{nM_5!byy1!~k-tedZ;+l`*mQLg0vzq%c5Ue`9VXww!QEO*Ffo{wQXl
z>IPT?!_84gHVzhQx~V@@tJ{`8{Q5>faTaePu%}ey<5IA8ntH20!TXOt8R{WRLVNN-
zNHrs=P6l0HkBI<ObVXK%8hGv7b=K>fTaoIbC=Pn<TH~ILrCkTGs-eWlq(4)&^$V{$
z!#XOd3VzUIe_k<|NQ!xl%<NI3eSAMk*RGYECG_iNTz=bFH|Q3Qb?yFcdD<p5Kduio
zphi@c1Q*9gr~T88ZpX^F?{Idd#=|Az=#0*0@1sGAf`hdwZWTV%Beg#~@fPB1^Ni6f
zmhLenFe3&DDuzgg_YDCF6)_eB6hW%YOM~HD3kk2MJm6c)=?;BAnE5a<Fd;Ar1_dh)
s0|FWa00b0T!V{1;2fMG9nkP>jfI~m>*hEJJ2%8zv02PBEzXAdX02VkwhX4Qo

diff --git a/packages/kbn-dev-utils/certs/elasticsearch_nopassword.p12 b/packages/kbn-dev-utils/certs/elasticsearch_nopassword.p12
index 3a22a58d207dfb67ab87d81de0860ab228561854..8ea7d49ab39aa4538e66d5b9192b2fbccd9f8bed 100644
GIT binary patch
literal 3481
zcmZvdcQhLe_s1h*1ff+zQ9B4lq*iUUX|1;Q3`*0YHfgQUP&;O+5n7{GqdH=*P^xCd
z&ZEPsQMG4z`+I)tdCz(8Id^@}z4y=0MMME<Xc1BLU`d=IZXZI!KtqTUjRIjIs)(rn
zAk(1`SURUaZb#4jKN~DeG(Z9tw2#1owh=ITrvH`yoaF+Y(>!RTDBg?L_Bu~zOD$aD
z1k!@V+d)`RZ^wNZ=|!Y2NoPJ$K6tXq9-auR#7Znq?`TinJ}+@uso&i6wap!D!BA9{
zd?{M~Mjd*MlxL{_*E*h{V3{iP`ezB6HKnd)#51D!q5EPTGa<~0txdf~^Mmo~8{!$8
zvcB%VFx+MN&5R~TASR}S%L@)3a=JDgUQiZjAMw7Yy2vGZ<-zg#&otx^JHHsBmQJ?{
zAa3w(jt#%Cm2LW}H;rXa15}bGv}$v|vti0jppq+ZjzXa(C$IAvsf5uU!R!nz0A{Oq
zB@dH*_e(x@_2?)9NAPOv;jx1vByOYE<@||Ymdx_CSs185Z0}{{vX}6a=25ANhV`l@
zKwp3O*L#C!GDIq(rG2m%tT8a4pWdBl)!NH~N+o6<3COo>J-EUq2S~s-%88<;*JeX3
zR&2c@;)Dz4td?+Wt&!q%4$YW2^<{YF*QKPI5SI<rAK~4f*8IcHSi5I?q`H)a*J)Z(
zY{NfAyEVp(?y)2suj|Tsi|foh08ZYaN;$@Z)`CxAwBZ}y*4{h&FSP-`PhM*2`aU!C
zh#nJeVI=!Rl+#W41&(7f#C>!xO2z`TBj9j(2z>^6m>jo9#e7`xYp`nI2{7zVc%T}W
z|EoSkY+%XjrbMVAIY6aCGH@m}^yu)ZCpza`a)7vhEPUN;JBw`$JSIfmadGhJKtY8u
zl=Eu!+j=^+kYT>HuNc{D>{edSYNyw?eP0lR8k|B$tnqStX(F=@SmQ~~&)H`$*X!H0
z+Gu*4h>KB87kM8~kcM=m>;iblVA2chOdgXYfQeIng~%r!TqroSs(lIB)4a|7#K%$j
zp`3-b-hDf8Y8Zmw_s5>;M+)oMC{Ga+ns_~c+lLaTmMUS<neo)eI$z1{gJjt8G~Ph!
z5y|Gl7>ZMfKi0Xvi#`p@$J{f?<l0s}A(z%;%>FD@Hc{0To-*})b0kj`$nE=@^;17&
zAupaPsNrzx(~c_}P$|wh@VGIWvOfbUqtN$ZnSaY--f_e|EzOXz92%&LqZKslGTB${
zf-<_hj(pBVKxWMkg2pYGWOUd9@(HJLJoTMPeP(ak6q9|6UW6G#h%qfr?;B}I2(#zV
zbX6P6ZaguNRvDpPL+;NuuhHqLqxy>LR=v9wM0b&<;#2thsA?Ar`S%R$#hd<0tY>++
z1XZsBzx6TYfFqAlznXTW=}<w2)_4}=OZcw}{wW1b%^&p0?(_<w=83kX0dbIf9vDB*
zb){qGb$!ek#)!2LZXxQUxZ!>@^1yB8@(b4IygQ9q(Nyu>pFP3CzpNE8bJf*UmxPE9
z=EYxbUHcLqG--fz>27QBS{tmlMc6EJ({e_VjepIoDy>JEYdahM7WqJNo-TkTTy@-*
zll~ebb!VkLuehJlabVmcbTrjjwOT##gIkk?@`}XzkV=*YuJYAQM%<_w`@zITbuGDv
z++Cx7T=V*|bUzHkp^R#fw`rS8qvK2Hrr1j6eXY~t!jplXoXV2Bv_dan=KyPZS5UzX
z*QdkvYJt!d#xohAlV7#3r&=Q$hL;p5Z_5S7JieItYMsu8E>XYAaNDU4`~}EeZFm_o
zSP+7*QhHuigkD{Mdgf7Wuch0*Ggdg*tiGfP7_U=j{QSy9&Kv>%KYD^W<oNh`03Lw*
z09QZ&AP{gD;Pxkb{OSDvR9*;?{~zU)gMv6hSo+f=ngb5A0<{a4;URj@q2bYhzwMv!
zr6>GhF^~rEPmSi^SWEw3tQGd>p^EH609m&zT;S&Dq`z59_ycnW8(X26(Wly41*=$Z
zF;!+=`r7NgYLlPM(r#)o6q<qF;bDdgS=Nv3q325x_k8>!V=}{74qSfMfSWi)+cwTp
zIufmu?4!tGrjD84mdpY4LvEC>)vY_MsVBtU%%ka!;_ecRrT&Vza62~S!V7S;H&Xn2
zr3zHYL;*pk@GMu2-gKp<f-EQYdo#qA@xDr<cun@5CERdmDNJ&=;&W@im3}y(!O}V2
zlTc{A<5om7uRhk^$#_R3gX|7a(}mt1pXr0v8gtuN6?P=PD6_Y#ZCoVz^IhAFO16XD
z0xRk2n~TQv*p=D5^S&LcVWRBX-)(z)>TpOSp}8#<ayqw!_gq;E(SlD5e2EXbM}C4F
zD8AbF=5C#iN_#R<_wyhp|1hQ;bNq?}qWyFNPtTp->nu0y(3cjok;K6ZM2^oRt9uaC
zhV*faUfJBV7F5)rZ6}ZjQ`_L?*RrmB`R<Kib#LIv3w<Q1WZRA#zt#6KNcO&bqPU0J
zlixrkr`0}x#yU)X-kta3zE$UdUn(N>&bbK*(%zkFAzM`+v1eV;77RAEeT6GHXiTQS
zJjqDdTb}&5&;mYeZtk}p&W<$ksl~Uw@YSJXwbY<7Mt8NxJG;?(uOM{j`*g%DoiVQY
zkVdD<!r3sJ2iwD)trX7SmaQy0`Qo#w&(W9ksmU>i;Rct=rAl4d^|k1zT7Ex&k!*a+
zb2r23HdC^436iOKN9~SGUAvZE`F@h)BHvuaGHp-1K5Z<Fx9xD*|M(KSALhdfq>JI$
z7};>K!R^=1EDrw&k9~HpGZ$aCtJm%C#fM~QUiEF`3Ko7NqqUMa6JiWik`=U!qq1R(
zs=x%YOu?WeO;HH-(C(1WR->Lr^AI>M`mFgl3vEySeG(_EZ;g&kEwy4o`R7)ePe5@o
z3X1nmC7oQ=BeoP*to1Jg;&v?3O5Y*}I~GY}yy0<iv_{fNPUyQj`pbH)pI`2FP{kD$
zavnR7avg>SJOz^)?a;&5_fy8*l#69>z4HSMBf?EV-)3w$E@~*w#)mu*h1{mWx5T^R
zeYy{pq>UKmAIo^j%;JLuh}kL(v^<g5Javm%D&<v~OsYA(yH@m!N4;Tt8OK`JgRS%~
zR+iXot#7j@H|a^ROFUJ{?2vLoK0SD2N(j0^Bl^ZC?xwy0Gg4vS%(#a#0hM62Ef*^O
zu0na;CN-kPw1%n?yj--K6B9P<%g$U>Dd~UjL6W=lac7Qg*<I$&yz=;Q-V~mxkAly5
z_$0fY-bzi+l3BqC5aLd3So(rKUYAGC+q4p_MWhG|Dze}>Q>9SHg^C-b!46J%{}s$s
z^-)R~ZOBqtX%34ltn)7vs$a(57TbhMNUsqwm11(l?fb8dT?KP1hlpQqC}?A|>u8a0
zX&Cv;zEu{cmAfe*A!aHXY=Hyx&<vCuk|_K~p=#3JR<`*wT}P@{gMS*=WxUnxXlJ$8
zT!Sd})bMgYfdyE4%AYa>**6t+*sk<1Th5dG^+q1}ls2hEKg>RHdq}wOMcgiN&PKCT
zrbA0mI=kk}Lw&J8eP`Wl|MJdEBGUc1p?icUY|iDCj+6j*smQM#uUeu~H;e^wV^$I_
zCCfiFcTW3mEA+H*#gm*P>~eVv58%b}$9F6YTc7_#E6S!RAv^o7x}$XtJ4@N-D*9xD
z^gd|L^X^3>BySPk&$pruMJj50FPJnZK|1$%H}g-tVg;+BDk*L$8<!2O7IGlpM4ib2
zh2Oy?zqECg(!Lp#IgC+!q%#sgFHzc+Sn^NgRS$@Ra-E7nLm9_=BML)};>l2uNYKp-
zM8#b6aU>7i2tgzOHwU0CNjoTp0qI_KtD#t8?bl?rUvPOTk*LXQuW46oexORjS;CV1
zDV;ZPWZ9Z}seS9$g_oW)2;Nj6T@bnF%a@9h``R>dvCv@Xbg`*;@-LT1z6@_OGb}xl
zj@uu#?|0%n_YcRDc(LUh>5qIZ)XxX5-Q4iIbz7Ps=6oKlWu^`3y3WO$6q&;yrm>);
zS023al1+u`aO+{k;4pWV77}IgFxQzz;8uy-bEl6-d@;zu`L^t6fw_Z-3C9Ylz1Ax0
zlago4eczrKg=DMK<_TZ$-4$81ixm+p0zuYz6tOJMG3k;<)9i=tt{%blPRW<Abm^w%
z2(u|T(ds&F4v2qjx^w<5NMWOM{7k4FVs{6*KHEGUuQ>ATsU~*Ww;}9FFEOW7$L*%7
z3EF)M#IxsGXm&DVVz9b~Bz2IxQL7>O8o~m{#j+AVy74?2SBOCzv)qrDWLdLI>${2S
zCMILIFPv2NZpZ@}N-KbXJcq-T8>E|LHpUlVX@M+VL;uuVxU?h&EsZI|wB<tXV~j;n
zyM6{9(aheQ7;2)-)jQ*)6lW4Ex&M`8xBO#<pDqdXVZw~<x)CqafI7L42D!rO;V^Qc
zaO%%d!)f*ggMuCY<&@?|&Itjy*fcWuif7I>KhseQq_NLc8|c+>uV*rkBfdF+7?%xa
zCe>)>j{f^=|1%;~5JCtrJ)IOQEs%!}0ODAJsrMAAxQ$$i9W$-_)RL~Iq^S!!r=H@Z
WGdK@R&y0L~bbW5?+}~dt0QeU-foR(R

literal 3543
zcmY+GXE+;-yT&Dg*c4H*_a@Y=T{BU&wW!+ECibWjV%A<osoJwf39r4HhM-05s#UL1
zsa>PSdH>gS&Uw%IaDVyT&-Hw~uOAFWJq-j9!%)-(q~s!TdU0pe05U)ciaHsDqK^Lu
z$G}iv=6@^F5)>Hx4*~%JL@*TD^}h`O#zso<-yf&|q%ax~m_|_f5&BEjGawL56on%D
z5+I~{+V^J*z*}-wT)(U4n(9H3S%S903nq`Atcp|-H=eBe=y$$9ODG-!PK84D(aJ{Y
z!)enV)=C|d`CXM+14B%)j+*$Msrc=C{1o>-E9aeRoNkan1j?ZmHrrmLSq}$0NLh2@
z@$-VuXTGxz%a3(lK*`PQswYyQ+WIf?7>cALiY-_7*D~4Lt{<Dk_XqLc=7|*%4tB`1
zcTdXbB$=5%aBF_D3K2b+wPa4wbzy_)d~VPyW4EZeEHmW~e1v=s7Zy%lW;D-W7NmYU
zn6f_WOj$FOD@YhGU-2t_v$2{UZ&~!x@RPSb>t4uO=~b$^Zop%hxL9t2hLcG7kPsG5
zvenh3Sk_fmvzc>l@&|q$w7<Dlf9EmgqiZ>BUUWF&5%wt1Ax+<+G!U1Zq?nm5E|KCE
zmC@RK43lxEFlzn40<w<wgK|(uHW4M&pz*I}XMf|o&Wl=q{TlD}Oeoa7PsOY9S}-5K
zOXrnvX6HEe{mOCi>5Z%~rcgU0yYp4^BS?q&p%b5!5JoEP?Q@~lFPKg17rv6kEPGE2
z>1bl5c?kkG^fdzf*x$R2)A`{CLgHVyq77je0UwoiWJq&4W(sH6F-E1ALd7U3wXKwF
z-PKv(fP}wYH^gf<`Kqlsy$#*{GDl{lrn)63;&=LTw(Je{jnR=FPydJk9qZi8_LakY
z<ak<pQkS#lCBIzJysN?LZm3T#w_Nm6)7kG-^a|RkD<nHdT0L@rw&Z{{-Cp^|D@obM
z`?F|m>=U#56miiL4!JHZ0s*E`m{0q!Og1EEj7RP)ai87GN;7$YtH@9p^_Iv#uxy53
z44WadOx$n2YM2>Kz{Le%);2<fkdzrFE-^>+k@`xg?4524lM0jx%ego@Prc<B6XLRJ
zb2%1TpPeYsz?_S`mH%2EBVdDDDOHF{rA=lWjM#XWcYDKIX9PBZYbJjQSvXvroZrDj
zEp8wdf*FGs`&&Chh8V=KHeX)C`xd@$?a`tiB?ci?p6@z+#$+?bE4D3cPL96s#h_JY
zcY*i#+#v01y-j^pXHU2&M{LC%L>G*pcvXYPzW7xdTIDtUi;EJzo`;n5-GL;E&jzzT
z=EQQn_Pi~#QJ*es+kr>#jeob<yNg>Gyr0B*ZzuusGmFtD#Xd$o6gscZcANlvss&yQ
zqbr(xi1bwBq3ypUxPXqSPF@>?ew<*X;f&%cIHYZg54NPn->qRYljQz@y=dauuT-RZ
z*l4chwbSe(k86y!R0x5Rn>>%4D9|Nx?|mR#uaNBq6V2EQ7h_(!-Wj)K;iso@GL?rc
zfvxjDvB*bUHcW|(1<QNYC^q|bew}I(RdZ;T$-Ab^b}Zp97DI$xs7xiDfZgyAr!*se
zgXkavTCU1xpm9`NKkh+Z3qHD67ioLLqts&d3BMF2zTLH+-_X$qp4$>INI-rm7zFOO
zamZA5$u?r?R$~y%Htv-U&+Yp)w!_aPB>}U{sL4$$V-D8Wwz$0BP<6go5xLPlKD3e~
zaEubC$n`!yZBEPw<;Sx#94g@~#Z>oHr;GK$+S}R8Dny{(&t#qVToSa0U6Dom3Jmj~
zxu%RK>a0(i+pF1Mw@vWW#cq#(6iY%B%7wYijjm_RmY8y*oJRC|vPu(6fAceR;}Fer
z4jv%bo+e3fL+UwSigiM3t$>l}q29}ri@nnnavsyoz`4PS7%8SzXoG=^x7RuTQjZ2?
zUGSZj<&T)xfRLkheE8=~Zbu{}mU@OSd?)bR?jKJnrV7{OV<!m9{m(0iNzcRFmd8L@
zgzsro#-#T`uHFxc%AdO2j;+vBh5~%B?>t;WvGs%ZxXSl~R@Zrnv+=%wVMD`Ebq@=)
zsrkG?%v!&w=#&{=^|1vIA}bvK$qW=ed#KheJz25{Xe1obXvUKoFK-BvLbd<aef2jX
zvV)y7PB+3o!AVA%#JsPnx{a72S?Ksa!Ck|ol<r$scFg0xPRXe*=7&z6j^qs*sw!uH
zzOvuy&oBw}-<BFPgh@AN|IB2pkzIfQJ((}uUPmuBUFVRD_NC-tJ5mP>n<U$BqA`7A
z`wLQ=-HJ#EeNl?0FY;5E%e5iu(`44Yo)(%tNQNplGj=M1uM=#;B?RP&-rHIsv={w|
zxgP2RSLm}caV*_-2_n?Vg2wXnS5a>dlJ44`;tF=toegge!5iexYUE`7livhTF(fqe
zWU+28c_~(J0)HN>N4Vco7EFY|0S?gCeoAd2b5Fb0TT2>`sGMZsnI}((a;;7z9A3Sv
zl@&-88;VUs${)LPe)cb#9saq(&}HPm$287T@9vA#>)@AR1HE;WTh1i|4?cR~qjt{3
zus<PoUez2^AkE89H7HRXCNh_PE=a1N<tGsLb?^GiVwlH9MyU{^845w8Fdi?Bhrj!=
z_jg9mZ#SOg%5;Ybai@c#UdCo(*b7&VAWf*2MSpL$K+gJQN}~%q5t3{?C7A>zrIzTt
zJT<R=Rg)^EBewtYU{IC5?1VNx9J2q}qEDh3*OE^7{+5L9(Sd}*VdBWfX1zw|x}Mk6
zX`R<G4PQMg2!0oeI>1C1raN5cF%{(7`)uzP4`P1na}KFxl1e#?Ih6T2_UO_2RlfuB
z$VVl)W~uA@-<HTtV%3EBWPeyn?m5CxBu@WF07_6K<{%V_@juw$pTJ2e|3?QX0KgIy
z=obtH+Wmi)K>Qy|VDBu3J$Grp`i~`mP#|0>OOJ0N^p<T$Wi?0|fB!8gCym}-G|k!S
z((PbXo!4lr{lhaR(T2Lm)wyW4>7|uA_?<vgQFU9&JSCiWz**y8ZW>nSioP<cIAUB&
z%}o?TrK<dXK#xZNV}8>YfX$5__|?q%#DJ`$(+>13zJ}jVEbb!2&}tx>UWSAoR+}Wq
z3;S4Nen;)f&E(W&t}UmCv_bZ8hks?vHgU4Lr6N{pQE|(l$cH?l3r%klkRMyv?Mclm
zBJQJG<d$pQwxV3}lp~#xBP!=<dE~dfTzsBFChWsbKJ=BHh}{i6La)8HNmd82(X<J2
z%~iH(u>v+k!rc>bw~~k+f74Jpu4$uoW8L;=>)rZP+NqpM4!>SBk`1%e{JM+BF{|Rq
zum)^-DI73Ah2dF|MN0W>$>HEqZ_P;Cj=hnOgghyhp96mm7>JR4<?E^KT70_8a~n#`
z?4uWbLc}t8vht<Vny68wKnLFiNm6BJgBMb!J%ujP7TL{gip;+lc9N|;dxn=wkc$tG
zQrHYOL=a+xY^L(f7e!n*X-NJaNFtQ<IN26fkdaAx*9!ha*)N`iL!|WBZ#K!xZ*Rk+
z!SpwP)RjX%6ZcEWBjYq+3}xa%txHX%v3gWz0_N?;Xe9L43%;<k?viXVAqX|D3}XJ)
zow$N5IZ2XHbvZ2Fk-ar&k?s_69aKcC>kOCgGQ1l~w7MsK8IHYaYZ(snOs^ecmK<+m
zByzwjPx0N#7fvHNDzu4jGV<~`u7k8NB!p;t@3D%Mvbb5Zt%89K=9d+Ob8QiTGPM$q
zK$^F~OEYS+rOI~OQG2^Kb9mYWY$sN<*XFsXIN6}GFqe)}!-FE>H-p=M84ZRB6q`#c
z%yHIsdk3pfrLREOK5Eo(K8;@Q<WS>OZ;YA@;o{kYVkL@uJnH)a_r-C9FxKk2_e<{u
zsT@oq=5>PTM?bvsUDNtuo?4l4B`S1t^;YgIm38?+5EelPlqa~k#YnHM@?Wt>IAU=k
zc?pllD~ClaY0F_#wh1*S31?6E=EcDTW@EWy<PKIVrf1_%`F%%%5C_G#-FwLiwdAhc
z{ify@au)}b^gjK*85@qh6q79T^n%mv9a}VKRXP!f{0_kqg>8S6ut)xWzT>RltnJZD
z;9;f{|4t?y1`EnwhKfVorQFh^x52jGmj}a&R>BiEe<dtY&#i}N-Q=q;aYxn%q$vw9
zPYM}K+q>q=+nytXTG+JOoU~*SOQo9~sbyIG=xn{rgJ%{MViUt<$^GXO3Y30Md?CRD
z1Eh};bx%Y4u)NriOt9g`nA56hV$rN4cYg5)4*>=uVwE+Jh|7rZQN>`MR<vC8+BYM(
z{+nkbV-;)u*ZyPbT3b_IpJty4He!72_-i?7Ck>vVpM<wVlJsp6@5%7SrYL0?lfvuR
ztF<ri&1YZ%-i6JEed2kvv8lb%-{qK;tusWqe@n^8O{N*PSUiC-@{eIH%Ld9`-27qe
z)dSQIh_gPeT?Kk^5x&rE<XRw2Vc`BFZQe)Yw-`(t@ZgO&Xin7$I6Bm$u+OL$_~XMj
zq{3g<;qMwXMz{B&QRM*E6-B~=L5Qv$g^!mAtFt+VLfZe_gb4_Hq?$GPge>Pyx?=EV
zrIa3w`+wJwoKcFA;|`H5kqnU>kp>ZrNSf#YkvtI*jQ8IYCMgJr5n)0_9>*Tu6E)Q)
z@?4nL?1EJJ6$}RBhLMw!h|&-Pp(I2gMi(7fhFY>;BUpvS_qVAZUe+0w2ZO+`tKy1|
L$;zsL0Kk6%be@sh

diff --git a/packages/kbn-dev-utils/certs/kibana.crt b/packages/kbn-dev-utils/certs/kibana.crt
index 1c83be587bff9..b73885dc7a0f9 100644
--- a/packages/kbn-dev-utils/certs/kibana.crt
+++ b/packages/kbn-dev-utils/certs/kibana.crt
@@ -1,29 +1,29 @@
 Bag Attributes
     friendlyName: kibana
-    localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 32 32 33 30 33 39 
+    localKeyID: 54 69 6D 65 20 31 36 33 34 31 32 30 31 35 38 38 30 33
 Key Attributes: <No Attributes>
 Bag Attributes
     friendlyName: kibana
-    localKeyID: 54 69 6D 65 20 31 35 37 37 34 36 36 32 32 33 30 33 39 
-subject=/CN=kibana
-issuer=/CN=Elastic Certificate Tool Autogenerated CA
+    localKeyID: 54 69 6D 65 20 31 36 33 34 31 32 30 31 35 38 38 30 33
+subject=CN = kibana
+issuer=CN = Elastic Certificate Tool Autogenerated CA
 -----BEGIN CERTIFICATE-----
-MIIDOTCCAiGgAwIBAgIVANNWkg9lzNiLqNkMFhFKHcXyaZmqMA0GCSqGSIb3DQEB
+MIIDOTCCAiGgAwIBAgIVAN0GVNLw3IaUBuG7t6CeW8w2wyymMA0GCSqGSIb3DQEB
 CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
-ZXJhdGVkIENBMCAXDTE5MTIyNzE3MDM0MloYDzIwNjkxMjE0MTcwMzQyWjARMQ8w
-DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ
-wYYbQtbRBKJ4uNZc2+IgRU+7NNL21ZebQlEIMgK7jAqOMrsW2b5DATz41Fd+GQFU
-FUYYjwo+PQj6sJHshOJo/gNb32HrydvMI7YPvevkszkuEGCfXxQ3Dw2RTACLgD0Q
-OCkwHvn3TMf0loloV/ePGWaZDYZaXi3a5DdWi/HFFoJysgF0JV2f6XyKhJkGaEfJ
-s9pWX269zH/XQvGNx4BEimJpYB8h4JnDYPFIiQdqj+sl2b+kS1hH9kL5gBAMXjFU
-vcNnX+PmyTjyJrGo75k0ku+spBf1bMwuQt3uSmM+TQIXkvFDmS0DOVESrpA5EC1T
-BUGRz6o/I88Xx4Mud771AgMBAAGjYzBhMB0GA1UdDgQWBBQLB1Eo23M3Ss8MsFaz
-V+Twcb3PmDAfBgNVHSMEGDAWgBQa7SYOe8NGcF00EbwPHA91YCsHSTAUBgNVHREE
-DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAnEl/
-z5IElIjvkK4AgMPrNcRlvIGDt2orEik7b6Jsq6/RiJQ7cSsYTZf7xbqyxNsUOTxv
-+frj47MEN448H2nRvUxH29YR3XygV5aEwADSAhwaQWn0QfWTCZbJTmSoNEDtDOzX
-TGDlAoCD9s9Xz9S1JpxY4H+WWRZrBSDM6SC1c6CzuEeZRuScNAjYD5mh2v6fOlSy
-b8xJWSg0AFlJPCa3ZsA2SKbNqI0uNfJTnkXRm88Z2NHcgtlADbOLKauWfCrpgsCk
-cZgo6yAYkOM148h/8wGla1eX+iE1R72NUABGydu8MSQKvc0emWJkGsC1/KqPlf/O
-eOUsdwn1yDKHRxDHyA==
+ZXJhdGVkIENBMCAXDTIxMTAxMzEwMTU1OFoYDzIwNzExMDAxMTAxNTU4WjARMQ8w
+DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3
+nvfL3/26D8EkLso+t9S0m+tSJipLsBWs0dCpc8KRJ/+ijDRnAQ5lOmOAcxt43SNY
+KFr0EntQEZyYaRwMIM8aPR0WYW/VV5o4fq2o/JnmHqzZJRJCwZq+5WiCiDPt012N
+mRGYCMUxjlEwejue6diLAeQhZ/sfN4jUp217bMEHrhHrNBWTwwJ+Uk5TBQMhviCW
+LKbsKrfluA6DGHWrXN4pH7Xmaf/Zyc9AYL/nxwv3VQHZzIAK/U/WNCgFJJ3qoFYY
+6TUwDDNa30mSj165OOds9N+VmUlDC3IFiHV3osBWscSU4HJd6QJ8huHrFLLV4y4i
+u62el47Qr+/8Ut3SzeIXAgMBAAGjYzBhMB0GA1UdDgQWBBQli5f2bYL9jKUA5Uxp
+yRRHeCoPJzAfBgNVHSMEGDAWgBQwTCrAjlvQxik3HBocn1PDUunenjAUBgNVHREE
+DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEATFNj
+WkTBPfgflGYZD4OsYvfT/rVjFKbJP/u1a0rkzNamA2QKNzI9JTOzONPTyRhe9yVS
+zeO8X2rtN63l38dtgMjFQ15Xxnp7GFT7GkXfa1JR+tGSGTgVld8nLUzig+mNmBoR
+nE4cNc0JJ1PsXPzfPgJ6WMp2WOoNUrQf2cm42i36Jk+7KGcosfyFMPQILZE34Geo
+DAgCVpNWPgST4HYBUCHMC7S14LHLVdUXPsfGZPEqU5Zf9Hvy61rQC/RdNjnMI6JD
+s57l9oHASNeEg55NQm01aOmwq/z1DXs3UP2nRmp6XCCfE61ghofO5dtV1j3cZ3f5
+dzkzSBV7H6+/MD3Y8Q==
 -----END CERTIFICATE-----
diff --git a/packages/kbn-dev-utils/certs/kibana.key b/packages/kbn-dev-utils/certs/kibana.key
index 4a4e6b4cb8c36..aae299d430585 100644
--- a/packages/kbn-dev-utils/certs/kibana.key
+++ b/packages/kbn-dev-utils/certs/kibana.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAkMGGG0LW0QSieLjWXNviIEVPuzTS9tWXm0JRCDICu4wKjjK7
-Ftm+QwE8+NRXfhkBVBVGGI8KPj0I+rCR7ITiaP4DW99h68nbzCO2D73r5LM5LhBg
-n18UNw8NkUwAi4A9EDgpMB7590zH9JaJaFf3jxlmmQ2GWl4t2uQ3VovxxRaCcrIB
-dCVdn+l8ioSZBmhHybPaVl9uvcx/10LxjceARIpiaWAfIeCZw2DxSIkHao/rJdm/
-pEtYR/ZC+YAQDF4xVL3DZ1/j5sk48iaxqO+ZNJLvrKQX9WzMLkLd7kpjPk0CF5Lx
-Q5ktAzlREq6QORAtUwVBkc+qPyPPF8eDLne+9QIDAQABAoIBAHl9suxWYKz00te3
-alJtSZAEHDLm1tjL034/XnseXiTCGGnYMiWvgnwCIgZFUVlH61GCuV4LT3GFEHA2
-mYKE1PGBn5gQF8MpnAvtPPRhVgaQVUFQBYg86F59h8mWnC545sciG4+DsA/apUem
-wJSOn/u+Odni/AwEV0ALolZFBhl+0rccSr+6paJnzJ7QNiIn6EWbgb0n9WXqkhap
-TqoPclBHm0ObeBI6lNyfvBZ8HB3hyjWZInNCaAs9DnkNPh4evuttUn/KlOPOVn9r
-xz2UYsmVW6E+yPXUpSYkFQN9aaPF6alOz8PIfF8Wit7pmZMmInluGcwi/us9+ZTN
-8gNvpoECgYEA0KC7XEoXRsBTN4kPznkGftvj1dtgB35W/HxXNouArQQjCbLhqcsA
-jqaK0f+stYzSWZXGsKl9yQU9KA7u/wCHmLep70l7WsYYUKdkhWouK0HU5MeeLwB0
-N4ekQOQuQGqelqMo7IG2hQhTYD9PB4F3G0Sz1FgdObfuGPKfvNFVjckCgYEAsaAA
-IY/TpRBWeWZfyXrnkp3atOPzkdpjb6cfT8Kib9bIECXr7ULUxA5QANX05ofodhsW
-3+7iW5wicyZ1VNVEsPRL0aw7YUbNpBvob8faBUZ2KEdKQr42IfVOo7TQnvVXtumR
-UE+dNvWUL2PbL0wMxD1XbMSmOze/wF8X2CeyDc0CgYBQnLqol2xVBz1gaRJ1emgb
-HoXzfVemrZeY6cadKdwnfkC3n6n4fJsTg6CCMiOe5vHkca4bVvJmeSK/Vr3cRG0g
-gl8kOaVzVrXQfE2oC3YZes9zMvqZOLivODcsZ77DXy82D4dhk2FeF/B3cR7tTIYk
-QDCoLP/l7H8QnrdAMza2mQKBgDODwuX475ncviehUEB/26+DBo4V2ms/mj0kjAk2
-2qNy+DzuspjyHADsYbmMU+WUHxA51Q2HG7ET/E3HJpo+7BgiEecye1pADZ391hCt
-Nob3I4eU/W2T+uEoYvFJnIOthg3veYyAOolY+ewwmr4B4WX8oGFUOx3Lklo5ehHf
-mV01AoGBAI/c6OoHdcqQsZxKlxDNLyB2bTbowAcccoZIOjkC5fkkbsmMDLfScBfW
-Q4YYJsmJBdrWNvo7jCl17Mcc4Is3RlmHDrItRkaZj+ehqAN3ejrnPLdgYeW/5XDK
-e7yBj7oJd4oKZc59jVytdHvo5R8K0QohAv9gQEZ/tdypX+xWe+5E
+MIIEpQIBAAKCAQEAt573y9/9ug/BJC7KPrfUtJvrUiYqS7AVrNHQqXPCkSf/oow0
+ZwEOZTpjgHMbeN0jWCha9BJ7UBGcmGkcDCDPGj0dFmFv1VeaOH6tqPyZ5h6s2SUS
+QsGavuVogogz7dNdjZkRmAjFMY5RMHo7nunYiwHkIWf7HzeI1Kdte2zBB64R6zQV
+k8MCflJOUwUDIb4gliym7Cq35bgOgxh1q1zeKR+15mn/2cnPQGC/58cL91UB2cyA
+Cv1P1jQoBSSd6qBWGOk1MAwzWt9Jko9euTjnbPTflZlJQwtyBYh1d6LAVrHElOBy
+XekCfIbh6xSy1eMuIrutnpeO0K/v/FLd0s3iFwIDAQABAoIBAAKgqzzHI/Xdfi7l
+iS5e6hPQPAytECOMza/vQV7+EZWLLtIlfdB63Y5e8107XclxJ1gpHQLAyvPz3zui
+cWzOVrhc5zAn98uOmTM1bjMXXkptO52l3/4wOrsq7upt8YmgjIZXX5Q/N+HZfq7v
+aNqsJQBO6B6pmBiJGROrS6/y9/Yt+3jDolgtI6fifYZcMXACoal++BAXbiHYPoff
++nG5lHrAdQoEfNACNnGFlq2O85EWmr3qxUsZV8TblOirAuaUFk5KhhDvTOfTknHY
+pW8Z4ttD26+QITyUbI56flgLOfe57y0u4XsOPtWQWEteIBxBFsB9MMj4B8XYdiO/
+hma1jSUCgYEA14H/6vtzM42INgphoj0lHFVL8N0DnuUquR77vQStTO2sDvMQrVTk
+BKpy5iYmokHPjY7qV7C37/tQVKdQpUz9Lr0ylwinHwX1KasJkYEJGv++Z59sKH+C
+CZX9lZjfTqPpuEonGgPruc8LOXaaM/+g3Nvs7M4S339gnjCZExNzpLsCgYEA2h8z
+OhHJpOWOy004HHVjpkWHKTxgZ9xfMLCKjMi1m5sCJ2PCdkd4+wTtkY+u7+iFF1cp
+5CVSvZC6fS0rk11ygXix1ZP7cDJj1y4mxvbzWOtPxvZc882Xv0RDXAQBLXgHW6YE
+RqvdMczfAx0mbUNke4Umwa5PngSWQAqCYkXNkFUCgYEAhEAY5wEsLyTZxCAWzlMr
+pPmLQuK+yBHmZ/hlkBeAqkboYbw0Lcp8q4hWPnqHFufAEST1Fp8yIaleILUUvnxC
+mx4sH5eFx3oGe22kz5AaIGF1XW3uF+Q3zt4m4lkQINhiI2AOIt7pF/vA7aCk/OgQ
+tbiY6rGDz3gBuNIl/hjfzOUCgYEAy1rDO6RRxnZuhoPbiEy5Ns8jkAJGLw55gL9W
+rKKDDiuZ+nc7WWKRHBYgFtFKW0kArB4LZDSXyzwfYYy3T5CTrLmFsoVgqd2Qz5Cr
+flvFzGS139zYFETc8OkHk8X4AxggZAWHfwvEESXb1N9ccAmgqLgexftpJv1HxzUF
+EfHaEHECgYEArtWvtUdvRQ20r/X/g+mNyUhbYOy15pAgswLK4gIi8rmQPxR08spl
+uJJ/cl4fGxG95dl/OV+lNdwl4UcvjATdreEMKvG4X4Cxd+42SUf40M6pGxXoyYz+
+i4WujBaEqBBqjKmYNJVgY7EvqF+VYLBVFZYB1zQhdNPcoPgIH/97vvI=
 -----END RSA PRIVATE KEY-----
diff --git a/packages/kbn-dev-utils/certs/kibana.p12 b/packages/kbn-dev-utils/certs/kibana.p12
index 06bbd23881290b8952db722041a5da7553546560..f9e689cf33e04aec3cc29e73d24b38dbd7bde5dc 100644
GIT binary patch
literal 3608
zcma)<cQhLe_s0`rMT{DyYO75p_AI4FNfA^LTkTP5MQc=y+M`-q?e$o#wpPs|D4|BI
zs!=PgC~C#b+u!-U=XuWi*Zcl)&pr3^z4!k4z2`#F^ekjRawwXvlafX(RxkFL4oC$o
zLen*X&~!C_a3vH?QU4zjMIi`Hk@p8@{fP`p+J8?$z(BGhG=;_=s0wxYdxC-vY6(^R
zr-VSoK`dZ`*hI181jJc*PTOm4<9=t$jX^RpVMa0_FBC#a{r?-uXea<sE=n5vSUsRK
zIS42QVsu7vUssE`9h&K{bJ|iT&<R3=zD$q%MU;;bgyVd}!#XfDse%%rxvUpIp)X6E
zh18mqmGc>d%9=x_zdA&g=JJ1ZJJKQaz9;x^aipP7ZY+gWr!}e;$%KWmCD~W5RFg9D
z>|f&EDP~-oq0eIHm?(u^WAJ|c`rS_2n2n=XyPliA>~+W83sHx~A9Fb*fCaz1M|XP_
zSUdDi`*<n;{yoGg*Fm}CzUQV%8y~WG%!n0yH_!EjJWlDC(gZ5Kf`}}QJ~E0K>a3gU
z_>MU;?zp$(=#nmPu@_CtS4<#CY?GcY8b)$~M<^D{N#9-^C)cn%-+R;c+V7ZJ$(YoR
z%|K~~=j4cp-}+g94pHeE%t{r%ed{>BCHLFyR0Y!`p}AR=d6Gak(|B^)52|X*J6T)p
z^nv=4>^f{;wgjpcx3oLjcS|1yMk+{;@PuBqlTFWcgIp-73q{-e<V^1PA&Qw+_XjlA
zYyn&=u4WDjLLQCMZl1Xf@B$I?r%5g>ur(sY#r7(vS3<L;1(ECgM^GMHKxwvH1|fw`
zx6ydL?~tzD`IbnrF@~Fq4Em{=%t)<n#&n0dOscc51@2>+;M)+XcaS&>F=p6A*L{)U
zcm$N!n5rXHjI9hUCqz->te^9FeSI2j-@MfYm?{R#*CWgy2*|KdJ<<t^rgrUE%C!jY
zEt5;a=S&-vre*EAY?Hxe00wWb#9yBXlsq!f2u!Fzhcp3dbGC&)NOVOADf4@K9%tiw
z@EuzAX%B=;w73Zn*7!#I?v{f%Cg;$?03NfGHLEFsN^O%Fvh0qdpBw0`_ag-s+);6K
zkd5mX>%W0rPVt*|SrY1$DQB2p@OTyd%hC=<QMh(3?ANGrW>9<<kXJ_B>#H%Vx;5FU
z-L;YPjTP$w*CcNa>e_7>`9UWLS)u646;}_JeyrX}`k)OB6<V}}tZ5x08b0T}x@%j0
zleb^$`8R?{Z*=$~!crnmav?7riAli8U7905<FSL7)(ti%($*D0iCp_QyQJdKPk!43
zj|Uv4%E4FSWYyC*g*I_U`*QG1(?aiQJAgRH&!q~s7>9RcYaL!91F3X9oHq@!0xH>2
zI2ek-6XCqdQ)=xi<jZ4|oPu%DXAKVP-YLQytLpSF_MRiOuTp0P5r#2Ognar@%+QJ~
z<FkdlNYFb3Z6K}BMM=`c@P<w9h5-0%iT-qR8UNCqW#idsyF!ep;j;RY0NP`-#M@lB
z|KW``<}<^1qjryEYLf|q!mQIWCS7@y(2EyqyGC_wPvEAXM>9@qA?btYa%=`Yw6qUI
z%r)o(07_wlq{Bqn88+y8UC^$syf24~^zP=eb&CE}6_aM$vh+{ZN*$HfI*<Y=bJFj+
z4Z@zz$wIxcqh0etTdT<K2HvUhsP_!~(QvEP*_(fJ*p2(+=l=cUo!9B=Lpg`N@M=Ym
z#A+uLs!98&%|yaZ%s%5QJ<{s5J2vVWv2%bN#cI9~)UcK5%XiFfBO|4Xo97y+x)l#O
zJT%uc#1!-^MJ+7f-F<&rP<jvRt!DY~*OM_Mn$Wxe<hR^52;R|^f0Yz84IGB12d|n`
zDA{<7tuYs0m`-JQ_TlfE)5&}2_AN@-iu$-;P0l|->DuOJb2+@KCkMh~7v&f)%Wa6K
zzY9v<big#A*Z;Ol8WtEmHw54ba0fU78~{E52Poe^A}fpq#AN2~?aT|4myv}@Lt%1?
ziclFSnriRwCMwDzG}ZS%XpsyE_>*S-QGox=rUS6i$-u}P9V}^?54v;Mi;Lu7^8brX
zn~peC20dAaU@&c4vLQJZ&(Ku%sOt6a{mDTinkf?2XJ3_gt{>2x-M|*)q2Yy$!=1#A
zk>?-Otxd?~+PT&4G)and_g9_Gc07V7*w$sQocp<leVPW3U%`eKhw%oa?v<G+4>^!n
z?dJ3Jn@wA`(K)zB&G}g3Za|qTf84l`QwY<`$fpi_VzMNRgOPOrgQp&|j&4-6S(%w!
zDf9{dw6|TIyd5|;@%PiYP}|LHI?|FUNxQ^--fBfG!?dTSN@wY<09cjns9I#Zdq~H^
zjXdIkN1{|iU>g`RUh`Ia#NL$RCE7K-`_mjCB()zhYC<tPDudP1zs#ca*DpYMfETI+
ztL~~w*d?;OhgA%k8fPoI4g@=v7NqeWQtHnTCNzi1U6W7*m`O61cJvW$lDAqq<i+bg
zttYrtcthC4vB$n_4yU`7odSFIE?>U=0zVa|`=G1oEl7P5_E1Ghl#)BBa*Xs>``z&q
zI>Cg+4!aRW{aZPqq7tiz%CTHZR-F|K<L2jXn^G*d^|6zyYD25$a1+~@m=8U+_=eVV
z45!1SmyON+l5YIB+x|@gD&;$`)~EbNQ6Q31YDqOc&E!vW@X}pl_{G9PJPR44BbAY}
z(8~bL!W@_UY`o%`uda~6+!PbJWk}VW50W4t`0M^)np=&5ezw75Kaj<6$vfhkTmf+J
zW51}Yl3!MoB?_Zk<?=e4C4I^{=H@iy>&}>iHM*avMVy=f*e?2P;<4Q~xbr_`t;!2v
zK`J#vhY`zHnXpd5OpI;f6$x*)(V03Gd05)lquCor4z#ZDE983%R+`ig2kE+fayy#1
zrB1{Qr&@c=%D5$kXDebEcONQu`|Gzo-)aG@Yt%h>X|n6IAorHXgH)ItW&L;>ET5q`
zv%-b{;_oFic(m!4R->c5a&1Z%Iql<kBSidG^IjE#mD}tuSxk3}7ei2BANR7lh86DQ
z9`}|<$ty|b#}1St5lDpg&J~E~=?P=L;XAyOyC0iZw(b@vmc|k9;LOR8{jiZL1~D}~
zy86J$jiQ;+C?g*3qkZ;OD1zBc<1t(P{`9Dz;V%V`HE<HX#I6p^+3UDL6e)YN*ozpi
zRXadMRgWsAvKl@To8vt6crAA#UH|bHB>ZBY;VV`!cpOgk=%N2(Gx)G?#>GOZB0~U|
zVc!*pda}r4iDyX$XnY#rP9%Qn)P3hi8C<TY)FnlYT}=g%Eg;<7IsD2+oraNpSm3as
z*Ykv{9@lC=B$Xj8y5*<BSX4-i@Q>$PqpWpHUq^VN+-ZIbCQON3*OBqxe+C}tW%&$_
zc}uC&x=Nc_gaGV{zU+zJ_@<e@n&wPj;L>(~;$}H;mF9!FuoGLAWrexK^jw74k7d{P
z`Mt5Y*k3`2hXb|GNGdjkp4<i&7}p47ISr11dcF3hA)A#C#Oc;kcYY#G?xAoOa?MIM
zUMscS>b`c5efF1n!D{TSPd1M*FxlVZ8mzsa=h{(x;+^^08CyPgViSY3ZQIQ47pK#G
z#jhp5+gVlNM+~`d>&AK-L`m+3*tHJoeEgOfa4f^&X+_OkY=sydR#{%Ui{s@i6Jm&V
z_)E&f(LE7p*l&9bQ~~1}w_t9=^2paTd*e^ucGE_g&(T8iu%6*6Tg3y!a{gUjyB}6q
zT~2sre(gRT713)x;GL!l)0>O|m;HcLw`!}n*03Nx1*Z2YrIsTnw&jh@S4~@lWQxC~
zePR=uu@-yHGSxU*pV7TwZZMcU1ThYIP~rac<oTqauzg4UdtGw4o@*E7nvt;K`(y(t
zvfzWR%;?6$Yo6f<&KY6rlh0XA&~?{F$d?oQJS~Ry%aTtYsrn?3qXUtc5xf*N#~Y?4
z9@8X*X?&hM4;Q~59sWD>rLTf~ZQ$j3fdVup>35}WqqeVMsZ48s3~tlM%IWg5$=$&6
z3xs}*F+^pttaalfzX&w<m5-dy<L22#a8~G)7Tb@O6#8k+;;#K;vy=j)P9?vg0fwLL
z=2$~x_$U9V{&_U{%#+UZMiuvrD!S<xlkza<5U-y8)z)LihQ2I$*#Q^H!ph0e5X;Lv
z^#gor@|;FSTs0jy-Qhmd3t0=TDPq?r928lpfK23O5f!$UcgjM9RTDR*HHaT?=AKxJ
zI!b)Fe}CqORME;&w8Q&AviZV$!tk4;gx#70=T|EswqJ|QeY?5LzwYw22$RY}a;b)_
zUBQIg{*7C}=TA;ndfj(-zJiC4EidRfk3v;zm-XYzo_l%fjXk}&S=E@>%C2e~l}LlM
zqh*((dFh6&5tfi;j~X<3fgbu<RYg@Z?V-EO%Icd>UZhEU-#&)QDNVu&v7W{-)W}Ws
zsDdeuug#vbF^Dlp)Xh@WX#O~g=+1x<!^xU-DiuSwUEl7=pbk+z&A1Vd{>0qJJYhU<
zZb7~U%e_!KM+$6K*3Yhm(=S9Ku1dMK>uu%DO?2`2FFD_i1NM1ep`0(m-LFL4qoynm
zS$-yycX}8SGeX|~Wo?nC0DM(CM#lNU!Ffs@&BG*LnGX|yLp1ar6b7aH`&%LdQUE}_
z;?2SL`jaOv381j2GBDqBcJ4CPI+!y6Ue-)qZYn$gVsU%|`o67a8O0V`p1Q<~TmI`&
KgWLa|_<sQ(<*qyc

delta 3445
zcmV-*4T|!Z9ETf!FoF$(0s#Xsf(<+d2`Yw2hW8Bt2LYgh4J`zM4Jj~!4J9yw1!)Ee
zDuzgg_YDCD0ic2fS_FaxRxpAEQZRxAP6i7qhDe6@4FL=a0Ro_c1p6?81otp01_~;M
zNQU<f0So~HFdGCEHO)QVeo?E1$z;k}2G#{K;nW%j0s{bl!%zf*1jsz2lS9^nM2UR4
zETMXzfj9@dZDhzJhBM<cNW+rHP1vVYR!w%s^OLPjjkzo5lk;*Ykun0+oFd+qRM8I2
z?v98lZMRKL)=yyGYTm}k{Qb~(7}KUJV4P8=3xBP?4t?(iaO1o<WJrsZA4+0NY~E&g
zG-C@6tY&q8$5j|OK`KV}_h3Fc8M?5VOUai(9#-B}9i>)@(80`xqnad1maWpYmV}Gm
zSeob97lxyurIoB4vDSfxTJ9k6$!-hZzG{0zM~<#LqyRfj!}6ZQIz~A?()+>AlfXO7
z3pIHnN!|HCg>sd7Kiox9%3l+7@~Ui4G}xHeUCUX2lD-uCNeHXBUbjt>Z;VS{!)eP1
zfTYB~-*x4B3Y8+)N`jJ65Kn)SI$4i6pRPL{k<{)1z9|_nWfsfkjWlWSE9p+VJ6UnP
zRiw(5@?DJu<t=@xLyny7n6eJR{EK=lv=unU#@ulzgE9c<ws>L}gK|#5>W$~%WN6ja
zJ1CZaoQ=P=-D(-`qL1#6AFqYq&JEG(Ix}LJ1ed^0A0k$yX@RpGtENF?a<lq7_Cy@_
zUc-$T;mX2XF7v4*D}JjI6+){%{E_$r0``~50+5IVhuEnGYiT;MdltTP>e{*%Lc)Wi
ze69*n7JFa~NB&yn)4rQ$Uf1{@s**=prD{fh-qV4IhiG=Af~+O&pw*#A<R;ybgXF1p
zY48PmTK}0zMsAiB(3mZOmqh14VDL4`oDnqAF~uFrKHuoME(VCqLQ8}*lpV{T9@S!*
z3EIOAiF#70#yoqr4HF#2)3md5GZTvjSC4MQ8%3~OqF!yc-1~@ChC)J*KGWE8#B*SO
z$$ZQ*7)5(TMok87hlN#d5bX6^rk65U-OKamHf>$}{N*Y9>Qo`gG@Qv$#>(Zmkblo*
zkKjH1`nmRClb~>~HgReeRNgg6DOnUpUOZ2TxV|}60Lz{x5<_<X#7>DxbKABqlvz%}
z*a&{LnQoS9<5l&O1VXM5em~=dSHl;7=j<&{|L0&sX1B{yDf7CE(T#V)(K*xr_H4)0
zfS*f&mK;*Q607lo#zMPLyw9?41utSli<7CrOd`5?bgu>VBni2FPveWAO-CftLAhS;
zwfbJTu;RzAmBiy!-n~4DT>-|Iu!%=5>Nb|8;AH1HFrP#SP&0L=uVJ-}yA*VPy5)+g
zuTDA|<kWz?ij7rS7s~fxeSe{;UtQO{u^h)?NnwThiYHD#^8Hn<3eo38JZ*fr(J$O(
zfR&Z&E%ldibo>!9W^r<FK@Np)Q4i*E^eUx|4#@_q<y*~xXQZ5Ot|SAPNQ~YzvRlQ?
zR|h3C1>tRzQl0|zekkHO2%<TEfjrg1Zdoy2F^kbwcw-8kcLU4|!d0d!B)hBZg<qqC
zn-iaF=g*`124nIEj${wnY_4%iq;)l|r&a*<Pi?HsyD3$<r81a`oz5MKVK`DrT`7<&
zPU8u^vSRp|3lDix`*7+x4~P$iRNK1sHsY>7H%7)Kx9ONTF#epaS>!2K%Et()4{OW8
z&hoYNepTQ61XxD5&h00Ga6ureMsOE*gPT@RdlFa0{R$R7JzK~Q!}jfWkVzC`X1hH3
zyHWXDwd}iR1Mq4Oj7aIu1<4y&jmuC0IXT>uk_9$@H8(djHa0RcGcYqbFoFlP1_>&L
zNQU<f0S5-4f(NBAf(M}j0RS+92bu;6Duzgg_YDCD0Wc{B3Mz(3hW8Bt3;_l(8w3<5
z>BL&)?MiPg59QD6B?=w0oE3Wl0|3KNfPx2LN@P@f2?@>eu`Vonitd|Gg#h`LOlfar
zo)g4>XJ|Ti0mBXitk*S(kgQ#GVEz_NArw_f`s>89wG7a{p#7EIAsYGJm!y{)B`-~|
z>U+g!jvU7FQV0=Mkpjgt`>qFrs7roKcl5V+&}0~B(ljDXhV4Gl-k3Ys3Gq~=+2YO_
zwW5Zsy);W?+*Z&xZG>W}z<hXJE>p{9sb4vNM!4g0cYl2FxAJ%kz8w<a)a!w|kJ}Gv
z7FBuDg+uIvJ_=fa#Otk3m)`A2xH37+iPy8Z<x`sz-Oe3Xjd#1@ICT$!bx9HNPbRs6
zjAxOp%AmU_roD#y@Mv*%IC=~+&Gk&#%dU#NmBsA%ukOq3ly*O}5lSXANT4Pmk0&sH
zt&k+D-T=94T<%$ooOQ%R;Aj7frVGS$O{;dhz097M>dO;3UoDF@l-#Yam|<VB*%POk
z?AJ|SFmGcCaU~Wn=m9tD)%upA+w`hyQ6aHa6yzTCQ@Vq{%&k8_#+LHG^xF^2J>G_f
z@yjH{$1w=RGc35@;f0YK^sf+pjmH^(sGMfUwmHhkG(wf`JKdu9<%|CoixuAGAxWR6
zHECZ`!R|)(Qk@Xz5=He8@h9EiT;D*9dvDaAeB1loAYNU<VRip8`8-@+B~9Dqu&1X6
zAh4_30gH2)eN$_Ham4DZwMo!2)IJAkIj$3B(So@{rxW%Vn}L9Qrq&pBe=h%jp*b3?
zXDY6llO6rVR>J-ES6%RO8O=&2@Qao>37dZr-8gv^ziQmoT8o4y0H<XvwUJH<=*8a!
zR}hNG>R;Jq$Oqtc?}ve(IvWimBo&{?s5NPzWq<8XMi?j0ghtwFgJ$VW%_zcJMVvUv
zn$>rPf&8YnBWWse3M_w7?)Hd(Q!Zp}a<zQnj^28*q6MN|No!L^<s*ZX-k+&u6++=H
zSrpy$0ax4Zs8d+QZ4s0UQZ)y{C}}Sed^~VtuwNkxzD|!=FIubzayNOLGNXFWd@Z>N
z6sKVP23eR#KCm6_jQ=RQkKWo>rN98PP&IO)BFBMsLw;8$`Fs5E^4!ROcjr*=xWG&*
zmn!?Ja)Ld90b^wL*<*CPg|jaGe6~9Y^APhQm1Eatsa^j;r*UXqFwd!^c!14UsQ>gp
z>TYljMD*CgE+}ik4QxHyb>ai!hsSPS7JleIW>JL~`zBQpyd*PLuW@vMc8|C>1wVw@
zqn9*>R+@R-+MvG`^2|?vUk9-H!+WJoggk~y*ZitSkqs*~u6WfqBC}(H+pdeecZwNx
zd7d5rnO}2bS!>oAi8wqzt>-Y^v*A#qKHQcygGXPzkZ<xu#OizIKhL$?KI0mP+THEz
zbw{dE|C`xJ|3)F-95n5IHNPQ+&gg_{TYm21qX0y}r8Ua;lVnMM7ungBpQzulERS^b
zYlYxWspsM4{v6S_f2$M7LyYUgM9r=5u&#X+ultL#Uf!J4nnBU*CE-ovU6Cyq(xOYx
zTO1k7y$RmA)jn}zhrUQPD9eeI)18Y^r#NrV)q8tocLu0Z$7of&qQU!uSOw%<#WA~H
znf-gYzR*B6J;TF)u01?D6@#rg-Oe#%4YQ|^*Tn5n&_GQC@XW8=o0FQ#e6sdDBL%EA
z8h<<*EQ6M;e_}6GDpt+~{rM9}`yptuXUGnLA%L(HaTZ4t`@~_t>lpLWlbI<^vy1^%
ztukEr;6S!l`D`Xi!i#qiE4*BpPfoUUTEFqYlTT;yM>QpX0+&ksB1w0E(~yKH6H&G`
z&T<+8T?jD7PUTD{#*J1cJ(K`D3IZ~zo&nOlvqWZ(pNm3I7}+LRgUnNGD%-e8X|EhG
z!<^p(?0E_#Q+GBAb*kv5+qJP2Tc0{yqu9yJ0N+;u?}QNgx(;WF*ay#aPI8|oQyppG
z@8s~UHXxXPwHx@F9$0Zo6<6t85%2lf)`On6zlWUkTZeR`ISk)0UkJ!0B86nX@rBd7
z!?y~FQMmqe)uRdS{D+e*C7pQV)gi;Syzi#d#v&Na1HdWuL=YFzG55Q4!N`WwpLjH&
z`jo^tZ6IUn*b$5X7k>Q$0i;l)xKI8+^_P?#1Rh9#AeqySXUC95lwYvI{+boP^|2@&
z2g_qY1=C99<3%zS(0R&5?0N7`<6X<D3nbm8pIG;KhJhws>t`c+Kq8-;+oZuV+``0Z
z?*|?VL4R18Gi^fRKjOHPq-Iu*i3&*|UaTp5@v~}I0*Lvw!E^I(ru2S{K13uVY8dwK
zkgRoo_%6dFo=f@+dX(_Gm^!|A{eKk1IRND4>>uhj9+Slk_Ue^05Gi}u_~l*i44c!8
zR@9_d$JTt~0f^M0ycg%B+%8fump-;mYp(YFC^e8@m)ZFBBCRNc*H8M*-cgMUz1QuF
z9(h}iWL5s{?+QzX)7jOB9J^m4=0eHv>A63Dx}%&2hv&f7^QI%oM)$0WUaos<+(`n1
z)R`I_lPO;^mh$&P4e(@>M}{;;r4<w(=+LTYlW(iQ0`+~bM&aymKt|_CF!6G!q#Md}
znqmp_ZZtqJJ}@CL2?hl#4g&%j1povTSOLR^7o#*m-;3jF2SAJeG`GK31QhV-j5&=I
Xsc0dJ9Oeg3RHb$?X`IOd0|ADh15A{S

diff --git a/packages/kbn-es/src/cluster.js b/packages/kbn-es/src/cluster.js
index dd9c17055fb18..36616694e69a3 100644
--- a/packages/kbn-es/src/cluster.js
+++ b/packages/kbn-es/src/cluster.js
@@ -257,9 +257,13 @@ exports.Cluster = class Cluster {
     // Add to esArgs if ssl is enabled
     if (this._ssl) {
       esArgs.push('xpack.security.http.ssl.enabled=true');
-      esArgs.push(`xpack.security.http.ssl.keystore.path=${ES_P12_PATH}`);
-      esArgs.push(`xpack.security.http.ssl.keystore.type=PKCS12`);
-      esArgs.push(`xpack.security.http.ssl.keystore.password=${ES_P12_PASSWORD}`);
+
+      // Include default keystore settings only if keystore isn't configured.
+      if (!esArgs.some((arg) => arg.startsWith('xpack.security.http.ssl.keystore'))) {
+        esArgs.push(`xpack.security.http.ssl.keystore.path=${ES_P12_PATH}`);
+        esArgs.push(`xpack.security.http.ssl.keystore.type=PKCS12`);
+        esArgs.push(`xpack.security.http.ssl.keystore.password=${ES_P12_PASSWORD}`);
+      }
     }
 
     const args = parseSettings(extractConfigFiles(esArgs, installPath, { log: this._log }), {
diff --git a/packages/kbn-es/src/utils/native_realm.js b/packages/kbn-es/src/utils/native_realm.js
index a5051cdb0d89a..c1682e0d18002 100644
--- a/packages/kbn-es/src/utils/native_realm.js
+++ b/packages/kbn-es/src/utils/native_realm.js
@@ -13,15 +13,12 @@ const { log: defaultLog } = require('./log');
 
 exports.NativeRealm = class NativeRealm {
   constructor({ elasticPassword, port, log = defaultLog, ssl = false, caCert }) {
-    this._client = new Client({
-      node: `${ssl ? 'https' : 'http'}://elastic:${elasticPassword}@localhost:${port}`,
-      ssl: ssl
-        ? {
-            ca: caCert,
-            rejectUnauthorized: true,
-          }
-        : undefined,
-    });
+    const auth = { username: 'elastic', password: elasticPassword };
+    this._client = new Client(
+      ssl
+        ? { node: `https://localhost:${port}`, ssl: { ca: caCert, rejectUnauthorized: true }, auth }
+        : { node: `http://localhost:${port}`, auth }
+    );
     this._elasticPassword = elasticPassword;
     this._log = log;
   }
diff --git a/packages/kbn-test/src/functional_tests/tasks.ts b/packages/kbn-test/src/functional_tests/tasks.ts
index b220c3899a638..6dde114d3a98e 100644
--- a/packages/kbn-test/src/functional_tests/tasks.ts
+++ b/packages/kbn-test/src/functional_tests/tasks.ts
@@ -169,7 +169,7 @@ export async function startServers({ ...options }: StartServerOptions) {
         ...opts,
         extraKbnOpts: [
           ...options.extraKbnOpts,
-          ...(options.installDir ? [] : ['--dev', '--no-dev-config']),
+          ...(options.installDir ? [] : ['--dev', '--no-dev-config', '--no-dev-credentials']),
         ],
       },
     });
diff --git a/packages/kbn-test/src/kbn_client/kbn_client_plugins.ts b/packages/kbn-test/src/kbn_client/kbn_client_plugins.ts
index 25c3d7e156e91..744a80d14684d 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client_plugins.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_plugins.ts
@@ -16,6 +16,7 @@ export class KbnClientPlugins {
   public async getEnabledIds() {
     const apiResp = await this.status.get();
 
-    return Object.keys(apiResp.status.plugins);
+    // Status may not be available at the `preboot` stage.
+    return Object.keys(apiResp.status?.plugins ?? {});
   }
 }
diff --git a/scripts/functional_tests.js b/scripts/functional_tests.js
index 89f20121867dc..601ee3096e0b7 100644
--- a/scripts/functional_tests.js
+++ b/scripts/functional_tests.js
@@ -12,6 +12,11 @@ const alwaysImportedTests = [
   require.resolve('../test/plugin_functional/config.ts'),
   require.resolve('../test/ui_capabilities/newsfeed_err/config.ts'),
   require.resolve('../test/new_visualize_flow/config.ts'),
+  require.resolve('../test/interactive_setup_api_integration/enrollment_flow.config.ts'),
+  require.resolve('../test/interactive_setup_api_integration/manual_configuration_flow.config.ts'),
+  require.resolve(
+    '../test/interactive_setup_api_integration/manual_configuration_flow_without_tls.config.ts'
+  ),
 ];
 // eslint-disable-next-line no-restricted-syntax
 const onlyNotInCoverageTests = [
diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index 8b346d38cfea8..b7228780a1005 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -67,7 +67,7 @@ function applyConfigOverrides(rawConfig, opts, extraCliOptions) {
   delete extraCliOptions.env;
 
   if (opts.dev) {
-    if (!has('elasticsearch.serviceAccountToken')) {
+    if (!has('elasticsearch.serviceAccountToken') && opts.devCredentials !== false) {
       if (!has('elasticsearch.username')) {
         set('elasticsearch.username', 'kibana_system');
       }
@@ -191,7 +191,11 @@ export default function (program) {
       .option('--no-watch', 'Prevents automatic restarts of the server in --dev mode')
       .option('--no-optimizer', 'Disable the kbn/optimizer completely')
       .option('--no-cache', 'Disable the kbn/optimizer cache')
-      .option('--no-dev-config', 'Prevents loading the kibana.dev.yml file in --dev mode');
+      .option('--no-dev-config', 'Prevents loading the kibana.dev.yml file in --dev mode')
+      .option(
+        '--no-dev-credentials',
+        'Prevents setting default values for `elasticsearch.username` and `elasticsearch.password` in --dev mode'
+      );
   }
 
   command.action(async function (opts) {
diff --git a/src/plugins/interactive_setup/server/plugin.ts b/src/plugins/interactive_setup/server/plugin.ts
index 2c3b517e78c5f..8c1d00a254764 100644
--- a/src/plugins/interactive_setup/server/plugin.ts
+++ b/src/plugins/interactive_setup/server/plugin.ts
@@ -67,8 +67,13 @@ export class InteractiveSetupPlugin implements PrebootPlugin {
       core.elasticsearch.config.hosts.length === 1 &&
       DEFAULT_ELASTICSEARCH_HOSTS.includes(core.elasticsearch.config.hosts[0]);
     if (!shouldActiveSetupMode) {
+      const reason = core.elasticsearch.config.credentialsSpecified
+        ? 'Kibana system user credentials are specified'
+        : core.elasticsearch.config.hosts.length > 1
+        ? 'more than one Elasticsearch host is specified'
+        : 'non-default Elasticsearch host is used';
       this.#logger.debug(
-        'Interactive setup mode will not be activated since Elasticsearch connection is already configured.'
+        `Interactive setup mode will not be activated since Elasticsearch connection is already configured: ${reason}.`
       );
       return;
     }
diff --git a/test/interactive_setup_api_integration/enrollment_flow.config.ts b/test/interactive_setup_api_integration/enrollment_flow.config.ts
new file mode 100644
index 0000000000000..5432e8002bdd1
--- /dev/null
+++ b/test/interactive_setup_api_integration/enrollment_flow.config.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 fs from 'fs/promises';
+import { join, resolve } from 'path';
+
+import type { FtrConfigProviderContext } from '@kbn/test';
+import { getDataPath } from '@kbn/utils';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const manualConfigurationFlowTestsConfig = await readConfigFile(
+    require.resolve('./manual_configuration_flow.config.ts')
+  );
+
+  const tempKibanaYamlFile = join(getDataPath(), `interactive_setup_kibana_${Date.now()}.yml`);
+  await fs.writeFile(tempKibanaYamlFile, '');
+
+  const caPath = resolve(__dirname, './fixtures/elasticsearch.p12');
+
+  return {
+    ...manualConfigurationFlowTestsConfig.getAll(),
+
+    testFiles: [require.resolve('./tests/enrollment_flow')],
+
+    junit: {
+      reportName: 'Interactive Setup API Integration Tests (Enrollment flow)',
+    },
+
+    esTestCluster: {
+      ...manualConfigurationFlowTestsConfig.get('esTestCluster'),
+      serverArgs: [
+        ...manualConfigurationFlowTestsConfig.get('esTestCluster.serverArgs'),
+        'xpack.security.enrollment.enabled=true',
+        `xpack.security.http.ssl.keystore.path=${caPath}`,
+        'xpack.security.http.ssl.keystore.password=storepass',
+      ],
+    },
+
+    kbnTestServer: {
+      ...manualConfigurationFlowTestsConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...manualConfigurationFlowTestsConfig
+          .get('kbnTestServer.serverArgs')
+          .filter((arg: string) => !arg.startsWith('--config')),
+        `--config=${tempKibanaYamlFile}`,
+      ],
+    },
+  };
+}
diff --git a/test/interactive_setup_api_integration/fixtures/README.md b/test/interactive_setup_api_integration/fixtures/README.md
new file mode 100644
index 0000000000000..5a7238bbba75a
--- /dev/null
+++ b/test/interactive_setup_api_integration/fixtures/README.md
@@ -0,0 +1,32 @@
+## Certificate generation
+
+The Elasticsearch HTTP layer keystore is supposed to mimic the PKCS12 keystore that the elasticsearch startup script will auto-generate for a node. The keystore contains:
+
+- A PrivateKeyEntry for the node's key and certificate for the HTTP layer
+- A PrivateKeyEntry for the CA's key and certificate
+- A TrustedCertificateEntry for the CA's certificate
+
+```bash
+$ES_HOME/bin/elasticsearch-certutil cert \
+  --out $KIBANA_HOME/test/interactive_setup_api_integration/fixtures/elasticsearch.p12 \
+  --ca $KIBANA_HOME/packages/kbn-dev-utils/certs/ca.p12 --ca-pass "castorepass" --pass "storepass" \
+  --dns=localhost --dns=localhost.localdomain --dns=localhost4 --dns=localhost4.localdomain4 \
+  --dns=localhost6 --dns=localhost6.localdomain6 \
+  --ip=127.0.0.1 --ip=0:0:0:0:0:0:0:1
+```
+
+Change the alias of the TrustedCertificateEntry so that it won't clash with the CA PrivateKeyEntry
+```bash
+keytool -changealias -alias ca -destalias cacert -keystore \
+  $KIBANA_HOME/test/interactive_setup_api_integration/fixtures/elasticsearch.p12 \
+  -deststorepass "storepass"
+```
+
+Import the CA PrivateKeyEntry
+```bash
+keytool -importkeystore \
+  -srckeystore $KIBANA_HOME/packages/kbn-dev-utils/certs/ca.p12 \
+  -srcstorepass "castorepass" \
+  -destkeystore $KIBANA_HOME/test/interactive_setup_api_integration/fixtures/elasticsearch.p12 \
+  -deststorepass "storepass"
+```
diff --git a/test/interactive_setup_api_integration/fixtures/elasticsearch.p12 b/test/interactive_setup_api_integration/fixtures/elasticsearch.p12
new file mode 100644
index 0000000000000000000000000000000000000000..964932d8ffe5e8ccc8a5c7ed93f6f73c52437dc4
GIT binary patch
literal 7131
zcmbW+RZtwvx-MYcWzgX6I)l3gCqRO`4z2?Mf;$Wr+}$BK!6gLu1jz(<cX!$Us=aHi
zIydL+I#*r&c7NaHQ!T&{^1lf1h`<o?U=(z=2*rpyY<N`of)H{DQV6;8Ke0V91XKF|
zSi<B%3c=+1CuReNAg7~X{!bMa20TJR2(r{ap%~Em-xbK%Kz*Rlf2LSKb|gX*wca-?
zw{FX8gCh>e`o0_3Se^g@ff;}RPXok4LHqBH2<XUgKuQ#Jvj|0aFd`B>8xp{A=FRl$
z0$pE-r)mtEG|T}h1nD=ozxlP(J{maPl}Q>0^0?qNFv!NWN<4zP?Z_(p(fEt9dxDfQ
zgg?%;sjM%4VfDI`6gzmuRE8E&V$9;bJ_P(1Mph<JaEw5;h{F&V6-HQ>RneldX{^Xs
z?WHepr`wm{#bi@H<J=HLxyPy)Pl6Zjm8uU2RAgFgr~6vvT3CHLU_1U5NQWmlZ&CQw
zFjojMNSh+AM_;B;IOlU0t%^pN=wf$HKo)0^WM-`nYg{3Q$j@f5PZ#Xv=<%ltrQaMf
z4T;4)JS-8x62=rcFx8ArInqU8hTB!pKgkBPNhHDE(@i8Bn7{L~UKo}-KdJAA3aAIV
zBP2a%H}3YU6IqrQNN~-+e=`rlOLJxuHT2omC=wq#F48YCBQ?m6)(b!9Snz*u959Qs
z;HwCb$|`ClylZ$vBJ)8$Jt968dh9-~Q{zEDR4YX-Z4`?eV{1QRoseNkCZXHfC)<(u
zBFBzsYlsvsjN`E$JhylmBqm}u(4e{5V#IkySzHP2cVSPg*~7L{lFRaM7nHm+xaKf^
zOIj203RJr8_mBsW?r)t^QIY30#!!&$RF4#1F(H=gjO^+~uJM4t11UCUmY;u<%oJ@A
z7A}$(4quyI^k)XlR`ttUMCxyii+m}*TCG^G4~U;8|KxIJuFblJzohX~?4=T{O6DcM
zN~fGNb8j}zCS-Jbs{T^1tV*vfn`yRTh$+0KWfKhl=UPMMb$&vI&T#v7&2a_XKF%yt
z)cIS!>a+xwA>;R(8dkydW}l4h&p0R0IgncsF*B@j_J<=+PW^}I5)PpcULY&4m3nEE
zNe>sx<5dPY&p-tDq3@6Lf|H|H2d(|pz&yxNo&O<EPbNetIP*S&Zj-I#Vy+fiC<GQM
zd2w2P_Y0g_5c9c#JNzdVXYJkeiv;9+a775CK|(UMwx-X%R>FT|>$@$`u8TFTWo%-;
z#hrh3?%nTOUq?a|24jOIGFz{qR3tes)eV~~Dfigl?XegH5)<lhzs($4IneDHtA6!6
z#iXE>O%c-(y`pmCTi;dGDHye(K^o$JJ$ger3`qm}D_d!0D$7bEyKvy0vKGT!nQ~7k
zm9nPhK3)DG6N|2NtDI<=&_Bd&vDd3(bU;cs)=ecm-7Z`XvX}2ikVp|XX*p@j`02lC
z5nG-#lpLNoG3d|@&JeI%N|_tO|FaQe-&!N-5KX4U?gtx7QNV6AZEY8dS0<INDg99p
z@l_g_NMf$qFTvx_auAmYDR`#$Lq>4O*2WnPjhNmEmd8gRZnk@plyAbLQ09>~bR84|
zsG)O}(G*WqbbG?zCBzHSiK{=^r`)AmPE7@0<TXyrgD?g+b<iD{@Z9IQF8I7%a&=W}
zTnVA-Zg_v$k{XY0$0(%C7@lO|OgSNCq)rTn8%Hrnn|xyvuG1J<agg(rEMs+V)Nxnk
zJ+%OG#2hY)6aQCumy^26l9G2bhG9!AAI_6cS(5VhkLOo|L_~UU(du+D4(Emg?AbEF
z%Rz$nrag5>>ZDQg8lw@AlP4C!edRFLsNBGd^>&!T(Q8H6y{2HWwGsP!qdn0OUJwYk
zKP-e+$$mv+)|=<=L7Aj>|LJGj#70#q5pC%<2Oqw{_&TUJSF@jM|6(6nfWKAH&zA$x
zdm#0{xkM)f;Zp(N?BJZ?+~GXn%>NlJ;lM!J|7;)v5hCGh**Sq}KmxpcARZoGAg`dX
z&_4>t{D0A`d><TY%JW8B{TPJqI+;EzZWXNdzoEG<PxQS$j9;CwZ*dWuHrx7NG$)Db
z9CSWMR%&hsQ6dQ5@HE{N<&xC|ML5Kbx*MO=M$UqMA?o~`3)*~JLpqu!PNZRy`!bv=
zCt3E!6CMlJ<~04x5(SVzsfYyic+wdrjZJcheNhU6aFMc-ow(Azn2<csd+#)u&-jD!
z<b9&9`%OYOANJ#0-#<%HK8E|~{kd5fBT0ETiHT;Mgug7)-dB7EU2~<aq%Z7_stBy-
zC>wJqfe(YCm{@E$nJ<pENp$+rJPbl7*wE2WJp0Gb%L%(bQFFoPZ%TuQts=6^{UyZO
z&#L`fSy;vf32=kB#L}>RU%QNW&$8q4h$FzdI)v^9^XaR0H=~TYdon}WLYosc`<Ww3
zO&~3}de|AyLSkOoFBQaED9H8MuYdvGLk$U{Sy<M=AY#~CKLY`xMeb85xKS6HeT_9X
zj?h7!G)lU<7c~*HALr1R-Mra_oZssgCBZRSmZu;Xe<-cKE)%Z`?X+Iufb4uJY_WH)
zAKtg2%2~0kz6&AJYwMe$sMwCENJRhH%<F_rf6fzic3nTbA{v}vFM_6=5fhbw4KU4g
zx4OFQJ^!v;CXqIXp-%V5BbirgUWVqAlU=4YE<u0V<ySFR2Pz~Z&PHp(6RR^Gy4IN>
zx7u&R(@IWZ%z33bSiXY!i7qKIFJqM}{VGb^Z~OTM=CxmpyIm|kvFTS&cm`t9S@4>V
z4GR_669A~xC}0f3y|)i_%iQaoxMDvzS%ugz04FTl4%tgnMm$5RUDD}~O-^PF9Y<RZ
zqZG!^SsF!Ey-cUicT~USO05X`Mj!6GBr_Q@cOW){4H^YJV}67`98A?8BKTXD7e%)i
z*R>*_Vju379eTRkZO>8qBx%Vo8VbyxM$`o!zWMj5Ob1+VIj|-i^cg+LM=x=9&b~?&
zbumrprA4pg7BfvVjGs<BEf`X0Hl?V)8+oNVhar}xS$2^O*tU(rhZ$L~4JM;zGPUno
z$)%50I7zzbfBq3CIA05I)sMCI`T6tDC$?KbA=!(BslM-X?g@odjv5_R@hVS4`iIFi
z5RRABgNm03qSP?6hkG<u<`NiQ(x_-P3m(TWuMq4(+WiG+Q7OIxX%lgs)JHvxo(Fxw
zJG=XssI*Y}!Dhv>5qmCZ1a*)({v8|^6@QHM+;OT9S|1x99u<t34feZZ`FYd%HGd|Y
zl3;kg+Pi(PSvsv)TJrND!uThwKLSxy6^B+A1(yi!4nBLkrd8vAI`8p&D&9NH!X~@G
zNpfqb;E$m|O~yUc1P(ih8q9DRv$jUnEsKWCg?p$i5X*FW2bZ)vHhxM_qv-~^vK;(?
zCOMngPzPX87gWv0_>d`~R1)a!2Xz_2>&OUDysaU)LX{L!)WvMC#@ck}$Aa;W#9#)o
zPY~frQoJ@TF^Fq=7h~nFFljW*I*Z$j`1{myc|BU^cc9oXNmb!YM(u~YVfAzVa-h73
zR}QuOa4~Jxwj7En;bY*wI~?45^(odLnd2y*QJt@88g4ym+VF30zx{dLX-qCAu#$W3
z&BVkN-E+|Y{<qhL#!ZD?gwB`T{Z^?gfjZkCw+LR6_zzaQaFXA_jZe;~3uc}saA7;S
zi*Me$5v2?oT^Lx#L=woLb|{o+M0K#ZGQd%H^#tc#{3A#RNbnzd2|*}SNdItb{(t9K
zh+hcE4-5hP$81!Tf)D`yKM@WBJlsD6>c4xU!vDWc&Z1|=Dmh3dU)p1r6D>OjR%FCv
zXZ|-l9|bGdC(+-@ywwU{aEot<2Zi7!xco7X^xB@xBi{9Bd`yb8hJ2eX9S`rUi2+!l
zJ{fM3&m`Xt=v7<ewm;d?6yIUr!~`g))ZdN`Ba%*G3XK~S4bND-4`h2`=-J-)zeHKS
z+m3@%_ZJR0`A%q#{$(3Zds^<ja;%MF)<(9_`d1VM12gZ>nclV!3%7@`nxRC9ao~X;
z+Z4y%>7-VO=>?%AkV+d8!qw32&LV>0v*e&El_JTfvyxtVpuid=v3+NZMSr#m`d)26
zG<Y*hN~00}9P#zJ^7wiR3MN8FAO;}Qaq>5+vMn!lG>k!^ZM25o1fUwWTkcQ59)Z^1
z_v=h|rK*g*wf2gz3Luc`V;VKJ>C`Xb2X~Rk9OZF|+2y%tYSCnP+snV}dP_DBY6AkV
zhj*S?nZ)sJayuQnA!4x!_Ne2F#tsTxVd<Mz#H0kEa8S>-d_biXma}qt75-O8_$K26
z!{)l$9*^ds_K_s<9WoySD6<6w;VH9{4__@ia5e7`NyjtP(@5KYX#<`zsBo+3XEIeD
zQt$3<kwFg{b-5JmJ#IC1rRO9C4t8k%mh1Dpz!$#xZDK3Pbq9oN&x>3E%Qnh-*VX9y
zeEJ+^GO{U4AqPXgC5QM&;hIHz$6)3oVp0ZD>Bef>=E#{(k!2`RqtAY)!zUB|X;)!K
zh)rk(SRyC#Xa$>*d>R4$DfJ825X;yN4qdRUv6$bDXxE_X3IqrDBEEr{dD42LEZ|at
zWxy6~+kmn!CE$yOLW3T##jTp;9n(*}G!JF!y3ZsH+@e=$>h=XORsx(^In-oP{s-5+
zAYK>g$tU;|`f@3;+ISsPSj&*Wj-RY`9wl;MneVE<5&9|!t_%4EWyQ1x|7#cMit94;
z*Zai!kH$Q^ORhV_MJ<z0*;x$nUlQ5EpvX_Uu?0iL75ign7I8ad#Q51k+rE2Fb5Xy8
zw?2r8!_8mp{9;Fl*O{zfEvi>p#T9PRu&0ra9jMD~5Q?@6Jb6l$k`E|!Ef>!B8MBRx
zYscyhAv@_2q(uJ+E!6@Ia9(t3EPoTH7wD^I?okdGCU+Ee;1Vk&RZ)sKHoD|bOWR<9
zU{^ruI<w55U6LjSV)`tNo@1KDfO@39fLpDds<7aNk8iV4ihxNqaonnn8yyOZ)aZpy
z)sA^9iWk&FH<E8e?e6kr-qKlw1A_7|P+p&;gzeUSPZX-qKTqnq?UROZs$ToPFd3(e
zJQHcLOInBgq(|oo5luOg#mMtd1I2~4un&YW%vLv0w;hl!+vsI-7^DC9Kf)7Z!6Q^P
z^r5#q2@|8MWEsn{9*W;;#r%#(v$VxvXsBRokC#6g>XCREXlU3ymn(R}GZp@X{-ZHz
z%~%s0%(i01jHrjIwS>D-7|uUPdp~;-Kv5T3Q<1q1E_22$U0-I6Mvgrx1Id(#jW7D~
zLQal-w-i^A#vgf1iL+7ZG@<@Bxs5_(AToo@kBCjoM2;T4EU}B=uW~YuN($RmqN12k
zvaU@;9qFd`_s1@EiJo!Y2%v&L?Nv^2zAZ<GJanbiUrWCvyZ8@K%Ahk&f*pUBBh0M-
zxfDnb=EJ$%cBQW3Xp<%0kTY-M&DwRmzYD&_k{vD@(~W|EznRrZ8&0ZfC}sr%f$*2d
zl2>>dJ0zkp-)F9MDt+*H!i{>R+D+eE!*u+9P^zaGuAjY1sKU^stT&gp5cO@uN+viM
z6vYIvJl88dr!$;)?R3ZF)T+))M{X@4);#mbJDV-(tD*SFE#Qe~_j$m(K-FtPAx!d9
z&vA6w>TDp+Qod>0W|IF9%ATm(;q504(w{%9yRoC0<pY%uCWJFNX5W^ntznk!?Q669
z0;H96Sv6bh+<&otN5EY&TBy_Igs#Xl+v;`Y#T8|oy=k+l;A4vS{BjJ%j1>~J5uU)?
zit>-&tz<x?`Rdh-&dUj0gC0-4)JKZ~_8rbkpt3sM74~4;3y;e_uAli1w3I#q?~3B>
z6Cw9)72ef_333<gq$Q{4C*>UTM++E5CTynnjO^T$m<Y!QohptdpZ|Utv!&wdz@1>b
zbX0;g+Z`ktv|W;yIV&uR19|gT$e7{S>o0%oIY}B|4U;Bsw<*f)nN83hgRa7o_8WX+
z3|{EQS$=Gv2|%K7OkYoKO)k@~<QyYe*jMLsRDmPoalZ=Q@JZiW@bQb~^5AQIb2)H9
z@1#&G&&&3zcPPea5@o(9C+)w?q6LsY$&e2bBpRB7Y#o6xu)Wz;;hO*XkLLC`1xbq0
z<w<%({g8eU?eA^M0PL_7B)<<mJh8cS$zD@T(Z~vh?tD)cUTR|{bakJ6W$9yOE$~eM
zOc<g_XO~YaH39RM*80S>rxF_3*=RQuiWxKr+c+N7p4nMPf81xhPR7RP7tlR34ESqr
z)Z}+9<hZBSg8*Zmun&Ikhucoh#-pI+2~L>#eH(g-hBmVg^=5|1Owu2>t6ocdzlSWD
z=_~~jsskjVP^6Y@R82`KdzpmXo^KMM&Awga8S<ti-L?Bs+AY(z=#&)r7OXF)DQpkd
zL$jS!Dk@!&$a%HU%qkOW4i-gi<ww7R!>u)TL^T3|%*MlGh?1Hrr?W%dU2Pa+HP(2>
zy*>1PF^DGzQ`NE;!l8anJ+In|-W|J+rNMKT@=*ed8ZS{NS|I20Z*9${>e^Xm3^F@x
zwd1N?_Kq`5Kvs&0Juxcj<`Ypv2El_i#5Ad5CJdC|?u61x5Z8?uDhJEDngVB~4|1dC
z_9bZf8u)wN0;pvzYdL+hOCdz+by2}6%|9p5$MPn8G;f8y$QkdL$-3_s%L=sECZc^n
z5(kgZsG~I^TKw9eevqJpFg#G)yYY<q4i>D0rUekWX^dsO<<Du=R9Iqfw}>T>L~RFX
zPcBo67y~x0T3f44F~n4uggW1t%_nuyN!jNDc1jcY1bO6MwH`0sxZD(9^y}`58_P4n
zw^m#DO6}p!;&h6P&vKK{{q;9>y4bhSYdz%2OLu1JIXhRDDL{w)MIOMKT?{dw(9;7f
zd3SRz_RuGtu0KX=S0>l)-%(G+Xw-q8D*d5x%p#d87gm27FY!L07QY0`i)UUrTU8d`
zmfjNxQ@NlX(!kE|iu$@PpgDQl=Q(hQz};2lm#;>#FPf8m#K=PXr89ws_08`d<d|l`
z<TfnV+A=+uJfu{MwLhIZ%PCcsfr{LTO$QKS{I(9O7P34wQ7L`NmAS2lj()ppW3GvL
zM#*%=dHfLc&n@!j4fK4iSj!)NhzSOC`W4x1xYt?cC-4;^l-1g?UfMt7_}tF^o#4AW
z4nof2k^=vF4>oGbNCucPWpuWVst*wE^7qncO>TMc$c7%0Vwim0X$BMdeK!?FbEH~v
z*tL_JYVVAh=2<MGs&3+gZEgmFy58-lEST_Hn0SEAHT{{JL<P8X6J%u>pW2Y!J@<BZ
z4|Wd+?YbAi6?fF8_>#?ipyUvGT?Hn#(^Rr_`Z|3OZV8>iG<BGqtsbsaPg}$GOAj<i
zPBkB|PQ)ti4kN|Pe7&PfBc5BdFGZXq*hS>4e_`V2QQXYfcrW*nBQ?02QBB$bp;O7R
zys^pJG^Hw+p*=Vxs58;4>=kZdYn$}`&kxSpg(3&mC<H~!;kDzPek3DzjLFSDi1chF
zBFvi+lFvIl@`Tv|@Qt7v<MZ#S+c@SfSQDfk;L<dX*eP5%2fu64*QaNV#95vEka3zo
zp0<rVq{->~n@O(lTa{kK5;j>FqShSm1R1yV*PJr7yG>?L?SUgJi7e@h&E%Gyy)rV?
zlp3t9UmzCvT^?TK;BcNjL?_ij8y59oP!4gRqCg+0h~ZY27wc9x0EJ2;SS&10vJ;1~
z<3wg&VCp4}JE<`f@G=GJp5!~UE2YH~YSmE@Umqbt_^0z0@o$A!UDz4EO^);?g}aaq
zxD|-FkT8tEGv5Ld{&M{eAI(JT%?=DdC!ykj45!!Zane87`HBRe=;ff=Ztiz2(MY4s
zd3vl3r2`?B7PT%4Zf~!e>*#{3A>Z;=xP&ZeY^O(|j%>7Lx#(I?!xGNU!6GXGC85PT
zQCO{}Q8E)0%Pz=%&0u<WM+`y?-NjTXY#vLSD|}Y&d2jan5;{}Gg0NsE*B+>lFSlvP
z+*~S%xC4G0Nm=a+!<9Whu~0u}Cjj2{?s(wBktpH7jdbnI7RNj#+|sVN0}7ZhyP@Ya
zj`zq6ww?%I!e>3{I69mNRsfkWVSTpEltV1_#9@@lv%wT7*{?D8{k>;qNI+=&)ehRC
zEfy6Vw%jnHAs!<pQTIn0_#I=@<^ByKpgF_ek~thxPT$(;_lYO$1^v{(zv%^4gU_9q
zf3X@KKa@zJg}d>`qP7eetueVG0Nqdu0jSPEsjce%*+i`o^;tKXmxWBMjD$C=QdFwI
z`=E_MoATi(eUp(l@az6Jw8_4t#R8HpB%gT#!YhDt?+Nn_oXPmWyEd}gB@vvv%gOU8
zdIytcmg3j~*^=rjB7I)XYjz%VrSoqQ!0<;L`28UouZ`0q#FnF9A2nSG8*0?mC|ruJ
z^xO?q${FGxs<GeJWIA0wcrwTjLh~JbSbqI^SA#fBFR&=KC+Hi*QQt-M?puV|$w9M=
zM}QhhQp3hE&Fe>LP_Syt!uH^0BbrpJ*D!3xiL{M_scYNA6n0d%g*$3$j%QUMnhEcY
zKrXj#F4ElhZddNvu4gzZg~@8^06l7*R%HC{82*H?38=mNs<Su0xiDBIfrPs!M}VU)
z;M3hE@w8({(;^T@%|xZGOQFQa^_^%)W@Z%smJ);B6VGES-HKSbOEsGh!A=tGHK<yh
zaabzbF`i&Z`LU0+HM%(Oxh5Qcx6_Y^yUHKphvXPJ)-_AdnejnBb;v~vp)0^@gx2g=
zO&Jc_V`74F->=q-b=2Nm8Chn<$%CLEm*hGEU)Y*I!_+F><U&DZMDfKGu?BH$UYjy0
zyTsoY)#)?9y-VqrZ*8tj6&f)q02Gm{w0rQAerS!bfDqfO<A-D{FY%^Zj(Gf#UR5Kp
zkj5BlInuc>+c<lXLpN`nAp%wazC~}XsOm{=al5=e!l3A*`?pAVa#`H%Z*p0%cE2jL
z6_g!AZscEmqFCsb?zSm^jXI1v`Bat|au@Y;1!-l;>LWk@9GG;4Q?(w~lnbenp7s`z
z;5p;4GyJQ!3EM2#TQ5%GO9ZuT<xPLoaxy6EY&M9X#-G8RxXZoi(tH$Vu3Eu00ZZv>
z7OS4n<aj$Tg^QoZBw@O2p&ISXQ#-Dc^m^er8)rnAt+}y=Z>^mj`Pq{osmsCvuVS8T
zrd~UNAAler_P;;85a5yFkZ8Cv(*togqz{GeSvo=u>C1Oi*Fvw!crQAT?a%kP$%>H(
dYo`g-Xg=Sh%X+HG`Bj8g{vv-D{jVp1{{nRlMNt3%

literal 0
HcmV?d00001

diff --git a/test/interactive_setup_api_integration/fixtures/test_endpoints/kibana.json b/test/interactive_setup_api_integration/fixtures/test_endpoints/kibana.json
new file mode 100644
index 0000000000000..f9969966456a2
--- /dev/null
+++ b/test/interactive_setup_api_integration/fixtures/test_endpoints/kibana.json
@@ -0,0 +1,12 @@
+{
+  "id": "interactiveSetupTestEndpoints",
+  "owner": {
+    "name": "Platform Security",
+    "githubTeam": "kibana-security"
+  },
+  "version": "8.0.0",
+  "kibanaVersion": "kibana",
+  "type": "preboot",
+  "server": true,
+  "ui": false
+}
diff --git a/test/interactive_setup_api_integration/fixtures/test_endpoints/server/index.ts b/test/interactive_setup_api_integration/fixtures/test_endpoints/server/index.ts
new file mode 100644
index 0000000000000..3373da1180d09
--- /dev/null
+++ b/test/interactive_setup_api_integration/fixtures/test_endpoints/server/index.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 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 fs from 'fs/promises';
+import path from 'path';
+
+import type { PluginInitializer, PrebootPlugin } from 'kibana/server';
+
+export const plugin: PluginInitializer<void, never> = (initializerContext): PrebootPlugin => ({
+  setup: (core) => {
+    core.http.registerRoutes('', (router) => {
+      router.get(
+        {
+          path: '/test_endpoints/verification_code',
+          validate: false,
+          options: { authRequired: false },
+        },
+        async (context, request, response) => {
+          // [HACK]: On CI tests are run from the different directories than the built and running Kibana instance. That
+          // means Kibana from a Directory A is running with the test plugins from a Directory B. The problem is that
+          // the data path that interactive setup plugin uses to store verification code is determined by the
+          // `__dirname` that depends on the physical location of the file where it's used. This is the reason why we
+          // end up with different data paths in Kibana built-in and test plugins. To workaround that we use Kibana
+          // `process.cwd()` to construct data path manually.
+          const verificationCodePath = path.join(process.cwd(), 'data', 'verification_code');
+          initializerContext.logger.get().info(`Will read code from ${verificationCodePath}`);
+          return response.ok({
+            body: {
+              verificationCode: (await fs.readFile(verificationCodePath)).toString(),
+            },
+          });
+        }
+      );
+    });
+  },
+  stop: () => {},
+});
diff --git a/test/interactive_setup_api_integration/fixtures/test_endpoints/tsconfig.json b/test/interactive_setup_api_integration/fixtures/test_endpoints/tsconfig.json
new file mode 100644
index 0000000000000..893665751cf30
--- /dev/null
+++ b/test/interactive_setup_api_integration/fixtures/test_endpoints/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "server/**/*.ts",
+  ],
+  "exclude": [],
+  "references": [
+    { "path": "../../../../src/core/tsconfig.json" },
+  ],
+}
diff --git a/test/interactive_setup_api_integration/fixtures/test_helpers.ts b/test/interactive_setup_api_integration/fixtures/test_helpers.ts
new file mode 100644
index 0000000000000..f1e72785af02d
--- /dev/null
+++ b/test/interactive_setup_api_integration/fixtures/test_helpers.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright 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 { delay } from 'bluebird';
+
+import expect from '@kbn/expect';
+
+import type { FtrProviderContext } from '../ftr_provider_context';
+
+export async function hasKibanaBooted(context: FtrProviderContext) {
+  const supertest = context.getService('supertest');
+  const log = context.getService('log');
+
+  // Run 30 consecutive requests with 1.5s delay to check if Kibana is up and running.
+  let kibanaHasBooted = false;
+  for (const counter of [...Array(30).keys()]) {
+    await delay(1500);
+
+    try {
+      expect((await supertest.get('/api/status').expect(200)).body).to.have.keys([
+        'version',
+        'status',
+      ]);
+
+      log.debug(`Kibana has booted after ${(counter + 1) * 1.5}s.`);
+      kibanaHasBooted = true;
+      break;
+    } catch (err) {
+      log.debug(`Kibana is still booting after ${(counter + 1) * 1.5}s due to: ${err.message}`);
+    }
+  }
+
+  return kibanaHasBooted;
+}
diff --git a/test/interactive_setup_api_integration/fixtures/tls_tools.ts b/test/interactive_setup_api_integration/fixtures/tls_tools.ts
new file mode 100644
index 0000000000000..ea6e40cbffbaa
--- /dev/null
+++ b/test/interactive_setup_api_integration/fixtures/tls_tools.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 tls from 'tls';
+
+export async function getElasticsearchCaCertificate(host: string, port: string) {
+  let peerCertificate = await new Promise<tls.DetailedPeerCertificate>((resolve, reject) => {
+    const socket = tls.connect({ host, port: Number(port), rejectUnauthorized: false });
+    socket.once('secureConnect', () => {
+      const cert = socket.getPeerCertificate(true);
+      socket.destroy();
+      resolve(cert);
+    });
+    socket.once('error', reject);
+  });
+
+  while (
+    peerCertificate.issuerCertificate &&
+    peerCertificate.fingerprint256 !== peerCertificate.issuerCertificate.fingerprint256
+  ) {
+    peerCertificate = peerCertificate.issuerCertificate;
+  }
+
+  return peerCertificate;
+}
diff --git a/test/interactive_setup_api_integration/ftr_provider_context.d.ts b/test/interactive_setup_api_integration/ftr_provider_context.d.ts
new file mode 100644
index 0000000000000..96f5dde2df0a6
--- /dev/null
+++ b/test/interactive_setup_api_integration/ftr_provider_context.d.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { GenericFtrProviderContext } from '@kbn/test';
+
+import type { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, {}>;
diff --git a/test/interactive_setup_api_integration/manual_configuration_flow.config.ts b/test/interactive_setup_api_integration/manual_configuration_flow.config.ts
new file mode 100644
index 0000000000000..9bb89a802975b
--- /dev/null
+++ b/test/interactive_setup_api_integration/manual_configuration_flow.config.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 fs from 'fs/promises';
+import { join } from 'path';
+
+import type { FtrConfigProviderContext } from '@kbn/test';
+import { getDataPath } from '@kbn/utils';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const manualConfigurationFlowWithoutTlsTestsConfig = await readConfigFile(
+    require.resolve('./manual_configuration_flow_without_tls.config.ts')
+  );
+
+  const tempKibanaYamlFile = join(getDataPath(), `interactive_setup_kibana_${Date.now()}.yml`);
+  await fs.writeFile(tempKibanaYamlFile, '');
+
+  return {
+    ...manualConfigurationFlowWithoutTlsTestsConfig.getAll(),
+
+    testFiles: [require.resolve('./tests/manual_configuration_flow')],
+
+    servers: {
+      ...manualConfigurationFlowWithoutTlsTestsConfig.get('servers'),
+      elasticsearch: {
+        ...manualConfigurationFlowWithoutTlsTestsConfig.get('servers.elasticsearch'),
+        protocol: 'https',
+      },
+    },
+
+    junit: {
+      reportName: 'Interactive Setup API Integration Tests (Manual configuration flow)',
+    },
+
+    esTestCluster: {
+      ...manualConfigurationFlowWithoutTlsTestsConfig.get('esTestCluster'),
+      ssl: true,
+    },
+
+    kbnTestServer: {
+      ...manualConfigurationFlowWithoutTlsTestsConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...manualConfigurationFlowWithoutTlsTestsConfig
+          .get('kbnTestServer.serverArgs')
+          .filter((arg: string) => !arg.startsWith('--config')),
+        `--config=${tempKibanaYamlFile}`,
+      ],
+    },
+  };
+}
diff --git a/test/interactive_setup_api_integration/manual_configuration_flow_without_tls.config.ts b/test/interactive_setup_api_integration/manual_configuration_flow_without_tls.config.ts
new file mode 100644
index 0000000000000..5317026a1d8dc
--- /dev/null
+++ b/test/interactive_setup_api_integration/manual_configuration_flow_without_tls.config.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 fs from 'fs/promises';
+import { join, resolve } from 'path';
+
+import type { FtrConfigProviderContext } from '@kbn/test';
+import { getDataPath } from '@kbn/utils';
+
+import { services } from './services';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config'));
+
+  const testEndpointsPlugin = resolve(__dirname, './fixtures/test_endpoints');
+
+  const tempKibanaYamlFile = join(getDataPath(), `interactive_setup_kibana_${Date.now()}.yml`);
+  await fs.writeFile(tempKibanaYamlFile, '');
+
+  return {
+    testFiles: [require.resolve('./tests/manual_configuration_flow_without_tls')],
+    servers: xPackAPITestsConfig.get('servers'),
+    services,
+    junit: {
+      reportName: 'Interactive Setup API Integration Tests (Manual configuration flow without TLS)',
+    },
+
+    esTestCluster: {
+      ...xPackAPITestsConfig.get('esTestCluster'),
+      serverArgs: [
+        ...xPackAPITestsConfig.get('esTestCluster.serverArgs'),
+        'xpack.security.enabled=true',
+      ],
+    },
+
+    kbnTestServer: {
+      ...xPackAPITestsConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...xPackAPITestsConfig
+          .get('kbnTestServer.serverArgs')
+          .filter((arg: string) => !arg.startsWith('--elasticsearch.')),
+        `--plugin-path=${testEndpointsPlugin}`,
+        `--config=${tempKibanaYamlFile}`,
+        '--interactiveSetup.enabled=true',
+      ],
+      runOptions: {
+        ...xPackAPITestsConfig.get('kbnTestServer.runOptions'),
+        wait: /Kibana has not been configured/,
+      },
+    },
+  };
+}
diff --git a/test/interactive_setup_api_integration/services.ts b/test/interactive_setup_api_integration/services.ts
new file mode 100644
index 0000000000000..b0385a7a0b9c3
--- /dev/null
+++ b/test/interactive_setup_api_integration/services.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { services as apiIntegrationServices } from '../api_integration/services';
+
+export const services = {
+  ...apiIntegrationServices,
+};
diff --git a/test/interactive_setup_api_integration/tests/enrollment_flow.ts b/test/interactive_setup_api_integration/tests/enrollment_flow.ts
new file mode 100644
index 0000000000000..9f61529cc3439
--- /dev/null
+++ b/test/interactive_setup_api_integration/tests/enrollment_flow.ts
@@ -0,0 +1,151 @@
+/*
+ * Copyright 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 { getUrl } from '@kbn/test';
+
+import { hasKibanaBooted } from '../fixtures/test_helpers';
+import { getElasticsearchCaCertificate } from '../fixtures/tls_tools';
+import type { FtrProviderContext } from '../ftr_provider_context';
+
+export default function (context: FtrProviderContext) {
+  const supertest = context.getService('supertest');
+  const es = context.getService('es');
+  const log = context.getService('log');
+  const config = context.getService('config');
+
+  describe('Interactive setup APIs - Enrollment flow', function () {
+    this.tags(['skipCloud', 'ciGroup2']);
+
+    let kibanaVerificationCode: string;
+    let elasticsearchCaFingerprint: string;
+    before(async () => {
+      const esServerConfig = config.get('servers.elasticsearch');
+      elasticsearchCaFingerprint = (
+        await getElasticsearchCaCertificate(esServerConfig.host, esServerConfig.port)
+      ).fingerprint256.replace(/:/g, '');
+
+      kibanaVerificationCode = (
+        await supertest.get('/test_endpoints/verification_code').expect(200)
+      ).body.verificationCode;
+    });
+
+    let enrollmentAPIKey: string;
+    beforeEach(async () => {
+      const apiResponse = await es.security.createApiKey({ body: { name: 'enrollment_api_key' } });
+      enrollmentAPIKey = Buffer.from(`${apiResponse.body.id}:${apiResponse.body.api_key}`).toString(
+        'base64'
+      );
+    });
+
+    afterEach(async () => {
+      await es.security.invalidateApiKey({ body: { name: 'enrollment_api_key' } });
+    });
+
+    it('fails to enroll with invalid authentication code', async () => {
+      const esHost = getUrl.baseUrl(config.get('servers.elasticsearch'));
+      const enrollPayload = {
+        apiKey: enrollmentAPIKey,
+        code: '000000',
+        caFingerprint: elasticsearchCaFingerprint,
+        hosts: [esHost],
+      };
+
+      log.debug(`Enroll payload ${JSON.stringify(enrollPayload)}`);
+
+      await supertest
+        .post('/internal/interactive_setup/enroll')
+        .set('kbn-xsrf', 'xxx')
+        .send(enrollPayload)
+        .expect(403, { statusCode: 403, error: 'Forbidden', message: 'Forbidden' });
+    });
+
+    it('fails to enroll with invalid CA fingerprint', async () => {
+      const esHost = getUrl.baseUrl(config.get('servers.elasticsearch'));
+      const enrollPayload = {
+        apiKey: enrollmentAPIKey,
+        code: kibanaVerificationCode,
+        caFingerprint: '3FDAEE71A3604070E6AE6B01412D19772DE5AE129F69C413F0453B293D9BE65D',
+        hosts: [esHost],
+      };
+
+      log.debug(`Enroll payload ${JSON.stringify(enrollPayload)}`);
+
+      await supertest
+        .post('/internal/interactive_setup/enroll')
+        .set('kbn-xsrf', 'xxx')
+        .send(enrollPayload)
+        .expect(500, {
+          statusCode: 500,
+          error: 'Internal Server Error',
+          message: 'Failed to enroll.',
+          attributes: { type: 'enroll_failure' },
+        });
+    });
+
+    it('fails to enroll with invalid api key', async function () {
+      const esServerConfig = config.get('servers.elasticsearch');
+      const enrollPayload = {
+        apiKey: enrollmentAPIKey,
+        code: kibanaVerificationCode,
+        caFingerprint: elasticsearchCaFingerprint,
+        hosts: [getUrl.baseUrl(esServerConfig)],
+      };
+
+      log.debug(`Enroll payload ${JSON.stringify(enrollPayload)}`);
+
+      // Invalidate API key.
+      await es.security.invalidateApiKey({ body: { name: 'enrollment_api_key' } });
+
+      await supertest
+        .post('/internal/interactive_setup/enroll')
+        .set('kbn-xsrf', 'xxx')
+        .send(enrollPayload)
+        .expect(500, {
+          statusCode: 500,
+          error: 'Internal Server Error',
+          message: 'Failed to enroll.',
+          attributes: { type: 'enroll_failure' },
+        });
+    });
+
+    it('should be able to enroll with valid authentication code', async function () {
+      this.timeout(60000);
+
+      const esServerConfig = config.get('servers.elasticsearch');
+      const enrollPayload = {
+        apiKey: enrollmentAPIKey,
+        code: kibanaVerificationCode,
+        caFingerprint: elasticsearchCaFingerprint,
+        hosts: [getUrl.baseUrl(esServerConfig)],
+      };
+
+      log.debug(`Enroll payload ${JSON.stringify(enrollPayload)}`);
+
+      await supertest
+        .post('/internal/interactive_setup/enroll')
+        .set('kbn-xsrf', 'xxx')
+        .send(enrollPayload)
+        .expect(204, {});
+
+      // Enroll should no longer accept requests.
+      await supertest
+        .post('/internal/interactive_setup/enroll')
+        .set('kbn-xsrf', 'xxx')
+        .send(enrollPayload)
+        .expect(400, {
+          error: 'Bad Request',
+          message: 'Cannot process request outside of preboot stage.',
+          statusCode: 400,
+          attributes: { type: 'outside_preboot_stage' },
+        });
+
+      expect(await hasKibanaBooted(context)).to.be(true);
+    });
+  });
+}
diff --git a/test/interactive_setup_api_integration/tests/manual_configuration_flow.ts b/test/interactive_setup_api_integration/tests/manual_configuration_flow.ts
new file mode 100644
index 0000000000000..2db59dd446fc4
--- /dev/null
+++ b/test/interactive_setup_api_integration/tests/manual_configuration_flow.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 expect from '@kbn/expect';
+import { getUrl, kibanaServerTestUser } from '@kbn/test';
+
+import { hasKibanaBooted } from '../fixtures/test_helpers';
+import { getElasticsearchCaCertificate } from '../fixtures/tls_tools';
+import type { FtrProviderContext } from '../ftr_provider_context';
+
+export default function (context: FtrProviderContext) {
+  const supertest = context.getService('supertest');
+  const log = context.getService('log');
+  const config = context.getService('config');
+
+  describe('Interactive setup APIs - Manual configuration flow', function () {
+    this.tags(['skipCloud', 'ciGroup2']);
+
+    let kibanaVerificationCode: string;
+    let elasticsearchCaCertificate: string;
+    before(async () => {
+      const esServerConfig = config.get('servers.elasticsearch');
+      elasticsearchCaCertificate = (
+        await getElasticsearchCaCertificate(esServerConfig.host, esServerConfig.port)
+      ).raw.toString('base64');
+
+      kibanaVerificationCode = (
+        await supertest.get('/test_endpoints/verification_code').expect(200)
+      ).body.verificationCode;
+    });
+
+    it('fails to configure with invalid authentication code', async () => {
+      const esServerConfig = config.get('servers.elasticsearch');
+      const configurePayload = {
+        host: getUrl.baseUrl(esServerConfig),
+        code: '000000',
+        caCert: elasticsearchCaCertificate,
+        ...kibanaServerTestUser,
+      };
+
+      log.debug(`Configure payload ${JSON.stringify(configurePayload)}`);
+
+      await supertest
+        .post('/internal/interactive_setup/configure')
+        .set('kbn-xsrf', 'xxx')
+        .send(configurePayload)
+        .expect(403, { statusCode: 403, error: 'Forbidden', message: 'Forbidden' });
+    });
+
+    it('fails to configure with invalid CA certificate', async () => {
+      const esServerConfig = config.get('servers.elasticsearch');
+      const configurePayload = {
+        host: getUrl.baseUrl(esServerConfig),
+        code: kibanaVerificationCode,
+        caCert: elasticsearchCaCertificate.split('').reverse().join(''),
+        ...kibanaServerTestUser,
+      };
+
+      log.debug(`Configure payload ${JSON.stringify(configurePayload)}`);
+
+      await supertest
+        .post('/internal/interactive_setup/configure')
+        .set('kbn-xsrf', 'xxx')
+        .send(configurePayload)
+        .expect(500, {
+          statusCode: 500,
+          error: 'Internal Server Error',
+          message: 'Failed to configure.',
+          attributes: { type: 'configure_failure' },
+        });
+    });
+
+    it('fails to configure with invalid credentials', async function () {
+      const esServerConfig = config.get('servers.elasticsearch');
+      const configurePayload = {
+        host: getUrl.baseUrl(esServerConfig),
+        code: kibanaVerificationCode,
+        caCert: elasticsearchCaCertificate,
+        ...kibanaServerTestUser,
+        password: 'no-way',
+      };
+
+      log.debug(`Configure payload ${JSON.stringify(configurePayload)}`);
+
+      await supertest
+        .post('/internal/interactive_setup/configure')
+        .set('kbn-xsrf', 'xxx')
+        .send(configurePayload)
+        .expect(500, {
+          statusCode: 500,
+          error: 'Internal Server Error',
+          message: 'Failed to configure.',
+          attributes: { type: 'configure_failure' },
+        });
+    });
+
+    it('should be able to configure with valid authentication code', async function () {
+      this.timeout(60000);
+
+      const esServerConfig = config.get('servers.elasticsearch');
+      const configurePayload = {
+        host: getUrl.baseUrl(esServerConfig),
+        code: kibanaVerificationCode,
+        caCert: elasticsearchCaCertificate,
+        ...kibanaServerTestUser,
+      };
+
+      log.debug(`Configure payload ${JSON.stringify(configurePayload)}`);
+
+      await supertest
+        .post('/internal/interactive_setup/configure')
+        .set('kbn-xsrf', 'xxx')
+        .send(configurePayload)
+        .expect(204, {});
+
+      // Configure should no longer accept requests.
+      await supertest
+        .post('/internal/interactive_setup/configure')
+        .set('kbn-xsrf', 'xxx')
+        .send(configurePayload)
+        .expect(400, {
+          error: 'Bad Request',
+          message: 'Cannot process request outside of preboot stage.',
+          statusCode: 400,
+          attributes: { type: 'outside_preboot_stage' },
+        });
+
+      expect(await hasKibanaBooted(context)).to.be(true);
+    });
+  });
+}
diff --git a/test/interactive_setup_api_integration/tests/manual_configuration_flow_without_tls.ts b/test/interactive_setup_api_integration/tests/manual_configuration_flow_without_tls.ts
new file mode 100644
index 0000000000000..97a3e490e9650
--- /dev/null
+++ b/test/interactive_setup_api_integration/tests/manual_configuration_flow_without_tls.ts
@@ -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 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 { getUrl, kibanaServerTestUser } from '@kbn/test';
+
+import { hasKibanaBooted } from '../fixtures/test_helpers';
+import type { FtrProviderContext } from '../ftr_provider_context';
+
+export default function (context: FtrProviderContext) {
+  const supertest = context.getService('supertest');
+  const log = context.getService('log');
+  const config = context.getService('config');
+
+  describe('Interactive setup APIs - Manual configuration flow without TLS', function () {
+    this.tags(['skipCloud', 'ciGroup2']);
+
+    let kibanaVerificationCode: string;
+    before(async () => {
+      kibanaVerificationCode = (
+        await supertest.get('/test_endpoints/verification_code').expect(200)
+      ).body.verificationCode;
+    });
+
+    it('fails to configure with invalid authentication code', async () => {
+      const esServerConfig = config.get('servers.elasticsearch');
+      const configurePayload = {
+        host: getUrl.baseUrl(esServerConfig),
+        code: '000000',
+        ...kibanaServerTestUser,
+      };
+
+      log.debug(`Configure payload ${JSON.stringify(configurePayload)}`);
+
+      await supertest
+        .post('/internal/interactive_setup/configure')
+        .set('kbn-xsrf', 'xxx')
+        .send(configurePayload)
+        .expect(403, { statusCode: 403, error: 'Forbidden', message: 'Forbidden' });
+    });
+
+    it('fails to configure with invalid credentials', async function () {
+      const esServerConfig = config.get('servers.elasticsearch');
+      const configurePayload = {
+        host: getUrl.baseUrl(esServerConfig),
+        code: kibanaVerificationCode,
+        ...kibanaServerTestUser,
+        password: 'no-way',
+      };
+
+      log.debug(`Configure payload ${JSON.stringify(configurePayload)}`);
+
+      await supertest
+        .post('/internal/interactive_setup/configure')
+        .set('kbn-xsrf', 'xxx')
+        .send(configurePayload)
+        .expect(500, {
+          statusCode: 500,
+          error: 'Internal Server Error',
+          message: 'Failed to configure.',
+          attributes: { type: 'configure_failure' },
+        });
+    });
+
+    it('should be able to configure with valid authentication code', async function () {
+      this.timeout(60000);
+
+      const esServerConfig = config.get('servers.elasticsearch');
+      const configurePayload = {
+        host: getUrl.baseUrl(esServerConfig),
+        code: kibanaVerificationCode,
+        ...kibanaServerTestUser,
+      };
+
+      log.debug(`Configure payload ${JSON.stringify(configurePayload)}`);
+
+      await supertest
+        .post('/internal/interactive_setup/configure')
+        .set('kbn-xsrf', 'xxx')
+        .send(configurePayload)
+        .expect(204, {});
+
+      // Configure should no longer accept requests.
+      await supertest
+        .post('/internal/interactive_setup/configure')
+        .set('kbn-xsrf', 'xxx')
+        .send(configurePayload)
+        .expect(400, {
+          error: 'Bad Request',
+          message: 'Cannot process request outside of preboot stage.',
+          statusCode: 400,
+          attributes: { type: 'outside_preboot_stage' },
+        });
+
+      expect(await hasKibanaBooted(context)).to.be(true);
+    });
+  });
+}
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 660850ffeb6ca..288d152bf4bc0 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -53,6 +53,7 @@
     { "path": "../src/plugins/usage_collection/tsconfig.json" },
     { "path": "../src/plugins/index_pattern_management/tsconfig.json" },
     { "path": "../src/plugins/visualize/tsconfig.json" },
+    { "path": "interactive_setup_api_integration/fixtures/test_endpoints/tsconfig.json" },
     { "path": "plugin_functional/plugins/core_app_status/tsconfig.json" },
     { "path": "plugin_functional/plugins/core_provider_plugin/tsconfig.json" },
     { "path": "server_integration/__fixtures__/plugins/status_plugin_a/tsconfig.json" },
diff --git a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/metadata.xml b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/metadata.xml
index 19a6c13264144..8cb33193f56c9 100644
--- a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/metadata.xml
+++ b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/metadata.xml
@@ -7,25 +7,24 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <!-- This certificate is extracted from KBN_CERT_PATH in @kbn/dev-utils and should always be in sync with it -->
-          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVANNWkg9lzNiLqNkMFhFKHcXyaZmqMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVAN0GVNLw3IaUBuG7t6CeW8w2wyymMA0GCSqGSIb3DQEB
 CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
-ZXJhdGVkIENBMCAXDTE5MTIyNzE3MDM0MloYDzIwNjkxMjE0MTcwMzQyWjARMQ8w
-DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ
-wYYbQtbRBKJ4uNZc2+IgRU+7NNL21ZebQlEIMgK7jAqOMrsW2b5DATz41Fd+GQFU
-FUYYjwo+PQj6sJHshOJo/gNb32HrydvMI7YPvevkszkuEGCfXxQ3Dw2RTACLgD0Q
-OCkwHvn3TMf0loloV/ePGWaZDYZaXi3a5DdWi/HFFoJysgF0JV2f6XyKhJkGaEfJ
-s9pWX269zH/XQvGNx4BEimJpYB8h4JnDYPFIiQdqj+sl2b+kS1hH9kL5gBAMXjFU
-vcNnX+PmyTjyJrGo75k0ku+spBf1bMwuQt3uSmM+TQIXkvFDmS0DOVESrpA5EC1T
-BUGRz6o/I88Xx4Mud771AgMBAAGjYzBhMB0GA1UdDgQWBBQLB1Eo23M3Ss8MsFaz
-V+Twcb3PmDAfBgNVHSMEGDAWgBQa7SYOe8NGcF00EbwPHA91YCsHSTAUBgNVHREE
-DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAnEl/
-z5IElIjvkK4AgMPrNcRlvIGDt2orEik7b6Jsq6/RiJQ7cSsYTZf7xbqyxNsUOTxv
-+frj47MEN448H2nRvUxH29YR3XygV5aEwADSAhwaQWn0QfWTCZbJTmSoNEDtDOzX
-TGDlAoCD9s9Xz9S1JpxY4H+WWRZrBSDM6SC1c6CzuEeZRuScNAjYD5mh2v6fOlSy
-b8xJWSg0AFlJPCa3ZsA2SKbNqI0uNfJTnkXRm88Z2NHcgtlADbOLKauWfCrpgsCk
-cZgo6yAYkOM148h/8wGla1eX+iE1R72NUABGydu8MSQKvc0emWJkGsC1/KqPlf/O
-eOUsdwn1yDKHRxDHyA==
-          </ds:X509Certificate>
+ZXJhdGVkIENBMCAXDTIxMTAxMzEwMTU1OFoYDzIwNzExMDAxMTAxNTU4WjARMQ8w
+DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3
+nvfL3/26D8EkLso+t9S0m+tSJipLsBWs0dCpc8KRJ/+ijDRnAQ5lOmOAcxt43SNY
+KFr0EntQEZyYaRwMIM8aPR0WYW/VV5o4fq2o/JnmHqzZJRJCwZq+5WiCiDPt012N
+mRGYCMUxjlEwejue6diLAeQhZ/sfN4jUp217bMEHrhHrNBWTwwJ+Uk5TBQMhviCW
+LKbsKrfluA6DGHWrXN4pH7Xmaf/Zyc9AYL/nxwv3VQHZzIAK/U/WNCgFJJ3qoFYY
+6TUwDDNa30mSj165OOds9N+VmUlDC3IFiHV3osBWscSU4HJd6QJ8huHrFLLV4y4i
+u62el47Qr+/8Ut3SzeIXAgMBAAGjYzBhMB0GA1UdDgQWBBQli5f2bYL9jKUA5Uxp
+yRRHeCoPJzAfBgNVHSMEGDAWgBQwTCrAjlvQxik3HBocn1PDUunenjAUBgNVHREE
+DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEATFNj
+WkTBPfgflGYZD4OsYvfT/rVjFKbJP/u1a0rkzNamA2QKNzI9JTOzONPTyRhe9yVS
+zeO8X2rtN63l38dtgMjFQ15Xxnp7GFT7GkXfa1JR+tGSGTgVld8nLUzig+mNmBoR
+nE4cNc0JJ1PsXPzfPgJ6WMp2WOoNUrQf2cm42i36Jk+7KGcosfyFMPQILZE34Geo
+DAgCVpNWPgST4HYBUCHMC7S14LHLVdUXPsfGZPEqU5Zf9Hvy61rQC/RdNjnMI6JD
+s57l9oHASNeEg55NQm01aOmwq/z1DXs3UP2nRmp6XCCfE61ghofO5dtV1j3cZ3f5
+dzkzSBV7H6+/MD3Y8Q==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/x-pack/test/security_api_integration/fixtures/pki/README.md b/x-pack/test/security_api_integration/fixtures/pki/README.md
index ac2be482c6e33..ae8623ab6411d 100644
--- a/x-pack/test/security_api_integration/fixtures/pki/README.md
+++ b/x-pack/test/security_api_integration/fixtures/pki/README.md
@@ -9,8 +9,8 @@ The `first_client.p12` and `second_client.p12` files were generated the same tim
 following commands:
 
 ```
-bin/elasticsearch-certutil cert -days 18250 --ca elastic-stack-ca.p12 --ca-pass castorepass --name first_client --pass ""
-bin/elasticsearch-certutil cert -days 18250 --ca elastic-stack-ca.p12 --ca-pass castorepass --name second_client --pass ""
+bin/elasticsearch-certutil cert -days 18250 --ca $KIBANA_HOME/packages/kbn-dev-utils/certs/ca.p12 --ca-pass castorepass --name first_client --pass ""
+bin/elasticsearch-certutil cert -days 18250 --ca $KIBANA_HOME/packages/kbn-dev-utils/certs/ca.p12 --ca-pass castorepass --name second_client --pass ""
 ```
 
 If that CA is ever changed, these two files must be regenerated.
diff --git a/x-pack/test/security_api_integration/fixtures/pki/first_client.p12 b/x-pack/test/security_api_integration/fixtures/pki/first_client.p12
index 9d838199e8392672bfff64155616ac536acb4621..9c2aa4401d1c7d1da273d11f97c83409c1decf67 100644
GIT binary patch
literal 3620
zcma)9byO3Mx8KI-j*(J=qj7|EjgBd(C?z#uba%smAvoz2M=B$R2#V4v(jusYv@`<J
z9Y5cB?|i@K{q^1-_uO+oasT|>b75#29uSZShNkW(As5EzVvebSq`*QnbrTp({qZmS
z4u&Rf{9hDtB^XVN{|lG=tpXCt|8Y@K06~RlVzs}Z5)Ac^gP0m-29x`Dq=Jcnnc^Zj
zFm;t?5LbF;Jwc6dvhX_%+#rwu9SFz+qaq>u?~NdGVgQVjgxm(B3v?g?1BJnKRjxbI
zA&0@<W;tBD+7TA_z-aK-#)+$}3dt`O?iD!<Woc5^DJ0rB2*;V{y)SBpP=?hGJvm~#
zPxFuK@$WRyT)Z-c7lq&HTouOi{WLU+hZQTh2?s<1_8+%%Q8QlW#dOf$2_a*#qfr->
zNKI5kc`(xi?Wv;JLUec+&A4u_=0b=rpIKzOtM~L%KskJe@k38)o)Y<;0({i|>a(}M
zlFQi7%SX^C6_&cQR#GcYSsT%}s%7Ypqawl=Y<d##V|E)#wjEc#i@rSXmb$Zam0I+Q
zV-gM+c&k+BbR@OqwJme&9US{nsV_jTda~*W%rbraDA|Tyq+#e4e*heFk`ks=hPe?m
zS^1Gz(P}TCqK`=Vn#;I=mtSGoL$H+pdu*t#fVXN+5pbFqdqdl|9s0ZlFFZNm8jw2<
zf5i#I)qc?H!qa6fdbhQ&CWx_RF(jEk<K*J&txVeK{Ih~(;7l!{u(_>{)m>BUDG~Ad
z%2LD9=y!XwJ!??zlWhIxNM!8V7T{UH_opYQ<kEzgY_RA4cat`h^zflxc3c11BZdm)
zYd2V3SR$vE>Uw{jBfKrfJ59-*&on?*k~(p(lfenw9N_2B=6QP6xr@xYXn}}H+w-KG
zCdIvqoC!bVFJo<}?p)8r!6x!<H){>rnz*q;4o)vq%yIYZ7p?OV#2NiJ&8wuo)>Pw{
zh)`FQbc{krBDd^s)YX(Q&<A_y@(=7V_?^rg$0Xr)u3fzf7gYrgIKe+1v=PUlhzW}!
zim^hI=WJ=>wwGMhzR7SgmLJ)b@C`_E22$y;*p&i0&hyg;Bgf)xR%|F}KV|N6zDu8y
zDI>R=jjD8FjV*#(vv6jK$<zL5w?Tvm>lsWLl8cMS>_mmAESv``qs<k=zTY47%*MPB
zJ<0|{&Gql(F82uDYKxxuJREJ@Q}~f`!1Z&U<-+H|I;P!jsnxBo;t}*Zs0ogM=ExUZ
z@q?oZ8o9c2E{(bP_6Nt)(yIyFD@Gd>Go~3UIHR$FED@PzPPXMoY31d%H$Vfk&xITe
zVRvJYvVjtU&cO#zix`O^Rn0FWdPlg7JpGo(m_CiEoMfd^$IZ%!L&DseRzI`RdD(I8
zzSwT<_z8NUT+;u-;O(C{qN(x6wK*55DTXt*gKX}@q7?^?Gs`C#5HGY41AOHVr>-{!
z8{zu3g2qi1N75rSFTEn<5^<OSjgtuAxHa{ltnbiruadIX($wBdUM?Gc5ywf&B2_`G
z8<;LTyrQO@c2M#nt4Ne<t=xZ0IX|dw`DirDsw$)i*$$O;Ow!gVa^E2qKDoZAU-bMW
zzZNh}Gs>8$-nlf|prRBG2~NO8EJ}`5MkE*fI$(Hq89&<KjBs=4|BVlSVvrB$07PP!
z*;n&*9$<OS-9^9X3+so@-BuG}x0soKvDn4I<;&%Np(%7At7mraXIh`0d`Yf~6_#iM
zPF>ykO^L6uPso1xo_$KS^nHkmluUsDeTYsxP3mYLD+G?PQlznO5#{Oe3^a{$dpzDv
zT{+E;999Ug(7$CTL;$K5_qL^a8IV8}UtI6dh&O`nsnd3Sxc&N6&diV4+gng?J!4aB
z=7W4(kT{$A?`^nF_^MJ&AX7N(9@zQ$o$i=LR$h@4j;f!q>%<oZq;G5ECz-*EbEfnX
z2$;Y>aY@c3!Oq1BKmnWqJ^){UAHW)52XOm4IRHEWelXsDg%AlQFoUtPy91AejFhy5
zq$EsAUQSL1h9=$pM?^|eh$j8@7n%hD0e{>0zYOsIifl*}RjZ!B-cXSs!y0mKj?QFq
z<IVpkvL6t?gXXb<Y_-%nCQU6xIHJ&`HtJ={8aG%8bA{C`oo>FPznqtKG-4EnWunI$
zyM>1>D>*sjD3`R9)D%vgt+y?PCrkRE533+8{^o4l^;I$in#^*sirR3nVe9(5oS2rr
zGg*LwjtQj2*L2L8phM2IhjlS&k*=)CctQ3V3)qeev!lB;i466>sYw%Qoq-<;jg&VQ
zUD~AT?RZ*E5omCvj4^3AqnqNbSQ}AU=hi(RYFQkzk=PW!@PJ-L{+wN#bj!UdyU<Rc
zL*IMn0+mOl+@J~w!VJX|C?A+WYR6oXMqC!hI7qFj%wU}4;ASdl<?M?JdZYD7VW)|)
zPR+mwCB+j-?H?%-N{k6vIvdSC^`Hx5;WOG|_P!?bw5?jBfi~iqW>Gf6N5vkecQp0x
z_-|At;|aB`djaWT?<2K{zam*f`Bjr~-{WpNo^rQqvv*h?0`<zJ1U8;8Qd&8XG4W6L
z6wWd*{oyWfba8eO&a{$bJBMq!yK1^}a``-T8Hg~@!!>WEsdPF-knV)v?d0EL_j&K(
z*|UP3jGP$n(BO98k<EtF6q~4<s(thAG{N3vX2eIoEltd>lw`M~@qYT6Ty{G0qHz@!
zdGVY3u9c{f!ERLS1AtnSl)mIz^2NX`j80?uz}oLu=+>YWZ~;X?LPPJwsC_tw8C`uW
zbwBY*Z0Zb>sIX$>Gb{*KR_!C|WR8RmclA|S(A0!!ZkVo{^)RGN8H*iaX&u<XRF8n}
z<rDHN-Q6oV=Xi$ovlbFT5`?lNXtiwb6MW~B?a$bpJ!jqJY8ePd&O-h9VU3PMyFblo
zH@A@{)g$ul_3M=cm%VK<%wEw=t{N8z9K@3+z{PVSy%{~p@Rbnwq^K0Gt?HNmU{9Wt
zwQpW7`m@X<gqj>EXNQ^bhq6Gk=6gYR9{utg`X@)>X6!cifo#6iiCX$N$wV>QlKzCN
zX>B6K+f-+WOWRutg^!<&*|xmKYf>%*;vCj^nAPZl%HJcUcLUdqr@8lI<1#WY!Ahdf
z5KdAkT707(M&#r<*5eiPleEIb2%;tFQ~?!q!X}VXdVS(%$Jv>2z}0#lnP~FnOCix>
ziDSE6f^=bae@lHhIn!YT2|<i!zge`-)vh=0$5m6cCuc8SeqT}5aYv_RZtgA!#FUbM
z?6lqyByAWhvAdH`4`Dk7{9$jpXWeQ|*Bu&5v1RH-sFuBgXu7n5iY63P5#1p@FK2rk
zgVQ;7`$jaQ4|=|9D_!tvD>tY85Rv0qqDoi81=XB38D&nWQQptD3bHfYAk1%AWSB%W
zJRPoB*p1UAziK~GZ9qs3I@g_4Ao)B$BO_azgZvpq*2$B~!ifI3_)VdLDI_&JPi&Rs
z<{RTBE$uKlGYhxIhvWOSi2N3Ee46-8X04{2mjd}N$1H70-t#7yhtQWS!hSZtEd@5|
zIms|RTxsEc!!FEcbPKf?;<${G*+qneRwRd6I+A&sonCA`H08I_fJrYoO-T^e6x3rG
zGlBOFd*{gbK&_+9Gb(`+XW#nGnVz*~@!qsiYnYO$#wV{=KJ|(<DSefzbsxtEw3J*e
z(Trc)5YS)0-n2S-%wI3H4<72W!|@X(o-)O8dHpEOd>v0j@kScTcqQ8P(TaMN{G0zW
z$M=_;ojUcqpK1dyaq<CKP7SX9O`F47@|CTw$$==(+GFH-Q~H~1!mdF9!tk;~H`^f$
zpI>jNR>>8--1RABMW_=iX&;}gJ5^tQ*2yy~&rctnGne8l$J?e(JsSD)v88T$PPh@X
zq3W4<{RfF}J{ojRntodFubkWC4JUML7F-#~*e!q6BZq?b+axR4mB4MjCwU>mUaTCs
z)#BZP9qIkBKl?JLc%O)wg>=RPXJB2gvbnb#vJyn=qk*LlAmCrO3tBq9c}>g6+$SJG
z6?1T#3`;~K!DrlWvZikOWFGiMZ;yueA)%Pn5e0dG<z*5=KDLH_E#v8EaRNk5VH`wd
zp=k|zCo#i|d#5x{tpYlFj$cCe*&L0_rUSmG6vU^8&nMH5AlD;?DeCC#Fc(ENPMGSb
z1!#eZmirYh|Hpn)LvD0?9vU2PDKK@o@$M~h3Frj#3tg@fqJqx;X6agv<2;+%Twtbi
z*Df&+R4;6mYPYX>O_|Cv7bYH;9plAfig3j{-<%zj!LHFTO;uiD$sD&BIFm93L?}Y0
z^tcq#3JT3NANtP=#Ws07k*9UH<GZ{8pC)N*8t77MM~UuR)SFVO1&)zNOPXv9_%FT}
zAS?T}aM{Tqh%cNri}V>9m915S8k;&is(sB!jrbI0qkLnKOyRbW`J-J+rZ>?`&1<xL
zitpw%vKQ1^C97pt#om%78ZTCdANh*md^Hpvq>TyZ&bJE*q<-VM-z9gKrvtcS-(2fq
z|C0_>^7zBMc``|Sk=@Kl8jXy3G1W-n$GuTsmK+U&n|zeL1duD0{weF2&L{Jb3ezVW
z4{T=dTa1@t3XhxAm_AGw7M~sTo@NQm6|V#tSk<-J8XvA`Ya65(!S2E&VATJ7P9PvL
z0L*hMXZn|issrNM%!k1)(5toT<!so<_PO^i@R^=Fgo+f*<OE)-vU2M>vY)rzGIM3S
MIJ+kI_^%WHA4&y_+5i9m

delta 3437
zcmV-z4U+Pt9E%%&FoF$-0s#Xsf(<|h2`Yw2hW8Bt2LYgh4KW0Q4J|N&4Jj~!1$71q
zDuzgg_YDCD0ic2fW(0x-VlaXQUNC|MS_TU$hDe6@4FL=a0Ro_c1p6?81otp01_~;M
zNQU<f0So~HFdGCEb5@MiU>Fz&GMzDlcr)l)M8=w@0s{bl!%zf*1jvX*y@`i#KTPk>
zd60aNZ+h-*_%XhiX?EpN4DISdu4)7lCJo|3IqF%PbF6)FuiS@R;yF(iC2UdEHg98c
zJD+vk9kZiVh1^1_23sCQar@oVsYzYf;M}C=zOv*9^0zsH*-lT1R6Pf7>+m&_P;>Jp
zn&@Pf;F~0W+Nl7PY@ZIYO2f&98_0v*MDp8?ASLG@Ox_EL{iTChl9ofVvYil9U))k^
zemVm&ZsNla7=9}rYSXxDTtfu@0zNIsBy$TE)g|7Fpvs@51nWE8@awje2?M>jf2BLS
zFc|J9fuS<Au`~DS3&CBf{pFN+q&PP_fy2}8PDw|9CR2oD9N_9JsINK=)WdArb8M2H
zCAv9>pp(vo9FjDhN5LsJfAsgJvXM}ib=xp2WrKZ-eZEI7^FcFMo<VTDd_6-H@&QI_
zR~>d{5HMPKt?`9ISVOJe+K*P_PN-}4!w3N@f07y{(q_WF-AmuBUVqi{I_)Zv+Ix#F
z!3~Ii=;mt4jYg|4uuw`Zq94HeE>?zWhu(i=+T1qW5dT_#XNRTp2uQVR>v=QaKp^>v
zVE9p^v|6=TW}?K#Y^RRYe=QA#{C+x_nEaO=QWrjP_K16Hq<n9qt2+dwHdURKO=wv+
zVeTPBqAXVgHGGBmJil2IyF!nz{;nMDrQ|PvY~u;rt|Bd%+tsA-wQkuB^sXKH;e&<B
zS$Vc;`0Z+E43IS}na%-AKW&q$zHMOyB;;3zqQMKCbTrAtD7Fhy=SuI3niv16=ZDp}
zmsf>^-KM0D@DML+4<$|i`&p1#BdI|0oH(Igm=qRtTK~}Sji@EiY!ELn`&4{|Vzq#O
zx2bUf3oVo)X`mzK|6O^al%~7dv%F588C+Q{lTO`VBr1nbWY|@<vevF{0<^aKka6M^
z@Qu79hq@@O>5W2&Co5;q)Me<1e?~;(^1Q2WmI8Y@F<uq_T`T%p;Rhx_=RhL*G%jTM
z)OtOJXGOpZk!x3}yBLexXf8u0Hd3*F=Kb`1B&iJwjUh9Ik!l@<;^)89atcZOhXnmI
zz1KMyN<0Xt=nky?$-H3Q1Dv6h&+Y9eBAHgajGWlEDIT5hD5YD$g#*TVc2Az7jJQ#&
zL}CxN3Q-%wgX%+Yhb-v?;TFbQR#fk;D?TMt_>!B3^lifyxf|5wi|W<bnD{Y&R0twg
zLy21dU3qev=1Ex6$7qQ{cH4HB7`@C28v-%PF&c5sO)TBI^NN@)u`&QjT}~`{BQz3+
zyzMOYY@3f7xc>MTf_T;*2)ehG|GpfW!2Fc9v_4qzqGP*GwJ|zTaqGyS_j(uH({gv3
z^%uTFG%P%^H0+4rF9ekN`mKO}#=@7TB&~J&$BEDuUHTchYqQ$YYJ(M!*waf7&h;js
z(kh$-w>fR*yOY}_NxSOsfx#jrB>ZK@wdIJ2ReR1NMY7b%tFSU*Rec6nEs2^oZdC5b
z7y@A*R6DwG%=v_8eA~9oq_J&L6wm_y*R{PnchqTK4jWB(xp7U}o;U$l=nHBsUnP~;
zk;2fGJ`{nha8HF?nbO0OrEA=n2s3Pdr=VJ!B<*pi+Cnm2BpZ|*GDF+8bkJ08^SU-Z
z*0#DY@#y~b3UO;ZYTCf-x*Oq<nQ9LqR)*b^k_AG4H8(djHa9snH!(0aFoFlH1_>&L
zNQU<f0S5-4f(M;2f(Mxb0RS+92a*N}Duzgg_YDCD0Wc{B3Mz(3hW8Bt3;_l(8w3<K
z!1-rNcOxGhh*9LM)*~70EiU^40|3KNfPx2DyT237#3f>Z-zTVJIF1ME5*U&T^*C(K
zInjcDEOJXr$n|o{HKPkOgm!<#9%A4^dgmeGN{09al{KrgAE-T9V=h~cb{<UaQ9Asq
z^^CV|^ooj|S`@=j2C<lv6tZyumJz(mJcf)@M|Ff)G~gd1X}e3=LJl`Y1*xZr*z2z1
zZ*=*fG@9`|XY}}7tqmAQ{FNGly(;l=Zl~yfNn4`g7J<cptk8;()cCtB(4zszA^<-M
z>|Zrh<97jfE?CWzI-cyXQq=c6<_|BElqMe{RDrXW--*`QnlrQENAH!Mh2+8A!~Z0a
zbg(2Tr109>Ss=t=_yzqPObQPKy!qbcvO{YaF|vG8@IHkC?fCXS1bj8fX0%wMAlZL^
z0W*_uax;LISoHW3<F}He1^Z?ZPSQm8APzWKO7CTu13Q2#7*o^^_<JTCo9ilky+Q2+
z2uP%slg6=j)2hM-OXi%Ucqt!6>~mh!Y@QC6<&cmq*4ZJ{8{I1mS`Kf6;c?MsH8VpQ
z;^QL`b;i6Jrrh`Azx~}IK{+4!<KB;dSnk)>kj{hI5r3ZL<=p2U*&HW13=7L8@ml0r
zy;PTCZh6knbJQwF`rY*Aeo8c(hNAo31nq6-ZbWWi+xU;i_#5b_?pjBo18wOOzaJnK
zp!26i7}3A35|ZfpYshU!(7siy81}o4Rr@k1ib1JRlV_$(Do~UlW5IH7zsu5p6???J
zP@(Mq!|mqS(>=ql2ef28uTd<e9qeL<XTVJdfM^>+V;oHXI5%U#u}ym4fKsH%=E_&N
z7*(d$ITdcaij`y+N)6~w{h7n6!M&vu)~}F2+5F`kpQ+;cBF(Tkl!k+iQ}09Z1`pb}
zo@JCBJ)>O7T7bdqZWuuVxzuZaw?bkIV6}u6i5kSN1EsaB?zWbq0Xi11vvta?d5g@a
zy>xEt%sm;93bJ*iE857yzR8NE5%GWr7_$1PEt7DjXe5_9;aG+N>~Cl$acYjSHX+qd
zlo&T4`NYby7@rk7Kit9q=`WnMVt(h{v3AfBO(m}|UItDrBt&fIH8}`>=VzE~8eZR=
zi01i111Q^R5Qz#2EmZT@0aUq43EurFVCnhK4~$GG$*z@rz#lM>ubJ#A=FR*UC&S7y
zML!emt2AZM>T_^zZ*!>ipr^SSVDvR_qq|0o2-^E@o4;GWowo}DpzVb;jt~h#g3Pi#
z%%5!@JQ&I!Q;WuHAPKI2uXxYu-8W_T?P4~37w`fh4D$XWnRocA;D?~1uk>g0mft(s
zoKty99c(4Vc>t9oTYFS2+;;c}BzoaMdA!<6(S`RHHJm4iX=jAy-R$2vRAyrP{y+-9
zLH;M7sLIsadul~x=p9C=|DG>tPVmT}!L(2<8vG$1RLw>$AB}&1|1p>{M#vG~nA}F7
z7I}WJ-Fi5WPRuKML>yJoChd{p&H1>-`10_Ih-!#3I&01irpi-e)FmR}2269wzeM1_
z%^+QYFDm;7l8=Po%QOsy^3qS00(#$pM0ld{<m&JiT9gTdAjv)J(ecpYI;5$4wRfH3
z4Oai3l#(DHERK4Av*rHrW3Sq;jmLgh#$;dVsz|Z-G>@uU8Rki(=7l}ZjfX`9t~L&8
z5p!%LlL^471ZGOcK!*B+c8;50g|_$NQPQdKtL6#;g{ogL$8{kt%B!QOA%uFWndQ6a
z2)3`WG$aBAyd^X?DuQnK$;82mY1O%UEWsH!^hB2P3Jmvu%{GdQv-IAQm%SE<{YQ@*
z<S_DH5b+0%pMNj!KX?Ys^C`|+pFCa&pcJ<}K)nhR#Gzj*bp|let=BBwOh8g47cTZp
z16lAUS5)Kj$)`R^t7u001jSV9BO?CI1;~<_5u`0U&M=3`^~qp#ubdHiOV@vJ{SET}
z_?xidgd}Kx9=tAyu|afUJE-<m{WJU(5I(LDP|1=1)SW;fb9}(%dv;aU=}k)1$#TdB
za9hBslq!4ge*q93B%ZywozIvWq9msFWe|fdP@KzKM5k^G?K1B*&juGNemV<mATWMF
z`cVkw(y1oF+U;m+U0yLJRF_42ZOkN8Hs1!L^9mJzC0HP;&G%ixZvej?0fFKVnS1uk
zo?`k?B3eN}npHSjscToOi8hV+EP`Un3pxZM_)3oWRQjp-)<O>EW#4WB!KeWlkO+Q=
zQ$Lj%adIdKpYmA>@Jrzp-pE@QbzL&dQ4QHGvFd!vM!VdZpAdh$b+|}7Ffl>0pSO5m
zT`D$zOBAX|hgmtJdL%s0Y?*RA$Y;fVJ`?yf=;7mO6;P1v;oN+)S^h3v<SB-!27C6f
zWKf!e@%VUcYV-gH_i-@pfHJ3={JM64cWkA)#Vm(<=qPd61kxlmJ0m7orr0BmzI!)V
zeO6&~$wXlUZYD+&ZMEr*5|Xkwf2kZ36xfu1XwL0JT^OH>pGZCVS(^m9L*W!@Fl`8H
z89f(~4aI`Y7ag_#RBL<jM1E(^PR`2Yeot(tIaX+oH+(L!#}$CJ4I>VJ#1GKd+HXZL
zJ}@CL2?hl#4g&%j1povTFiRDtEMj3|-!OS^@W?+D7WMOX1Qh*MGG-LE6;+WRrQ53v
PTqKYU$QS?u0|ADh?Fe;f

diff --git a/x-pack/test/security_api_integration/fixtures/pki/second_client.p12 b/x-pack/test/security_api_integration/fixtures/pki/second_client.p12
index f41c0e030ba793d8e4c4fa28738383797eaa54d6..a06e6947f75df7a4d7661d97fd350fa4ca54fd52 100644
GIT binary patch
literal 3622
zcma)<byyRO_Q$s|8l;A#guF<Iu)&03&|v^l(p?T1F^AGMk&;dU5pW<SCCvzt?v6=F
z$D~0Jka7Jzzx%xJbN{;ckMo>!J}3VCp65WZSFVGAWKb-9KLxdD=!4J`dLSh*8%y5=
z#?sgS!PQVKdE<YS$V<Rj^1?qj?~mnB(EfXhjs^(I#*!=if%l*ee@~FpLye(`e^NT=
zO)%t?GwGA3%LNiUF}sJY#toHcWjzFegcw0UJ}4ap)&Fk<QIi9p*C?p1LLUI_$-qES
zFyl#!#iAH$oCF++_3BP;)B<C{!>OjD_GY-Q!NR*4H5}o(Z{ueMuvk0EPT>q!(yA7I
zF(TLJnDp3L_8HBQ$pf+3EbeVYxm=ofUWXV2lEz>IGG`a}W$>{5%o|&^?7K7CyMIH8
zKeS--uih!23%$*$?(U>1HM%B^-7L@6xT8D2%%442kh6X=NdlwpqT`7RHz0PXI=bA>
zac12KuR@=U)>8TjOPrj#&Z_#3m9|70>8gs0)5W5oT1mO0R-`o`bkEC)B;7G)dZ{R>
ztoi|k;bx*-tOH)O$TF1ockrie`fiE?T$P{aH|EcLk2d_y0b9}Kj73IqnW5m*%yzCZ
zT09e5A!KnI4LVAR=Hte$7<LL8xgQ8tFr0EWd1Q;KqoQhk3pKqqMVsb@Kj3}LGRoSV
z!Z8oeTXKnm$d0`9LlzxYvXX#Fj})c+Cmqn+;{hioc$MKHfb!a)-a(n!bKz1ZbYkta
zsz{Zbe5h;M@IIt>2G?=CQgf-OjM;n6EK5hm9b0X6xnY`|r*9a<<NG5~(g`<7P@fl>
zG)sXEokf~^q>gvD5OKR^MD?eErv39`M5A(8jgn+>Zm@d2i~m{88yoBd)P?pN9v1^<
z&w1L&A7n$pvsEs9PA_7Zj7VPWSW;(PxPk<pIv}S?*Yzy8E2Be)H90*CqYiGiIg?c1
z7YKMf=hR@IhzkCqXXUpmKJK|Hm=KqIWrkO{MTjS3ABqg9SJ97V@1{#OqNkmFae9+J
z*k`wUj%{ng2G=ffT};>eP|nu98u@v=$<6Y`8vK+k^!KVE^Wi3FmaNsBHo-UYAh+5l
zV_HZEu;>5mnWiwc;N;us_d1K$cb=uR$SQ3yHlPQzneBG1cD!4^Z*G120sJd^F)Pzt
zHa!cj8MGQ7%@UMQ{yy>i;_8LwS5HSy-}`LlMw)f&j=*6^IVVp>piY&K!ViI}`)i{)
zgz<~^p{L>XmtL-8{sV8Sy%n3N7+@u=zuTj^botI$-I5&qya-Civ`Zh_)=n?{DQ>;i
zwZtENs<|-o>1?Zcm*XQ8TpHaXXd9p{vFVX^RAB8^NKkzo{F2SowCmj6zD&)>TOn44
z%aBSfRmbDb%*=4!R9?>|k5sN;@1B2H{J6;qEmHGkp778dD<sD^5vLDx%>HQcj4Vl>
zr?!;NN@`EU^%(~Pminu&mO*36B*L=y-PR2JZk-!FCK12LV~*vlF2e;6UD_VE+@w$B
z7~m-^L0s0&xKnyc4se(M<&tgj=pNOm;${!=k-I`$>bgJB7gmEE!CZojkBw!&Rp^6q
zdu@Yv%>@ZipEPe2v9woT3Q%7onzJUH=04JtgjqY_s>O4P*&Tq-_UEI>ffQLUH_i=K
zm?X!+1hVV^c9dS0bvMBo7Upnv6wvdd^p0om++$6p<C8Iw<DU_Tz&Y;@$l&Sb!-P+2
z+BVd(8ELN3_eW>AHF)62Yf<$dUN#)Y9-!h5*WLHnMaHb|OY}g>Xx14<W{B`Aq+d!d
z@Z@T9szADGRG%c@zD+2d20AaDG;d$dK=w=Nn?IJXnjSzsF+>{%4-4U7PfEjFd`}@S
z5}fac*Hzc?ZP~pcQP(ULjRi`-{pk|ddVu;NPfKXHa&G5r<SU~od1|gEEnG^Kn4-1W
z?hn&~iu^5?)DRdq4<`Tvum{)z+yJfsJAmb%2nBHbLtFtKQ2u{fSz!<`v%aH?Js(V3
z3J#N$gx;2vl9YyGDfj<wqNK>iQZD^L^B^GLkDL0Z0{m~Hy<u9b)O?XvC><L@Eonk!
zElMbi_+LbOobcwbZ%(79mr6aZLP&`s2uo?@8^fYEJ?Ge*;?RI-G+cZ)m5F5n=Jj`{
z34*kBrx#jpnZ#&$CCzzPzJ1jq91$tF)|s6U#oTx`-{0LO5;OBL6F<vzq2+R0a}E=H
zBWFpHg}llk!=pmv+Ehg!d5nPNc7VpnQMbMS6Ed}!6algYU`Xv&!PQDit|BEjRX8e=
zP-J^;efFhy0o{Q{QYq5LCFq*5uHokobgrE03Cdf^6TK?t^2eEa67T%0-act&YM@Xx
zPd_kt=Z6{Fbjmz?Tu>$w-J?==%+=8y@d{f!(4#{z{z{wrLx*bVs-4H~31-bXg(6%G
zk?<ydN{V5$<O<{73;S%0w0c?rpLgEQBBsdEHdX@s`W_H9d33B`AP^+)gf3jIT@_)h
zN@ui&5N^)_=5#sB`zpH_!P`~`g>CM!)-n71+Yd7p!>d`yZC*}jYXO!KM_C#RugN~3
z0n5F^>m)-b^7pjF{fzF^T6v3&c6+~fh60tA{D$$&Ecl(Xk`)8RVcYrwKUR9;a6nh$
z&x`6fBdGwc0lAMH@oIOwtxbAwq>SBYrf1b+?7CxO`8BK*CHkq$(b|>P_GpM`7&E3C
zUT&%ESaV^;{ptD$k5@M>u28SnzWlpEbMZ!cmN3`SmbcH$_!~lvUJT7jnpVHUNH~6U
zk;}ygCd2Is{SfeLCe9)otna2seqKr_>TEV^$z-vTAEfu>s6u;%gV=c4+boe2j#9kU
zvL3S4`E@ZT`CaO9Pv9HT_`dX$`tOKEiIipGK0W_keboKLo%ZHCt$2R6qPDuTob4RP
zih)hMbDVX(X~L5r3lm!-etfW4bD~80X62Ds@nJ?_*hdX0+ooJLheDRn6L%(}2}6mo
z1<tHyZxHq~REhSLt(|7yYe}CqpJDP(<!wLn+a9py7%A@&9s<an8;B0k{IUldiboW4
z6`N}N_D_qQV)}Qx_m*T-(2tPY#?Cq064ML8k+-VE$Kpi4p54e$$h!UpURaFld7!Y%
zTp(Urx48Fhc`d?R@b#h1w8435CwU7_jiq%}oYW)!Xy8=@jgWdL=yQB>k@6{J;tB7;
zv__uxZ~GY6lt&@CFWY|$ewg={pO7JZv6VH;d<i|VM(f<ZPIg|RS^t_C1hC=+Uj6xG
zM~gbO*2tQ?h%2;#0xD&$KZ4{U;-gKO@y~$xa<#lrL~*!GVTfYD*7`@T_kvaiGW|<=
z?Y`6n6n*A=2)U-OQOZvj8(ws>J@+T^rHgh;SPGBJ-HYe?*|{KcdB7Rs*5{Ma1WV(M
z8eFE@*FN4hC*1WA`C?7u;MSt$cl#q1K-j6gk7_elGu<m^5G37TVjCk2R2e|uF3GpX
z<&b?si5X2$Rpm3yi3Q~oOL{69TUcFl9=LsB>&f^rIEWFN_RTh^0W{@YOFlIcmIf#l
zJ-e5!|FEeb7_9g^xZ<t`g7P5!(OzKew_u;I9LT)_mm>ElpVQq`GJ%QrEMO-(wU(Pr
zEb5QQc-kYi`Lb`Zy->fo?O;sEg`C1^5D@k{wq8<Mg-pJcfz<tKF?m}_DG~{NPHlIO
zFT*eMOX*S8t77zPGbf!GZNllP2>fZGEAN+PLFN)QqoENQU4aI=&i?cZ$Cc0m<OZ_m
zs_+#>Tf__9mJ48Mq-bW~7F=5A^ZA#Lma1$6yGb4IN6T_RCZkuha9imBM2|wS_>=5<
zPjSd`i!!WgJ6Td*&!_sugF(()r6QX-qC4Cffp_fsw9(X{!?D^segog0FU^jz8hR@h
zagu7cLK<QBraoToq1GP#E->8o9u{HQrEDIAK^>rdMtwK+mjh!nxj6&gsfalv?Bcfp
zPc~vAt-w0BG!~U)mPco<0OXWQ`DtDVFa;YaBr`3BxuN8%bI!YHV<t^}H?x-;DF=k#
zjyi}Glu$2S6eV;A=|klE<2?H&bFU?sW+sf;DYp}aCZtTHzl`ErTy=?o;~O2Vi@B}5
z4vRp+&AY=?*TQcHi_J()kG3VDvkHZM_g%*@QTAtD%AkmV*2D1H57x0mB!!P*T<BDn
z6&a#)JjX-H$APiZZ4shNF*22obxZ9o%b_^hemM(mJI^%45FUE`vyRGppZ@DoYl~Nm
zQhme10u!~2gr))x&JoM1Qiyp!+4QULK41e8D#6>>OhG7mulk{<P+dmGjT!6~XLPsy
zC|b<J7^`5n1ks;3@_lNe?qR!2yN7o;t$vDDm<?m(%P$LjyCJX8a8x>LO2Qy1hUoOg
zaJ62u%!P)iu9L))wI82YD#|FciuFSCCJv>&G}Wq(@_0kfv6xiRd5eu-3Fpe?Mav{{
zif>39_j*u1ZAW5WS{@$lq_VY=_iYkDN@Q@jVX<Jy*+^$c$e><IZABiV{R5<PeJ|%T
z{ixsdsu$B})TyrK(Ub#=L+Xeg0bZ-G8o-CWpXny=*7IWfWNg}{cT|<vi(u&iTq{lU
zxpl%mNn!dL=cyU3?75?`Ju}a@4+qvOD;Cw{msgMdFbVSLj?Ay@B2T}JK{cT;DE;5R
z69`BS0P~Gz!mr2hprz?vv@MaZ6{xVQ8r?}+W5e;)_j&#L%%KN{%%BkA<)=Rr_ckID
QEGpeaTOT_U{_n*93tDi<VE_OC

delta 3445
zcmV-*4T|!n9F-e?FoF${0s#Xsf(=Rr2`Yw2hW8Bt2LYgh4Lbya4L2}?4Kpx;1$PDs
zDuzgg_YDCD0ic2fXas@<WH5pSU@(FOTm}m&hDe6@4FL=a0Ro_c1p6?81otp01_~;M
zNQU<f0So~HFdGCE2G@Usb#SCMY*A_XL;QMwvbwl|0s{bl!%zf*1jskafdmOLLaSxH
zn~_mD<@q(4uf@?TeYseXt6eoqFO2pkIa{mvUht(&TJ1k0KP!V@kXz~YKXsU`arALk
zGS+(5w;HDBRJ!;T;fpPfDPo<QcPdo&KCBC=6&lfhtn}6b#skB;5bdbJP_bkHHD75Q
z%V7e(A-^Smg8ppy3e)<j=L3kPbC1%Q)ZGS#g`g>)X<q1kEVZtVPHtxI>JL?}LM~OT
zCus+EW@|@_$?#lDBc%`|I65+jZ6C;>hPC=_Bm-WIjdi*|VZ$&DFR8b!v1+j<O5B?%
z-M38wNBoDWJS5rOWL@4w+zem+A?E|ntYt^o(ypL?P>I%yjcr8BEDgXez%V{z|K)E~
z;QhonS)}^DZx#L5bCq}BnQ}Z8c32l=y*G%nAoQ@S8Q52T)IRt$v~(@eid>Cro1y&Q
z3DN)VB#MEsYC*biIjhDctDH!yh>nh8HEYj%G22jPAD15O-fXTr9qd3H#yPTbPz;Np
z*%On0-pw%W%`ma)(jlwm+LW4yQB;Qqhv@10LmDveOl*)`O$hN2S%BicL3j&6)1-$z
z+~U&XD?@*L+~R?)tIrpcyiMSX%}+ozG&I1j!GH8Ero~Qy(_%Y)OscYqJ{vEJ-?<&a
zL)Dch;NMP`G{n3{>?(_%o`TBVH4v`B-(_-ti7yQhomG6VBuF`~=?)u54y>Z+d8~j(
z5V{q{4HMxG6=)L(ruoD>R!M$aIT~r85TE%#+~N9ebrU*O38uT!4=Jz9f)p-4lP}$f
zxR7)OQK#gCWjTbRkcN^%WLa_`tiPE6&&yuh$-*fk5&v0A$Mr+E_0_80>iRFW4t8&U
zz7mWjM@oU%jYq;b<AzC-ny_#{=$5sCSmbLu6T{%GTj7&M-hv$W6|>aD3g<R$Ll{hH
z5x&|W`P<wE5N4I?yML=uX^bc}(6H1I3+Wusg!~mhqcC3P_rV6D<=1r6XcV}Au`Fu4
zfpc1G<#&ZW(50ph-c0j=t<8Sub=l8<x_rP)A=~LJBDs9A_Zi(X`KdjolZOqA@&D}S
zS6NYxwXYV0%Ci94Q3LwXNQ05zl7#OksB6eJeus(B))k{oFL>@nP<gSUGJ`gw(_FD6
zr4;t3h4Bd_4IWAOHg|brOWR<!qrEGh`oojgIU3y79EkBOZXyi*;$4ktkhmUy0qdz)
zUfiYIc&2|<np8nx>Q#F|m~HHTdivrvQgys@*BFka>DD1Um8<amZ$9lKNVjpjn#5;5
zWQCL2ei3w>96tv}$*={5B&7+J6Il4WAmloyS7&JTA390IYX7LWaC>3X03w|b=N#iU
zyb;nYZFUwnBmQ0E#LgRvM0j?8+2BW^3xk6=>0kk!1NHi&Z1<#!38jk4G04xf%BiWl
zv*N(i6+cP9%eTB`l$P3oV^W=y@vM{u8l@CSZ<Bn3(5ppfTwx^O_5YC<>pOh_WNP8c
zMMZinr$gOrYzEunj15wwJ^)~ywikD-XRWEWXL*P}*shMyJ!XB&nUGai`^h`h-rAPG
zQQTGs5(F3Pm?miwv$&*ZeB;*FX6$$s0`&bsOs^8|wB1yhwaWHzr{fasEH{N1C~%(`
zjvJ|tdn-cAJd@-BTAN?yF)@;u9#-JphjJB@k_AM6H8(djHaIXcH!?FcFoFlP1_>&L
zNQU<f0S5-4f(NBAf(M}j0RS+92bu;6Duzgg_YDCD0Wc{B3Mz(3hW8Bt3;_l(8w3=9
z+6=#}q&J?#N_OhG?NJl4zn3Zk0|3KNfPx2LS#IP(A$>;cry|N+pp&I{YtQfyKoBAC
zOCFkkD+taTJ{>;p6gPz%t%^ccyZmN>bGW#6-QRuMq-e!UrJWa;=>@R-Cz=Yz*5&Kq
z!Q`yc9?;x8kK`$K*jHBR@3wMKPDIMCYnGD$PS@Jui11k`T05r-+IbU_llk6j{@_cA
zLTf&<4q&mADdPu9t#aXDtO`e|^y07~x%@nTd;KzfbHecru<c%g-u6Let1_3waGfc*
z9kYHW<Hm4k%^*uUTO+n?_L#$)`>i|JS{{GUtp(7D-Z27P*0tRD;860&=&J;&3h8<y
z-8~jeJ1ooD%UoUJ?>4S|%a^muaHcEGE=$u0w_Be;a-?O_+{O9SqM2O(tBU8nrdg1G
z(oyVTsE?ca+e1<)Vqf-1)?v#bGg6fL-h}->>4WN(N^*?ZtcHJwgb#O<X5*wR+3cS|
zI-}gdL?=z}VNzm2e_1tZ78m9}%sL?H9z&2v51JcC%{3F!)920W;h`&xau1_|?7pdC
zzi7KPz(-Upy8V`|I8qLClb|hoBEhqN6+?hOfaNz%F-r#(M^-$}t-A%B4l%ejQ<9=4
zPrtjYLCGCuO<@!NCT?w02}K3{rM`e&WO{lSFHXQvh%>kQyX9}0=(2kCTPm$6yy$)t
zhB|buQb0QAfuqg$hCSuIy-v;?R`Sj!_&});Dt_cy!P-aK>cO#r=@q72R^m~APpogR
z`1DG3M_1^@Z=19s@;!6y?++^4FKLzvD$om{YNb&QDEBmTRGnkR$<d4w%pz=HzEDNr
zm-;L5sXhn%!S00&R0}u)6*jO^X+FOU*{0U##A2DxBy?z@Ub#|f&8@^j`Pa2QJEje?
z>S>oCV}NY9D^6xU)RFDK!1K?4VAM4w26p#A$oA;7ENyevVfj6O*Q2IPCm1z~ZX=}R
z`TKnC4^sJMJMLz&U9<A3uD4*5Q)*7nL89DA&jA1pv?HbBP?}P0vP)N;!`EWtbG|T7
z*R|O^#7~9JVUn|mo5^=8aW-(81Utofkyqep#*_%U3^QuQogS;lSM&paFG5X@f_nH4
z`XI=^E%U9EX{pApG`*R{=IkEfnuC$&O!e-{7#*zy^(#eL)Gh~>kfGCo)<WvttkoD-
z$AAUmsS0r^Jfe3+ld%7-I!>(oD$h>oAIwKJx2IaPx9Mh;Km8peu~=WoGYg4QMHI-Z
zSAD1&3%1{tW?Ig?5?QK$NUl>ZN%XF9*m#81esC@ha>Sw?6YWYw;&>Be)KwQ#j<&I;
zgi#fjKlO5^0TXLnaxRFU2VBX8S0I!FnII-EeHgenILd6{`&-~L!+laP4qzEi4Q+RE
z40&~}U#ubv3$6lj>*u8|7<MS~R`AP8oqwx~6|55|fJo_+U3sT}Yf2QYH|ZdBYB<;s
zgwuLiOY3DbLX7mYNQ`i1jRNnND)A8SjW!@`cle5bGE3jY-Jg-b7b_t*SnrFxtRhHQ
z-z@G3x88{)wZ5u5^CwDtwaiTdIzKv*DkpV~CyZP-fkt{O6XQ0d3_!*!p0w%<<p|B;
zFzRQ*?J?P(k6xyKTjL$zx&!mUdTAh2hi%q{lv=Gg+1EjI;I;rKZZ$seKXFyLF`I9^
z6_-zggctYFK<EqSms+vJi6m7%3t}n<kosN2gm-<hZq!Guy`|i9m6s4__@ABRj@5k@
z(1rdga%Lml1=5BWsvT=(E-Ec~3G0XK_VK2~HUy$MTeK*DLD)cn4!$LH%lm|^&RPMx
zvFH|sy$kN^NvZ92JcrK`_$wLGG5vrU3V}o77H}N7>Z~5fU_>%|O4FS`k<YgD|MGJ1
z0@@k_-g5E|{`^oroM{@LBSVZMG7*{A<k$rpkP_3|JRj<>5N5rQYNx|a`EtWsW5QzM
zQF%;%R8NL~T*jUFU_JKW)mEJk0U$NZqL53s)kJ4Ut~G34%AgNnS+exkNNNT%b|0NG
zqb`On%|Bl`WwMzexGbiVG1qdKqDv(+go*0-ajzwAbP)5K90=9xmdxhMsK|u5S3;aK
z4e=rgf$+UQY4ZHIk~@;dsa1*Y64DX(49FTf`416)hm@|7)qUZ`%;b1NKgruK+9XHr
z>&QO5LmeUr6jF9d%S!PZgXufBS=q^%<hY5JYLx{{Goe?=Ps-}P5GXX36*n#dBisq4
zqVjvBz|+(^-b;oDkU9osOKRHpj3>PXBN2AKOw*<Y=8rXVzdW{*E|;ty5&r`S9e5m(
zH!P2TgOydB+<ZBasQTs?OE_+<fM#(dGD7*cQZP*!#mSL(J934VcU;fl*8|_azIW@J
z;XLfB(GA0oL4jEwC#azY&o!OHVF{IliDq+B@KIdmort%fWJ#Qf9R$o_%xfUc0oiF~
z&$|6)X7#!(oMTq=GW~iQ0$Oy_#U*zpiYZ5bXk@Xn81S`D&_2=*RLEp65tqi_E_ZSr
z#@r^p<Zp!7TLIY}G}v8GCL2Sz2^lv&Z{mE0KLbI$^U0<CYRy$bIZ$VZiVS<kwTlr2
zoHS&ktI23EJ}@CL2?hl#4g&%j1povT)GyogCiCMse3^WddsV_(zYlCs1Qco1Y^>iD
XkO5#k!5y|h7%VFuZApp(0|ADh+R=ku

diff --git a/x-pack/test/security_api_integration/fixtures/saml/idp_metadata.xml b/x-pack/test/security_api_integration/fixtures/saml/idp_metadata.xml
index 57b9e824c9d53..207148665c293 100644
--- a/x-pack/test/security_api_integration/fixtures/saml/idp_metadata.xml
+++ b/x-pack/test/security_api_integration/fixtures/saml/idp_metadata.xml
@@ -7,25 +7,24 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <!-- This certificate is extracted from KBN_CERT_PATH in @kbn/dev-utils and should always be in sync with it -->
-          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVANNWkg9lzNiLqNkMFhFKHcXyaZmqMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVAN0GVNLw3IaUBuG7t6CeW8w2wyymMA0GCSqGSIb3DQEB
 CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
-ZXJhdGVkIENBMCAXDTE5MTIyNzE3MDM0MloYDzIwNjkxMjE0MTcwMzQyWjARMQ8w
-DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ
-wYYbQtbRBKJ4uNZc2+IgRU+7NNL21ZebQlEIMgK7jAqOMrsW2b5DATz41Fd+GQFU
-FUYYjwo+PQj6sJHshOJo/gNb32HrydvMI7YPvevkszkuEGCfXxQ3Dw2RTACLgD0Q
-OCkwHvn3TMf0loloV/ePGWaZDYZaXi3a5DdWi/HFFoJysgF0JV2f6XyKhJkGaEfJ
-s9pWX269zH/XQvGNx4BEimJpYB8h4JnDYPFIiQdqj+sl2b+kS1hH9kL5gBAMXjFU
-vcNnX+PmyTjyJrGo75k0ku+spBf1bMwuQt3uSmM+TQIXkvFDmS0DOVESrpA5EC1T
-BUGRz6o/I88Xx4Mud771AgMBAAGjYzBhMB0GA1UdDgQWBBQLB1Eo23M3Ss8MsFaz
-V+Twcb3PmDAfBgNVHSMEGDAWgBQa7SYOe8NGcF00EbwPHA91YCsHSTAUBgNVHREE
-DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAnEl/
-z5IElIjvkK4AgMPrNcRlvIGDt2orEik7b6Jsq6/RiJQ7cSsYTZf7xbqyxNsUOTxv
-+frj47MEN448H2nRvUxH29YR3XygV5aEwADSAhwaQWn0QfWTCZbJTmSoNEDtDOzX
-TGDlAoCD9s9Xz9S1JpxY4H+WWRZrBSDM6SC1c6CzuEeZRuScNAjYD5mh2v6fOlSy
-b8xJWSg0AFlJPCa3ZsA2SKbNqI0uNfJTnkXRm88Z2NHcgtlADbOLKauWfCrpgsCk
-cZgo6yAYkOM148h/8wGla1eX+iE1R72NUABGydu8MSQKvc0emWJkGsC1/KqPlf/O
-eOUsdwn1yDKHRxDHyA==
-          </ds:X509Certificate>
+ZXJhdGVkIENBMCAXDTIxMTAxMzEwMTU1OFoYDzIwNzExMDAxMTAxNTU4WjARMQ8w
+DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3
+nvfL3/26D8EkLso+t9S0m+tSJipLsBWs0dCpc8KRJ/+ijDRnAQ5lOmOAcxt43SNY
+KFr0EntQEZyYaRwMIM8aPR0WYW/VV5o4fq2o/JnmHqzZJRJCwZq+5WiCiDPt012N
+mRGYCMUxjlEwejue6diLAeQhZ/sfN4jUp217bMEHrhHrNBWTwwJ+Uk5TBQMhviCW
+LKbsKrfluA6DGHWrXN4pH7Xmaf/Zyc9AYL/nxwv3VQHZzIAK/U/WNCgFJJ3qoFYY
+6TUwDDNa30mSj165OOds9N+VmUlDC3IFiHV3osBWscSU4HJd6QJ8huHrFLLV4y4i
+u62el47Qr+/8Ut3SzeIXAgMBAAGjYzBhMB0GA1UdDgQWBBQli5f2bYL9jKUA5Uxp
+yRRHeCoPJzAfBgNVHSMEGDAWgBQwTCrAjlvQxik3HBocn1PDUunenjAUBgNVHREE
+DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEATFNj
+WkTBPfgflGYZD4OsYvfT/rVjFKbJP/u1a0rkzNamA2QKNzI9JTOzONPTyRhe9yVS
+zeO8X2rtN63l38dtgMjFQ15Xxnp7GFT7GkXfa1JR+tGSGTgVld8nLUzig+mNmBoR
+nE4cNc0JJ1PsXPzfPgJ6WMp2WOoNUrQf2cm42i36Jk+7KGcosfyFMPQILZE34Geo
+DAgCVpNWPgST4HYBUCHMC7S14LHLVdUXPsfGZPEqU5Zf9Hvy61rQC/RdNjnMI6JD
+s57l9oHASNeEg55NQm01aOmwq/z1DXs3UP2nRmp6XCCfE61ghofO5dtV1j3cZ3f5
+dzkzSBV7H6+/MD3Y8Q==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/x-pack/test/security_api_integration/fixtures/saml/idp_metadata_2.xml b/x-pack/test/security_api_integration/fixtures/saml/idp_metadata_2.xml
index ff67779d7732c..ff1f6eccaf6d9 100644
--- a/x-pack/test/security_api_integration/fixtures/saml/idp_metadata_2.xml
+++ b/x-pack/test/security_api_integration/fixtures/saml/idp_metadata_2.xml
@@ -7,25 +7,24 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <!-- This certificate is extracted from KBN_CERT_PATH in @kbn/dev-utils and should always be in sync with it -->
-          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVANNWkg9lzNiLqNkMFhFKHcXyaZmqMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVAN0GVNLw3IaUBuG7t6CeW8w2wyymMA0GCSqGSIb3DQEB
 CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
-ZXJhdGVkIENBMCAXDTE5MTIyNzE3MDM0MloYDzIwNjkxMjE0MTcwMzQyWjARMQ8w
-DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ
-wYYbQtbRBKJ4uNZc2+IgRU+7NNL21ZebQlEIMgK7jAqOMrsW2b5DATz41Fd+GQFU
-FUYYjwo+PQj6sJHshOJo/gNb32HrydvMI7YPvevkszkuEGCfXxQ3Dw2RTACLgD0Q
-OCkwHvn3TMf0loloV/ePGWaZDYZaXi3a5DdWi/HFFoJysgF0JV2f6XyKhJkGaEfJ
-s9pWX269zH/XQvGNx4BEimJpYB8h4JnDYPFIiQdqj+sl2b+kS1hH9kL5gBAMXjFU
-vcNnX+PmyTjyJrGo75k0ku+spBf1bMwuQt3uSmM+TQIXkvFDmS0DOVESrpA5EC1T
-BUGRz6o/I88Xx4Mud771AgMBAAGjYzBhMB0GA1UdDgQWBBQLB1Eo23M3Ss8MsFaz
-V+Twcb3PmDAfBgNVHSMEGDAWgBQa7SYOe8NGcF00EbwPHA91YCsHSTAUBgNVHREE
-DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAnEl/
-z5IElIjvkK4AgMPrNcRlvIGDt2orEik7b6Jsq6/RiJQ7cSsYTZf7xbqyxNsUOTxv
-+frj47MEN448H2nRvUxH29YR3XygV5aEwADSAhwaQWn0QfWTCZbJTmSoNEDtDOzX
-TGDlAoCD9s9Xz9S1JpxY4H+WWRZrBSDM6SC1c6CzuEeZRuScNAjYD5mh2v6fOlSy
-b8xJWSg0AFlJPCa3ZsA2SKbNqI0uNfJTnkXRm88Z2NHcgtlADbOLKauWfCrpgsCk
-cZgo6yAYkOM148h/8wGla1eX+iE1R72NUABGydu8MSQKvc0emWJkGsC1/KqPlf/O
-eOUsdwn1yDKHRxDHyA==
-          </ds:X509Certificate>
+ZXJhdGVkIENBMCAXDTIxMTAxMzEwMTU1OFoYDzIwNzExMDAxMTAxNTU4WjARMQ8w
+DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3
+nvfL3/26D8EkLso+t9S0m+tSJipLsBWs0dCpc8KRJ/+ijDRnAQ5lOmOAcxt43SNY
+KFr0EntQEZyYaRwMIM8aPR0WYW/VV5o4fq2o/JnmHqzZJRJCwZq+5WiCiDPt012N
+mRGYCMUxjlEwejue6diLAeQhZ/sfN4jUp217bMEHrhHrNBWTwwJ+Uk5TBQMhviCW
+LKbsKrfluA6DGHWrXN4pH7Xmaf/Zyc9AYL/nxwv3VQHZzIAK/U/WNCgFJJ3qoFYY
+6TUwDDNa30mSj165OOds9N+VmUlDC3IFiHV3osBWscSU4HJd6QJ8huHrFLLV4y4i
+u62el47Qr+/8Ut3SzeIXAgMBAAGjYzBhMB0GA1UdDgQWBBQli5f2bYL9jKUA5Uxp
+yRRHeCoPJzAfBgNVHSMEGDAWgBQwTCrAjlvQxik3HBocn1PDUunenjAUBgNVHREE
+DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEATFNj
+WkTBPfgflGYZD4OsYvfT/rVjFKbJP/u1a0rkzNamA2QKNzI9JTOzONPTyRhe9yVS
+zeO8X2rtN63l38dtgMjFQ15Xxnp7GFT7GkXfa1JR+tGSGTgVld8nLUzig+mNmBoR
+nE4cNc0JJ1PsXPzfPgJ6WMp2WOoNUrQf2cm42i36Jk+7KGcosfyFMPQILZE34Geo
+DAgCVpNWPgST4HYBUCHMC7S14LHLVdUXPsfGZPEqU5Zf9Hvy61rQC/RdNjnMI6JD
+s57l9oHASNeEg55NQm01aOmwq/z1DXs3UP2nRmp6XCCfE61ghofO5dtV1j3cZ3f5
+dzkzSBV7H6+/MD3Y8Q==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/x-pack/test/security_api_integration/fixtures/saml/idp_metadata_never_login.xml b/x-pack/test/security_api_integration/fixtures/saml/idp_metadata_never_login.xml
index 44b2ede5060ff..6ab5e1aeb708a 100644
--- a/x-pack/test/security_api_integration/fixtures/saml/idp_metadata_never_login.xml
+++ b/x-pack/test/security_api_integration/fixtures/saml/idp_metadata_never_login.xml
@@ -7,25 +7,24 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <!-- This certificate is extracted from KBN_CERT_PATH in @kbn/dev-utils and should always be in sync with it -->
-          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVANNWkg9lzNiLqNkMFhFKHcXyaZmqMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVAN0GVNLw3IaUBuG7t6CeW8w2wyymMA0GCSqGSIb3DQEB
 CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
-ZXJhdGVkIENBMCAXDTE5MTIyNzE3MDM0MloYDzIwNjkxMjE0MTcwMzQyWjARMQ8w
-DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ
-wYYbQtbRBKJ4uNZc2+IgRU+7NNL21ZebQlEIMgK7jAqOMrsW2b5DATz41Fd+GQFU
-FUYYjwo+PQj6sJHshOJo/gNb32HrydvMI7YPvevkszkuEGCfXxQ3Dw2RTACLgD0Q
-OCkwHvn3TMf0loloV/ePGWaZDYZaXi3a5DdWi/HFFoJysgF0JV2f6XyKhJkGaEfJ
-s9pWX269zH/XQvGNx4BEimJpYB8h4JnDYPFIiQdqj+sl2b+kS1hH9kL5gBAMXjFU
-vcNnX+PmyTjyJrGo75k0ku+spBf1bMwuQt3uSmM+TQIXkvFDmS0DOVESrpA5EC1T
-BUGRz6o/I88Xx4Mud771AgMBAAGjYzBhMB0GA1UdDgQWBBQLB1Eo23M3Ss8MsFaz
-V+Twcb3PmDAfBgNVHSMEGDAWgBQa7SYOe8NGcF00EbwPHA91YCsHSTAUBgNVHREE
-DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAnEl/
-z5IElIjvkK4AgMPrNcRlvIGDt2orEik7b6Jsq6/RiJQ7cSsYTZf7xbqyxNsUOTxv
-+frj47MEN448H2nRvUxH29YR3XygV5aEwADSAhwaQWn0QfWTCZbJTmSoNEDtDOzX
-TGDlAoCD9s9Xz9S1JpxY4H+WWRZrBSDM6SC1c6CzuEeZRuScNAjYD5mh2v6fOlSy
-b8xJWSg0AFlJPCa3ZsA2SKbNqI0uNfJTnkXRm88Z2NHcgtlADbOLKauWfCrpgsCk
-cZgo6yAYkOM148h/8wGla1eX+iE1R72NUABGydu8MSQKvc0emWJkGsC1/KqPlf/O
-eOUsdwn1yDKHRxDHyA==
-          </ds:X509Certificate>
+ZXJhdGVkIENBMCAXDTIxMTAxMzEwMTU1OFoYDzIwNzExMDAxMTAxNTU4WjARMQ8w
+DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3
+nvfL3/26D8EkLso+t9S0m+tSJipLsBWs0dCpc8KRJ/+ijDRnAQ5lOmOAcxt43SNY
+KFr0EntQEZyYaRwMIM8aPR0WYW/VV5o4fq2o/JnmHqzZJRJCwZq+5WiCiDPt012N
+mRGYCMUxjlEwejue6diLAeQhZ/sfN4jUp217bMEHrhHrNBWTwwJ+Uk5TBQMhviCW
+LKbsKrfluA6DGHWrXN4pH7Xmaf/Zyc9AYL/nxwv3VQHZzIAK/U/WNCgFJJ3qoFYY
+6TUwDDNa30mSj165OOds9N+VmUlDC3IFiHV3osBWscSU4HJd6QJ8huHrFLLV4y4i
+u62el47Qr+/8Ut3SzeIXAgMBAAGjYzBhMB0GA1UdDgQWBBQli5f2bYL9jKUA5Uxp
+yRRHeCoPJzAfBgNVHSMEGDAWgBQwTCrAjlvQxik3HBocn1PDUunenjAUBgNVHREE
+DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEATFNj
+WkTBPfgflGYZD4OsYvfT/rVjFKbJP/u1a0rkzNamA2QKNzI9JTOzONPTyRhe9yVS
+zeO8X2rtN63l38dtgMjFQ15Xxnp7GFT7GkXfa1JR+tGSGTgVld8nLUzig+mNmBoR
+nE4cNc0JJ1PsXPzfPgJ6WMp2WOoNUrQf2cm42i36Jk+7KGcosfyFMPQILZE34Geo
+DAgCVpNWPgST4HYBUCHMC7S14LHLVdUXPsfGZPEqU5Zf9Hvy61rQC/RdNjnMI6JD
+s57l9oHASNeEg55NQm01aOmwq/z1DXs3UP2nRmp6XCCfE61ghofO5dtV1j3cZ3f5
+dzkzSBV7H6+/MD3Y8Q==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/x-pack/test/security_api_integration/fixtures/saml/saml_provider/metadata.xml b/x-pack/test/security_api_integration/fixtures/saml/saml_provider/metadata.xml
index 19a6c13264144..8cb33193f56c9 100644
--- a/x-pack/test/security_api_integration/fixtures/saml/saml_provider/metadata.xml
+++ b/x-pack/test/security_api_integration/fixtures/saml/saml_provider/metadata.xml
@@ -7,25 +7,24 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <!-- This certificate is extracted from KBN_CERT_PATH in @kbn/dev-utils and should always be in sync with it -->
-          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVANNWkg9lzNiLqNkMFhFKHcXyaZmqMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIVAN0GVNLw3IaUBuG7t6CeW8w2wyymMA0GCSqGSIb3DQEB
 CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
-ZXJhdGVkIENBMCAXDTE5MTIyNzE3MDM0MloYDzIwNjkxMjE0MTcwMzQyWjARMQ8w
-DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ
-wYYbQtbRBKJ4uNZc2+IgRU+7NNL21ZebQlEIMgK7jAqOMrsW2b5DATz41Fd+GQFU
-FUYYjwo+PQj6sJHshOJo/gNb32HrydvMI7YPvevkszkuEGCfXxQ3Dw2RTACLgD0Q
-OCkwHvn3TMf0loloV/ePGWaZDYZaXi3a5DdWi/HFFoJysgF0JV2f6XyKhJkGaEfJ
-s9pWX269zH/XQvGNx4BEimJpYB8h4JnDYPFIiQdqj+sl2b+kS1hH9kL5gBAMXjFU
-vcNnX+PmyTjyJrGo75k0ku+spBf1bMwuQt3uSmM+TQIXkvFDmS0DOVESrpA5EC1T
-BUGRz6o/I88Xx4Mud771AgMBAAGjYzBhMB0GA1UdDgQWBBQLB1Eo23M3Ss8MsFaz
-V+Twcb3PmDAfBgNVHSMEGDAWgBQa7SYOe8NGcF00EbwPHA91YCsHSTAUBgNVHREE
-DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAnEl/
-z5IElIjvkK4AgMPrNcRlvIGDt2orEik7b6Jsq6/RiJQ7cSsYTZf7xbqyxNsUOTxv
-+frj47MEN448H2nRvUxH29YR3XygV5aEwADSAhwaQWn0QfWTCZbJTmSoNEDtDOzX
-TGDlAoCD9s9Xz9S1JpxY4H+WWRZrBSDM6SC1c6CzuEeZRuScNAjYD5mh2v6fOlSy
-b8xJWSg0AFlJPCa3ZsA2SKbNqI0uNfJTnkXRm88Z2NHcgtlADbOLKauWfCrpgsCk
-cZgo6yAYkOM148h/8wGla1eX+iE1R72NUABGydu8MSQKvc0emWJkGsC1/KqPlf/O
-eOUsdwn1yDKHRxDHyA==
-          </ds:X509Certificate>
+ZXJhdGVkIENBMCAXDTIxMTAxMzEwMTU1OFoYDzIwNzExMDAxMTAxNTU4WjARMQ8w
+DQYDVQQDEwZraWJhbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3
+nvfL3/26D8EkLso+t9S0m+tSJipLsBWs0dCpc8KRJ/+ijDRnAQ5lOmOAcxt43SNY
+KFr0EntQEZyYaRwMIM8aPR0WYW/VV5o4fq2o/JnmHqzZJRJCwZq+5WiCiDPt012N
+mRGYCMUxjlEwejue6diLAeQhZ/sfN4jUp217bMEHrhHrNBWTwwJ+Uk5TBQMhviCW
+LKbsKrfluA6DGHWrXN4pH7Xmaf/Zyc9AYL/nxwv3VQHZzIAK/U/WNCgFJJ3qoFYY
+6TUwDDNa30mSj165OOds9N+VmUlDC3IFiHV3osBWscSU4HJd6QJ8huHrFLLV4y4i
+u62el47Qr+/8Ut3SzeIXAgMBAAGjYzBhMB0GA1UdDgQWBBQli5f2bYL9jKUA5Uxp
+yRRHeCoPJzAfBgNVHSMEGDAWgBQwTCrAjlvQxik3HBocn1PDUunenjAUBgNVHREE
+DTALgglsb2NhbGhvc3QwCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEATFNj
+WkTBPfgflGYZD4OsYvfT/rVjFKbJP/u1a0rkzNamA2QKNzI9JTOzONPTyRhe9yVS
+zeO8X2rtN63l38dtgMjFQ15Xxnp7GFT7GkXfa1JR+tGSGTgVld8nLUzig+mNmBoR
+nE4cNc0JJ1PsXPzfPgJ6WMp2WOoNUrQf2cm42i36Jk+7KGcosfyFMPQILZE34Geo
+DAgCVpNWPgST4HYBUCHMC7S14LHLVdUXPsfGZPEqU5Zf9Hvy61rQC/RdNjnMI6JD
+s57l9oHASNeEg55NQm01aOmwq/z1DXs3UP2nRmp6XCCfE61ghofO5dtV1j3cZ3f5
+dzkzSBV7H6+/MD3Y8Q==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>

From 35da3233130eccb938568f298c602f5829742d6c Mon Sep 17 00:00:00 2001
From: Quynh Nguyen <43350163+qn895@users.noreply.github.com>
Date: Thu, 14 Oct 2021 13:17:55 -0500
Subject: [PATCH 094/117] [ML] Display advanced mode toggle for the APM failed
 transactions table (#114363)

* Add new toggle

* [ML] Add tooltip for p value

* [ML] Add tooltip for p value

* Update tooltip

* Add callback, revert i18n, compressed

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../failed_transactions_correlations.tsx      | 121 +++++++++++++-----
 1 file changed, 88 insertions(+), 33 deletions(-)

diff --git a/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx b/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx
index c497ce434180b..d73ed9d58e526 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx
@@ -21,6 +21,8 @@ import {
   EuiBadge,
   EuiToolTip,
   RIGHT_ALIGNMENT,
+  EuiSwitch,
+  EuiIconTip,
 } from '@elastic/eui';
 import type { EuiTableSortingType } from '@elastic/eui/src/components/basic_table/table_types';
 import type { Direction } from '@elastic/eui/src/services/sort/sort_direction';
@@ -44,7 +46,6 @@ import { useSearchStrategy } from '../../../hooks/use_search_strategy';
 
 import { ImpactBar } from '../../shared/ImpactBar';
 import { createHref, push } from '../../shared/Links/url_helpers';
-import { Summary } from '../../shared/Summary';
 
 import { CorrelationsTable } from './correlations_table';
 import { FailedTransactionsCorrelationsHelpPopover } from './failed_transactions_correlations_help_popover';
@@ -59,6 +60,8 @@ import { CorrelationsLog } from './correlations_log';
 import { CorrelationsEmptyStatePrompt } from './empty_state_prompt';
 import { CrossClusterSearchCompatibilityWarning } from './cross_cluster_search_warning';
 import { CorrelationsProgressControls } from './progress_controls';
+import { useLocalStorage } from '../../../hooks/useLocalStorage';
+import { useTheme } from '../../../hooks/use_theme';
 
 export function FailedTransactionsCorrelations({
   onFilter,
@@ -91,18 +94,53 @@ export function FailedTransactionsCorrelations({
     selectedSignificantTerm ?? response.failedTransactionsCorrelations?.[0];
 
   const history = useHistory();
+  const [showStats, setShowStats] = useLocalStorage(
+    'apmFailedTransactionsShowAdvancedStats',
+    false
+  );
+  const euiTheme = useTheme();
+
+  const toggleShowStats = useCallback(() => {
+    setShowStats(!showStats);
+  }, [setShowStats, showStats]);
 
   const failedTransactionsCorrelationsColumns: Array<
     EuiBasicTableColumn<FailedTransactionsCorrelation>
   > = useMemo(() => {
     const percentageColumns: Array<
       EuiBasicTableColumn<FailedTransactionsCorrelation>
-    > = inspectEnabled
+    > = showStats
       ? [
           {
             width: '100px',
             field: 'pValue',
-            name: 'p-value',
+            name: (
+              <EuiToolTip
+                content={i18n.translate(
+                  'xpack.apm.correlations.failedTransactions.correlationsTable.pValueDescription',
+                  {
+                    defaultMessage:
+                      'The chance of getting at least this amount of field name and value for failed transactions given its prevalence in successful transactions.',
+                  }
+                )}
+              >
+                <>
+                  {i18n.translate(
+                    'xpack.apm.correlations.failedTransactions.correlationsTable.pValueLabel',
+                    {
+                      defaultMessage: 'p-value',
+                    }
+                  )}
+                  <EuiIcon
+                    size="s"
+                    color="subdued"
+                    type="questionInCircle"
+                    className="eui-alignTop"
+                  />
+                </>
+              </EuiToolTip>
+            ),
+
             render: (pValue: number) => pValue.toPrecision(3),
             sortable: true,
           },
@@ -182,7 +220,7 @@ export function FailedTransactionsCorrelations({
         name: (
           <>
             {i18n.translate(
-              'xpack.apm.correlations.failedTransactions.correlationsTable.pValueLabel',
+              'xpack.apm.correlations.failedTransactions.correlationsTable.scoreLabel',
               {
                 defaultMessage: 'Score',
               }
@@ -315,7 +353,7 @@ export function FailedTransactionsCorrelations({
         },
       },
     ] as Array<EuiBasicTableColumn<FailedTransactionsCorrelation>>;
-  }, [history, onFilter, trackApmEvent, inspectEnabled]);
+  }, [history, onFilter, trackApmEvent, showStats]);
 
   useEffect(() => {
     if (isErrorMessage(progress.error)) {
@@ -367,9 +405,6 @@ export function FailedTransactionsCorrelations({
     correlationTerms.length < 1 &&
     (progressNormalized === 1 || !progress.isRunning);
 
-  const showSummaryBadge =
-    inspectEnabled && (progress.isRunning || correlationTerms.length > 0);
-
   const transactionDistributionChartData: TransactionDistributionChartData[] =
     [];
 
@@ -462,17 +497,51 @@ export function FailedTransactionsCorrelations({
 
       <EuiSpacer size="s" />
 
-      <EuiTitle size="xs">
-        <span data-test-subj="apmFailedTransactionsCorrelationsTablePanelTitle">
-          {i18n.translate(
-            'xpack.apm.correlations.failedTransactions.tableTitle',
-            {
-              defaultMessage: 'Correlations',
-            }
-          )}
-        </span>
-      </EuiTitle>
-
+      <EuiFlexGroup gutterSize="s" alignItems="center">
+        <EuiTitle size="xs">
+          <span data-test-subj="apmFailedTransactionsCorrelationsTablePanelTitle">
+            {i18n.translate(
+              'xpack.apm.correlations.failedTransactions.tableTitle',
+              {
+                defaultMessage: 'Correlations',
+              }
+            )}
+          </span>
+        </EuiTitle>
+        <EuiFlexItem
+          style={{
+            display: 'flex',
+            flexDirection: 'row',
+            paddingLeft: euiTheme.eui.paddingSizes.s,
+          }}
+        >
+          <EuiSwitch
+            label={i18n.translate(
+              'xpack.apm.correlations.latencyCorrelations.advancedStatisticsLabel',
+              {
+                defaultMessage: 'Advanced statistics',
+              }
+            )}
+            checked={showStats}
+            onChange={toggleShowStats}
+            compressed
+          />
+          <EuiIconTip
+            size="m"
+            iconProps={{
+              style: { marginLeft: euiTheme.eui.paddingSizes.xs },
+            }}
+            content={i18n.translate(
+              'xpack.apm.correlations.latencyCorrelations.advancedStatisticsTooltipContent',
+              {
+                defaultMessage:
+                  'Enable additional statistical information for the correlation results.',
+              }
+            )}
+            type="questionInCircle"
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
       <EuiSpacer size="s" />
 
       <CorrelationsProgressControls
@@ -490,20 +559,6 @@ export function FailedTransactionsCorrelations({
         </>
       )}
 
-      {showSummaryBadge && selectedTerm?.pValue && (
-        <>
-          <EuiSpacer size="m" />
-          <Summary
-            items={[
-              <EuiBadge color="hollow">
-                {`${selectedTerm.fieldName}: ${selectedTerm.fieldValue}`}
-              </EuiBadge>,
-              <>{`p-value: ${selectedTerm.pValue.toPrecision(3)}`}</>,
-            ]}
-          />
-        </>
-      )}
-
       <EuiSpacer size="m" />
 
       <div data-test-subj="apmCorrelationsTable">

From 1929f88ce0e1092d471fddcd8568ecc8625cc371 Mon Sep 17 00:00:00 2001
From: Khristinin Nikita <nikita.khristinin@elastic.co>
Date: Thu, 14 Oct 2021 20:21:39 +0200
Subject: [PATCH 095/117] Update CTI ECS 1.11 fields (#113404)

* Update threatintel to threat

* Remove CTI mappings

* Update CTI_DATASET_KEY_MAP

* Update default threat index

* Change mapping to dataset

* Fix tests

* Fix tests

* Fix test

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../security_solution/common/constants.ts     |   4 +-
 .../security_solution/common/cti/constants.ts |  36 ++--
 .../security_solution/cti/index.mock.ts       |  38 ++---
 .../detection_alerts/cti_enrichments.spec.ts  |   4 +-
 .../security_solution/cypress/objects/rule.ts |   4 +-
 .../cti_details/threat_details_view.test.tsx  |   6 +-
 .../rule_types/field_maps/cti.ts              | 154 ------------------
 .../create_indicator_match_alert_type.test.ts |   6 +-
 .../scripts/create_rule_indicator_match.sh    |   2 +-
 .../security_solution/server/plugin.ts        |   6 +-
 .../cti/event_enrichment/helpers.test.ts      |  30 ++--
 .../cti/event_enrichment/query.test.ts        |   6 +-
 .../cti/event_enrichment/response.test.ts     |   6 +-
 .../filebeat/threat_intel/data.json           |   8 +-
 .../legacy_cti_signals/data.json              |  12 +-
 .../es_archives/threat_indicator/data.json    |  20 +--
 .../threat_indicator/mappings.json            |   4 +-
 .../es_archives/threat_indicator2/data.json   |   6 +-
 .../threat_indicator2/mappings.json           |   6 +-
 19 files changed, 99 insertions(+), 259 deletions(-)
 delete mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/field_maps/cti.ts

diff --git a/x-pack/plugins/security_solution/common/constants.ts b/x-pack/plugins/security_solution/common/constants.ts
index 51511fad90b30..5c41e92661e58 100644
--- a/x-pack/plugins/security_solution/common/constants.ts
+++ b/x-pack/plugins/security_solution/common/constants.ts
@@ -61,10 +61,10 @@ export const DEFAULT_SPACE_ID = 'default';
 
 // Document path where threat indicator fields are expected. Fields are used
 // to enrich signals, and are copied to threat.enrichments.
-export const DEFAULT_INDICATOR_SOURCE_PATH = 'threatintel.indicator';
+export const DEFAULT_INDICATOR_SOURCE_PATH = 'threat.indicator';
 export const ENRICHMENT_DESTINATION_PATH = 'threat.enrichments';
 export const DEFAULT_THREAT_INDEX_KEY = 'securitySolution:defaultThreatIndex';
-export const DEFAULT_THREAT_INDEX_VALUE = ['filebeat-*'];
+export const DEFAULT_THREAT_INDEX_VALUE = ['logs-ti_*'];
 export const DEFAULT_THREAT_MATCH_QUERY = '@timestamp >= "now-30d"';
 
 export enum SecurityPageName {
diff --git a/x-pack/plugins/security_solution/common/cti/constants.ts b/x-pack/plugins/security_solution/common/cti/constants.ts
index 2c50c8e0d12ad..e63385a15062f 100644
--- a/x-pack/plugins/security_solution/common/cti/constants.ts
+++ b/x-pack/plugins/security_solution/common/cti/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ENRICHMENT_DESTINATION_PATH } from '../constants';
+import { ENRICHMENT_DESTINATION_PATH, DEFAULT_INDICATOR_SOURCE_PATH } from '../constants';
 
 export const MATCHED_ATOMIC = 'matched.atomic';
 export const MATCHED_FIELD = 'matched.field';
@@ -43,27 +43,27 @@ export enum ENRICHMENT_TYPES {
 }
 
 export const EVENT_ENRICHMENT_INDICATOR_FIELD_MAP = {
-  'file.hash.md5': 'threatintel.indicator.file.hash.md5',
-  'file.hash.sha1': 'threatintel.indicator.file.hash.sha1',
-  'file.hash.sha256': 'threatintel.indicator.file.hash.sha256',
-  'file.pe.imphash': 'threatintel.indicator.file.pe.imphash',
-  'file.elf.telfhash': 'threatintel.indicator.file.elf.telfhash',
-  'file.hash.ssdeep': 'threatintel.indicator.file.hash.ssdeep',
-  'source.ip': 'threatintel.indicator.ip',
-  'destination.ip': 'threatintel.indicator.ip',
-  'url.full': 'threatintel.indicator.url.full',
-  'registry.path': 'threatintel.indicator.registry.path',
+  'file.hash.md5': `${DEFAULT_INDICATOR_SOURCE_PATH}.file.hash.md5`,
+  'file.hash.sha1': `${DEFAULT_INDICATOR_SOURCE_PATH}.file.hash.sha1`,
+  'file.hash.sha256': `${DEFAULT_INDICATOR_SOURCE_PATH}.file.hash.sha256`,
+  'file.pe.imphash': `${DEFAULT_INDICATOR_SOURCE_PATH}.file.pe.imphash`,
+  'file.elf.telfhash': `${DEFAULT_INDICATOR_SOURCE_PATH}.file.elf.telfhash`,
+  'file.hash.ssdeep': `${DEFAULT_INDICATOR_SOURCE_PATH}.file.hash.ssdeep`,
+  'source.ip': `${DEFAULT_INDICATOR_SOURCE_PATH}.ip`,
+  'destination.ip': `${DEFAULT_INDICATOR_SOURCE_PATH}.ip`,
+  'url.full': `${DEFAULT_INDICATOR_SOURCE_PATH}.url.full`,
+  'registry.path': `${DEFAULT_INDICATOR_SOURCE_PATH}.registry.path`,
 };
 
 export const DEFAULT_EVENT_ENRICHMENT_FROM = 'now-30d';
 export const DEFAULT_EVENT_ENRICHMENT_TO = 'now';
 
 export const CTI_DATASET_KEY_MAP: { [key: string]: string } = {
-  'Abuse URL': 'threatintel.abuseurl',
-  'Abuse Malware': 'threatintel.abusemalware',
-  'AlienVault OTX': 'threatintel.otx',
-  Anomali: 'threatintel.anomali',
-  'Malware Bazaar': 'threatintel.malwarebazaar',
-  MISP: 'threatintel.misp',
-  'Recorded Future': 'threatintel.recordedfuture',
+  'Abuse URL': 'ti_abusech.url',
+  'Abuse Malware': 'ti_abusech.malware',
+  'Malware Bazaar': 'ti_abusech.malwarebazaar',
+  'AlienVault OTX': 'ti_otx.threat',
+  'Anomali Limo': 'ti_anomali.limo',
+  'Anomali ThreatStream': 'ti_anomali.threatstream',
+  MISP: 'ti_misp.threat',
 };
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.mock.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.mock.ts
index 7898962b1a72d..4656a200ccac6 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.mock.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.mock.ts
@@ -52,29 +52,29 @@ export const buildEventEnrichmentRawResponseMock = (): IEsSearchResponse => ({
           _score: 6.0637846,
           fields: {
             'event.category': ['threat'],
-            'threatintel.indicator.file.type': ['html'],
+            'threat.indicator.file.type': ['html'],
             'related.hash': [
               '5529de7b60601aeb36f57824ed0e1ae8',
               '15b012e6f626d0f88c2926d2bf4ca394d7b8ee07cc06d2ec05ea76bed3e8a05e',
               '768:NXSFGJ/ooP6FawrB7Bo1MWnF/jRmhJImp:1SFXIqBo1Mwj2p',
             ],
-            'threatintel.indicator.first_seen': ['2021-05-28T18:33:29.000Z'],
-            'threatintel.indicator.file.hash.tlsh': [
+            'threat.indicator.first_seen': ['2021-05-28T18:33:29.000Z'],
+            'threat.indicator.file.hash.tlsh': [
               'FFB20B82F6617061C32784E2712F7A46B179B04FD1EA54A0F28CD8E9CFE4CAA1617F1C',
             ],
             'service.type': ['threatintel'],
-            'threatintel.indicator.file.hash.ssdeep': [
+            'threat.indicator.file.hash.ssdeep': [
               '768:NXSFGJ/ooP6FawrB7Bo1MWnF/jRmhJImp:1SFXIqBo1Mwj2p',
             ],
             'agent.type': ['filebeat'],
             'event.module': ['threatintel'],
-            'threatintel.indicator.type': ['file'],
+            'threat.indicator.type': ['file'],
             'agent.name': ['rylastic.local'],
-            'threatintel.indicator.file.hash.sha256': [
+            'threat.indicator.file.hash.sha256': [
               '15b012e6f626d0f88c2926d2bf4ca394d7b8ee07cc06d2ec05ea76bed3e8a05e',
             ],
             'event.kind': ['enrichment'],
-            'threatintel.indicator.file.hash.md5': ['5529de7b60601aeb36f57824ed0e1ae8'],
+            'threat.indicator.file.hash.md5': ['5529de7b60601aeb36f57824ed0e1ae8'],
             'fileset.name': ['abusemalware'],
             'input.type': ['httpjson'],
             'agent.hostname': ['rylastic.local'],
@@ -89,9 +89,9 @@ export const buildEventEnrichmentRawResponseMock = (): IEsSearchResponse => ({
             'event.type': ['indicator'],
             'event.created': ['2021-05-28T18:33:52.993Z'],
             'agent.ephemeral_id': ['d6b14f65-5bf3-430d-8315-7b5613685979'],
-            'threatintel.indicator.file.size': [24738],
+            'threat.indicator.file.size': [24738],
             'agent.version': ['8.0.0'],
-            'event.dataset': ['threatintel.abusemalware'],
+            'event.dataset': ['ti_abusech.malware'],
           },
           matched_queries: ['file.hash.md5'],
         },
@@ -113,7 +113,7 @@ export const buildEventEnrichmentMock = (
   'ecs.version': ['1.6.0'],
   'event.category': ['threat'],
   'event.created': ['2021-05-28T18:33:52.993Z'],
-  'event.dataset': ['threatintel.abusemalware'],
+  'event.dataset': ['ti_abusech.malware'],
   'event.ingested': ['2021-05-28T18:33:55.086Z'],
   'event.kind': ['enrichment'],
   'event.module': ['threatintel'],
@@ -135,20 +135,18 @@ export const buildEventEnrichmentMock = (
   ],
   'service.type': ['threatintel'],
   tags: ['threatintel-abusemalware', 'forwarded'],
-  'threatintel.indicator.file.hash.md5': ['5529de7b60601aeb36f57824ed0e1ae8'],
-  'threatintel.indicator.file.hash.sha256': [
+  'threat.indicator.file.hash.md5': ['5529de7b60601aeb36f57824ed0e1ae8'],
+  'threat.indicator.file.hash.sha256': [
     '15b012e6f626d0f88c2926d2bf4ca394d7b8ee07cc06d2ec05ea76bed3e8a05e',
   ],
-  'threatintel.indicator.file.hash.ssdeep': [
-    '768:NXSFGJ/ooP6FawrB7Bo1MWnF/jRmhJImp:1SFXIqBo1Mwj2p',
-  ],
-  'threatintel.indicator.file.hash.tlsh': [
+  'threat.indicator.file.hash.ssdeep': ['768:NXSFGJ/ooP6FawrB7Bo1MWnF/jRmhJImp:1SFXIqBo1Mwj2p'],
+  'threat.indicator.file.hash.tlsh': [
     'FFB20B82F6617061C32784E2712F7A46B179B04FD1EA54A0F28CD8E9CFE4CAA1617F1C',
   ],
-  'threatintel.indicator.file.size': [24738],
-  'threatintel.indicator.file.type': ['html'],
-  'threatintel.indicator.first_seen': ['2021-05-28T18:33:29.000Z'],
-  'threatintel.indicator.type': ['file'],
+  'threat.indicator.file.size': [24738],
+  'threat.indicator.file.type': ['html'],
+  'threat.indicator.first_seen': ['2021-05-28T18:33:29.000Z'],
+  'threat.indicator.type': ['file'],
   ...overrides,
 });
 
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_alerts/cti_enrichments.spec.ts b/x-pack/plugins/security_solution/cypress/integration/detection_alerts/cti_enrichments.spec.ts
index 8d60dc33216c0..b3c6abcd8e426 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detection_alerts/cti_enrichments.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/detection_alerts/cti_enrichments.spec.ts
@@ -79,7 +79,7 @@ describe('CTI Enrichment', () => {
       { line: 4, text: '  "threat": {' },
       {
         line: 3,
-        text: '    "enrichments": "{\\"indicator\\":{\\"first_seen\\":\\"2021-03-10T08:02:14.000Z\\",\\"file\\":{\\"size\\":80280,\\"pe\\":{},\\"type\\":\\"elf\\",\\"hash\\":{\\"sha256\\":\\"a04ac6d98ad989312783d4fe3456c53730b212c79a426fb215708b6c6daa3de3\\",\\"tlsh\\":\\"6D7312E017B517CC1371A8353BED205E9128223972AE35302E97528DF957703BAB2DBE\\",\\"ssdeep\\":\\"1536:87vbq1lGAXSEYQjbChaAU2yU23M51DjZgSQAvcYkFtZTjzBht5:8D+CAXFYQChaAUk5ljnQssL\\",\\"md5\\":\\"9b6c3518a91d23ed77504b5416bfb5b3\\"}},\\"type\\":\\"file\\"},\\"matched\\":{\\"atomic\\":\\"a04ac6d98ad989312783d4fe3456c53730b212c79a426fb215708b6c6daa3de3\\",\\"field\\":\\"myhash.mysha256\\",\\"id\\":\\"84cf452c1e0375c3d4412cb550bd1783358468a3b3b777da4829d72c7d6fb74f\\",\\"index\\":\\"filebeat-7.12.0-2021.03.10-000001\\",\\"type\\":\\"indicator_match_rule\\"}}"',
+        text: '    "enrichments": "{\\"indicator\\":{\\"first_seen\\":\\"2021-03-10T08:02:14.000Z\\",\\"file\\":{\\"size\\":80280,\\"pe\\":{},\\"type\\":\\"elf\\",\\"hash\\":{\\"sha256\\":\\"a04ac6d98ad989312783d4fe3456c53730b212c79a426fb215708b6c6daa3de3\\",\\"tlsh\\":\\"6D7312E017B517CC1371A8353BED205E9128223972AE35302E97528DF957703BAB2DBE\\",\\"ssdeep\\":\\"1536:87vbq1lGAXSEYQjbChaAU2yU23M51DjZgSQAvcYkFtZTjzBht5:8D+CAXFYQChaAUk5ljnQssL\\",\\"md5\\":\\"9b6c3518a91d23ed77504b5416bfb5b3\\"}},\\"type\\":\\"file\\"},\\"matched\\":{\\"atomic\\":\\"a04ac6d98ad989312783d4fe3456c53730b212c79a426fb215708b6c6daa3de3\\",\\"field\\":\\"myhash.mysha256\\",\\"id\\":\\"84cf452c1e0375c3d4412cb550bd1783358468a3b3b777da4829d72c7d6fb74f\\",\\"index\\":\\"logs-ti_abusech.malware\\",\\"type\\":\\"indicator_match_rule\\"}}"',
       },
       { line: 2, text: '  }' },
     ];
@@ -127,7 +127,7 @@ describe('CTI Enrichment', () => {
         field: 'matched.id',
         value: '84cf452c1e0375c3d4412cb550bd1783358468a3b3b777da4829d72c7d6fb74f',
       },
-      { field: 'matched.index', value: 'filebeat-7.12.0-2021.03.10-000001' },
+      { field: 'matched.index', value: 'logs-ti_abusech.malware' },
       { field: 'matched.type', value: 'indicator_match_rule' },
     ];
 
diff --git a/x-pack/plugins/security_solution/cypress/objects/rule.ts b/x-pack/plugins/security_solution/cypress/objects/rule.ts
index 788e177fec721..4b061865d632b 100644
--- a/x-pack/plugins/security_solution/cypress/objects/rule.ts
+++ b/x-pack/plugins/security_solution/cypress/objects/rule.ts
@@ -108,7 +108,7 @@ export const getIndexPatterns = (): string[] => [
   'winlogbeat-*',
 ];
 
-export const getThreatIndexPatterns = (): string[] => ['filebeat-*'];
+export const getThreatIndexPatterns = (): string[] => ['logs-ti_*'];
 
 const getMitre1 = (): Mitre => ({
   tactic: `${getMockThreatData().tactic.name} (${getMockThreatData().tactic.id})`,
@@ -380,7 +380,7 @@ export const getNewThreatIndicatorRule = (): ThreatIndicatorRule => ({
   lookBack: getLookBack(),
   indicatorIndexPattern: ['filebeat-*'],
   indicatorMappingField: 'myhash.mysha256',
-  indicatorIndexField: 'threatintel.indicator.file.hash.sha256',
+  indicatorIndexField: 'threat.indicator.file.hash.sha256',
   type: 'file',
   atomic: 'a04ac6d98ad989312783d4fe3456c53730b212c79a426fb215708b6c6daa3de3',
   timeline: getIndicatorMatchTimelineTemplate(),
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_details_view.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_details_view.test.tsx
index ff6a72f735e77..2b1e73c1141c4 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_details_view.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_details_view.test.tsx
@@ -37,7 +37,7 @@ describe('ThreatDetailsView', () => {
   it('renders an anchor link for indicator.reference', () => {
     const enrichments = [
       buildEventEnrichmentMock({
-        'threatintel.indicator.reference': ['http://foo.baz'],
+        'threat.indicator.reference': ['http://foo.baz'],
       }),
     ];
     const wrapper = mount(
@@ -60,10 +60,10 @@ describe('ThreatDetailsView', () => {
     const existingEnrichment = buildEventEnrichmentMock({
       'indicator.first_seen': [mostRecentDate],
     });
-    delete existingEnrichment['threatintel.indicator.first_seen'];
+    delete existingEnrichment['threat.indicator.first_seen'];
     const newEnrichment = buildEventEnrichmentMock({
       'matched.id': ['other.id'],
-      'threatintel.indicator.first_seen': [olderDate],
+      'threat.indicator.first_seen': [olderDate],
     });
     const enrichments = [existingEnrichment, newEnrichment];
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/field_maps/cti.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/field_maps/cti.ts
deleted file mode 100644
index daf54e4f7cf5c..0000000000000
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/field_maps/cti.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export const ctiFieldMap = {
-  'threat.indicator': {
-    type: 'nested',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.as.number': {
-    type: 'long',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.as.organization.name': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.confidence': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.dataset': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.description': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.domain': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.email.address': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.first_seen': {
-    type: 'date',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.geo.city_name': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.geo.continent_name': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.geo.country_iso_code': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.geo.country_name': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.geo.location': {
-    type: 'geo_point',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.geo.name': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.geo.region_iso_code': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.geo.region_name': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.ip': {
-    type: 'ip',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.last_seen': {
-    type: 'date',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.marking.tlp': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.matched.atomic': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.matched.field': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.matched.type': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.module': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.port': {
-    type: 'long',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.provider': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.scanner_stats': {
-    type: 'long',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.sightings': {
-    type: 'long',
-    array: false,
-    required: false,
-  },
-  'threat.indicator.type': {
-    type: 'keyword',
-    array: false,
-    required: false,
-  },
-};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.test.ts
index 576e409378213..1bd3d411adf11 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.test.ts
@@ -42,7 +42,7 @@ describe('Indicator Match Alerts', () => {
           {
             field: 'file.hash.md5',
             type: 'mapping',
-            value: 'threatintel.indicator.file.hash.md5',
+            value: 'threat.indicator.file.hash.md5',
           },
         ],
       },
@@ -156,11 +156,11 @@ describe('Indicator Match Alerts', () => {
               ...sampleDocNoSortId(v4()),
               _source: {
                 ...sampleDocNoSortId(v4())._source,
-                'threatintel.indicator.file.hash.md5': 'a1b2c3',
+                'threat.indicator.file.hash.md5': 'a1b2c3',
               },
               fields: {
                 ...sampleDocNoSortId(v4()).fields,
-                'threatintel.indicator.file.hash.md5': ['a1b2c3'],
+                'threat.indicator.file.hash.md5': ['a1b2c3'],
               },
             },
           ],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/scripts/create_rule_indicator_match.sh b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/scripts/create_rule_indicator_match.sh
index f50aac30a69c5..5beaea5e14475 100755
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/scripts/create_rule_indicator_match.sh
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/scripts/create_rule_indicator_match.sh
@@ -46,7 +46,7 @@ curl -X POST ${KIBANA_URL}${SPACE_URL}/api/alerts/alert \
             {
               "field":"file.hash.md5",
               "type":"mapping",
-              "value":"threatintel.indicator.file.hash.md5"
+              "value":"threat.indicator.file.hash.md5"
             }
           ]
         }
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index d54ed18af01e3..4cecabe52b588 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -104,7 +104,6 @@ import { RuleExecutionLogClient } from './lib/detection_engine/rule_execution_lo
 import { getKibanaPrivilegesFeaturePrivileges, getCasesKibanaFeature } from './features';
 import { EndpointMetadataService } from './endpoint/services/metadata';
 import { CreateRuleOptions } from './lib/detection_engine/rule_types/types';
-import { ctiFieldMap } from './lib/detection_engine/rule_types/field_maps/cti';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRulesNotificationAlertType } from './lib/detection_engine/notifications/legacy_rules_notification_alert_type';
 // eslint-disable-next-line no-restricted-imports
@@ -257,10 +256,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
         componentTemplates: [
           {
             name: 'mappings',
-            mappings: mappingFromFieldMap(
-              { ...alertsFieldMap, ...rulesFieldMap, ...ctiFieldMap },
-              false
-            ),
+            mappings: mappingFromFieldMap({ ...alertsFieldMap, ...rulesFieldMap }, false),
           },
         ],
         secondaryAlias: config.signalsIndex,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/helpers.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/helpers.test.ts
index a246b66d462ce..f20c567813f7f 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/helpers.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/helpers.test.ts
@@ -32,7 +32,7 @@ describe('buildIndicatorShouldClauses', () => {
 
     expect(buildIndicatorShouldClauses(eventFields)).toContainEqual({
       match: {
-        'threatintel.indicator.file.hash.md5': {
+        'threat.indicator.file.hash.md5': {
           _name: 'file.hash.md5',
           query: '1eee2bf3f56d8abed72da2bc523e7431',
         },
@@ -44,8 +44,8 @@ describe('buildIndicatorShouldClauses', () => {
     const eventFields = { 'source.ip': '127.0.0.1', 'url.full': 'elastic.co' };
     expect(buildIndicatorShouldClauses(eventFields)).toEqual(
       expect.arrayContaining([
-        { match: { 'threatintel.indicator.ip': { _name: 'source.ip', query: '127.0.0.1' } } },
-        { match: { 'threatintel.indicator.url.full': { _name: 'url.full', query: 'elastic.co' } } },
+        { match: { 'threat.indicator.ip': { _name: 'source.ip', query: '127.0.0.1' } } },
+        { match: { 'threat.indicator.url.full': { _name: 'url.full', query: 'elastic.co' } } },
       ])
     );
   });
@@ -83,7 +83,7 @@ describe('buildIndicatorEnrichments', () => {
         _index: '_index',
         matched_queries: ['file.hash.md5'],
         fields: {
-          'threatintel.indicator.file.hash.md5': ['indicator_value'],
+          'threat.indicator.file.hash.md5': ['indicator_value'],
         },
       },
     ];
@@ -94,7 +94,7 @@ describe('buildIndicatorEnrichments', () => {
         'matched.field': ['file.hash.md5'],
         'matched.id': ['_id'],
         'matched.index': ['_index'],
-        'threatintel.indicator.file.hash.md5': ['indicator_value'],
+        'threat.indicator.file.hash.md5': ['indicator_value'],
       }),
     ]);
   });
@@ -106,8 +106,8 @@ describe('buildIndicatorEnrichments', () => {
         _index: '_index',
         matched_queries: ['file.hash.md5', 'source.ip'],
         fields: {
-          'threatintel.indicator.file.hash.md5': ['indicator_value'],
-          'threatintel.indicator.ip': ['127.0.0.1'],
+          'threat.indicator.file.hash.md5': ['indicator_value'],
+          'threat.indicator.ip': ['127.0.0.1'],
         },
       },
     ];
@@ -118,16 +118,16 @@ describe('buildIndicatorEnrichments', () => {
         'matched.field': ['file.hash.md5'],
         'matched.id': ['_id'],
         'matched.index': ['_index'],
-        'threatintel.indicator.file.hash.md5': ['indicator_value'],
-        'threatintel.indicator.ip': ['127.0.0.1'],
+        'threat.indicator.file.hash.md5': ['indicator_value'],
+        'threat.indicator.ip': ['127.0.0.1'],
       }),
       expect.objectContaining({
         'matched.atomic': ['127.0.0.1'],
         'matched.field': ['source.ip'],
         'matched.id': ['_id'],
         'matched.index': ['_index'],
-        'threatintel.indicator.file.hash.md5': ['indicator_value'],
-        'threatintel.indicator.ip': ['127.0.0.1'],
+        'threat.indicator.file.hash.md5': ['indicator_value'],
+        'threat.indicator.ip': ['127.0.0.1'],
       }),
     ]);
   });
@@ -139,7 +139,7 @@ describe('buildIndicatorEnrichments', () => {
         _index: '_index',
         matched_queries: ['file.hash.md5'],
         fields: {
-          'threatintel.indicator.file.hash.md5': ['indicator_value'],
+          'threat.indicator.file.hash.md5': ['indicator_value'],
         },
       },
       {
@@ -147,7 +147,7 @@ describe('buildIndicatorEnrichments', () => {
         _index: '_index2',
         matched_queries: ['source.ip'],
         fields: {
-          'threatintel.indicator.ip': ['127.0.0.1'],
+          'threat.indicator.ip': ['127.0.0.1'],
         },
       },
     ];
@@ -158,14 +158,14 @@ describe('buildIndicatorEnrichments', () => {
         'matched.field': ['file.hash.md5'],
         'matched.id': ['_id'],
         'matched.index': ['_index'],
-        'threatintel.indicator.file.hash.md5': ['indicator_value'],
+        'threat.indicator.file.hash.md5': ['indicator_value'],
       }),
       expect.objectContaining({
         'matched.atomic': ['127.0.0.1'],
         'matched.field': ['source.ip'],
         'matched.id': ['_id2'],
         'matched.index': ['_index2'],
-        'threatintel.indicator.ip': ['127.0.0.1'],
+        'threat.indicator.ip': ['127.0.0.1'],
       }),
     ]);
   });
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/query.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/query.test.ts
index bc96a387105c6..d953cb2979e5c 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/query.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/query.test.ts
@@ -16,14 +16,14 @@ describe('buildEventEnrichmentQuery', () => {
       expect.arrayContaining([
         {
           match: {
-            'threatintel.indicator.file.hash.md5': {
+            'threat.indicator.file.hash.md5': {
               _name: 'file.hash.md5',
               query: '1eee2bf3f56d8abed72da2bc523e7431',
             },
           },
         },
-        { match: { 'threatintel.indicator.ip': { _name: 'source.ip', query: '127.0.0.1' } } },
-        { match: { 'threatintel.indicator.url.full': { _name: 'url.full', query: 'elastic.co' } } },
+        { match: { 'threat.indicator.ip': { _name: 'source.ip', query: '127.0.0.1' } } },
+        { match: { 'threat.indicator.url.full': { _name: 'url.full', query: 'elastic.co' } } },
       ])
     );
   });
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/response.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/response.test.ts
index 7ced866e0bb5b..11c6f4aa60265 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/response.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/response.test.ts
@@ -41,16 +41,16 @@ describe('parseEventEnrichmentResponse', () => {
             should: [
               {
                 match: {
-                  'threatintel.indicator.file.hash.md5': {
+                  'threat.indicator.file.hash.md5': {
                     _name: 'file.hash.md5',
                     query: '1eee2bf3f56d8abed72da2bc523e7431',
                   },
                 },
               },
-              { match: { 'threatintel.indicator.ip': { _name: 'source.ip', query: '127.0.0.1' } } },
+              { match: { 'threat.indicator.ip': { _name: 'source.ip', query: '127.0.0.1' } } },
               {
                 match: {
-                  'threatintel.indicator.url.full': { _name: 'url.full', query: 'elastic.co' },
+                  'threat.indicator.url.full': { _name: 'url.full', query: 'elastic.co' },
                 },
               },
             ],
diff --git a/x-pack/test/functional/es_archives/filebeat/threat_intel/data.json b/x-pack/test/functional/es_archives/filebeat/threat_intel/data.json
index 0cbc7f37bd519..f426ffae33e1c 100644
--- a/x-pack/test/functional/es_archives/filebeat/threat_intel/data.json
+++ b/x-pack/test/functional/es_archives/filebeat/threat_intel/data.json
@@ -18,7 +18,7 @@
       "event": {
         "category": "threat",
         "created": "2021-01-26T11:09:05.529Z",
-        "dataset": "threatintel.abuseurl",
+        "dataset": "ti_abusech.malware",
         "ingested": "2021-01-26T11:09:06.595350Z",
         "kind": "enrichment",
         "module": "threatintel",
@@ -87,7 +87,7 @@
       "event": {
         "category": "threat",
         "created": "2021-01-26T11:09:05.529Z",
-        "dataset": "threatintel.abuseurl",
+        "dataset": "ti_abusech.malware",
         "ingested": "2021-01-26T11:09:06.616763Z",
         "kind": "enrichment",
         "module": "threatintel",
@@ -156,7 +156,7 @@
       "event": {
         "category": "threat",
         "created": "2021-01-26T11:09:05.529Z",
-        "dataset": "threatintel.abuseurl",
+        "dataset": "ti_abusech.malware",
         "ingested": "2021-01-26T11:09:06.616763Z",
         "kind": "enrichment",
         "module": "threatintel",
@@ -226,7 +226,7 @@
       "event": {
         "category": "threat",
         "created": "2021-01-26T11:09:05.529Z",
-        "dataset": "threatintel.abuseurl",
+        "dataset": "ti_abusech.malware",
         "ingested": "2021-01-26T11:09:06.616763Z",
         "kind": "enrichment",
         "module": "threatintel",
diff --git a/x-pack/test/functional/es_archives/security_solution/legacy_cti_signals/data.json b/x-pack/test/functional/es_archives/security_solution/legacy_cti_signals/data.json
index bcc8d5f86e1d3..56fa5ea6af329 100644
--- a/x-pack/test/functional/es_archives/security_solution/legacy_cti_signals/data.json
+++ b/x-pack/test/functional/es_archives/security_solution/legacy_cti_signals/data.json
@@ -168,12 +168,12 @@
                 {
                   "field": "host.name",
                   "type": "mapping",
-                  "value": "threatintel.indicator.domain"
+                  "value": "threat.indicator.domain"
                 }
               ]
             }
           ],
-          "threat_query": "threatintel.indicator.type : \"url\"",
+          "threat_query": "threat.indicator.type : \"url\"",
           "throttle": null,
           "to": "now",
           "type": "threat_match",
@@ -190,7 +190,7 @@
             "event": {
               "category": "threat",
               "created": "2021-08-04T03:53:30.761Z",
-              "dataset": "threatintel.abuseurl",
+              "dataset": "ti_abusech.malware",
               "ingested": "2021-08-04T03:53:37.514040Z",
               "kind": "enrichment",
               "module": "threatintel",
@@ -412,12 +412,12 @@
                 {
                   "field": "host.name",
                   "type": "mapping",
-                  "value": "threatintel.indicator.domain"
+                  "value": "threat.indicator.domain"
                 }
               ]
             }
           ],
-          "threat_query": "threatintel.indicator.type : \"url\"",
+          "threat_query": "threat.indicator.type : \"url\"",
           "throttle": null,
           "to": "now",
           "type": "threat_match",
@@ -434,7 +434,7 @@
             "event": {
               "category": "threat",
               "created": "2021-08-04T03:53:30.761Z",
-              "dataset": "threatintel.abuseurl",
+              "dataset": "ti_abusech.malware",
               "ingested": "2021-08-04T03:53:37.514040Z",
               "kind": "enrichment",
               "module": "threatintel",
diff --git a/x-pack/test/security_solution_cypress/es_archives/threat_indicator/data.json b/x-pack/test/security_solution_cypress/es_archives/threat_indicator/data.json
index c5d382194027f..a2e0c2d2921dc 100644
--- a/x-pack/test/security_solution_cypress/es_archives/threat_indicator/data.json
+++ b/x-pack/test/security_solution_cypress/es_archives/threat_indicator/data.json
@@ -2,7 +2,7 @@
   "type": "doc",
   "value": {
     "id": "84cf452c1e0375c3d4412cb550bd1783358468a3b3b777da4829d72c7d6fb74f",
-    "index": "filebeat-7.12.0-2021.03.10-000001",
+    "index": "logs-ti_abusech.malware",
     "source": {
       "@timestamp": "2021-03-10T14:51:05.766Z",
       "agent": {
@@ -16,7 +16,7 @@
       "fileset": {
         "name": "abusemalware"
       },
-      "threatintel": {
+      "threat": {
         "indicator": {
           "first_seen": "2021-03-10T08:02:14.000Z",
           "file": {
@@ -31,13 +31,13 @@
             }
           },
           "type": "file"
-        },
-        "abusemalware": {
-          "virustotal": {
-            "result": "38 / 61",
-            "link": "https://www.virustotal.com/gui/file/a04ac6d98ad989312783d4fe3456c53730b212c79a426fb215708b6c6daa3de3/detection/f-a04ac6d",
-            "percent": "62.30"
-          }
+        }
+      },
+      "abusemalware": {
+        "virustotal": {
+          "result": "38 / 61",
+          "link": "https://www.virustotal.com/gui/file/a04ac6d98ad989312783d4fe3456c53730b212c79a426fb215708b6c6daa3de3/detection/f-a04ac6d",
+          "percent": "62.30"
         }
       },
       "tags": [
@@ -68,7 +68,7 @@
         "module": "threatintel",
         "category": "threat",
         "type": "indicator",
-        "dataset": "threatintel.abusemalware"
+        "dataset": "ti_abusech.malware"
       }
     }
   }
diff --git a/x-pack/test/security_solution_cypress/es_archives/threat_indicator/mappings.json b/x-pack/test/security_solution_cypress/es_archives/threat_indicator/mappings.json
index efd23c5a6bba4..8840cd4bee0dd 100644
--- a/x-pack/test/security_solution_cypress/es_archives/threat_indicator/mappings.json
+++ b/x-pack/test/security_solution_cypress/es_archives/threat_indicator/mappings.json
@@ -6,7 +6,7 @@
         "is_write_index": true
       }
     },
-    "index": "filebeat-7.12.0-2021.03.10-000001",
+    "index": "logs-ti_abusech.malware",
     "mappings": {
       "_meta": {
         "beat": "filebeat",
@@ -194,7 +194,7 @@
             }
           }
         },
-        "threatintel": {
+        "threat": {
           "properties": {
             "abusemalware": {
               "properties": {
diff --git a/x-pack/test/security_solution_cypress/es_archives/threat_indicator2/data.json b/x-pack/test/security_solution_cypress/es_archives/threat_indicator2/data.json
index 0598fd7ba7c86..1a8d3ff5a309a 100644
--- a/x-pack/test/security_solution_cypress/es_archives/threat_indicator2/data.json
+++ b/x-pack/test/security_solution_cypress/es_archives/threat_indicator2/data.json
@@ -2,7 +2,7 @@
   "type": "doc",
   "value": {
     "id": "a04ac6d98ad989312783d4fe3456c53730b212c79a426fb215708b6c6daa3de3",
-    "index": "filebeat-7.12.0-2021.03.11-000001",
+    "index": "logs-ti_abusech.malware",
     "source": {
       "@timestamp": "2021-06-27T14:51:05.766Z",
       "agent": {
@@ -16,7 +16,7 @@
       "fileset": {
         "name": "abusemalware"
       },
-      "threatintel": {
+      "threat": {
         "indicator": {
           "first_seen": "2021-03-11T08:02:14.000Z",
           "ip": "192.168.1.1",
@@ -56,7 +56,7 @@
         "module": "threatintel",
         "category": "threat",
         "type": "indicator",
-        "dataset": "threatintel.abusemalware"
+        "dataset": "ti_abusech.malware"
       }
     }
   }
diff --git a/x-pack/test/security_solution_cypress/es_archives/threat_indicator2/mappings.json b/x-pack/test/security_solution_cypress/es_archives/threat_indicator2/mappings.json
index 072318f7f4fc4..cba4263f32b69 100644
--- a/x-pack/test/security_solution_cypress/es_archives/threat_indicator2/mappings.json
+++ b/x-pack/test/security_solution_cypress/es_archives/threat_indicator2/mappings.json
@@ -2,11 +2,11 @@
   "type": "index",
   "value": {
     "aliases": {
-      "filebeat-7.12.0": {
+      "logs-ti": {
         "is_write_index": false
       }
     },
-    "index": "filebeat-7.12.0-2021.03.11-000001",
+    "index": "logs-ti_abusech.malware",
     "mappings": {
       "_meta": {
         "beat": "filebeat",
@@ -194,7 +194,7 @@
             }
           }
         },
-        "threatintel": {
+        "threat": {
           "properties": {
             "abusemalware": {
               "properties": {

From 7d8d85e1c8f401e7ce153412517d91338d6b2c11 Mon Sep 17 00:00:00 2001
From: "Joey F. Poon" <joey.poon@elastic.co>
Date: Thu, 14 Oct 2021 13:21:55 -0500
Subject: [PATCH 096/117] [Security Solution] unskip endpoint functional tests
 (#114922)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../endpoint/lib/metadata/check_metadata_transforms_task.ts  | 2 +-
 .../apps/endpoint/endpoint_list.ts                           | 5 +----
 .../test/security_solution_endpoint/apps/endpoint/index.ts   | 2 +-
 .../apps/endpoint/trusted_apps_list.ts                       | 5 +----
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.ts b/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.ts
index 68f149bcc64c4..d55e3966f997b 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.ts
@@ -119,7 +119,7 @@ export class CheckMetadataTransformsTask {
 
     const { transforms } = transformStatsResponse.body;
     if (!transforms.length) {
-      this.logger.info('no OLM metadata transforms found');
+      this.logger.info('no endpoint metadata transforms found');
       return;
     }
 
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 8f5177fe14f43..3a49278bd21a8 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
@@ -72,10 +72,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     return tableData;
   };
 
-  // FLAKY
-  // https://github.com/elastic/kibana/issues/114249
-  // https://github.com/elastic/kibana/issues/114250
-  describe.skip('endpoint list', function () {
+  describe('endpoint list', function () {
     const sleep = (ms = 100) => new Promise((resolve) => setTimeout(resolve, ms));
     let indexedData: IndexedHostsAndAlertsResponse;
     describe('when initially navigating to page', () => {
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
index 5ff206b8ad676..70d60ba5c1b67 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
@@ -15,7 +15,7 @@ import {
 export default function (providerContext: FtrProviderContext) {
   const { loadTestFile, getService } = providerContext;
 
-  describe.skip('endpoint', function () {
+  describe('endpoint', function () {
     const ingestManager = getService('ingestManager');
     const log = getService('log');
     const endpointTestResources = getService('endpointTestResources');
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/trusted_apps_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/trusted_apps_list.ts
index 042a685d19ef8..52fb9b8fc8599 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/trusted_apps_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/trusted_apps_list.ts
@@ -16,10 +16,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const endpointTestResources = getService('endpointTestResources');
   const policyTestResources = getService('policyTestResources');
 
-  // FLAKY
-  // https://github.com/elastic/kibana/issues/114308
-  // https://github.com/elastic/kibana/issues/114309
-  describe.skip('When on the Trusted Apps list', function () {
+  describe('When on the Trusted Apps list', function () {
     let indexedData: IndexedHostsAndAlertsResponse;
     before(async () => {
       const endpointPackage = await policyTestResources.getEndpointPackage();

From 7fb99fbe066a05ddb943607921f8bc867e802c5a Mon Sep 17 00:00:00 2001
From: Dominique Clarke <doclarke71@gmail.com>
Date: Thu, 14 Oct 2021 14:31:45 -0400
Subject: [PATCH 097/117] [Uptime] [Synthetics integration] browser monitors -
 Zip Url - add TLS Options and Proxy Url (#112554)

* add tls options to browser monitors when zip url is selected

* adjust types

* add tests

* refactor tls fields and zip url tls fields

* adjust types

* adjust i18n

* add proxy url

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../fleet_package/browser/formatters.ts       |  20 +
 .../fleet_package/browser/normalizers.ts      |  30 ++
 .../fleet_package/browser/simple_fields.tsx   |   4 +-
 .../browser/source_field.test.tsx             |  63 +++
 .../fleet_package/browser/source_field.tsx    |  31 +-
 .../browser/zip_url_tls_fields.test.tsx       | 108 ++++
 .../browser/zip_url_tls_fields.tsx            |  84 +++
 .../fleet_package/common/formatters.ts        |   2 +-
 .../fleet_package/common/tls_options.tsx      | 411 +++++++++++++++
 .../contexts/browser_context.tsx              |  12 +
 .../fleet_package/contexts/http_context.tsx   |   3 +
 .../fleet_package/contexts/index.ts           |   8 +-
 .../contexts/monitor_type_context.tsx         |  47 --
 .../contexts/policy_config_context.tsx        |  86 ++++
 .../fleet_package/contexts/tcp_context.tsx    |   3 +
 .../contexts/tls_fields_context.tsx           |  30 +-
 .../fleet_package/custom_fields.test.tsx      |  48 +-
 .../fleet_package/custom_fields.tsx           | 283 +++++------
 .../http/advanced_fields.test.tsx             |  17 +
 .../fleet_package/http/formatters.ts          |   1 +
 .../fleet_package/http/normalizers.ts         |   1 +
 .../fleet_package/request_body_field.test.tsx |  17 +
 .../synthetics_policy_create_extension.tsx    |  17 +-
 ...s_policy_create_extension_wrapper.test.tsx |  83 +--
 ...hetics_policy_create_extension_wrapper.tsx |   6 +-
 .../synthetics_policy_edit_extension.tsx      |  23 +-
 ...ics_policy_edit_extension_wrapper.test.tsx |  67 ++-
 ...nthetics_policy_edit_extension_wrapper.tsx |  21 +-
 .../fleet_package/tcp/formatters.ts           |   3 +-
 .../fleet_package/tcp/normalizers.ts          |  12 +-
 .../fleet_package/tls/default_values.ts       |  17 +
 .../fleet_package/tls/formatters.ts           |  11 +-
 .../fleet_package/tls/normalizers.ts          |  21 +-
 .../fleet_package/tls_fields.test.tsx         |  33 +-
 .../components/fleet_package/tls_fields.tsx   | 478 ++----------------
 .../public/components/fleet_package/types.tsx |  59 ++-
 .../fleet_package/use_update_policy.test.tsx  |  30 +-
 .../uptime/public/lib/helper/test_helpers.ts  |   2 -
 .../synthetics_integration_page.ts            |   9 +-
 39 files changed, 1353 insertions(+), 848 deletions(-)
 create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.test.tsx
 create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/browser/zip_url_tls_fields.test.tsx
 create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/browser/zip_url_tls_fields.tsx
 create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/common/tls_options.tsx
 delete mode 100644 x-pack/plugins/uptime/public/components/fleet_package/contexts/monitor_type_context.tsx
 create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/contexts/policy_config_context.tsx
 create mode 100644 x-pack/plugins/uptime/public/components/fleet_package/tls/default_values.ts

diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/formatters.ts b/x-pack/plugins/uptime/public/components/fleet_package/browser/formatters.ts
index 5bc44775ee2f5..640db94028bc6 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/formatters.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/formatters.ts
@@ -11,20 +11,40 @@ import {
   commonFormatters,
   arrayToJsonFormatter,
   stringToJsonFormatter,
+  objectToJsonFormatter,
 } from '../common/formatters';
+import {
+  tlsValueToYamlFormatter,
+  tlsValueToStringFormatter,
+  tlsArrayToYamlFormatter,
+} from '../tls/formatters';
 
 export type BrowserFormatMap = Record<keyof BrowserFields, Formatter>;
 
 export const browserFormatters: BrowserFormatMap = {
+  [ConfigKeys.METADATA]: (fields) => objectToJsonFormatter(fields[ConfigKeys.METADATA]),
   [ConfigKeys.SOURCE_ZIP_URL]: null,
   [ConfigKeys.SOURCE_ZIP_USERNAME]: null,
   [ConfigKeys.SOURCE_ZIP_PASSWORD]: null,
   [ConfigKeys.SOURCE_ZIP_FOLDER]: null,
+  [ConfigKeys.SOURCE_ZIP_PROXY_URL]: null,
   [ConfigKeys.SOURCE_INLINE]: (fields) => stringToJsonFormatter(fields[ConfigKeys.SOURCE_INLINE]),
   [ConfigKeys.PARAMS]: null,
   [ConfigKeys.SCREENSHOTS]: null,
   [ConfigKeys.SYNTHETICS_ARGS]: (fields) =>
     arrayToJsonFormatter(fields[ConfigKeys.SYNTHETICS_ARGS]),
+  [ConfigKeys.ZIP_URL_TLS_CERTIFICATE_AUTHORITIES]: (fields) =>
+    tlsValueToYamlFormatter(fields[ConfigKeys.ZIP_URL_TLS_CERTIFICATE_AUTHORITIES]),
+  [ConfigKeys.ZIP_URL_TLS_CERTIFICATE]: (fields) =>
+    tlsValueToYamlFormatter(fields[ConfigKeys.ZIP_URL_TLS_CERTIFICATE]),
+  [ConfigKeys.ZIP_URL_TLS_KEY]: (fields) =>
+    tlsValueToYamlFormatter(fields[ConfigKeys.ZIP_URL_TLS_KEY]),
+  [ConfigKeys.ZIP_URL_TLS_KEY_PASSPHRASE]: (fields) =>
+    tlsValueToStringFormatter(fields[ConfigKeys.ZIP_URL_TLS_KEY_PASSPHRASE]),
+  [ConfigKeys.ZIP_URL_TLS_VERIFICATION_MODE]: (fields) =>
+    tlsValueToStringFormatter(fields[ConfigKeys.ZIP_URL_TLS_VERIFICATION_MODE]),
+  [ConfigKeys.ZIP_URL_TLS_VERSION]: (fields) =>
+    tlsArrayToYamlFormatter(fields[ConfigKeys.ZIP_URL_TLS_VERSION]),
   [ConfigKeys.JOURNEY_FILTERS_MATCH]: (fields) =>
     stringToJsonFormatter(fields[ConfigKeys.JOURNEY_FILTERS_MATCH]),
   [ConfigKeys.JOURNEY_FILTERS_TAGS]: (fields) =>
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/normalizers.ts b/x-pack/plugins/uptime/public/components/fleet_package/browser/normalizers.ts
index 0107fb3884f41..34b937b80dad0 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/normalizers.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/normalizers.ts
@@ -14,6 +14,7 @@ import {
 } from '../common/normalizers';
 
 import { defaultBrowserSimpleFields, defaultBrowserAdvancedFields } from '../contexts';
+import { tlsJsonToObjectNormalizer, tlsStringToObjectNormalizer } from '../tls/normalizers';
 
 export type BrowserNormalizerMap = Record<keyof BrowserFields, Normalizer>;
 
@@ -31,14 +32,43 @@ export const getBrowserJsonToJavascriptNormalizer = (key: ConfigKeys) => {
 };
 
 export const browserNormalizers: BrowserNormalizerMap = {
+  [ConfigKeys.METADATA]: getBrowserJsonToJavascriptNormalizer(ConfigKeys.METADATA),
   [ConfigKeys.SOURCE_ZIP_URL]: getBrowserNormalizer(ConfigKeys.SOURCE_ZIP_URL),
   [ConfigKeys.SOURCE_ZIP_USERNAME]: getBrowserNormalizer(ConfigKeys.SOURCE_ZIP_USERNAME),
   [ConfigKeys.SOURCE_ZIP_PASSWORD]: getBrowserNormalizer(ConfigKeys.SOURCE_ZIP_PASSWORD),
   [ConfigKeys.SOURCE_ZIP_FOLDER]: getBrowserNormalizer(ConfigKeys.SOURCE_ZIP_FOLDER),
   [ConfigKeys.SOURCE_INLINE]: getBrowserJsonToJavascriptNormalizer(ConfigKeys.SOURCE_INLINE),
+  [ConfigKeys.SOURCE_ZIP_PROXY_URL]: getBrowserNormalizer(ConfigKeys.SOURCE_ZIP_PROXY_URL),
   [ConfigKeys.PARAMS]: getBrowserNormalizer(ConfigKeys.PARAMS),
   [ConfigKeys.SCREENSHOTS]: getBrowserNormalizer(ConfigKeys.SCREENSHOTS),
   [ConfigKeys.SYNTHETICS_ARGS]: getBrowserJsonToJavascriptNormalizer(ConfigKeys.SYNTHETICS_ARGS),
+  [ConfigKeys.ZIP_URL_TLS_CERTIFICATE_AUTHORITIES]: (fields) =>
+    tlsJsonToObjectNormalizer(
+      fields?.[ConfigKeys.ZIP_URL_TLS_CERTIFICATE_AUTHORITIES]?.value,
+      ConfigKeys.TLS_CERTIFICATE_AUTHORITIES
+    ),
+  [ConfigKeys.ZIP_URL_TLS_CERTIFICATE]: (fields) =>
+    tlsJsonToObjectNormalizer(
+      fields?.[ConfigKeys.ZIP_URL_TLS_CERTIFICATE]?.value,
+      ConfigKeys.TLS_CERTIFICATE
+    ),
+  [ConfigKeys.ZIP_URL_TLS_KEY]: (fields) =>
+    tlsJsonToObjectNormalizer(fields?.[ConfigKeys.ZIP_URL_TLS_KEY]?.value, ConfigKeys.TLS_KEY),
+  [ConfigKeys.ZIP_URL_TLS_KEY_PASSPHRASE]: (fields) =>
+    tlsStringToObjectNormalizer(
+      fields?.[ConfigKeys.ZIP_URL_TLS_KEY_PASSPHRASE]?.value,
+      ConfigKeys.TLS_KEY_PASSPHRASE
+    ),
+  [ConfigKeys.ZIP_URL_TLS_VERIFICATION_MODE]: (fields) =>
+    tlsStringToObjectNormalizer(
+      fields?.[ConfigKeys.ZIP_URL_TLS_VERIFICATION_MODE]?.value,
+      ConfigKeys.TLS_VERIFICATION_MODE
+    ),
+  [ConfigKeys.ZIP_URL_TLS_VERSION]: (fields) =>
+    tlsJsonToObjectNormalizer(
+      fields?.[ConfigKeys.ZIP_URL_TLS_VERSION]?.value,
+      ConfigKeys.TLS_VERSION
+    ),
   [ConfigKeys.JOURNEY_FILTERS_MATCH]: getBrowserJsonToJavascriptNormalizer(
     ConfigKeys.JOURNEY_FILTERS_MATCH
   ),
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/simple_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/browser/simple_fields.tsx
index 7c7a6b199adcb..775778296fba8 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/simple_fields.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/simple_fields.tsx
@@ -24,10 +24,11 @@ export const BrowserSimpleFields = memo<Props>(({ validate }) => {
     setFields((prevFields) => ({ ...prevFields, [configKey]: value }));
   };
   const onChangeSourceField = useCallback(
-    ({ zipUrl, folder, username, password, inlineScript, params }) => {
+    ({ zipUrl, folder, username, password, inlineScript, params, proxyUrl }) => {
       setFields((prevFields) => ({
         ...prevFields,
         [ConfigKeys.SOURCE_ZIP_URL]: zipUrl,
+        [ConfigKeys.SOURCE_ZIP_PROXY_URL]: proxyUrl,
         [ConfigKeys.SOURCE_ZIP_FOLDER]: folder,
         [ConfigKeys.SOURCE_ZIP_USERNAME]: username,
         [ConfigKeys.SOURCE_ZIP_PASSWORD]: password,
@@ -80,6 +81,7 @@ export const BrowserSimpleFields = memo<Props>(({ validate }) => {
           defaultConfig={useMemo(
             () => ({
               zipUrl: defaultValues[ConfigKeys.SOURCE_ZIP_URL],
+              proxyUrl: defaultValues[ConfigKeys.SOURCE_ZIP_PROXY_URL],
               folder: defaultValues[ConfigKeys.SOURCE_ZIP_FOLDER],
               username: defaultValues[ConfigKeys.SOURCE_ZIP_USERNAME],
               password: defaultValues[ConfigKeys.SOURCE_ZIP_PASSWORD],
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.test.tsx
new file mode 100644
index 0000000000000..6cf37aa2238f3
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.test.tsx
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import 'jest-canvas-mock';
+
+import React from 'react';
+import { fireEvent, screen, waitFor } from '@testing-library/react';
+import { render } from '../../../lib/helper/rtl_helpers';
+import { SourceField, defaultValues } from './source_field';
+import { BrowserSimpleFieldsContextProvider } from '../contexts';
+
+jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
+  ...jest.requireActual('@elastic/eui/lib/services/accessibility/html_id_generator'),
+  htmlIdGenerator: () => () => `id-${Math.random()}`,
+}));
+
+jest.mock('../../../../../../../src/plugins/kibana_react/public', () => {
+  const original = jest.requireActual('../../../../../../../src/plugins/kibana_react/public');
+  return {
+    ...original,
+    // Mocking CodeEditor, which uses React Monaco under the hood
+    CodeEditor: (props: any) => (
+      <input
+        data-test-subj={props['data-test-subj'] || 'mockCodeEditor'}
+        data-currentvalue={props.value}
+        onChange={(e: any) => {
+          props.onChange(e.jsonContent);
+        }}
+      />
+    ),
+  };
+});
+
+const onChange = jest.fn();
+
+describe('<SourceField />', () => {
+  const WrappedComponent = () => {
+    return (
+      <BrowserSimpleFieldsContextProvider>
+        <SourceField onChange={onChange} />
+      </BrowserSimpleFieldsContextProvider>
+    );
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('calls onChange', async () => {
+    render(<WrappedComponent />);
+    const zipUrl = 'test.zip';
+
+    const zipUrlField = screen.getByTestId('syntheticsBrowserZipUrl');
+    fireEvent.change(zipUrlField, { target: { value: zipUrl } });
+
+    await waitFor(() => {
+      expect(onChange).toBeCalledWith({ ...defaultValues, zipUrl });
+    });
+  });
+});
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.tsx b/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.tsx
index 243d709d304ce..6f2a7c99ad0d5 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.tsx
@@ -17,6 +17,7 @@ import {
 } from '@elastic/eui';
 import { OptionalLabel } from '../optional_label';
 import { CodeEditor } from '../code_editor';
+import { ZipUrlTLSFields } from './zip_url_tls_fields';
 import { MonacoEditorLangId } from '../types';
 
 enum SourceType {
@@ -26,6 +27,7 @@ enum SourceType {
 
 interface SourceConfig {
   zipUrl: string;
+  proxyUrl: string;
   folder: string;
   username: string;
   password: string;
@@ -35,11 +37,12 @@ interface SourceConfig {
 
 interface Props {
   onChange: (sourceConfig: SourceConfig) => void;
-  defaultConfig: SourceConfig;
+  defaultConfig?: SourceConfig;
 }
 
-const defaultValues = {
+export const defaultValues = {
   zipUrl: '',
+  proxyUrl: '',
   folder: '',
   username: '',
   password: '',
@@ -96,6 +99,30 @@ export const SourceField = ({ onChange, defaultConfig = defaultValues }: Props)
               data-test-subj="syntheticsBrowserZipUrl"
             />
           </EuiFormRow>
+          <ZipUrlTLSFields />
+          <EuiFormRow
+            label={
+              <FormattedMessage
+                id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.brower.proxyURL.label"
+                defaultMessage="Zip Proxy URL"
+              />
+            }
+            labelAppend={<OptionalLabel />}
+            helpText={
+              <FormattedMessage
+                id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.browser.http.helpText"
+                defaultMessage="HTTP proxy for Zip URL."
+              />
+            }
+          >
+            <EuiFieldText
+              onChange={({ target: { value } }) =>
+                setConfig((prevConfig) => ({ ...prevConfig, proxyUrl: value }))
+              }
+              value={config.proxyUrl}
+              data-test-subj="syntheticsBrowserZipUrlProxy"
+            />
+          </EuiFormRow>
           <EuiFormRow
             label={
               <FormattedMessage
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/zip_url_tls_fields.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/browser/zip_url_tls_fields.test.tsx
new file mode 100644
index 0000000000000..334166e716ff3
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/zip_url_tls_fields.test.tsx
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import 'jest-canvas-mock';
+
+import React from 'react';
+import { fireEvent } from '@testing-library/react';
+import { render } from '../../../lib/helper/rtl_helpers';
+import { ZipUrlTLSFields } from './zip_url_tls_fields';
+import { ConfigKeys, VerificationMode } from '../types';
+import {
+  BrowserSimpleFieldsContextProvider,
+  PolicyConfigContextProvider,
+  defaultBrowserSimpleFields as defaultValues,
+} from '../contexts';
+
+jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
+  ...jest.requireActual('@elastic/eui/lib/services/accessibility/html_id_generator'),
+  htmlIdGenerator: () => () => `id-${Math.random()}`,
+}));
+
+describe('<SourceField />', () => {
+  const WrappedComponent = ({ isEnabled = true }: { isEnabled?: boolean }) => {
+    return (
+      <BrowserSimpleFieldsContextProvider defaultValues={defaultValues}>
+        <PolicyConfigContextProvider defaultIsZipUrlTLSEnabled={isEnabled}>
+          <ZipUrlTLSFields />
+        </PolicyConfigContextProvider>
+      </BrowserSimpleFieldsContextProvider>
+    );
+  };
+  it('renders ZipUrlTLSFields', () => {
+    const { getByLabelText, getByText } = render(<WrappedComponent isEnabled={false} />);
+
+    const toggle = getByText('Enable TLS configuration for Zip URL');
+
+    fireEvent.click(toggle);
+
+    expect(getByText('Certificate settings')).toBeInTheDocument();
+    expect(getByText('Supported TLS protocols')).toBeInTheDocument();
+    expect(getByLabelText('Client certificate')).toBeInTheDocument();
+    expect(getByLabelText('Client key')).toBeInTheDocument();
+    expect(getByLabelText('Certificate authorities')).toBeInTheDocument();
+    expect(getByLabelText('Verification mode')).toBeInTheDocument();
+  });
+
+  it('updates fields', async () => {
+    const { getByLabelText } = render(<WrappedComponent />);
+
+    const clientCertificate = getByLabelText('Client certificate') as HTMLInputElement;
+    const clientKey = getByLabelText('Client key') as HTMLInputElement;
+    const clientKeyPassphrase = getByLabelText('Client key passphrase') as HTMLInputElement;
+    const certificateAuthorities = getByLabelText('Certificate authorities') as HTMLInputElement;
+    const verificationMode = getByLabelText('Verification mode') as HTMLInputElement;
+
+    const newValues = {
+      [ConfigKeys.TLS_CERTIFICATE]: 'sampleClientCertificate',
+      [ConfigKeys.TLS_KEY]: 'sampleClientKey',
+      [ConfigKeys.TLS_KEY_PASSPHRASE]: 'sampleClientKeyPassphrase',
+      [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: 'sampleCertificateAuthorities',
+      [ConfigKeys.TLS_VERIFICATION_MODE]: VerificationMode.NONE,
+    };
+
+    fireEvent.change(clientCertificate, {
+      target: { value: newValues[ConfigKeys.TLS_CERTIFICATE] },
+    });
+    fireEvent.change(clientKey, { target: { value: newValues[ConfigKeys.TLS_KEY] } });
+    fireEvent.change(clientKeyPassphrase, {
+      target: { value: newValues[ConfigKeys.TLS_KEY_PASSPHRASE] },
+    });
+    fireEvent.change(certificateAuthorities, {
+      target: { value: newValues[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES] },
+    });
+    fireEvent.change(verificationMode, {
+      target: { value: newValues[ConfigKeys.TLS_VERIFICATION_MODE] },
+    });
+
+    expect(clientCertificate.value).toEqual(newValues[ConfigKeys.TLS_CERTIFICATE]);
+    expect(clientKey.value).toEqual(newValues[ConfigKeys.TLS_KEY]);
+    expect(certificateAuthorities.value).toEqual(newValues[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]);
+    expect(verificationMode.value).toEqual(newValues[ConfigKeys.TLS_VERIFICATION_MODE]);
+  });
+
+  it('shows warning when verification mode is set to none', () => {
+    const { getByLabelText, getByText } = render(<WrappedComponent />);
+
+    const verificationMode = getByLabelText('Verification mode') as HTMLInputElement;
+
+    fireEvent.change(verificationMode, {
+      target: { value: VerificationMode.NONE },
+    });
+
+    expect(getByText('Disabling TLS')).toBeInTheDocument();
+  });
+
+  it('does not show fields when isEnabled is false', async () => {
+    const { queryByLabelText } = render(<WrappedComponent isEnabled={false} />);
+
+    expect(queryByLabelText('Client certificate')).not.toBeInTheDocument();
+    expect(queryByLabelText('Client key')).not.toBeInTheDocument();
+    expect(queryByLabelText('Client key passphrase')).not.toBeInTheDocument();
+    expect(queryByLabelText('Certificate authorities')).not.toBeInTheDocument();
+    expect(queryByLabelText('verification mode')).not.toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/zip_url_tls_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/browser/zip_url_tls_fields.tsx
new file mode 100644
index 0000000000000..bd5d2f3e5d4a2
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/zip_url_tls_fields.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, { useCallback, useEffect } from 'react';
+
+import { EuiSwitch, EuiFormRow } from '@elastic/eui';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import { TLSOptions, TLSConfig } from '../common/tls_options';
+import { useBrowserSimpleFieldsContext, usePolicyConfigContext } from '../contexts';
+
+import { ConfigKeys } from '../types';
+
+export const ZipUrlTLSFields = () => {
+  const { defaultValues, setFields } = useBrowserSimpleFieldsContext();
+  const { isZipUrlTLSEnabled, setIsZipUrlTLSEnabled } = usePolicyConfigContext();
+
+  const handleOnChange = useCallback(
+    (tlsConfig: TLSConfig) => {
+      setFields((prevFields) => ({
+        ...prevFields,
+        [ConfigKeys.ZIP_URL_TLS_CERTIFICATE_AUTHORITIES]: tlsConfig.certificateAuthorities,
+        [ConfigKeys.ZIP_URL_TLS_CERTIFICATE]: tlsConfig.certificate,
+        [ConfigKeys.ZIP_URL_TLS_KEY]: tlsConfig.key,
+        [ConfigKeys.ZIP_URL_TLS_KEY_PASSPHRASE]: tlsConfig.keyPassphrase,
+        [ConfigKeys.ZIP_URL_TLS_VERIFICATION_MODE]: tlsConfig.verificationMode,
+        [ConfigKeys.ZIP_URL_TLS_VERSION]: tlsConfig.version,
+      }));
+    },
+    [setFields]
+  );
+
+  useEffect(() => {
+    if (!isZipUrlTLSEnabled) {
+      setFields((prevFields) => ({
+        ...prevFields,
+        [ConfigKeys.ZIP_URL_TLS_CERTIFICATE_AUTHORITIES]: undefined,
+        [ConfigKeys.ZIP_URL_TLS_CERTIFICATE]: undefined,
+        [ConfigKeys.ZIP_URL_TLS_KEY]: undefined,
+        [ConfigKeys.ZIP_URL_TLS_KEY_PASSPHRASE]: undefined,
+        [ConfigKeys.ZIP_URL_TLS_VERIFICATION_MODE]: undefined,
+        [ConfigKeys.ZIP_URL_TLS_VERSION]: undefined,
+      }));
+    }
+  }, [setFields, isZipUrlTLSEnabled]);
+
+  return (
+    <EuiFormRow>
+      <>
+        <EuiSwitch
+          id={'syntheticsBrowserIsZipUrlTLSEnabled'}
+          data-test-subj="syntheticsBrowserIsZipUrlTLSEnabled"
+          checked={!!isZipUrlTLSEnabled}
+          label={
+            <FormattedMessage
+              id="xpack.uptime.createPackagePolicy.stepConfigure.certificateSettings.enableZipUrlSSLSettings.label"
+              defaultMessage="Enable TLS configuration for Zip URL"
+            />
+          }
+          onChange={(event) => setIsZipUrlTLSEnabled(event.target.checked)}
+        />
+        {isZipUrlTLSEnabled ? (
+          <TLSOptions
+            defaultValues={{
+              certificateAuthorities: defaultValues[ConfigKeys.ZIP_URL_TLS_CERTIFICATE_AUTHORITIES],
+              certificate: defaultValues[ConfigKeys.ZIP_URL_TLS_CERTIFICATE],
+              key: defaultValues[ConfigKeys.ZIP_URL_TLS_KEY],
+              keyPassphrase: defaultValues[ConfigKeys.ZIP_URL_TLS_KEY_PASSPHRASE],
+              verificationMode: defaultValues[ConfigKeys.ZIP_URL_TLS_VERIFICATION_MODE],
+              version: defaultValues[ConfigKeys.ZIP_URL_TLS_VERSION],
+            }}
+            onChange={handleOnChange}
+            tlsRole="client"
+          />
+        ) : null}
+      </>
+    </EuiFormRow>
+  );
+};
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/formatters.ts b/x-pack/plugins/uptime/public/components/fleet_package/common/formatters.ts
index 4b30f4b4f0484..278aa1b03bab1 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/common/formatters.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/common/formatters.ts
@@ -28,7 +28,7 @@ export const arrayToJsonFormatter = (value: string[] = []) =>
 
 export const secondsToCronFormatter = (value: string = '') => (value ? `${value}s` : null);
 
-export const objectToJsonFormatter = (value: Record<string, string> = {}) =>
+export const objectToJsonFormatter = (value: Record<string, any> = {}) =>
   Object.keys(value).length ? JSON.stringify(value) : null;
 
 export const stringToJsonFormatter = (value: string = '') => (value ? JSON.stringify(value) : null);
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/tls_options.tsx b/x-pack/plugins/uptime/public/components/fleet_package/common/tls_options.tsx
new file mode 100644
index 0000000000000..44a948b24823b
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/fleet_package/common/tls_options.tsx
@@ -0,0 +1,411 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useEffect, useState, memo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiCallOut,
+  EuiComboBox,
+  EuiComboBoxOptionOption,
+  EuiFormRow,
+  EuiTextArea,
+  EuiFormFieldset,
+  EuiSelect,
+  EuiScreenReaderOnly,
+  EuiSpacer,
+  EuiFieldPassword,
+} from '@elastic/eui';
+
+import { VerificationMode, TLSVersion } from '../types';
+
+import { OptionalLabel } from '../optional_label';
+
+type TLSRole = 'client' | 'server';
+
+export interface TLSConfig {
+  certificateAuthorities?: string;
+  certificate?: string;
+  key?: string;
+  keyPassphrase?: string;
+  verificationMode?: VerificationMode;
+  version?: TLSVersion[];
+}
+
+const defaultConfig = {
+  certificateAuthorities: '',
+  certificate: '',
+  key: '',
+  keyPassphrase: '',
+  verificationMode: VerificationMode.STRICT,
+  version: [],
+};
+
+interface Props {
+  onChange: (defaultConfig: TLSConfig) => void;
+  defaultValues: TLSConfig;
+  tlsRole: TLSRole;
+}
+
+export const TLSOptions: React.FunctionComponent<Props> = memo(
+  ({ onChange, defaultValues = defaultConfig, tlsRole }) => {
+    const [verificationVersionInputRef, setVerificationVersionInputRef] =
+      useState<HTMLInputElement | null>(null);
+    const [hasVerificationVersionError, setHasVerificationVersionError] = useState<
+      string | undefined
+    >(undefined);
+
+    const [config, setConfig] = useState<TLSConfig>(defaultValues);
+
+    useEffect(() => {
+      onChange(config);
+    }, [config, onChange]);
+
+    const onVerificationVersionChange = (
+      selectedVersionOptions: Array<EuiComboBoxOptionOption<TLSVersion>>
+    ) => {
+      setConfig((prevConfig) => ({
+        ...prevConfig,
+        version: selectedVersionOptions.map((option) => option.label as TLSVersion),
+      }));
+      setHasVerificationVersionError(undefined);
+    };
+
+    const onSearchChange = (value: string, hasMatchingOptions?: boolean) => {
+      setHasVerificationVersionError(
+        value.length === 0 || hasMatchingOptions ? undefined : `"${value}" is not a valid option`
+      );
+    };
+
+    const onBlur = () => {
+      if (verificationVersionInputRef) {
+        const { value } = verificationVersionInputRef;
+        setHasVerificationVersionError(
+          value.length === 0 ? undefined : `"${value}" is not a valid option`
+        );
+      }
+    };
+
+    return (
+      <EuiFormFieldset
+        legend={{
+          children: (
+            <EuiScreenReaderOnly>
+              <span>
+                <FormattedMessage
+                  id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.legend"
+                  defaultMessage="Certificate settings"
+                />
+              </span>
+            </EuiScreenReaderOnly>
+          ),
+        }}
+      >
+        <EuiFormRow
+          label={
+            <FormattedMessage
+              id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.label"
+              defaultMessage="Verification mode"
+            />
+          }
+          helpText={
+            config.verificationMode ? verificationModeHelpText[config.verificationMode] : ''
+          }
+        >
+          <EuiSelect
+            options={verificationModeOptions}
+            value={config.verificationMode}
+            onChange={(event) => {
+              const verificationMode = event.target.value as VerificationMode;
+              setConfig((prevConfig) => ({
+                ...prevConfig,
+                verificationMode,
+              }));
+            }}
+            data-test-subj="syntheticsTLSVerificationMode"
+          />
+        </EuiFormRow>
+        {config.verificationMode === VerificationMode.NONE && (
+          <>
+            <EuiSpacer size="s" />
+            <EuiCallOut
+              title={
+                <FormattedMessage
+                  id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.warning.title"
+                  defaultMessage="Disabling TLS"
+                />
+              }
+              color="warning"
+              size="s"
+            >
+              <p>
+                <FormattedMessage
+                  id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.warning.description"
+                  defaultMessage="This mode disables many of the security benefits of SSL/TLS and should only be used
+                  after cautious consideration."
+                />
+              </p>
+            </EuiCallOut>
+            <EuiSpacer size="s" />
+          </>
+        )}
+        <EuiFormRow
+          label={
+            <FormattedMessage
+              id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.version.label"
+              defaultMessage="Supported TLS protocols"
+            />
+          }
+          error={hasVerificationVersionError}
+          isInvalid={hasVerificationVersionError !== undefined}
+        >
+          <EuiComboBox
+            placeholder={i18n.translate(
+              'xpack.uptime.createPackagePolicy.stepConfigure.certsField.version.placeholder',
+              {
+                defaultMessage: 'Select one or more TLS protocols.',
+              }
+            )}
+            options={tlsVersionOptions}
+            selectedOptions={(config.version || []).map((version: TLSVersion) => ({
+              label: version,
+            }))}
+            inputRef={setVerificationVersionInputRef}
+            onChange={onVerificationVersionChange}
+            onSearchChange={onSearchChange}
+            onBlur={onBlur}
+          />
+        </EuiFormRow>
+        <EuiFormRow
+          label={
+            <FormattedMessage
+              id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateAuthorities.label"
+              defaultMessage="Certificate authorities"
+            />
+          }
+          helpText={
+            <FormattedMessage
+              id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateAuthorities.helpText"
+              defaultMessage="PEM formatted custom certificate authorities."
+            />
+          }
+          labelAppend={<OptionalLabel />}
+        >
+          <EuiTextArea
+            value={config.certificateAuthorities}
+            onChange={(event) => {
+              const certificateAuthorities = event.target.value;
+              setConfig((prevConfig) => ({
+                ...prevConfig,
+                certificateAuthorities,
+              }));
+            }}
+            onBlur={(event) => {
+              const certificateAuthorities = event.target.value;
+              setConfig((prevConfig) => ({
+                ...prevConfig,
+                certificateAuthorities: certificateAuthorities.trim(),
+              }));
+            }}
+            data-test-subj="syntheticsTLSCA"
+          />
+        </EuiFormRow>
+        <EuiFormRow
+          label={
+            <>
+              {tlsRoleLabels[tlsRole]}{' '}
+              <FormattedMessage
+                id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificate.label"
+                defaultMessage="certificate"
+              />
+            </>
+          }
+          helpText={
+            <FormattedMessage
+              id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificate.helpText"
+              defaultMessage="PEM formatted certificate for TLS client authentication."
+            />
+          }
+          labelAppend={<OptionalLabel />}
+        >
+          <EuiTextArea
+            value={config.certificate}
+            onChange={(event) => {
+              const certificate = event.target.value;
+              setConfig((prevConfig) => ({
+                ...prevConfig,
+                certificate,
+              }));
+            }}
+            onBlur={(event) => {
+              const certificate = event.target.value;
+              setConfig((prevConfig) => ({
+                ...prevConfig,
+                certificate: certificate.trim(),
+              }));
+            }}
+            data-test-subj="syntheticsTLSCert"
+          />
+        </EuiFormRow>
+        <EuiFormRow
+          label={
+            <>
+              {tlsRoleLabels[tlsRole]}{' '}
+              <FormattedMessage
+                id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateKey.label"
+                defaultMessage="key"
+              />
+            </>
+          }
+          helpText={
+            <FormattedMessage
+              id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateKey.helpText"
+              defaultMessage="PEM formatted certificate key for TLS client authentication."
+            />
+          }
+          labelAppend={<OptionalLabel />}
+        >
+          <EuiTextArea
+            value={config.key}
+            onChange={(event) => {
+              const key = event.target.value;
+              setConfig((prevConfig) => ({
+                ...prevConfig,
+                key,
+              }));
+            }}
+            onBlur={(event) => {
+              const key = event.target.value;
+              setConfig((prevConfig) => ({
+                ...prevConfig,
+                key: key.trim(),
+              }));
+            }}
+            data-test-subj="syntheticsTLSCertKey"
+          />
+        </EuiFormRow>
+        <EuiFormRow
+          label={
+            <>
+              {tlsRoleLabels[tlsRole]}{' '}
+              <FormattedMessage
+                id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateKeyPassphrase.label"
+                defaultMessage="key passphrase"
+              />
+            </>
+          }
+          helpText={
+            <FormattedMessage
+              id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateKeyPassphrase.helpText"
+              defaultMessage="Certificate key passphrase for TLS client authentication."
+            />
+          }
+          labelAppend={<OptionalLabel />}
+        >
+          <EuiFieldPassword
+            value={config.keyPassphrase}
+            onChange={(event) => {
+              const keyPassphrase = event.target.value;
+              setConfig((prevConfig) => ({
+                ...prevConfig,
+                keyPassphrase,
+              }));
+            }}
+            data-test-subj="syntheticsTLSCertKeyPassphrase"
+          />
+        </EuiFormRow>
+      </EuiFormFieldset>
+    );
+  }
+);
+
+const tlsRoleLabels = {
+  client: (
+    <FormattedMessage
+      id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.tlsRole.client"
+      defaultMessage="Client"
+    />
+  ),
+  server: (
+    <FormattedMessage
+      id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.tlsRole.server"
+      defaultMessage="Server"
+    />
+  ),
+};
+
+const verificationModeHelpText = {
+  [VerificationMode.CERTIFICATE]: i18n.translate(
+    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.certificate.description',
+    {
+      defaultMessage:
+        'Verifies that the provided certificate is signed by a trusted authority (CA), but does not perform any hostname verification.',
+    }
+  ),
+  [VerificationMode.FULL]: i18n.translate(
+    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.full.description',
+    {
+      defaultMessage:
+        'Verifies that the provided certificate is signed by a trusted authority (CA) and also verifies that the server’s hostname (or IP address) matches the names identified within the certificate.',
+    }
+  ),
+  [VerificationMode.NONE]: i18n.translate(
+    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.none.description',
+    {
+      defaultMessage:
+        'Performs no verification of the server’s certificate. It is primarily intended as a temporary diagnostic mechanism when attempting to resolve TLS errors; its use in production environments is strongly discouraged.',
+    }
+  ),
+  [VerificationMode.STRICT]: i18n.translate(
+    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.strict.description',
+    {
+      defaultMessage:
+        'Verifies that the provided certificate is signed by a trusted authority (CA) and also verifies that the server’s hostname (or IP address) matches the names identified within the certificate. If the Subject Alternative Name is empty, it returns an error.',
+    }
+  ),
+};
+
+const verificationModeLabels = {
+  [VerificationMode.CERTIFICATE]: i18n.translate(
+    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.certificate.label',
+    {
+      defaultMessage: 'Certificate',
+    }
+  ),
+  [VerificationMode.FULL]: i18n.translate(
+    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.full.label',
+    {
+      defaultMessage: 'Full',
+    }
+  ),
+  [VerificationMode.NONE]: i18n.translate(
+    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.none.label',
+    {
+      defaultMessage: 'None',
+    }
+  ),
+  [VerificationMode.STRICT]: i18n.translate(
+    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.strict.label',
+    {
+      defaultMessage: 'Strict',
+    }
+  ),
+};
+
+const verificationModeOptions = [
+  {
+    value: VerificationMode.CERTIFICATE,
+    text: verificationModeLabels[VerificationMode.CERTIFICATE],
+  },
+  { value: VerificationMode.FULL, text: verificationModeLabels[VerificationMode.FULL] },
+  { value: VerificationMode.NONE, text: verificationModeLabels[VerificationMode.NONE] },
+  { value: VerificationMode.STRICT, text: verificationModeLabels[VerificationMode.STRICT] },
+];
+
+const tlsVersionOptions = Object.values(TLSVersion).map((method) => ({
+  label: method,
+}));
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context.tsx
index 1d1493178b944..1fb1291c42893 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context.tsx
@@ -8,6 +8,7 @@
 import React, { createContext, useContext, useMemo, useState } from 'react';
 import { IBrowserSimpleFields, ConfigKeys, DataStream } from '../types';
 import { defaultValues as commonDefaultValues } from '../common/default_values';
+import { defaultValues as tlsDefaultValues } from '../tls/default_values';
 
 interface IBrowserSimpleFieldsContext {
   setFields: React.Dispatch<React.SetStateAction<IBrowserSimpleFields>>;
@@ -22,13 +23,24 @@ interface IBrowserSimpleFieldsContextProvider {
 
 export const initialValues: IBrowserSimpleFields = {
   ...commonDefaultValues,
+  [ConfigKeys.METADATA]: {
+    is_zip_url_tls_enabled: false,
+  },
   [ConfigKeys.MONITOR_TYPE]: DataStream.BROWSER,
   [ConfigKeys.SOURCE_ZIP_URL]: '',
   [ConfigKeys.SOURCE_ZIP_USERNAME]: '',
   [ConfigKeys.SOURCE_ZIP_PASSWORD]: '',
   [ConfigKeys.SOURCE_ZIP_FOLDER]: '',
+  [ConfigKeys.SOURCE_ZIP_PROXY_URL]: '',
   [ConfigKeys.SOURCE_INLINE]: '',
   [ConfigKeys.PARAMS]: '',
+  [ConfigKeys.ZIP_URL_TLS_CERTIFICATE_AUTHORITIES]:
+    tlsDefaultValues[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES],
+  [ConfigKeys.ZIP_URL_TLS_CERTIFICATE]: tlsDefaultValues[ConfigKeys.TLS_CERTIFICATE],
+  [ConfigKeys.ZIP_URL_TLS_KEY]: tlsDefaultValues[ConfigKeys.TLS_KEY],
+  [ConfigKeys.ZIP_URL_TLS_KEY_PASSPHRASE]: tlsDefaultValues[ConfigKeys.TLS_KEY_PASSPHRASE],
+  [ConfigKeys.ZIP_URL_TLS_VERIFICATION_MODE]: tlsDefaultValues[ConfigKeys.TLS_VERIFICATION_MODE],
+  [ConfigKeys.ZIP_URL_TLS_VERSION]: tlsDefaultValues[ConfigKeys.TLS_VERSION],
 };
 
 const defaultContext: IBrowserSimpleFieldsContext = {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_context.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_context.tsx
index d8b89a1dfc4d0..c29080cfcaf90 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_context.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/http_context.tsx
@@ -22,6 +22,9 @@ interface IHTTPSimpleFieldsContextProvider {
 
 export const initialValues: IHTTPSimpleFields = {
   ...commonDefaultValues,
+  [ConfigKeys.METADATA]: {
+    is_tls_enabled: false,
+  },
   [ConfigKeys.URLS]: '',
   [ConfigKeys.MAX_REDIRECTS]: '0',
   [ConfigKeys.MONITOR_TYPE]: DataStream.HTTP,
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/index.ts b/x-pack/plugins/uptime/public/components/fleet_package/contexts/index.ts
index 4d76a6d8f8d67..3d08dec46a4be 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/contexts/index.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 export {
-  MonitorTypeContext,
-  MonitorTypeContextProvider,
+  PolicyConfigContext,
+  PolicyConfigContextProvider,
   initialValue as defaultMonitorType,
-  useMonitorTypeContext,
-} from './monitor_type_context';
+  usePolicyConfigContext,
+} from './policy_config_context';
 export {
   HTTPSimpleFieldsContext,
   HTTPSimpleFieldsContextProvider,
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/monitor_type_context.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/monitor_type_context.tsx
deleted file mode 100644
index 6e9a5de83c2fe..0000000000000
--- a/x-pack/plugins/uptime/public/components/fleet_package/contexts/monitor_type_context.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { createContext, useContext, useMemo, useState } from 'react';
-import { DataStream } from '../types';
-
-interface IMonitorTypeFieldsContext {
-  setMonitorType: React.Dispatch<React.SetStateAction<DataStream>>;
-  monitorType: DataStream;
-  defaultValue: DataStream;
-}
-
-interface IMonitorTypeFieldsContextProvider {
-  children: React.ReactNode;
-  defaultValue?: DataStream;
-}
-
-export const initialValue = DataStream.HTTP;
-
-const defaultContext: IMonitorTypeFieldsContext = {
-  setMonitorType: (_monitorType: React.SetStateAction<DataStream>) => {
-    throw new Error('setMonitorType was not initialized, set it when you invoke the context');
-  },
-  monitorType: initialValue, // mutable
-  defaultValue: initialValue, // immutable
-};
-
-export const MonitorTypeContext = createContext(defaultContext);
-
-export const MonitorTypeContextProvider = ({
-  children,
-  defaultValue = initialValue,
-}: IMonitorTypeFieldsContextProvider) => {
-  const [monitorType, setMonitorType] = useState<DataStream>(defaultValue);
-
-  const value = useMemo(() => {
-    return { monitorType, setMonitorType, defaultValue };
-  }, [monitorType, defaultValue]);
-
-  return <MonitorTypeContext.Provider value={value} children={children} />;
-};
-
-export const useMonitorTypeContext = () => useContext(MonitorTypeContext);
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/policy_config_context.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/policy_config_context.tsx
new file mode 100644
index 0000000000000..535a415c9a43d
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/policy_config_context.tsx
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { createContext, useContext, useMemo, useState } from 'react';
+import { DataStream } from '../types';
+
+interface IPolicyConfigContext {
+  setMonitorType: React.Dispatch<React.SetStateAction<DataStream>>;
+  setIsTLSEnabled: React.Dispatch<React.SetStateAction<boolean>>;
+  setIsZipUrlTLSEnabled: React.Dispatch<React.SetStateAction<boolean>>;
+  monitorType: DataStream;
+  defaultMonitorType: DataStream;
+  isTLSEnabled?: boolean;
+  isZipUrlTLSEnabled?: boolean;
+  defaultIsTLSEnabled?: boolean;
+  defaultIsZipUrlTLSEnabled?: boolean;
+}
+
+interface IPolicyConfigContextProvider {
+  children: React.ReactNode;
+  defaultMonitorType?: DataStream;
+  defaultIsTLSEnabled?: boolean;
+  defaultIsZipUrlTLSEnabled?: boolean;
+}
+
+export const initialValue = DataStream.HTTP;
+
+const defaultContext: IPolicyConfigContext = {
+  setMonitorType: (_monitorType: React.SetStateAction<DataStream>) => {
+    throw new Error('setMonitorType was not initialized, set it when you invoke the context');
+  },
+  setIsTLSEnabled: (_isTLSEnabled: React.SetStateAction<boolean>) => {
+    throw new Error('setIsTLSEnabled was not initialized, set it when you invoke the context');
+  },
+  setIsZipUrlTLSEnabled: (_isZipUrlTLSEnabled: React.SetStateAction<boolean>) => {
+    throw new Error(
+      'setIsZipUrlTLSEnabled was not initialized, set it when you invoke the context'
+    );
+  },
+  monitorType: initialValue, // mutable
+  defaultMonitorType: initialValue, // immutable,
+  defaultIsTLSEnabled: false,
+  defaultIsZipUrlTLSEnabled: false,
+};
+
+export const PolicyConfigContext = createContext(defaultContext);
+
+export const PolicyConfigContextProvider = ({
+  children,
+  defaultMonitorType = initialValue,
+  defaultIsTLSEnabled = false,
+  defaultIsZipUrlTLSEnabled = false,
+}: IPolicyConfigContextProvider) => {
+  const [monitorType, setMonitorType] = useState<DataStream>(defaultMonitorType);
+  const [isTLSEnabled, setIsTLSEnabled] = useState<boolean>(defaultIsTLSEnabled);
+  const [isZipUrlTLSEnabled, setIsZipUrlTLSEnabled] = useState<boolean>(defaultIsZipUrlTLSEnabled);
+
+  const value = useMemo(() => {
+    return {
+      monitorType,
+      setMonitorType,
+      defaultMonitorType,
+      isTLSEnabled,
+      isZipUrlTLSEnabled,
+      setIsTLSEnabled,
+      setIsZipUrlTLSEnabled,
+      defaultIsTLSEnabled,
+      defaultIsZipUrlTLSEnabled,
+    };
+  }, [
+    monitorType,
+    defaultMonitorType,
+    isTLSEnabled,
+    isZipUrlTLSEnabled,
+    defaultIsTLSEnabled,
+    defaultIsZipUrlTLSEnabled,
+  ]);
+
+  return <PolicyConfigContext.Provider value={value} children={children} />;
+};
+
+export const usePolicyConfigContext = () => useContext(PolicyConfigContext);
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_context.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_context.tsx
index a1e01cb7faab7..c084ea757035f 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_context.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/tcp_context.tsx
@@ -22,6 +22,9 @@ interface ITCPSimpleFieldsContextProvider {
 
 export const initialValues: ITCPSimpleFields = {
   ...commonDefaultValues,
+  [ConfigKeys.METADATA]: {
+    is_tls_enabled: false,
+  },
   [ConfigKeys.HOSTS]: '',
   [ConfigKeys.MONITOR_TYPE]: DataStream.TCP,
 };
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/tls_fields_context.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/tls_fields_context.tsx
index 2a88b8c88e96c..e754d0ca03257 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/contexts/tls_fields_context.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/tls_fields_context.tsx
@@ -6,7 +6,8 @@
  */
 
 import React, { createContext, useContext, useMemo, useState } from 'react';
-import { ITLSFields, ConfigKeys, TLSVersion, VerificationMode } from '../types';
+import { ITLSFields } from '../types';
+import { defaultValues as tlsDefaultValues } from '../tls/default_values';
 
 interface ITLSFieldsContext {
   setFields: React.Dispatch<React.SetStateAction<ITLSFields>>;
@@ -19,32 +20,7 @@ interface ITLSFieldsContextProvider {
   defaultValues?: ITLSFields;
 }
 
-export const initialValues: ITLSFields = {
-  [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: {
-    value: '',
-    isEnabled: false,
-  },
-  [ConfigKeys.TLS_CERTIFICATE]: {
-    value: '',
-    isEnabled: false,
-  },
-  [ConfigKeys.TLS_KEY]: {
-    value: '',
-    isEnabled: false,
-  },
-  [ConfigKeys.TLS_KEY_PASSPHRASE]: {
-    value: '',
-    isEnabled: false,
-  },
-  [ConfigKeys.TLS_VERIFICATION_MODE]: {
-    value: VerificationMode.FULL,
-    isEnabled: false,
-  },
-  [ConfigKeys.TLS_VERSION]: {
-    value: [TLSVersion.ONE_ONE, TLSVersion.ONE_TWO, TLSVersion.ONE_THREE],
-    isEnabled: false,
-  },
-};
+export const initialValues: ITLSFields = tlsDefaultValues;
 
 const defaultContext: ITLSFieldsContext = {
   setFields: (_fields: React.SetStateAction<ITLSFields>) => {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx
index 3a13be1aa3f68..f16e72837b343 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx
@@ -14,7 +14,7 @@ import {
   HTTPContextProvider,
   BrowserContextProvider,
   ICMPSimpleFieldsContextProvider,
-  MonitorTypeContextProvider,
+  PolicyConfigContextProvider,
   TLSFieldsContextProvider,
 } from './contexts';
 import { CustomFields } from './custom_fields';
@@ -24,9 +24,27 @@ import { defaultConfig } from './synthetics_policy_create_extension';
 
 // ensures that fields appropriately match to their label
 jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
+  ...jest.requireActual('@elastic/eui/lib/services/accessibility/html_id_generator'),
   htmlIdGenerator: () => () => `id-${Math.random()}`,
 }));
 
+jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
+  const original = jest.requireActual('../../../../../../src/plugins/kibana_react/public');
+  return {
+    ...original,
+    // Mocking CodeEditor, which uses React Monaco under the hood
+    CodeEditor: (props: any) => (
+      <input
+        data-test-subj={props['data-test-subj'] || 'mockCodeEditor'}
+        data-currentvalue={props.value}
+        onChange={(e: any) => {
+          props.onChange(e.jsonContent);
+        }}
+      />
+    ),
+  };
+});
+
 const defaultValidation = centralValidation[DataStream.HTTP];
 
 const defaultHTTPConfig = defaultConfig[DataStream.HTTP];
@@ -40,7 +58,7 @@ describe('<CustomFields />', () => {
   }) => {
     return (
       <HTTPContextProvider>
-        <MonitorTypeContextProvider>
+        <PolicyConfigContextProvider>
           <TCPContextProvider>
             <BrowserContextProvider>
               <ICMPSimpleFieldsContextProvider>
@@ -54,7 +72,7 @@ describe('<CustomFields />', () => {
               </ICMPSimpleFieldsContextProvider>
             </BrowserContextProvider>
           </TCPContextProvider>
-        </MonitorTypeContextProvider>
+        </PolicyConfigContextProvider>
       </HTTPContextProvider>
     );
   };
@@ -124,15 +142,11 @@ describe('<CustomFields />', () => {
     expect(verificationMode).toBeInTheDocument();
 
     await waitFor(() => {
-      expect(ca.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES].value);
-      expect(clientKey.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_KEY].value);
-      expect(clientKeyPassphrase.value).toEqual(
-        defaultHTTPConfig[ConfigKeys.TLS_KEY_PASSPHRASE].value
-      );
-      expect(clientCertificate.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_CERTIFICATE].value);
-      expect(verificationMode.value).toEqual(
-        defaultHTTPConfig[ConfigKeys.TLS_VERIFICATION_MODE].value
-      );
+      expect(ca.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]);
+      expect(clientKey.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_KEY]);
+      expect(clientKeyPassphrase.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_KEY_PASSPHRASE]);
+      expect(clientCertificate.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_CERTIFICATE]);
+      expect(verificationMode.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_VERIFICATION_MODE]);
     });
   });
 
@@ -182,6 +196,9 @@ describe('<CustomFields />', () => {
     expect(queryByLabelText('URL')).not.toBeInTheDocument();
     expect(queryByLabelText('Max redirects')).not.toBeInTheDocument();
 
+    // expect tls options to be available for TCP
+    expect(queryByLabelText('Enable TLS configuration')).toBeInTheDocument();
+
     // ensure at least one tcp advanced option is present
     let advancedOptionsButton = getByText('Advanced TCP options');
     fireEvent.click(advancedOptionsButton);
@@ -194,6 +211,9 @@ describe('<CustomFields />', () => {
     // expect ICMP fields to be in the DOM
     expect(getByLabelText('Wait in seconds')).toBeInTheDocument();
 
+    // expect tls options not be available for ICMP
+    expect(queryByLabelText('Enable TLS configuration')).not.toBeInTheDocument();
+
     // expect TCP fields not to be in the DOM
     expect(queryByLabelText('Proxy URL')).not.toBeInTheDocument();
 
@@ -209,6 +229,10 @@ describe('<CustomFields />', () => {
       )
     ).toBeInTheDocument();
 
+    // expect tls options to be available for browser
+    expect(queryByLabelText('Zip Proxy URL')).toBeInTheDocument();
+    expect(queryByLabelText('Enable TLS configuration for Zip URL')).toBeInTheDocument();
+
     // ensure at least one browser advanced option is present
     advancedOptionsButton = getByText('Advanced Browser options');
     fireEvent.click(advancedOptionsButton);
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.tsx
index d641df9c44c5f..7323464f3e9dd 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React, { useState, useMemo, memo } from 'react';
+import React, { useMemo, memo } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiFlexGroup,
@@ -14,13 +14,13 @@ import {
   EuiSelect,
   EuiSpacer,
   EuiDescribedFormGroup,
-  EuiCheckbox,
+  EuiSwitch,
   EuiCallOut,
   EuiLink,
 } from '@elastic/eui';
 import { ConfigKeys, DataStream, Validation } from './types';
-import { useMonitorTypeContext } from './contexts';
-import { TLSFields, TLSRole } from './tls_fields';
+import { usePolicyConfigContext } from './contexts';
+import { TLSFields } from './tls_fields';
 import { HTTPSimpleFields } from './http/simple_fields';
 import { HTTPAdvancedFields } from './http/advanced_fields';
 import { TCPSimpleFields } from './tcp/simple_fields';
@@ -31,168 +31,159 @@ import { BrowserAdvancedFields } from './browser/advanced_fields';
 
 interface Props {
   typeEditable?: boolean;
-  isTLSEnabled?: boolean;
   validate: Validation;
   dataStreams?: DataStream[];
 }
 
-export const CustomFields = memo<Props>(
-  ({
-    typeEditable = false,
-    isTLSEnabled: defaultIsTLSEnabled = false,
-    validate,
-    dataStreams = [],
-  }) => {
-    const [isTLSEnabled, setIsTLSEnabled] = useState<boolean>(defaultIsTLSEnabled);
-    const { monitorType, setMonitorType } = useMonitorTypeContext();
+export const CustomFields = memo<Props>(({ typeEditable = false, validate, dataStreams = [] }) => {
+  const { monitorType, setMonitorType, isTLSEnabled, setIsTLSEnabled } = usePolicyConfigContext();
 
-    const isHTTP = monitorType === DataStream.HTTP;
-    const isTCP = monitorType === DataStream.TCP;
-    const isBrowser = monitorType === DataStream.BROWSER;
+  const isHTTP = monitorType === DataStream.HTTP;
+  const isTCP = monitorType === DataStream.TCP;
+  const isBrowser = monitorType === DataStream.BROWSER;
 
-    const dataStreamOptions = useMemo(() => {
-      const dataStreamToString = [
-        { value: DataStream.HTTP, text: 'HTTP' },
-        { value: DataStream.TCP, text: 'TCP' },
-        { value: DataStream.ICMP, text: 'ICMP' },
-        { value: DataStream.BROWSER, text: 'Browser' },
-      ];
-      return dataStreamToString.filter((dataStream) => dataStreams.includes(dataStream.value));
-    }, [dataStreams]);
+  const dataStreamOptions = useMemo(() => {
+    const dataStreamToString = [
+      { value: DataStream.HTTP, text: 'HTTP' },
+      { value: DataStream.TCP, text: 'TCP' },
+      { value: DataStream.ICMP, text: 'ICMP' },
+      { value: DataStream.BROWSER, text: 'Browser' },
+    ];
+    return dataStreamToString.filter((dataStream) => dataStreams.includes(dataStream.value));
+  }, [dataStreams]);
 
-    const renderSimpleFields = (type: DataStream) => {
-      switch (type) {
-        case DataStream.HTTP:
-          return <HTTPSimpleFields validate={validate} />;
-        case DataStream.ICMP:
-          return <ICMPSimpleFields validate={validate} />;
-        case DataStream.TCP:
-          return <TCPSimpleFields validate={validate} />;
-        case DataStream.BROWSER:
-          return <BrowserSimpleFields validate={validate} />;
-        default:
-          return null;
-      }
-    };
+  const renderSimpleFields = (type: DataStream) => {
+    switch (type) {
+      case DataStream.HTTP:
+        return <HTTPSimpleFields validate={validate} />;
+      case DataStream.ICMP:
+        return <ICMPSimpleFields validate={validate} />;
+      case DataStream.TCP:
+        return <TCPSimpleFields validate={validate} />;
+      case DataStream.BROWSER:
+        return <BrowserSimpleFields validate={validate} />;
+      default:
+        return null;
+    }
+  };
 
-    return (
-      <EuiForm component="form">
+  return (
+    <EuiForm component="form">
+      <EuiDescribedFormGroup
+        title={
+          <h4>
+            <FormattedMessage
+              id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSectionTitle"
+              defaultMessage="Monitor settings"
+            />
+          </h4>
+        }
+        description={
+          <FormattedMessage
+            id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSectionDescription"
+            defaultMessage="Configure your monitor with the following options."
+          />
+        }
+        data-test-subj="monitorSettingsSection"
+      >
+        <EuiFlexGroup>
+          <EuiFlexItem>
+            {typeEditable && (
+              <EuiFormRow
+                label={
+                  <FormattedMessage
+                    id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType"
+                    defaultMessage="Monitor Type"
+                  />
+                }
+                isInvalid={
+                  !!validate[ConfigKeys.MONITOR_TYPE]?.({
+                    [ConfigKeys.MONITOR_TYPE]: monitorType,
+                  })
+                }
+                error={
+                  <FormattedMessage
+                    id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.error"
+                    defaultMessage="Monitor type is required"
+                  />
+                }
+              >
+                <EuiSelect
+                  options={dataStreamOptions}
+                  value={monitorType}
+                  onChange={(event) => setMonitorType(event.target.value as DataStream)}
+                  data-test-subj="syntheticsMonitorTypeField"
+                />
+              </EuiFormRow>
+            )}
+            <EuiSpacer size="s" />
+            {isBrowser && (
+              <EuiCallOut
+                title={
+                  <FormattedMessage
+                    id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.browser.warning.description"
+                    defaultMessage='To create a "Browser" monitor, please ensure you are using the elastic-agent-complete Docker container, which contains the dependencies to run these monitors. For more information, please visit our {link}.'
+                    values={{
+                      link: (
+                        <EuiLink
+                          target="_blank"
+                          href="https://www.elastic.co/guide/en/observability/current/synthetics-quickstart-fleet.html"
+                          external
+                        >
+                          <FormattedMessage
+                            id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.browser.warning.link"
+                            defaultMessage="synthetics documentation"
+                          />
+                        </EuiLink>
+                      ),
+                    }}
+                  />
+                }
+                iconType="help"
+                size="s"
+              />
+            )}
+            <EuiSpacer size="s" />
+            {renderSimpleFields(monitorType)}
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiDescribedFormGroup>
+      {(isHTTP || isTCP) && (
         <EuiDescribedFormGroup
           title={
             <h4>
               <FormattedMessage
-                id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSectionTitle"
-                defaultMessage="Monitor settings"
+                id="xpack.uptime.createPackagePolicy.stepConfigure.tlsSettings.label"
+                defaultMessage="TLS settings"
               />
             </h4>
           }
           description={
             <FormattedMessage
-              id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSectionDescription"
-              defaultMessage="Configure your monitor with the following options."
+              id="xpack.uptime.createPackagePolicy.stepConfigure.tlsSettings.description"
+              defaultMessage="Configure TLS options, including verification mode, certificate authorities, and client certificates."
             />
           }
-          data-test-subj="monitorSettingsSection"
         >
-          <EuiFlexGroup>
-            <EuiFlexItem>
-              {typeEditable && (
-                <EuiFormRow
-                  label={
-                    <FormattedMessage
-                      id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType"
-                      defaultMessage="Monitor Type"
-                    />
-                  }
-                  isInvalid={
-                    !!validate[ConfigKeys.MONITOR_TYPE]?.({
-                      [ConfigKeys.MONITOR_TYPE]: monitorType,
-                    })
-                  }
-                  error={
-                    <FormattedMessage
-                      id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.error"
-                      defaultMessage="Monitor type is required"
-                    />
-                  }
-                >
-                  <EuiSelect
-                    options={dataStreamOptions}
-                    value={monitorType}
-                    onChange={(event) => setMonitorType(event.target.value as DataStream)}
-                    data-test-subj="syntheticsMonitorTypeField"
-                  />
-                </EuiFormRow>
-              )}
-              <EuiSpacer size="s" />
-              {isBrowser && (
-                <EuiCallOut
-                  title={
-                    <FormattedMessage
-                      id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.browser.warning.description"
-                      defaultMessage='To create a "Browser" monitor, please ensure you are using the elastic-agent-complete Docker container, which contains the dependencies to run these monitors. For more information, please visit our {link}.'
-                      values={{
-                        link: (
-                          <EuiLink
-                            target="_blank"
-                            href="https://www.elastic.co/guide/en/observability/current/synthetics-quickstart-fleet.html"
-                            external
-                          >
-                            <FormattedMessage
-                              id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.monitorType.browser.warning.link"
-                              defaultMessage="synthetics documentation"
-                            />
-                          </EuiLink>
-                        ),
-                      }}
-                    />
-                  }
-                  iconType="help"
-                  size="s"
-                />
-              )}
-              <EuiSpacer size="s" />
-              {renderSimpleFields(monitorType)}
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiDescribedFormGroup>
-        {(isHTTP || isTCP) && (
-          <EuiDescribedFormGroup
-            title={
-              <h4>
-                <FormattedMessage
-                  id="xpack.uptime.createPackagePolicy.stepConfigure.tlsSettings.label"
-                  defaultMessage="TLS settings"
-                />
-              </h4>
-            }
-            description={
+          <EuiSwitch
+            id={'uptimeFleetIsTLSEnabled'}
+            data-test-subj="syntheticsIsTLSEnabled"
+            checked={!!isTLSEnabled}
+            label={
               <FormattedMessage
-                id="xpack.uptime.createPackagePolicy.stepConfigure.tlsSettings.description"
-                defaultMessage="Configure TLS options, including verification mode, certificate authorities, and client certificates."
+                id="xpack.uptime.createPackagePolicy.stepConfigure.certificateSettings.enableSSLSettings.label"
+                defaultMessage="Enable TLS configuration"
               />
             }
-            data-test-subj="syntheticsIsTLSEnabled"
-          >
-            <EuiCheckbox
-              id={'uptimeFleetIsTLSEnabled'}
-              checked={isTLSEnabled}
-              label={
-                <FormattedMessage
-                  id="xpack.uptime.createPackagePolicy.stepConfigure.certificateSettings.enableSSLSettings.label"
-                  defaultMessage="Enable TLS configuration"
-                />
-              }
-              onChange={(event) => setIsTLSEnabled(event.target.checked)}
-            />
-            <TLSFields tlsRole={TLSRole.CLIENT} isEnabled={isTLSEnabled} />
-          </EuiDescribedFormGroup>
-        )}
-        <EuiSpacer size="m" />
-        {isHTTP && <HTTPAdvancedFields validate={validate} />}
-        {isTCP && <TCPAdvancedFields />}
-        {isBrowser && <BrowserAdvancedFields />}
-      </EuiForm>
-    );
-  }
-);
+            onChange={(event) => setIsTLSEnabled(event.target.checked)}
+          />
+          <TLSFields />
+        </EuiDescribedFormGroup>
+      )}
+      <EuiSpacer size="m" />
+      {isHTTP && <HTTPAdvancedFields validate={validate} />}
+      {isTCP && <TCPAdvancedFields />}
+      {isBrowser && <BrowserAdvancedFields />}
+    </EuiForm>
+  );
+});
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx
index 69c1d897f7847..0b434b6677353 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx
@@ -20,6 +20,23 @@ jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
   htmlIdGenerator: () => () => `id-${Math.random()}`,
 }));
 
+jest.mock('../../../../../../../src/plugins/kibana_react/public', () => {
+  const original = jest.requireActual('../../../../../../../src/plugins/kibana_react/public');
+  return {
+    ...original,
+    // Mocking CodeEditor, which uses React Monaco under the hood
+    CodeEditor: (props: any) => (
+      <input
+        data-test-subj={props['data-test-subj'] || 'mockCodeEditor'}
+        data-currentvalue={props.value}
+        onChange={(e: any) => {
+          props.onChange(e.jsonContent);
+        }}
+      />
+    ),
+  };
+});
+
 const defaultValidation = centralValidation[DataStream.HTTP];
 
 describe('<HTTPAdvancedFields />', () => {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http/formatters.ts b/x-pack/plugins/uptime/public/components/fleet_package/http/formatters.ts
index 226874ec41442..0c27eb3be1a2d 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/http/formatters.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/http/formatters.ts
@@ -17,6 +17,7 @@ import { tlsFormatters } from '../tls/formatters';
 export type HTTPFormatMap = Record<keyof HTTPFields, Formatter>;
 
 export const httpFormatters: HTTPFormatMap = {
+  [ConfigKeys.METADATA]: (fields) => objectToJsonFormatter(fields[ConfigKeys.METADATA]),
   [ConfigKeys.URLS]: null,
   [ConfigKeys.MAX_REDIRECTS]: null,
   [ConfigKeys.USERNAME]: null,
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http/normalizers.ts b/x-pack/plugins/uptime/public/components/fleet_package/http/normalizers.ts
index ca86fd5bdc35b..e6e9b5121bf2c 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/http/normalizers.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/http/normalizers.ts
@@ -31,6 +31,7 @@ export const getHTTPJsonToJavascriptNormalizer = (key: ConfigKeys) => {
 };
 
 export const httpNormalizers: HTTPNormalizerMap = {
+  [ConfigKeys.METADATA]: getHTTPJsonToJavascriptNormalizer(ConfigKeys.METADATA),
   [ConfigKeys.URLS]: getHTTPNormalizer(ConfigKeys.URLS),
   [ConfigKeys.MAX_REDIRECTS]: getHTTPNormalizer(ConfigKeys.MAX_REDIRECTS),
   [ConfigKeys.USERNAME]: getHTTPNormalizer(ConfigKeys.USERNAME),
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/request_body_field.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/request_body_field.test.tsx
index d6f25449a98c0..c3bc20076bc2f 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/request_body_field.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/request_body_field.test.tsx
@@ -17,6 +17,23 @@ jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
   htmlIdGenerator: () => () => `id-${Math.random()}`,
 }));
 
+jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
+  const original = jest.requireActual('../../../../../../src/plugins/kibana_react/public');
+  return {
+    ...original,
+    // Mocking CodeEditor, which uses React Monaco under the hood
+    CodeEditor: (props: any) => (
+      <input
+        data-test-subj={props['data-test-subj'] || 'mockCodeEditor'}
+        data-currentvalue={props.value}
+        onChange={(e: any) => {
+          props.onChange(e.jsonContent);
+        }}
+      />
+    ),
+  };
+});
+
 describe('<RequestBodyField />', () => {
   const defaultMode = Mode.PLAINTEXT;
   const defaultValue = 'sample value';
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx
index 60f8021b1bcb0..3db7ac424e651 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx
@@ -18,7 +18,7 @@ import {
   BrowserFields,
 } from './types';
 import {
-  useMonitorTypeContext,
+  usePolicyConfigContext,
   useTCPSimpleFieldsContext,
   useTCPAdvancedFieldsContext,
   useICMPSimpleFieldsContext,
@@ -55,6 +55,7 @@ export const defaultConfig: PolicyConfig = {
   [DataStream.BROWSER]: {
     ...defaultBrowserSimpleFields,
     ...defaultBrowserAdvancedFields,
+    ...defaultTLSFields,
   },
 };
 
@@ -64,7 +65,7 @@ export const defaultConfig: PolicyConfig = {
  */
 export const SyntheticsPolicyCreateExtension = memo<PackagePolicyCreateExtensionComponentProps>(
   ({ newPolicy, onChange }) => {
-    const { monitorType } = useMonitorTypeContext();
+    const { monitorType, isTLSEnabled, isZipUrlTLSEnabled } = usePolicyConfigContext();
     const { fields: httpSimpleFields } = useHTTPSimpleFieldsContext();
     const { fields: tcpSimpleFields } = useTCPSimpleFieldsContext();
     const { fields: icmpSimpleFields } = useICMPSimpleFieldsContext();
@@ -74,17 +75,27 @@ export const SyntheticsPolicyCreateExtension = memo<PackagePolicyCreateExtension
     const { fields: browserAdvancedFields } = useBrowserAdvancedFieldsContext();
     const { fields: tlsFields } = useTLSFieldsContext();
 
+    const metaData = useMemo(
+      () => ({
+        is_tls_enabled: isTLSEnabled,
+        is_zip_url_tls_enabled: isZipUrlTLSEnabled,
+      }),
+      [isTLSEnabled, isZipUrlTLSEnabled]
+    );
+
     const policyConfig: PolicyConfig = {
       [DataStream.HTTP]: {
         ...httpSimpleFields,
         ...httpAdvancedFields,
         ...tlsFields,
+        [ConfigKeys.METADATA]: metaData,
         [ConfigKeys.NAME]: newPolicy.name,
       } as HTTPFields,
       [DataStream.TCP]: {
         ...tcpSimpleFields,
         ...tcpAdvancedFields,
         ...tlsFields,
+        [ConfigKeys.METADATA]: metaData,
         [ConfigKeys.NAME]: newPolicy.name,
       } as TCPFields,
       [DataStream.ICMP]: {
@@ -94,6 +105,8 @@ export const SyntheticsPolicyCreateExtension = memo<PackagePolicyCreateExtension
       [DataStream.BROWSER]: {
         ...browserSimpleFields,
         ...browserAdvancedFields,
+        ...tlsFields,
+        [ConfigKeys.METADATA]: metaData,
         [ConfigKeys.NAME]: newPolicy.name,
       } as BrowserFields,
     };
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
index e642ea44ab58d..138174792708f 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
@@ -17,12 +17,26 @@ import { ConfigKeys, DataStream, ScheduleUnit, VerificationMode } from './types'
 
 // ensures that fields appropriately match to their label
 jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
+  ...jest.requireActual('@elastic/eui/lib/services/accessibility/html_id_generator'),
   htmlIdGenerator: () => () => `id-${Math.random()}`,
 }));
 
-jest.mock('./code_editor', () => ({
-  CodeEditor: () => <div>code editor mock</div>,
-}));
+jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
+  const original = jest.requireActual('../../../../../../src/plugins/kibana_react/public');
+  return {
+    ...original,
+    // Mocking CodeEditor, which uses React Monaco under the hood
+    CodeEditor: (props: any) => (
+      <input
+        data-test-subj={props['data-test-subj'] || 'mockCodeEditor'}
+        data-currentvalue={props.value}
+        onChange={(e: any) => {
+          props.onChange(e.jsonContent);
+        }}
+      />
+    ),
+  };
+});
 
 const defaultNewPolicy: NewPackagePolicy = {
   name: 'samplePolicyName',
@@ -43,6 +57,10 @@ const defaultNewPolicy: NewPackagePolicy = {
             dataset: 'http',
           },
           vars: {
+            __ui: {
+              value: JSON.stringify({ is_tls_enabled: true }),
+              type: 'yaml',
+            },
             type: {
               value: 'http',
               type: 'text',
@@ -736,51 +754,6 @@ describe('<SyntheticsPolicyCreateExtension />', () => {
     const { findByLabelText, queryByLabelText } = render(<WrappedComponent />);
     const enableSSL = queryByLabelText('Enable TLS configuration') as HTMLInputElement;
 
-    await waitFor(() => {
-      expect(onChange).toBeCalledWith({
-        isValid: false,
-        updatedPolicy: {
-          ...defaultNewPolicy,
-          inputs: [
-            {
-              ...defaultNewPolicy.inputs[0],
-              streams: [
-                {
-                  ...defaultNewPolicy.inputs[0].streams[0],
-                  vars: {
-                    ...defaultNewPolicy.inputs[0].streams[0].vars,
-                    [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: {
-                      value: null,
-                      type: 'yaml',
-                    },
-                    [ConfigKeys.TLS_CERTIFICATE]: {
-                      value: null,
-                      type: 'yaml',
-                    },
-                    [ConfigKeys.TLS_KEY]: {
-                      value: null,
-                      type: 'yaml',
-                    },
-                    [ConfigKeys.TLS_KEY_PASSPHRASE]: {
-                      value: null,
-                      type: 'text',
-                    },
-                    [ConfigKeys.TLS_VERIFICATION_MODE]: {
-                      value: null,
-                      type: 'text',
-                    },
-                  },
-                },
-              ],
-            },
-            defaultNewPolicy.inputs[1],
-            defaultNewPolicy.inputs[2],
-            defaultNewPolicy.inputs[3],
-          ],
-        },
-      });
-    });
-
     // ensure at least one http advanced option is present
     fireEvent.click(enableSSL);
 
@@ -794,27 +767,23 @@ describe('<SyntheticsPolicyCreateExtension />', () => {
 
     await waitFor(() => {
       fireEvent.change(ca, { target: { value: 'certificateAuthorities' } });
-      expect(ca.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES].value);
+      expect(ca.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]);
     });
     await waitFor(() => {
       fireEvent.change(clientCertificate, { target: { value: 'clientCertificate' } });
-      expect(clientCertificate.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_KEY].value);
+      expect(clientCertificate.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_KEY]);
     });
     await waitFor(() => {
       fireEvent.change(clientKey, { target: { value: 'clientKey' } });
-      expect(clientKey.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_KEY].value);
+      expect(clientKey.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_KEY]);
     });
     await waitFor(() => {
       fireEvent.change(clientKeyPassphrase, { target: { value: 'clientKeyPassphrase' } });
-      expect(clientKeyPassphrase.value).toEqual(
-        defaultHTTPConfig[ConfigKeys.TLS_KEY_PASSPHRASE].value
-      );
+      expect(clientKeyPassphrase.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_KEY_PASSPHRASE]);
     });
     await waitFor(() => {
       fireEvent.change(verificationMode, { target: { value: VerificationMode.NONE } });
-      expect(verificationMode.value).toEqual(
-        defaultHTTPConfig[ConfigKeys.TLS_VERIFICATION_MODE].value
-      );
+      expect(verificationMode.value).toEqual(defaultHTTPConfig[ConfigKeys.TLS_VERIFICATION_MODE]);
     });
 
     await waitFor(() => {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx
index c845abc3320c2..c3b2b632850be 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx
@@ -9,7 +9,7 @@ import React, { memo } from 'react';
 import { PackagePolicyCreateExtensionComponentProps } from '../../../../fleet/public';
 import { SyntheticsPolicyCreateExtension } from './synthetics_policy_create_extension';
 import {
-  MonitorTypeContextProvider,
+  PolicyConfigContextProvider,
   TCPContextProvider,
   ICMPSimpleFieldsContextProvider,
   HTTPContextProvider,
@@ -24,7 +24,7 @@ import {
 export const SyntheticsPolicyCreateExtensionWrapper =
   memo<PackagePolicyCreateExtensionComponentProps>(({ newPolicy, onChange }) => {
     return (
-      <MonitorTypeContextProvider>
+      <PolicyConfigContextProvider>
         <HTTPContextProvider>
           <TCPContextProvider>
             <TLSFieldsContextProvider>
@@ -36,7 +36,7 @@ export const SyntheticsPolicyCreateExtensionWrapper =
             </TLSFieldsContextProvider>
           </TCPContextProvider>
         </HTTPContextProvider>
-      </MonitorTypeContextProvider>
+      </PolicyConfigContextProvider>
     );
   });
 SyntheticsPolicyCreateExtensionWrapper.displayName = 'SyntheticsPolicyCreateExtensionWrapper';
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx
index ec135e4e914a7..8e441d4eed6e3 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import React, { memo } from 'react';
+import React, { memo, useMemo } from 'react';
 import { PackagePolicyEditExtensionComponentProps } from '../../../../fleet/public';
 import { useTrackPageview } from '../../../../observability/public';
 import {
-  useMonitorTypeContext,
+  usePolicyConfigContext,
   useTCPSimpleFieldsContext,
   useTCPAdvancedFieldsContext,
   useICMPSimpleFieldsContext,
@@ -37,17 +37,17 @@ interface SyntheticsPolicyEditExtensionProps {
   newPolicy: PackagePolicyEditExtensionComponentProps['newPolicy'];
   onChange: PackagePolicyEditExtensionComponentProps['onChange'];
   defaultConfig: Partial<ICustomFields>;
-  isTLSEnabled: boolean;
 }
+
 /**
  * Exports Synthetics-specific package policy instructions
  * for use in the Fleet app create / edit package policy
  */
 export const SyntheticsPolicyEditExtension = memo<SyntheticsPolicyEditExtensionProps>(
-  ({ newPolicy, onChange, defaultConfig, isTLSEnabled }) => {
+  ({ newPolicy, onChange, defaultConfig }) => {
     useTrackPageview({ app: 'fleet', path: 'syntheticsEdit' });
     useTrackPageview({ app: 'fleet', path: 'syntheticsEdit', delay: 15000 });
-    const { monitorType } = useMonitorTypeContext();
+    const { monitorType, isTLSEnabled, isZipUrlTLSEnabled } = usePolicyConfigContext();
     const { fields: httpSimpleFields } = useHTTPSimpleFieldsContext();
     const { fields: tcpSimpleFields } = useTCPSimpleFieldsContext();
     const { fields: icmpSimpleFields } = useICMPSimpleFieldsContext();
@@ -57,17 +57,27 @@ export const SyntheticsPolicyEditExtension = memo<SyntheticsPolicyEditExtensionP
     const { fields: browserSimpleFields } = useBrowserSimpleFieldsContext();
     const { fields: browserAdvancedFields } = useBrowserAdvancedFieldsContext();
 
+    const metadata = useMemo(
+      () => ({
+        is_tls_enabled: isTLSEnabled,
+        is_zip_url_tls_enabled: isZipUrlTLSEnabled,
+      }),
+      [isTLSEnabled, isZipUrlTLSEnabled]
+    );
+
     const policyConfig: PolicyConfig = {
       [DataStream.HTTP]: {
         ...httpSimpleFields,
         ...httpAdvancedFields,
         ...tlsFields,
+        [ConfigKeys.METADATA]: metadata,
         [ConfigKeys.NAME]: newPolicy.name,
       } as HTTPFields,
       [DataStream.TCP]: {
         ...tcpSimpleFields,
         ...tcpAdvancedFields,
         ...tlsFields,
+        [ConfigKeys.METADATA]: metadata,
         [ConfigKeys.NAME]: newPolicy.name,
       } as TCPFields,
       [DataStream.ICMP]: {
@@ -77,6 +87,7 @@ export const SyntheticsPolicyEditExtension = memo<SyntheticsPolicyEditExtensionP
       [DataStream.BROWSER]: {
         ...browserSimpleFields,
         ...browserAdvancedFields,
+        [ConfigKeys.METADATA]: metadata,
         [ConfigKeys.NAME]: newPolicy.name,
       } as BrowserFields,
     };
@@ -90,7 +101,7 @@ export const SyntheticsPolicyEditExtension = memo<SyntheticsPolicyEditExtensionP
       monitorType,
     });
 
-    return <CustomFields isTLSEnabled={isTLSEnabled} validate={validate[monitorType]} />;
+    return <CustomFields validate={validate[monitorType]} />;
   }
 );
 SyntheticsPolicyEditExtension.displayName = 'SyntheticsPolicyEditExtension';
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
index d3c9030e85597..e874ca73d951b 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
@@ -17,12 +17,26 @@ import { defaultConfig } from './synthetics_policy_create_extension';
 
 // ensures that fields appropriately match to their label
 jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
+  ...jest.requireActual('@elastic/eui/lib/services/accessibility/html_id_generator'),
   htmlIdGenerator: () => () => `id-${Math.random()}`,
 }));
 
-jest.mock('./code_editor', () => ({
-  CodeEditor: () => <div>code editor mock</div>,
-}));
+jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
+  const original = jest.requireActual('../../../../../../src/plugins/kibana_react/public');
+  return {
+    ...original,
+    // Mocking CodeEditor, which uses React Monaco under the hood
+    CodeEditor: (props: any) => (
+      <input
+        data-test-subj={props['data-test-subj'] || 'mockCodeEditor'}
+        data-currentvalue={props.value}
+        onChange={(e: any) => {
+          props.onChange(e.jsonContent);
+        }}
+      />
+    ),
+  };
+});
 
 const defaultNewPolicy: NewPackagePolicy = {
   name: 'samplePolicyName',
@@ -43,6 +57,10 @@ const defaultNewPolicy: NewPackagePolicy = {
             dataset: 'http',
           },
           vars: {
+            __ui: {
+              value: JSON.stringify({ is_tls_enabled: true }),
+              type: 'yaml',
+            },
             type: {
               value: 'http',
               type: 'text',
@@ -366,10 +384,10 @@ describe('<SyntheticsPolicyEditExtension />', () => {
     expect(timeout).toBeInTheDocument();
     expect(timeout.value).toEqual(`${defaultHTTPConfig[ConfigKeys.TIMEOUT]}`);
     // expect TLS settings to be in the document when at least one tls key is populated
-    expect(enableTLSConfig.checked).toBe(true);
+    expect(enableTLSConfig.getAttribute('aria-checked')).toEqual('true');
     expect(verificationMode).toBeInTheDocument();
     expect(verificationMode.value).toEqual(
-      `${defaultHTTPConfig[ConfigKeys.TLS_VERIFICATION_MODE].value}`
+      `${defaultHTTPConfig[ConfigKeys.TLS_VERIFICATION_MODE]}`
     );
 
     // ensure other monitor type options are not in the DOM
@@ -555,6 +573,17 @@ describe('<SyntheticsPolicyEditExtension />', () => {
     });
   });
 
+  it('shows tls fields when metadata.is_tls_enabled is true', async () => {
+    const { getByLabelText } = render(<WrappedComponent />);
+    const verificationMode = getByLabelText('Verification mode') as HTMLInputElement;
+    const enableTLSConfig = getByLabelText('Enable TLS configuration') as HTMLInputElement;
+    expect(enableTLSConfig.getAttribute('aria-checked')).toEqual('true');
+    expect(verificationMode).toBeInTheDocument();
+    expect(verificationMode.value).toEqual(
+      `${defaultHTTPConfig[ConfigKeys.TLS_VERIFICATION_MODE]}`
+    );
+  });
+
   it('handles browser validation', async () => {
     const currentPolicy = {
       ...defaultCurrentPolicy,
@@ -825,7 +854,7 @@ describe('<SyntheticsPolicyEditExtension />', () => {
 
     /* expect TLS settings not to be in the document when and Enable TLS settings not to be checked
      * when all TLS values are falsey */
-    expect(enableTLSConfig.checked).toBe(false);
+    expect(enableTLSConfig.getAttribute('aria-checked')).toEqual('false');
     expect(queryByText('Verification mode')).not.toBeInTheDocument();
 
     // ensure other monitor type options are not in the DOM
@@ -1045,4 +1074,30 @@ describe('<SyntheticsPolicyEditExtension />', () => {
     expect(queryByLabelText('Proxy URL')).not.toBeInTheDocument();
     expect(queryByLabelText('Host')).not.toBeInTheDocument();
   });
+
+  it('hides tls fields when metadata.is_tls_enabled is false', async () => {
+    const { getByLabelText, queryByLabelText } = render(
+      <WrappedComponent
+        policy={{
+          ...defaultCurrentPolicy,
+          inputs: [
+            {
+              ...defaultNewPolicy.inputs[0],
+              enabled: false,
+            },
+            {
+              ...defaultNewPolicy.inputs[1],
+              enabled: true,
+            },
+            defaultNewPolicy.inputs[2],
+            defaultNewPolicy.inputs[3],
+          ],
+        }}
+      />
+    );
+    const verificationMode = queryByLabelText('Verification mode');
+    const enableTLSConfig = getByLabelText('Enable TLS configuration') as HTMLInputElement;
+    expect(enableTLSConfig.getAttribute('aria-checked')).toEqual('false');
+    expect(verificationMode).not.toBeInTheDocument();
+  });
 });
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx
index 219fa86958c34..25fce88e0c866 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx
@@ -10,7 +10,7 @@ import { PackagePolicyEditExtensionComponentProps } from '../../../../fleet/publ
 import { PolicyConfig, ConfigKeys, DataStream, ITLSFields, ICustomFields } from './types';
 import { SyntheticsPolicyEditExtension } from './synthetics_policy_edit_extension';
 import {
-  MonitorTypeContextProvider,
+  PolicyConfigContextProvider,
   HTTPContextProvider,
   TCPContextProvider,
   ICMPSimpleFieldsContextProvider,
@@ -27,12 +27,14 @@ export const SyntheticsPolicyEditExtensionWrapper = memo<PackagePolicyEditExtens
   ({ policy: currentPolicy, newPolicy, onChange }) => {
     const {
       enableTLS: isTLSEnabled,
+      enableZipUrlTLS: isZipUrlTLSEnabled,
       fullConfig: fullDefaultConfig,
       monitorTypeConfig: defaultConfig,
       monitorType,
       tlsConfig: defaultTLSConfig,
     } = useMemo(() => {
       let enableTLS = false;
+      let enableZipUrlTLS = false;
       const getDefaultConfig = () => {
         // find the enabled input to identify the current monitor type
         const currentInput = currentPolicy.inputs.find((input) => input.enabled === true);
@@ -68,7 +70,10 @@ export const SyntheticsPolicyEditExtensionWrapper = memo<PackagePolicyEditExtens
           [ConfigKeys.TLS_VERSION]: formattedDefaultConfigForMonitorType[ConfigKeys.TLS_VERSION],
         };
 
-        enableTLS = Object.values(tlsConfig).some((value) => value?.isEnabled);
+        enableTLS =
+          formattedDefaultConfigForMonitorType[ConfigKeys.METADATA].is_tls_enabled || false;
+        enableZipUrlTLS =
+          formattedDefaultConfigForMonitorType[ConfigKeys.METADATA].is_zip_url_tls_enabled || false;
 
         const formattedDefaultConfig: Partial<PolicyConfig> = {
           [type]: formattedDefaultConfigForMonitorType,
@@ -78,8 +83,9 @@ export const SyntheticsPolicyEditExtensionWrapper = memo<PackagePolicyEditExtens
           fullConfig: formattedDefaultConfig,
           monitorTypeConfig: formattedDefaultConfigForMonitorType,
           tlsConfig,
-          enableTLS,
           monitorType: type,
+          enableTLS,
+          enableZipUrlTLS,
         };
       };
 
@@ -87,7 +93,11 @@ export const SyntheticsPolicyEditExtensionWrapper = memo<PackagePolicyEditExtens
     }, [currentPolicy]);
 
     return (
-      <MonitorTypeContextProvider defaultValue={monitorType}>
+      <PolicyConfigContextProvider
+        defaultMonitorType={monitorType}
+        defaultIsTLSEnabled={isTLSEnabled}
+        defaultIsZipUrlTLSEnabled={isZipUrlTLSEnabled}
+      >
         <TLSFieldsContextProvider defaultValues={isTLSEnabled ? defaultTLSConfig : undefined}>
           <HTTPContextProvider defaultValues={fullDefaultConfig?.[DataStream.HTTP]}>
             <TCPContextProvider defaultValues={fullDefaultConfig?.[DataStream.TCP]}>
@@ -97,14 +107,13 @@ export const SyntheticsPolicyEditExtensionWrapper = memo<PackagePolicyEditExtens
                     newPolicy={newPolicy}
                     onChange={onChange}
                     defaultConfig={defaultConfig}
-                    isTLSEnabled={isTLSEnabled}
                   />
                 </BrowserContextProvider>
               </ICMPSimpleFieldsContextProvider>
             </TCPContextProvider>
           </HTTPContextProvider>
         </TLSFieldsContextProvider>
-      </MonitorTypeContextProvider>
+      </PolicyConfigContextProvider>
     );
   }
 );
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tcp/formatters.ts b/x-pack/plugins/uptime/public/components/fleet_package/tcp/formatters.ts
index 2f4a43ee6becf..ce65c2c23d0d9 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/tcp/formatters.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/tcp/formatters.ts
@@ -6,12 +6,13 @@
  */
 
 import { TCPFields, ConfigKeys } from '../types';
-import { Formatter, commonFormatters } from '../common/formatters';
+import { Formatter, commonFormatters, objectToJsonFormatter } from '../common/formatters';
 import { tlsFormatters } from '../tls/formatters';
 
 export type TCPFormatMap = Record<keyof TCPFields, Formatter>;
 
 export const tcpFormatters: TCPFormatMap = {
+  [ConfigKeys.METADATA]: (fields) => objectToJsonFormatter(fields[ConfigKeys.METADATA]),
   [ConfigKeys.HOSTS]: null,
   [ConfigKeys.PROXY_URL]: null,
   [ConfigKeys.PROXY_USE_LOCAL_RESOLVER]: null,
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tcp/normalizers.ts b/x-pack/plugins/uptime/public/components/fleet_package/tcp/normalizers.ts
index d19aea55addf2..962bb9cc9785e 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/tcp/normalizers.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/tcp/normalizers.ts
@@ -6,7 +6,12 @@
  */
 
 import { TCPFields, ConfigKeys } from '../types';
-import { Normalizer, commonNormalizers, getNormalizer } from '../common/normalizers';
+import {
+  Normalizer,
+  commonNormalizers,
+  getNormalizer,
+  getJsonToJavascriptNormalizer,
+} from '../common/normalizers';
 import { tlsNormalizers } from '../tls/normalizers';
 import { defaultTCPSimpleFields, defaultTCPAdvancedFields } from '../contexts';
 
@@ -21,7 +26,12 @@ export const getTCPNormalizer = (key: ConfigKeys) => {
   return getNormalizer(key, defaultTCPFields);
 };
 
+export const getTCPJsonToJavascriptNormalizer = (key: ConfigKeys) => {
+  return getJsonToJavascriptNormalizer(key, defaultTCPFields);
+};
+
 export const tcpNormalizers: TCPNormalizerMap = {
+  [ConfigKeys.METADATA]: getTCPJsonToJavascriptNormalizer(ConfigKeys.METADATA),
   [ConfigKeys.HOSTS]: getTCPNormalizer(ConfigKeys.HOSTS),
   [ConfigKeys.PROXY_URL]: getTCPNormalizer(ConfigKeys.PROXY_URL),
   [ConfigKeys.PROXY_USE_LOCAL_RESOLVER]: getTCPNormalizer(ConfigKeys.PROXY_USE_LOCAL_RESOLVER),
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tls/default_values.ts b/x-pack/plugins/uptime/public/components/fleet_package/tls/default_values.ts
new file mode 100644
index 0000000000000..6f44e2c1c22b5
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/fleet_package/tls/default_values.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 { ITLSFields, ConfigKeys, VerificationMode, TLSVersion } from '../types';
+
+export const defaultValues: ITLSFields = {
+  [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: '',
+  [ConfigKeys.TLS_CERTIFICATE]: '',
+  [ConfigKeys.TLS_KEY]: '',
+  [ConfigKeys.TLS_KEY_PASSPHRASE]: '',
+  [ConfigKeys.TLS_VERIFICATION_MODE]: VerificationMode.FULL,
+  [ConfigKeys.TLS_VERSION]: [TLSVersion.ONE_ONE, TLSVersion.ONE_TWO, TLSVersion.ONE_THREE],
+};
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tls/formatters.ts b/x-pack/plugins/uptime/public/components/fleet_package/tls/formatters.ts
index a3e9af9ac12b3..1191c7b018237 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/tls/formatters.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/tls/formatters.ts
@@ -24,11 +24,10 @@ export const tlsFormatters: TLSFormatMap = {
 };
 
 // only add tls settings if they are enabled by the user and isEnabled is true
-export const tlsValueToYamlFormatter = (tlsValue: { value?: string; isEnabled?: boolean } = {}) =>
-  tlsValue.isEnabled && tlsValue.value ? JSON.stringify(tlsValue.value) : null;
+export const tlsValueToYamlFormatter = (tlsValue: string = '') =>
+  tlsValue ? JSON.stringify(tlsValue) : null;
 
-export const tlsValueToStringFormatter = (tlsValue: { value?: string; isEnabled?: boolean } = {}) =>
-  tlsValue.isEnabled && tlsValue.value ? tlsValue.value : null;
+export const tlsValueToStringFormatter = (tlsValue: string = '') => tlsValue || null;
 
-export const tlsArrayToYamlFormatter = (tlsValue: { value?: string[]; isEnabled?: boolean } = {}) =>
-  tlsValue.isEnabled && tlsValue.value?.length ? JSON.stringify(tlsValue.value) : null;
+export const tlsArrayToYamlFormatter = (tlsValue: string[] = []) =>
+  tlsValue.length ? JSON.stringify(tlsValue) : null;
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tls/normalizers.ts b/x-pack/plugins/uptime/public/components/fleet_package/tls/normalizers.ts
index 2344e599d6c01..6398362220de1 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/tls/normalizers.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/tls/normalizers.ts
@@ -13,17 +13,17 @@ type TLSNormalizerMap = Record<keyof ITLSFields, Normalizer>;
 
 export const tlsNormalizers: TLSNormalizerMap = {
   [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: (fields) =>
-    tlsYamlToObjectNormalizer(
+    tlsJsonToObjectNormalizer(
       fields?.[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]?.value,
       ConfigKeys.TLS_CERTIFICATE_AUTHORITIES
     ),
   [ConfigKeys.TLS_CERTIFICATE]: (fields) =>
-    tlsYamlToObjectNormalizer(
+    tlsJsonToObjectNormalizer(
       fields?.[ConfigKeys.TLS_CERTIFICATE]?.value,
       ConfigKeys.TLS_CERTIFICATE
     ),
   [ConfigKeys.TLS_KEY]: (fields) =>
-    tlsYamlToObjectNormalizer(fields?.[ConfigKeys.TLS_KEY]?.value, ConfigKeys.TLS_KEY),
+    tlsJsonToObjectNormalizer(fields?.[ConfigKeys.TLS_KEY]?.value, ConfigKeys.TLS_KEY),
   [ConfigKeys.TLS_KEY_PASSPHRASE]: (fields) =>
     tlsStringToObjectNormalizer(
       fields?.[ConfigKeys.TLS_KEY_PASSPHRASE]?.value,
@@ -35,15 +35,10 @@ export const tlsNormalizers: TLSNormalizerMap = {
       ConfigKeys.TLS_VERIFICATION_MODE
     ),
   [ConfigKeys.TLS_VERSION]: (fields) =>
-    tlsYamlToObjectNormalizer(fields?.[ConfigKeys.TLS_VERSION]?.value, ConfigKeys.TLS_VERSION),
+    tlsJsonToObjectNormalizer(fields?.[ConfigKeys.TLS_VERSION]?.value, ConfigKeys.TLS_VERSION),
 };
 
-// only add tls settings if they are enabled by the user and isEnabled is true
-export const tlsStringToObjectNormalizer = (value: string = '', key: keyof ITLSFields) => ({
-  value: value ?? defaultTLSFields[key]?.value,
-  isEnabled: Boolean(value),
-});
-export const tlsYamlToObjectNormalizer = (value: string = '', key: keyof ITLSFields) => ({
-  value: value ? JSON.parse(value) : defaultTLSFields[key]?.value,
-  isEnabled: Boolean(value),
-});
+export const tlsStringToObjectNormalizer = (value: string = '', key: keyof ITLSFields) =>
+  value ?? defaultTLSFields[key];
+export const tlsJsonToObjectNormalizer = (value: string = '', key: keyof ITLSFields) =>
+  value ? JSON.parse(value) : defaultTLSFields[key];
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tls_fields.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/tls_fields.test.tsx
index 0528438650dc3..1c9c4f4e69f43 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/tls_fields.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/tls_fields.test.tsx
@@ -8,9 +8,13 @@
 import React from 'react';
 import { fireEvent } from '@testing-library/react';
 import { render } from '../../lib/helper/rtl_helpers';
-import { TLSFields, TLSRole } from './tls_fields';
+import { TLSFields } from './tls_fields';
 import { ConfigKeys, VerificationMode } from './types';
-import { TLSFieldsContextProvider, defaultTLSFields as defaultValues } from './contexts';
+import {
+  TLSFieldsContextProvider,
+  PolicyConfigContextProvider,
+  defaultTLSFields as defaultValues,
+} from './contexts';
 
 // ensures that fields appropriately match to their label
 jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
@@ -18,17 +22,13 @@ jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
 }));
 
 describe('<TLSFields />', () => {
-  const WrappedComponent = ({
-    tlsRole = TLSRole.CLIENT,
-    isEnabled = true,
-  }: {
-    tlsRole?: TLSRole;
-    isEnabled?: boolean;
-  }) => {
+  const WrappedComponent = ({ isEnabled = true }: { isEnabled?: boolean }) => {
     return (
-      <TLSFieldsContextProvider defaultValues={defaultValues}>
-        <TLSFields tlsRole={tlsRole} isEnabled={isEnabled} />
-      </TLSFieldsContextProvider>
+      <PolicyConfigContextProvider defaultIsTLSEnabled={isEnabled}>
+        <TLSFieldsContextProvider defaultValues={defaultValues}>
+          <TLSFields />
+        </TLSFieldsContextProvider>
+      </PolicyConfigContextProvider>
     );
   };
   it('renders TLSFields', () => {
@@ -42,15 +42,6 @@ describe('<TLSFields />', () => {
     expect(getByLabelText('Verification mode')).toBeInTheDocument();
   });
 
-  it('handles role', () => {
-    const { getByLabelText, rerender } = render(<WrappedComponent tlsRole={TLSRole.SERVER} />);
-
-    expect(getByLabelText('Server certificate')).toBeInTheDocument();
-    expect(getByLabelText('Server key')).toBeInTheDocument();
-
-    rerender(<WrappedComponent tlsRole={TLSRole.CLIENT} />);
-  });
-
   it('updates fields and calls onChange', async () => {
     const { getByLabelText } = render(<WrappedComponent />);
 
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tls_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/tls_fields.tsx
index d2cfd65c61c37..e33b4ef3fbb1b 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/tls_fields.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/tls_fields.tsx
@@ -5,438 +5,56 @@
  * 2.0.
  */
 
-import React, { useEffect, useState, memo } from 'react';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  EuiCallOut,
-  EuiComboBox,
-  EuiComboBoxOptionOption,
-  EuiFormRow,
-  EuiTextArea,
-  EuiFormFieldset,
-  EuiSelect,
-  EuiScreenReaderOnly,
-  EuiSpacer,
-  EuiFieldPassword,
-} from '@elastic/eui';
-
-import { useTLSFieldsContext } from './contexts';
-
-import { VerificationMode, ConfigKeys, TLSVersion } from './types';
-
-import { OptionalLabel } from './optional_label';
-
-export enum TLSRole {
-  CLIENT = 'client',
-  SERVER = 'server',
-}
-
-export const TLSFields: React.FunctionComponent<{
-  isEnabled: boolean;
-  tlsRole: TLSRole;
-}> = memo(({ isEnabled, tlsRole }) => {
-  const { fields, setFields } = useTLSFieldsContext();
-  const [verificationVersionInputRef, setVerificationVersionInputRef] =
-    useState<HTMLInputElement | null>(null);
-  const [hasVerificationVersionError, setHasVerificationVersionError] = useState<
-    string | undefined
-  >(undefined);
+import React, { useCallback, useEffect } from 'react';
+
+import { TLSOptions, TLSConfig } from './common/tls_options';
+import { useTLSFieldsContext, usePolicyConfigContext } from './contexts';
+
+import { ConfigKeys } from './types';
+
+export const TLSFields = () => {
+  const { defaultValues, setFields } = useTLSFieldsContext();
+  const { isTLSEnabled } = usePolicyConfigContext();
+
+  const handleOnChange = useCallback(
+    (tlsConfig: TLSConfig) => {
+      setFields({
+        [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: tlsConfig.certificateAuthorities,
+        [ConfigKeys.TLS_CERTIFICATE]: tlsConfig.certificate,
+        [ConfigKeys.TLS_KEY]: tlsConfig.key,
+        [ConfigKeys.TLS_KEY_PASSPHRASE]: tlsConfig.keyPassphrase,
+        [ConfigKeys.TLS_VERIFICATION_MODE]: tlsConfig.verificationMode,
+        [ConfigKeys.TLS_VERSION]: tlsConfig.version,
+      });
+    },
+    [setFields]
+  );
 
   useEffect(() => {
-    setFields((prevFields) => ({
-      [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: {
-        value: prevFields[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES].value,
-        isEnabled,
-      },
-      [ConfigKeys.TLS_CERTIFICATE]: {
-        value: prevFields[ConfigKeys.TLS_CERTIFICATE].value,
-        isEnabled,
-      },
-      [ConfigKeys.TLS_KEY]: {
-        value: prevFields[ConfigKeys.TLS_KEY].value,
-        isEnabled,
-      },
-      [ConfigKeys.TLS_KEY_PASSPHRASE]: {
-        value: prevFields[ConfigKeys.TLS_KEY_PASSPHRASE].value,
-        isEnabled,
-      },
-      [ConfigKeys.TLS_VERIFICATION_MODE]: {
-        value: prevFields[ConfigKeys.TLS_VERIFICATION_MODE].value,
-        isEnabled,
-      },
-      [ConfigKeys.TLS_VERSION]: {
-        value: prevFields[ConfigKeys.TLS_VERSION].value,
-        isEnabled,
-      },
-    }));
-  }, [isEnabled, setFields]);
-
-  const onVerificationVersionChange = (
-    selectedVersionOptions: Array<EuiComboBoxOptionOption<TLSVersion>>
-  ) => {
-    setFields((prevFields) => ({
-      ...prevFields,
-      [ConfigKeys.TLS_VERSION]: {
-        value: selectedVersionOptions.map((option) => option.label as TLSVersion),
-        isEnabled: true,
-      },
-    }));
-    setHasVerificationVersionError(undefined);
-  };
-
-  const onSearchChange = (value: string, hasMatchingOptions?: boolean) => {
-    setHasVerificationVersionError(
-      value.length === 0 || hasMatchingOptions ? undefined : `"${value}" is not a valid option`
-    );
-  };
-
-  const onBlur = () => {
-    if (verificationVersionInputRef) {
-      const { value } = verificationVersionInputRef;
-      setHasVerificationVersionError(
-        value.length === 0 ? undefined : `"${value}" is not a valid option`
-      );
-    }
-  };
-
-  return isEnabled ? (
-    <EuiFormFieldset
-      legend={{
-        children: (
-          <EuiScreenReaderOnly>
-            <span>
-              <FormattedMessage
-                id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.legend"
-                defaultMessage="Certificate settings"
-              />
-            </span>
-          </EuiScreenReaderOnly>
-        ),
+    if (!isTLSEnabled) {
+      setFields({
+        [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: undefined,
+        [ConfigKeys.TLS_CERTIFICATE]: undefined,
+        [ConfigKeys.TLS_KEY]: undefined,
+        [ConfigKeys.TLS_KEY_PASSPHRASE]: undefined,
+        [ConfigKeys.TLS_VERIFICATION_MODE]: undefined,
+        [ConfigKeys.TLS_VERSION]: undefined,
+      });
+    }
+  }, [setFields, isTLSEnabled]);
+
+  return isTLSEnabled ? (
+    <TLSOptions
+      defaultValues={{
+        certificateAuthorities: defaultValues[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES],
+        certificate: defaultValues[ConfigKeys.TLS_CERTIFICATE],
+        key: defaultValues[ConfigKeys.TLS_KEY],
+        keyPassphrase: defaultValues[ConfigKeys.TLS_KEY_PASSPHRASE],
+        verificationMode: defaultValues[ConfigKeys.TLS_VERIFICATION_MODE],
+        version: defaultValues[ConfigKeys.TLS_VERSION],
       }}
-    >
-      <EuiFormRow
-        label={
-          <FormattedMessage
-            id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.label"
-            defaultMessage="Verification mode"
-          />
-        }
-        helpText={verificationModeHelpText[fields[ConfigKeys.TLS_VERIFICATION_MODE].value]}
-      >
-        <EuiSelect
-          options={verificationModeOptions}
-          value={fields[ConfigKeys.TLS_VERIFICATION_MODE].value}
-          onChange={(event) => {
-            const value = event.target.value as VerificationMode;
-            setFields((prevFields) => ({
-              ...prevFields,
-              [ConfigKeys.TLS_VERIFICATION_MODE]: {
-                value,
-                isEnabled: true,
-              },
-            }));
-          }}
-          data-test-subj="syntheticsTLSVerificationMode"
-        />
-      </EuiFormRow>
-      {fields[ConfigKeys.TLS_VERIFICATION_MODE].value === VerificationMode.NONE && (
-        <>
-          <EuiSpacer size="s" />
-          <EuiCallOut
-            title={
-              <FormattedMessage
-                id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.warning.title"
-                defaultMessage="Disabling TLS"
-              />
-            }
-            color="warning"
-            size="s"
-          >
-            <p>
-              <FormattedMessage
-                id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.warning.description"
-                defaultMessage="This mode disables many of the security benefits of SSL/TLS and should only be used
-                  after cautious consideration."
-              />
-            </p>
-          </EuiCallOut>
-          <EuiSpacer size="s" />
-        </>
-      )}
-      <EuiFormRow
-        label={
-          <FormattedMessage
-            id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.version.label"
-            defaultMessage="Supported TLS protocols"
-          />
-        }
-        error={hasVerificationVersionError}
-        isInvalid={hasVerificationVersionError !== undefined}
-      >
-        <EuiComboBox
-          placeholder={i18n.translate(
-            'xpack.uptime.createPackagePolicy.stepConfigure.certsField.version.placeholder',
-            {
-              defaultMessage: 'Select one or more TLS protocols.',
-            }
-          )}
-          options={tlsVersionOptions}
-          selectedOptions={fields[ConfigKeys.TLS_VERSION].value.map((version: TLSVersion) => ({
-            label: version,
-          }))}
-          inputRef={setVerificationVersionInputRef}
-          onChange={onVerificationVersionChange}
-          onSearchChange={onSearchChange}
-          onBlur={onBlur}
-        />
-      </EuiFormRow>
-      <EuiFormRow
-        label={
-          <FormattedMessage
-            id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateAuthorities.label"
-            defaultMessage="Certificate authorities"
-          />
-        }
-        helpText={
-          <FormattedMessage
-            id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateAuthorities.helpText"
-            defaultMessage="PEM formatted custom certificate authorities."
-          />
-        }
-        labelAppend={<OptionalLabel />}
-      >
-        <EuiTextArea
-          value={fields[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES].value}
-          onChange={(event) => {
-            const value = event.target.value;
-            setFields((prevFields) => ({
-              ...prevFields,
-              [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: {
-                value,
-                isEnabled: true,
-              },
-            }));
-          }}
-          onBlur={(event) => {
-            const value = event.target.value;
-            setFields((prevFields) => ({
-              ...prevFields,
-              [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: {
-                value: value.trim(),
-                isEnabled: true,
-              },
-            }));
-          }}
-          data-test-subj="syntheticsTLSCA"
-        />
-      </EuiFormRow>
-      <EuiFormRow
-        label={
-          <>
-            {tlsRoleLabels[tlsRole]}{' '}
-            <FormattedMessage
-              id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificate.label"
-              defaultMessage="certificate"
-            />
-          </>
-        }
-        helpText={
-          <FormattedMessage
-            id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificate.helpText"
-            defaultMessage="PEM formatted certificate for TLS client authentication."
-          />
-        }
-        labelAppend={<OptionalLabel />}
-      >
-        <EuiTextArea
-          value={fields[ConfigKeys.TLS_CERTIFICATE].value}
-          onChange={(event) => {
-            const value = event.target.value;
-            setFields((prevFields) => ({
-              ...prevFields,
-              [ConfigKeys.TLS_CERTIFICATE]: {
-                value,
-                isEnabled: true,
-              },
-            }));
-          }}
-          onBlur={(event) => {
-            const value = event.target.value;
-            setFields((prevFields) => ({
-              ...prevFields,
-              [ConfigKeys.TLS_CERTIFICATE]: {
-                value: value.trim(),
-                isEnabled: true,
-              },
-            }));
-          }}
-          data-test-subj="syntheticsTLSCert"
-        />
-      </EuiFormRow>
-      <EuiFormRow
-        label={
-          <>
-            {tlsRoleLabels[tlsRole]}{' '}
-            <FormattedMessage
-              id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateKey.label"
-              defaultMessage="key"
-            />
-          </>
-        }
-        helpText={
-          <FormattedMessage
-            id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateKey.helpText"
-            defaultMessage="PEM formatted certificate key for TLS client authentication."
-          />
-        }
-        labelAppend={<OptionalLabel />}
-      >
-        <EuiTextArea
-          value={fields[ConfigKeys.TLS_KEY].value}
-          onChange={(event) => {
-            const value = event.target.value;
-            setFields((prevFields) => ({
-              ...prevFields,
-              [ConfigKeys.TLS_KEY]: {
-                value,
-                isEnabled: true,
-              },
-            }));
-          }}
-          onBlur={(event) => {
-            const value = event.target.value;
-            setFields((prevFields) => ({
-              ...prevFields,
-              [ConfigKeys.TLS_KEY]: {
-                value: value.trim(),
-                isEnabled: true,
-              },
-            }));
-          }}
-          data-test-subj="syntheticsTLSCertKey"
-        />
-      </EuiFormRow>
-      <EuiFormRow
-        label={
-          <>
-            {tlsRoleLabels[tlsRole]}{' '}
-            <FormattedMessage
-              id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateKeyPassphrase.label"
-              defaultMessage="key passphrase"
-            />
-          </>
-        }
-        helpText={
-          <FormattedMessage
-            id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.certificateKeyPassphrase.helpText"
-            defaultMessage="Certificate key passphrase for TLS client authentication."
-          />
-        }
-        labelAppend={<OptionalLabel />}
-      >
-        <EuiFieldPassword
-          value={fields[ConfigKeys.TLS_KEY_PASSPHRASE].value}
-          onChange={(event) => {
-            const value = event.target.value;
-            setFields((prevFields) => ({
-              ...prevFields,
-              [ConfigKeys.TLS_KEY_PASSPHRASE]: {
-                value,
-                isEnabled: true,
-              },
-            }));
-          }}
-          data-test-subj="syntheticsTLSCertKeyPassphrase"
-        />
-      </EuiFormRow>
-    </EuiFormFieldset>
-  ) : null;
-});
-
-const tlsRoleLabels = {
-  [TLSRole.CLIENT]: (
-    <FormattedMessage
-      id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.tlsRole.client"
-      defaultMessage="Client"
-    />
-  ),
-  [TLSRole.SERVER]: (
-    <FormattedMessage
-      id="xpack.uptime.createPackagePolicy.stepConfigure.certsField.tlsRole.server"
-      defaultMessage="Server"
+      onChange={handleOnChange}
+      tlsRole="client"
     />
-  ),
-};
-
-const verificationModeHelpText = {
-  [VerificationMode.CERTIFICATE]: i18n.translate(
-    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.certificate.description',
-    {
-      defaultMessage:
-        'Verifies that the provided certificate is signed by a trusted authority (CA), but does not perform any hostname verification.',
-    }
-  ),
-  [VerificationMode.FULL]: i18n.translate(
-    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.full.description',
-    {
-      defaultMessage:
-        'Verifies that the provided certificate is signed by a trusted authority (CA) and also verifies that the server’s hostname (or IP address) matches the names identified within the certificate.',
-    }
-  ),
-  [VerificationMode.NONE]: i18n.translate(
-    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.none.description',
-    {
-      defaultMessage:
-        'Performs no verification of the server’s certificate. It is primarily intended as a temporary diagnostic mechanism when attempting to resolve TLS errors; its use in production environments is strongly discouraged.',
-    }
-  ),
-  [VerificationMode.STRICT]: i18n.translate(
-    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.strict.description',
-    {
-      defaultMessage:
-        'Verifies that the provided certificate is signed by a trusted authority (CA) and also verifies that the server’s hostname (or IP address) matches the names identified within the certificate. If the Subject Alternative Name is empty, it returns an error.',
-    }
-  ),
-};
-
-const verificationModeLabels = {
-  [VerificationMode.CERTIFICATE]: i18n.translate(
-    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.certificate.label',
-    {
-      defaultMessage: 'Certificate',
-    }
-  ),
-  [VerificationMode.FULL]: i18n.translate(
-    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.full.label',
-    {
-      defaultMessage: 'Full',
-    }
-  ),
-  [VerificationMode.NONE]: i18n.translate(
-    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.none.label',
-    {
-      defaultMessage: 'None',
-    }
-  ),
-  [VerificationMode.STRICT]: i18n.translate(
-    'xpack.uptime.createPackagePolicy.stepConfigure.certsField.verificationMode.strict.label',
-    {
-      defaultMessage: 'Strict',
-    }
-  ),
+  ) : null;
 };
-
-const verificationModeOptions = [
-  {
-    value: VerificationMode.CERTIFICATE,
-    text: verificationModeLabels[VerificationMode.CERTIFICATE],
-  },
-  { value: VerificationMode.FULL, text: verificationModeLabels[VerificationMode.FULL] },
-  { value: VerificationMode.NONE, text: verificationModeLabels[VerificationMode.NONE] },
-  { value: VerificationMode.STRICT, text: verificationModeLabels[VerificationMode.STRICT] },
-];
-
-const tlsVersionOptions = Object.values(TLSVersion).map((method) => ({
-  label: method,
-}));
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/types.tsx b/x-pack/plugins/uptime/public/components/fleet_package/types.tsx
index db736f1bae4d2..f391c6c271f69 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/types.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/types.tsx
@@ -80,6 +80,7 @@ export enum ConfigKeys {
   JOURNEY_FILTERS_MATCH = 'filter_journeys.match',
   JOURNEY_FILTERS_TAGS = 'filter_journeys.tags',
   MAX_REDIRECTS = 'max_redirects',
+  METADATA = '__ui',
   MONITOR_TYPE = 'type',
   NAME = 'name',
   PARAMS = 'params',
@@ -104,6 +105,7 @@ export enum ConfigKeys {
   SOURCE_ZIP_USERNAME = 'source.zip_url.username',
   SOURCE_ZIP_PASSWORD = 'source.zip_url.password',
   SOURCE_ZIP_FOLDER = 'source.zip_url.folder',
+  SOURCE_ZIP_PROXY_URL = 'source.zip_url.proxy_url',
   SYNTHETICS_ARGS = 'synthetics_args',
   TLS_CERTIFICATE_AUTHORITIES = 'ssl.certificate_authorities',
   TLS_CERTIFICATE = 'ssl.certificate',
@@ -116,6 +118,17 @@ export enum ConfigKeys {
   URLS = 'urls',
   USERNAME = 'username',
   WAIT = 'wait',
+  ZIP_URL_TLS_CERTIFICATE_AUTHORITIES = 'source.zip_url.ssl.certificate_authorities',
+  ZIP_URL_TLS_CERTIFICATE = 'source.zip_url.ssl.certificate',
+  ZIP_URL_TLS_KEY = 'source.zip_url.ssl.key',
+  ZIP_URL_TLS_KEY_PASSPHRASE = 'source.zip_url.ssl.key_passphrase',
+  ZIP_URL_TLS_VERIFICATION_MODE = 'source.zip_url.ssl.verification_mode',
+  ZIP_URL_TLS_VERSION = 'source.zip_url.ssl.supported_protocols',
+}
+
+export interface Metadata {
+  is_tls_enabled?: boolean;
+  is_zip_url_tls_enabled?: boolean;
 }
 
 export interface ICommonFields {
@@ -127,11 +140,13 @@ export interface ICommonFields {
 }
 
 export type IHTTPSimpleFields = {
+  [ConfigKeys.METADATA]: Metadata;
   [ConfigKeys.MAX_REDIRECTS]: string;
   [ConfigKeys.URLS]: string;
 } & ICommonFields;
 
 export type ITCPSimpleFields = {
+  [ConfigKeys.METADATA]: Metadata;
   [ConfigKeys.HOSTS]: string;
 } & ICommonFields;
 
@@ -141,30 +156,21 @@ export type IICMPSimpleFields = {
 } & ICommonFields;
 
 export interface ITLSFields {
-  [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: {
-    value: string;
-    isEnabled: boolean;
-  };
-  [ConfigKeys.TLS_CERTIFICATE]: {
-    value: string;
-    isEnabled: boolean;
-  };
-  [ConfigKeys.TLS_KEY]: {
-    value: string;
-    isEnabled: boolean;
-  };
-  [ConfigKeys.TLS_KEY_PASSPHRASE]: {
-    value: string;
-    isEnabled: boolean;
-  };
-  [ConfigKeys.TLS_VERIFICATION_MODE]: {
-    value: VerificationMode;
-    isEnabled: boolean;
-  };
-  [ConfigKeys.TLS_VERSION]: {
-    value: TLSVersion[];
-    isEnabled: boolean;
-  };
+  [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]?: string;
+  [ConfigKeys.TLS_CERTIFICATE]?: string;
+  [ConfigKeys.TLS_KEY]?: string;
+  [ConfigKeys.TLS_KEY_PASSPHRASE]?: string;
+  [ConfigKeys.TLS_VERIFICATION_MODE]?: VerificationMode;
+  [ConfigKeys.TLS_VERSION]?: TLSVersion[];
+}
+
+export interface IZipUrlTLSFields {
+  [ConfigKeys.ZIP_URL_TLS_CERTIFICATE_AUTHORITIES]?: ITLSFields[ConfigKeys.TLS_CERTIFICATE_AUTHORITIES];
+  [ConfigKeys.ZIP_URL_TLS_CERTIFICATE]?: ITLSFields[ConfigKeys.TLS_CERTIFICATE];
+  [ConfigKeys.ZIP_URL_TLS_KEY]?: ITLSFields[ConfigKeys.TLS_KEY];
+  [ConfigKeys.ZIP_URL_TLS_KEY_PASSPHRASE]?: ITLSFields[ConfigKeys.TLS_KEY_PASSPHRASE];
+  [ConfigKeys.ZIP_URL_TLS_VERIFICATION_MODE]?: ITLSFields[ConfigKeys.TLS_VERIFICATION_MODE];
+  [ConfigKeys.ZIP_URL_TLS_VERSION]?: ITLSFields[ConfigKeys.TLS_VERSION];
 }
 
 export interface IHTTPAdvancedFields {
@@ -190,13 +196,16 @@ export interface ITCPAdvancedFields {
 }
 
 export type IBrowserSimpleFields = {
+  [ConfigKeys.METADATA]: Metadata;
   [ConfigKeys.SOURCE_INLINE]: string;
   [ConfigKeys.SOURCE_ZIP_URL]: string;
   [ConfigKeys.SOURCE_ZIP_FOLDER]: string;
   [ConfigKeys.SOURCE_ZIP_USERNAME]: string;
   [ConfigKeys.SOURCE_ZIP_PASSWORD]: string;
+  [ConfigKeys.SOURCE_ZIP_PROXY_URL]: string;
   [ConfigKeys.PARAMS]: string;
-} & ICommonFields;
+} & ICommonFields &
+  IZipUrlTLSFields;
 
 export interface IBrowserAdvancedFields {
   [ConfigKeys.SYNTHETICS_ARGS]: string[];
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/use_update_policy.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/use_update_policy.test.tsx
index 05d45da8d38ac..3bffab33adb1e 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/use_update_policy.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/use_update_policy.test.tsx
@@ -332,22 +332,10 @@ describe('useBarChartsHooks', () => {
   };
 
   const defaultTLSFields: Partial<ITLSFields> = {
-    [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: {
-      isEnabled: true,
-      value: 'ca',
-    },
-    [ConfigKeys.TLS_CERTIFICATE]: {
-      isEnabled: true,
-      value: 'cert',
-    },
-    [ConfigKeys.TLS_KEY]: {
-      isEnabled: true,
-      value: 'key',
-    },
-    [ConfigKeys.TLS_KEY_PASSPHRASE]: {
-      isEnabled: true,
-      value: 'password',
-    },
+    [ConfigKeys.TLS_CERTIFICATE_AUTHORITIES]: 'ca',
+    [ConfigKeys.TLS_CERTIFICATE]: 'cert',
+    [ConfigKeys.TLS_KEY]: 'key',
+    [ConfigKeys.TLS_KEY_PASSPHRASE]: 'password',
   };
 
   it('handles http data stream', async () => {
@@ -436,10 +424,7 @@ describe('useBarChartsHooks', () => {
         [ConfigKeys.RESPONSE_BODY_CHECK_NEGATIVE]: ['test'],
         [ConfigKeys.RESPONSE_STATUS_CHECK]: ['test'],
         [ConfigKeys.TAGS]: ['test'],
-        [ConfigKeys.TLS_VERSION]: {
-          value: [TLSVersion.ONE_ONE],
-          isEnabled: true,
-        },
+        [ConfigKeys.TLS_VERSION]: [TLSVersion.ONE_ONE],
       },
     });
 
@@ -467,10 +452,7 @@ describe('useBarChartsHooks', () => {
         [ConfigKeys.RESPONSE_BODY_CHECK_NEGATIVE]: [],
         [ConfigKeys.RESPONSE_STATUS_CHECK]: [],
         [ConfigKeys.TAGS]: [],
-        [ConfigKeys.TLS_VERSION]: {
-          value: [],
-          isEnabled: true,
-        },
+        [ConfigKeys.TLS_VERSION]: [],
       },
     });
 
diff --git a/x-pack/plugins/uptime/public/lib/helper/test_helpers.ts b/x-pack/plugins/uptime/public/lib/helper/test_helpers.ts
index 500b147860528..6a1fe15c9a6de 100644
--- a/x-pack/plugins/uptime/public/lib/helper/test_helpers.ts
+++ b/x-pack/plugins/uptime/public/lib/helper/test_helpers.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-/* global jest */
-
 import moment from 'moment';
 import { Moment } from 'moment-timezone';
 import * as redux from 'react-redux';
diff --git a/x-pack/test/functional/page_objects/synthetics_integration_page.ts b/x-pack/test/functional/page_objects/synthetics_integration_page.ts
index cfb6e1dac980e..5551ea2c3bcd0 100644
--- a/x-pack/test/functional/page_objects/synthetics_integration_page.ts
+++ b/x-pack/test/functional/page_objects/synthetics_integration_page.ts
@@ -117,10 +117,9 @@ export function SyntheticsIntegrationPageProvider({
     /**
      * Finds and returns the enable TLS checkbox
      */
-    async findEnableTLSCheckbox() {
+    async findEnableTLSSwitch() {
       await this.ensureIsOnPackagePage();
-      const tlsCheckboxContainer = await testSubjects.find('syntheticsIsTLSEnabled');
-      return await tlsCheckboxContainer.findByCssSelector('label');
+      return await testSubjects.find('syntheticsIsTLSEnabled');
     },
 
     /**
@@ -321,8 +320,8 @@ export function SyntheticsIntegrationPageProvider({
      * Enables TLS
      */
     async enableTLS() {
-      const tlsCheckbox = await this.findEnableTLSCheckbox();
-      await tlsCheckbox.click();
+      const tlsSwitch = await this.findEnableTLSSwitch();
+      await tlsSwitch.click();
     },
 
     /**

From d7e7dbfe53f08aabd29b15152c34719a571f0108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Thu, 14 Oct 2021 14:48:15 -0400
Subject: [PATCH 098/117] [APM] Remove rate aggregations (#114187)

* fixing throughput chart api

* change backends

* adding intervalString to the observability callback functions

* fixing transaction group detailed stats

* fixing tests

* fixing test

* fixing obs tests

* fixing tests

* adding tests

* fixing ci

* using data generator

* changing name

* fixing i18n

* updating opbs test to use data generator

* fixing api tests

* fixing tests

* using data generator to run the tests

* fixing tests

* fixing test
---
 .../apm/common/utils/formatters/duration.ts   |   9 +-
 .../service_overview_throughput_chart.tsx     |  23 +-
 ...pm_observability_overview_fetchers.test.ts |   3 +-
 .../apm_observability_overview_fetchers.ts    |   2 +
 x-pack/plugins/apm/server/index.ts            |   2 +-
 .../get_throughput_charts_for_backend.ts      |  30 +-
 .../lib/helpers/calculate_throughput.ts       |  27 +
 .../get_transactions_per_minute.ts            |  21 +-
 ...e_transaction_group_detailed_statistics.ts |   7 +-
 .../apm/server/lib/services/get_throughput.ts |  17 +-
 .../server/routes/observability_overview.ts   |   9 +-
 x-pack/plugins/apm/server/routes/services.ts  |   6 +-
 x-pack/plugins/apm/typings/common.d.ts        |   8 +
 .../public/metrics_overview_fetchers.test.ts  |   6 +-
 .../infra/public/metrics_overview_fetchers.ts |   4 +-
 .../public/utils/logs_overview_fetchers.ts    |   2 +-
 .../utils/logs_overview_fetches.test.ts       |   3 +-
 .../components/app/section/apm/index.test.tsx |  12 +-
 .../components/app/section/apm/index.tsx      |   5 +-
 .../components/app/section/logs/index.tsx     |   5 +-
 .../components/app/section/metrics/index.tsx  |   5 +-
 .../components/app/section/uptime/index.tsx   |   5 +-
 .../components/app/section/ux/index.test.tsx  |  12 +-
 .../components/app/section/ux/index.tsx       |   5 +-
 .../observability/public/data_handler.test.ts |   3 +-
 .../public/pages/overview/data_sections.tsx   |   3 +-
 .../public/pages/overview/index.tsx           |   4 +-
 .../typings/fetch_overview_data/index.ts      |   5 +-
 .../translations/translations/ja-JP.json      |   3 -
 .../translations/translations/zh-CN.json      |   3 -
 .../public/apps/uptime_overview_fetcher.ts    |   8 +-
 .../fixtures/es_archiver/archives_metadata.ts |   3 +-
 .../test/apm_api_integration/tests/index.ts   |   8 +
 .../tests/inspect/inspect.ts                  |   2 +-
 .../observability_overview.ts                 | 193 ++--
 .../tests/service_maps/service_maps.ts        |   4 +-
 .../__snapshots__/instance_details.snap       |   2 +-
 .../instances_detailed_statistics.snap        | 324 +++---
 .../instances_main_statistics.ts              |  18 +-
 .../services/__snapshots__/throughput.snap    | 139 ---
 .../tests/services/throughput.ts              | 403 +++-----
 .../tests/services/top_services.ts            |  32 +-
 .../tests/throughput/dependencies_apis.ts     | 236 +++++
 .../tests/throughput/service_apis.ts          | 163 +++
 .../traces/__snapshots__/top_traces.snap      | 610 ++++++------
 .../tests/traces/top_traces.ts                |   6 +-
 .../__snapshots__/error_rate.snap             | 836 ++++++++++++++--
 .../transactions/__snapshots__/latency.snap   | 356 ++++++-
 ...ansactions_groups_detailed_statistics.snap | 931 ------------------
 .../tests/transactions/error_rate.ts          |  20 +-
 .../tests/transactions/latency.ts             |   8 +-
 ...transactions_groups_detailed_statistics.ts | 434 ++++----
 .../transactions_groups_main_statistics.ts    |  32 +-
 53 files changed, 2675 insertions(+), 2342 deletions(-)
 delete mode 100644 x-pack/test/apm_api_integration/tests/services/__snapshots__/throughput.snap
 create mode 100644 x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.ts
 create mode 100644 x-pack/test/apm_api_integration/tests/throughput/service_apis.ts
 delete mode 100644 x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transactions_groups_detailed_statistics.snap

diff --git a/x-pack/plugins/apm/common/utils/formatters/duration.ts b/x-pack/plugins/apm/common/utils/formatters/duration.ts
index bc4d58831ff35..5b20b2e1827a1 100644
--- a/x-pack/plugins/apm/common/utils/formatters/duration.ts
+++ b/x-pack/plugins/apm/common/utils/formatters/duration.ts
@@ -13,8 +13,6 @@ import { asDecimalOrInteger, asInteger, asDecimal } from './formatters';
 import { TimeUnit } from './datetime';
 import { Maybe } from '../../../typings/common';
 import { isFiniteNumber } from '../is_finite_number';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { ThroughputUnit } from '../../../server/lib/helpers/calculate_throughput';
 
 interface FormatterOptions {
   defaultValue?: string;
@@ -182,13 +180,12 @@ export function asTransactionRate(value: Maybe<number>) {
   });
 }
 
-export function asExactTransactionRate(value: number, unit: ThroughputUnit) {
+export function asExactTransactionRate(value: number) {
   return i18n.translate('xpack.apm.exactTransactionRateLabel', {
-    defaultMessage: `{value} { unit, select, minute {tpm} other {tps} }`,
-    values: { value: asDecimalOrInteger(value), unit },
+    defaultMessage: `{value} tpm`,
+    values: { value: asDecimalOrInteger(value) },
   });
 }
-
 /**
  * Converts value and returns it formatted - 00 unit
  */
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx
index 0780c2d272715..6648eaec80fa6 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx
@@ -135,29 +135,16 @@ export function ServiceOverviewThroughputChart({
                 'xpack.apm.serviceOverview.throughtputChartTitle',
                 { defaultMessage: 'Throughput' }
               )}
-              {data.throughputUnit === 'second'
-                ? i18n.translate(
-                    'xpack.apm.serviceOverview.throughtputPerSecondChartTitle',
-                    { defaultMessage: ' (per second)' }
-                  )
-                : ''}
             </h2>
           </EuiTitle>
         </EuiFlexItem>
 
         <EuiFlexItem grow={false}>
           <EuiIconTip
-            content={
-              data.throughputUnit === 'minute'
-                ? i18n.translate('xpack.apm.serviceOverview.tpmHelp', {
-                    defaultMessage:
-                      'Throughput is measured in transactions per minute (tpm)',
-                  })
-                : i18n.translate('xpack.apm.serviceOverview.tpsHelp', {
-                    defaultMessage:
-                      'Throughput is measured in transactions per second (tps)',
-                  })
-            }
+            content={i18n.translate('xpack.apm.serviceOverview.tpmHelp', {
+              defaultMessage:
+                'Throughput is measured in transactions per minute (tpm)',
+            })}
             position="right"
           />
         </EuiFlexItem>
@@ -169,7 +156,7 @@ export function ServiceOverviewThroughputChart({
         showAnnotations={false}
         fetchStatus={status}
         timeseries={timeseries}
-        yLabelFormat={(y) => asExactTransactionRate(y, data.throughputUnit)}
+        yLabelFormat={asExactTransactionRate}
         customTheme={comparisonChartTheme}
       />
     </EuiPanel>
diff --git a/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.test.ts b/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.test.ts
index 00447607cf787..c6513aa24df6b 100644
--- a/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.test.ts
+++ b/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.test.ts
@@ -23,7 +23,8 @@ describe('Observability dashboard data', () => {
       start: 'now-15m',
       end: 'now',
     },
-    bucketSize: '600s',
+    intervalString: '600s',
+    bucketSize: 600,
   };
   afterEach(() => {
     callApmApiMock.mockClear();
diff --git a/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts b/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts
index f26fd85bde968..4e7114ebb9e35 100644
--- a/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts
+++ b/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts
@@ -15,6 +15,7 @@ export const fetchObservabilityOverviewPageData = async ({
   absoluteTime,
   relativeTime,
   bucketSize,
+  intervalString,
 }: FetchDataParams): Promise<ApmFetchDataResponse> => {
   const data = await callApmApi({
     endpoint: 'GET /internal/apm/observability_overview',
@@ -24,6 +25,7 @@ export const fetchObservabilityOverviewPageData = async ({
         start: new Date(absoluteTime.start).toISOString(),
         end: new Date(absoluteTime.end).toISOString(),
         bucketSize,
+        intervalString,
       },
     },
   });
diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
index c0dffc50e4e4f..abf9b3f5fb774 100644
--- a/x-pack/plugins/apm/server/index.ts
+++ b/x-pack/plugins/apm/server/index.ts
@@ -38,7 +38,7 @@ const configSchema = schema.object({
       schema.literal(SearchAggregatedTransactionSetting.always),
       schema.literal(SearchAggregatedTransactionSetting.never),
     ],
-    { defaultValue: SearchAggregatedTransactionSetting.auto }
+    { defaultValue: SearchAggregatedTransactionSetting.never }
   ),
   telemetryCollectionEnabled: schema.boolean({ defaultValue: true }),
   metricsInterval: schema.number({ defaultValue: 30 }),
diff --git a/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts b/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts
index 19a26c3fcf035..1fbdd1c680c58 100644
--- a/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts
+++ b/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts
@@ -13,8 +13,9 @@ import { environmentQuery } from '../../../common/utils/environment_query';
 import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../helpers/setup_request';
-import { getMetricsDateHistogramParams } from '../helpers/metrics';
 import { getOffsetInMs } from '../../../common/utils/get_offset_in_ms';
+import { getBucketSize } from '../helpers/get_bucket_size';
+import { calculateThroughputWithInterval } from '../helpers/calculate_throughput';
 
 export async function getThroughputChartsForBackend({
   backendName,
@@ -41,6 +42,12 @@ export async function getThroughputChartsForBackend({
     offset,
   });
 
+  const { intervalString, bucketSize } = getBucketSize({
+    start: startWithOffset,
+    end: endWithOffset,
+    minBucketSize: 60,
+  });
+
   const response = await apmEventClient.search('get_throughput_for_backend', {
     apm: {
       events: [ProcessorEvent.metric],
@@ -59,16 +66,16 @@ export async function getThroughputChartsForBackend({
       },
       aggs: {
         timeseries: {
-          date_histogram: getMetricsDateHistogramParams({
-            start: startWithOffset,
-            end: endWithOffset,
-            metricsInterval: 60,
-          }),
+          date_histogram: {
+            field: '@timestamp',
+            fixed_interval: intervalString,
+            min_doc_count: 0,
+            extended_bounds: { min: startWithOffset, max: endWithOffset },
+          },
           aggs: {
-            throughput: {
-              rate: {
+            spanDestinationLatencySum: {
+              sum: {
                 field: SPAN_DESTINATION_SERVICE_RESPONSE_TIME_COUNT,
-                unit: 'minute',
               },
             },
           },
@@ -81,7 +88,10 @@ export async function getThroughputChartsForBackend({
     response.aggregations?.timeseries.buckets.map((bucket) => {
       return {
         x: bucket.key + offsetInMs,
-        y: bucket.throughput.value,
+        y: calculateThroughputWithInterval({
+          bucketSize,
+          value: bucket.spanDestinationLatencySum.value || 0,
+        }),
       };
     }) ?? []
   );
diff --git a/x-pack/plugins/apm/server/lib/helpers/calculate_throughput.ts b/x-pack/plugins/apm/server/lib/helpers/calculate_throughput.ts
index 6508329a494ff..9c99f94f82861 100644
--- a/x-pack/plugins/apm/server/lib/helpers/calculate_throughput.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/calculate_throughput.ts
@@ -5,6 +5,9 @@
  * 2.0.
  */
 
+/**
+ * @deprecated use calculateThroughputWithRange instead
+ */
 export function calculateThroughput({
   start,
   end,
@@ -18,6 +21,30 @@ export function calculateThroughput({
   return value / durationAsMinutes;
 }
 
+export function calculateThroughputWithRange({
+  start,
+  end,
+  value,
+}: {
+  start: number;
+  end: number;
+  value: number;
+}) {
+  const durationAsMinutes = (end - start) / 1000 / 60;
+  return value / durationAsMinutes;
+}
+
+export function calculateThroughputWithInterval({
+  bucketSize,
+  value,
+}: {
+  bucketSize: number;
+  value: number;
+}) {
+  const durationAsMinutes = bucketSize / 60;
+  return value / durationAsMinutes;
+}
+
 export type ThroughputUnit = 'minute' | 'second';
 export function getThroughputUnit(bucketSize: number): ThroughputUnit {
   return bucketSize >= 60 ? 'minute' : 'second';
diff --git a/x-pack/plugins/apm/server/lib/observability_overview/get_transactions_per_minute.ts b/x-pack/plugins/apm/server/lib/observability_overview/get_transactions_per_minute.ts
index bfa8d53d2a9fb..8c64670f5d2e9 100644
--- a/x-pack/plugins/apm/server/lib/observability_overview/get_transactions_per_minute.ts
+++ b/x-pack/plugins/apm/server/lib/observability_overview/get_transactions_per_minute.ts
@@ -16,7 +16,10 @@ import {
   getDocumentTypeFilterForAggregatedTransactions,
   getProcessorEventForAggregatedTransactions,
 } from '../helpers/aggregated_transactions';
-import { calculateThroughput } from '../helpers/calculate_throughput';
+import {
+  calculateThroughputWithInterval,
+  calculateThroughputWithRange,
+} from '../helpers/calculate_throughput';
 
 export async function getTransactionsPerMinute({
   setup,
@@ -24,9 +27,11 @@ export async function getTransactionsPerMinute({
   searchAggregatedTransactions,
   start,
   end,
+  intervalString,
 }: {
   setup: Setup;
-  bucketSize: string;
+  bucketSize: number;
+  intervalString: string;
   searchAggregatedTransactions: boolean;
   start: number;
   end: number;
@@ -64,12 +69,9 @@ export async function getTransactionsPerMinute({
               timeseries: {
                 date_histogram: {
                   field: '@timestamp',
-                  fixed_interval: bucketSize,
+                  fixed_interval: intervalString,
                   min_doc_count: 0,
                 },
-                aggs: {
-                  throughput: { rate: { unit: 'minute' as const } },
-                },
               },
             },
           },
@@ -90,7 +92,7 @@ export async function getTransactionsPerMinute({
     ) || aggregations.transactionType.buckets[0];
 
   return {
-    value: calculateThroughput({
+    value: calculateThroughputWithRange({
       start,
       end,
       value: topTransactionTypeBucket?.doc_count || 0,
@@ -98,7 +100,10 @@ export async function getTransactionsPerMinute({
     timeseries:
       topTransactionTypeBucket?.timeseries.buckets.map((bucket) => ({
         x: bucket.key,
-        y: bucket.throughput.value,
+        y: calculateThroughputWithInterval({
+          bucketSize,
+          value: bucket.doc_count,
+        }),
       })) || [],
   };
 }
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_transaction_group_detailed_statistics.ts b/x-pack/plugins/apm/server/lib/services/get_service_transaction_group_detailed_statistics.ts
index adf0317ccf174..feab6d78f02c8 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_transaction_group_detailed_statistics.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_transaction_group_detailed_statistics.ts
@@ -125,11 +125,6 @@ export async function getServiceTransactionGroupDetailedStatistics({
                   },
                 },
                 aggs: {
-                  throughput_rate: {
-                    rate: {
-                      unit: 'minute',
-                    },
-                  },
                   ...getLatencyAggregation(latencyAggregationType, field),
                   [EVENT_OUTCOME]: {
                     terms: {
@@ -160,7 +155,7 @@ export async function getServiceTransactionGroupDetailedStatistics({
     }));
     const throughput = bucket.timeseries.buckets.map((timeseriesBucket) => ({
       x: timeseriesBucket.key,
-      y: timeseriesBucket.throughput_rate.value,
+      y: timeseriesBucket.doc_count, // sparklines only shows trend (no axis)
     }));
     const errorRate = bucket.timeseries.buckets.map((timeseriesBucket) => ({
       x: timeseriesBucket.key,
diff --git a/x-pack/plugins/apm/server/lib/services/get_throughput.ts b/x-pack/plugins/apm/server/lib/services/get_throughput.ts
index 76d6000a161e6..669203ad198b9 100644
--- a/x-pack/plugins/apm/server/lib/services/get_throughput.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_throughput.ts
@@ -18,6 +18,7 @@ import {
   getProcessorEventForAggregatedTransactions,
 } from '../helpers/aggregated_transactions';
 import { Setup } from '../helpers/setup_request';
+import { calculateThroughputWithInterval } from '../helpers/calculate_throughput';
 
 interface Options {
   environment: string;
@@ -30,7 +31,7 @@ interface Options {
   start: number;
   end: number;
   intervalString: string;
-  throughputUnit: 'minute' | 'second';
+  bucketSize: number;
 }
 
 export async function getThroughput({
@@ -44,7 +45,7 @@ export async function getThroughput({
   start,
   end,
   intervalString,
-  throughputUnit,
+  bucketSize,
 }: Options) {
   const { apmEventClient } = setup;
 
@@ -86,13 +87,6 @@ export async function getThroughput({
             min_doc_count: 0,
             extended_bounds: { min: start, max: end },
           },
-          aggs: {
-            throughput: {
-              rate: {
-                unit: throughputUnit,
-              },
-            },
-          },
         },
       },
     },
@@ -107,7 +101,10 @@ export async function getThroughput({
     response.aggregations?.timeseries.buckets.map((bucket) => {
       return {
         x: bucket.key,
-        y: bucket.throughput.value,
+        y: calculateThroughputWithInterval({
+          bucketSize,
+          value: bucket.doc_count,
+        }),
       };
     }) ?? []
   );
diff --git a/x-pack/plugins/apm/server/routes/observability_overview.ts b/x-pack/plugins/apm/server/routes/observability_overview.ts
index a99291ff32bb6..0dbebd061e8be 100644
--- a/x-pack/plugins/apm/server/routes/observability_overview.ts
+++ b/x-pack/plugins/apm/server/routes/observability_overview.ts
@@ -6,6 +6,7 @@
  */
 
 import * as t from 'io-ts';
+import { toNumberRt } from '@kbn/io-ts-utils';
 import { setupRequest } from '../lib/helpers/setup_request';
 import { getServiceCount } from '../lib/observability_overview/get_service_count';
 import { getTransactionsPerMinute } from '../lib/observability_overview/get_transactions_per_minute';
@@ -28,12 +29,15 @@ const observabilityOverviewHasDataRoute = createApmServerRoute({
 const observabilityOverviewRoute = createApmServerRoute({
   endpoint: 'GET /internal/apm/observability_overview',
   params: t.type({
-    query: t.intersection([rangeRt, t.type({ bucketSize: t.string })]),
+    query: t.intersection([
+      rangeRt,
+      t.type({ bucketSize: toNumberRt, intervalString: t.string }),
+    ]),
   }),
   options: { tags: ['access:apm'] },
   handler: async (resources) => {
     const setup = await setupRequest(resources);
-    const { bucketSize, start, end } = resources.params.query;
+    const { bucketSize, intervalString, start, end } = resources.params.query;
 
     const searchAggregatedTransactions = await getSearchAggregatedTransactions({
       apmEventClient: setup.apmEventClient,
@@ -57,6 +61,7 @@ const observabilityOverviewRoute = createApmServerRoute({
           searchAggregatedTransactions,
           start,
           end,
+          intervalString,
         }),
       ]);
       return { serviceCount, transactionPerMinute };
diff --git a/x-pack/plugins/apm/server/routes/services.ts b/x-pack/plugins/apm/server/routes/services.ts
index d4af7315b9c23..f1f29dc2f036c 100644
--- a/x-pack/plugins/apm/server/routes/services.ts
+++ b/x-pack/plugins/apm/server/routes/services.ts
@@ -12,7 +12,6 @@ import { uniq } from 'lodash';
 import { latencyAggregationTypeRt } from '../../common/latency_aggregation_types';
 import { ProfilingValueType } from '../../common/profiling';
 import { getSearchAggregatedTransactions } from '../lib/helpers/aggregated_transactions';
-import { getThroughputUnit } from '../lib/helpers/calculate_throughput';
 import { setupRequest } from '../lib/helpers/setup_request';
 import { getServiceAnnotations } from '../lib/services/annotations';
 import { getServices } from '../lib/services/get_services';
@@ -515,8 +514,6 @@ const serviceThroughputRoute = createApmServerRoute({
         searchAggregatedTransactions,
       });
 
-    const throughputUnit = getThroughputUnit(bucketSize);
-
     const commonProps = {
       environment,
       kuery,
@@ -525,8 +522,8 @@ const serviceThroughputRoute = createApmServerRoute({
       setup,
       transactionType,
       transactionName,
-      throughputUnit,
       intervalString,
+      bucketSize,
     };
 
     const [currentPeriod, previousPeriod] = await Promise.all([
@@ -550,7 +547,6 @@ const serviceThroughputRoute = createApmServerRoute({
         currentPeriodTimeseries: currentPeriod,
         previousPeriodTimeseries: previousPeriod,
       }),
-      throughputUnit,
     };
   },
 });
diff --git a/x-pack/plugins/apm/typings/common.d.ts b/x-pack/plugins/apm/typings/common.d.ts
index b94eb6cd97b06..a3af717b5949b 100644
--- a/x-pack/plugins/apm/typings/common.d.ts
+++ b/x-pack/plugins/apm/typings/common.d.ts
@@ -27,3 +27,11 @@ type AllowUnknownObjectProperties<T> = T extends object
 export type PromiseValueType<T extends Promise<any>> = UnwrapPromise<T>;
 
 export type Maybe<T> = T | null | undefined;
+
+export type RecursivePartial<T> = {
+  [P in keyof T]?: T[P] extends Array<infer U>
+    ? Array<RecursivePartial<U>>
+    : T[P] extends object
+    ? RecursivePartial<T[P]>
+    : T[P];
+};
diff --git a/x-pack/plugins/infra/public/metrics_overview_fetchers.test.ts b/x-pack/plugins/infra/public/metrics_overview_fetchers.test.ts
index e6ffbc30fe24d..c2e60090d81f3 100644
--- a/x-pack/plugins/infra/public/metrics_overview_fetchers.test.ts
+++ b/x-pack/plugins/infra/public/metrics_overview_fetchers.test.ts
@@ -56,7 +56,8 @@ describe('Metrics UI Observability Homepage Functions', () => {
       const fetchData = createMetricsFetchData(mockedGetStartServices);
       const endTime = moment('2020-07-02T13:25:11.629Z');
       const startTime = endTime.clone().subtract(1, 'h');
-      const bucketSize = '300s';
+      const bucketSize = 300;
+      const intervalString = '300s';
       const response = await fetchData({
         absoluteTime: {
           start: startTime.valueOf(),
@@ -67,12 +68,13 @@ describe('Metrics UI Observability Homepage Functions', () => {
           end: 'now',
         },
         bucketSize,
+        intervalString,
       });
       expect(core.http.post).toHaveBeenCalledTimes(1);
       expect(core.http.post).toHaveBeenCalledWith('/api/metrics/overview/top', {
         body: JSON.stringify({
           sourceId: 'default',
-          bucketSize,
+          bucketSize: intervalString,
           size: 5,
           timerange: {
             from: startTime.valueOf(),
diff --git a/x-pack/plugins/infra/public/metrics_overview_fetchers.ts b/x-pack/plugins/infra/public/metrics_overview_fetchers.ts
index 57017d25ecc64..c69ed451ea6d6 100644
--- a/x-pack/plugins/infra/public/metrics_overview_fetchers.ts
+++ b/x-pack/plugins/infra/public/metrics_overview_fetchers.ts
@@ -27,7 +27,7 @@ export const createMetricsHasData =
 
 export const createMetricsFetchData =
   (getStartServices: InfraClientCoreSetup['getStartServices']) =>
-  async ({ absoluteTime, bucketSize }: FetchDataParams): Promise<MetricsFetchDataResponse> => {
+  async ({ absoluteTime, intervalString }: FetchDataParams): Promise<MetricsFetchDataResponse> => {
     const [coreServices] = await getStartServices();
     const { http } = coreServices;
 
@@ -36,7 +36,7 @@ export const createMetricsFetchData =
 
       const overviewRequest: TopNodesRequest = {
         sourceId: 'default',
-        bucketSize,
+        bucketSize: intervalString,
         size: 5,
         timerange: {
           from: start,
diff --git a/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts b/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts
index 67db6a4721941..c813bd3dae781 100644
--- a/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts
+++ b/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts
@@ -138,7 +138,7 @@ function buildLogOverviewAggregations(logParams: LogParams, params: FetchDataPar
         series: {
           date_histogram: {
             field: logParams.timestampField,
-            fixed_interval: params.bucketSize,
+            fixed_interval: params.intervalString,
           },
         },
       },
diff --git a/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts b/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts
index 4fcb83fd02754..d0349ab20710f 100644
--- a/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts
+++ b/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts
@@ -29,7 +29,8 @@ const mockedCallFetchLogSourceConfigurationAPI =
 const DEFAULT_PARAMS = {
   absoluteTime: { start: 1593430680000, end: 1593430800000 },
   relativeTime: { start: 'now-2m', end: 'now' }, // Doesn't matter for the test
-  bucketSize: '30s', // Doesn't matter for the test
+  intervalString: '30s', // Doesn't matter for the test
+  bucketSize: 30, // Doesn't matter for the test
 };
 
 function setup() {
diff --git a/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx
index 8b1480246210a..c9c2ed549a1c3 100644
--- a/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx
@@ -78,7 +78,9 @@ describe('APMSection', () => {
       status: fetcherHook.FETCH_STATUS.SUCCESS,
       refetch: jest.fn(),
     });
-    const { getByText, queryAllByTestId } = render(<APMSection bucketSize="60s" />);
+    const { getByText, queryAllByTestId } = render(
+      <APMSection bucketSize={{ intervalString: '60s', bucketSize: 60 }} />
+    );
 
     expect(getByText('APM')).toBeInTheDocument();
     expect(getByText('View in app')).toBeInTheDocument();
@@ -93,7 +95,9 @@ describe('APMSection', () => {
       status: fetcherHook.FETCH_STATUS.SUCCESS,
       refetch: jest.fn(),
     });
-    const { getByText, queryAllByTestId } = render(<APMSection bucketSize="60s" />);
+    const { getByText, queryAllByTestId } = render(
+      <APMSection bucketSize={{ intervalString: '60s', bucketSize: 60 }} />
+    );
 
     expect(getByText('APM')).toBeInTheDocument();
     expect(getByText('View in app')).toBeInTheDocument();
@@ -107,7 +111,9 @@ describe('APMSection', () => {
       status: fetcherHook.FETCH_STATUS.LOADING,
       refetch: jest.fn(),
     });
-    const { getByText, queryAllByText, getByTestId } = render(<APMSection bucketSize="60s" />);
+    const { getByText, queryAllByText, getByTestId } = render(
+      <APMSection bucketSize={{ intervalString: '60s', bucketSize: 60 }} />
+    );
 
     expect(getByText('APM')).toBeInTheDocument();
     expect(getByTestId('loading')).toBeInTheDocument();
diff --git a/x-pack/plugins/observability/public/components/app/section/apm/index.tsx b/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
index 8df14129623f6..11565cfb972e7 100644
--- a/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
@@ -30,9 +30,10 @@ import { useHasData } from '../../../../hooks/use_has_data';
 import { ChartContainer } from '../../chart_container';
 import { StyledStat } from '../../styled_stat';
 import { onBrushEnd } from '../helper';
+import { BucketSize } from '../../../../pages/overview';
 
 interface Props {
-  bucketSize?: string;
+  bucketSize: BucketSize;
 }
 
 function formatTpm(value?: number) {
@@ -65,7 +66,7 @@ export function APMSection({ bucketSize }: Props) {
         return getDataHandler('apm')?.fetchData({
           absoluteTime: { start: absoluteStart, end: absoluteEnd },
           relativeTime: { start: relativeStart, end: relativeEnd },
-          bucketSize,
+          ...bucketSize,
         });
       }
     },
diff --git a/x-pack/plugins/observability/public/components/app/section/logs/index.tsx b/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
index dcd51a531a73d..0ff2c203c7707 100644
--- a/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
@@ -32,9 +32,10 @@ import { formatStatValue } from '../../../../utils/format_stat_value';
 import { ChartContainer } from '../../chart_container';
 import { StyledStat } from '../../styled_stat';
 import { onBrushEnd } from '../helper';
+import { BucketSize } from '../../../../pages/overview';
 
 interface Props {
-  bucketSize?: string;
+  bucketSize: BucketSize;
 }
 
 function getColorPerItem(series?: LogsFetchDataResponse['series']) {
@@ -64,7 +65,7 @@ export function LogsSection({ bucketSize }: Props) {
         return getDataHandler('infra_logs')?.fetchData({
           absoluteTime: { start: absoluteStart, end: absoluteEnd },
           relativeTime: { start: relativeStart, end: relativeEnd },
-          bucketSize,
+          ...bucketSize,
         });
       }
     },
diff --git a/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx b/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx
index fd1e356f849a2..8cd49efe4787a 100644
--- a/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx
@@ -29,6 +29,7 @@ import { useTimeRange } from '../../../../hooks/use_time_range';
 import { HostLink } from './host_link';
 import { formatDuration } from './lib/format_duration';
 import { MetricWithSparkline } from './metric_with_sparkline';
+import { BucketSize } from '../../../../pages/overview';
 
 const COLOR_ORANGE = 7;
 const COLOR_BLUE = 1;
@@ -36,7 +37,7 @@ const COLOR_GREEN = 0;
 const COLOR_PURPLE = 3;
 
 interface Props {
-  bucketSize?: string;
+  bucketSize: BucketSize;
 }
 
 const percentFormatter = (value: NumberOrNull) =>
@@ -61,7 +62,7 @@ export function MetricsSection({ bucketSize }: Props) {
         return getDataHandler('infra_metrics')?.fetchData({
           absoluteTime: { start: absoluteStart, end: absoluteEnd },
           relativeTime: { start: relativeStart, end: relativeEnd },
-          bucketSize,
+          ...bucketSize,
         });
       }
     },
diff --git a/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx b/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
index 8c0f1f8db7c1a..4c9e7b42f40c6 100644
--- a/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
@@ -32,9 +32,10 @@ import { Series } from '../../../../typings';
 import { ChartContainer } from '../../chart_container';
 import { StyledStat } from '../../styled_stat';
 import { onBrushEnd } from '../helper';
+import { BucketSize } from '../../../../pages/overview';
 
 interface Props {
-  bucketSize?: string;
+  bucketSize: BucketSize;
 }
 
 export function UptimeSection({ bucketSize }: Props) {
@@ -50,7 +51,7 @@ export function UptimeSection({ bucketSize }: Props) {
         return getDataHandler('synthetics')?.fetchData({
           absoluteTime: { start: absoluteStart, end: absoluteEnd },
           relativeTime: { start: relativeStart, end: relativeEnd },
-          bucketSize,
+          ...bucketSize,
         });
       }
     },
diff --git a/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx
index 19bc20f5da605..8a99b6a53cf06 100644
--- a/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx
@@ -67,7 +67,9 @@ describe('UXSection', () => {
       status: fetcherHook.FETCH_STATUS.SUCCESS,
       refetch: jest.fn(),
     });
-    const { getByText, getAllByText } = render(<UXSection bucketSize="60s" />);
+    const { getByText, getAllByText } = render(
+      <UXSection bucketSize={{ bucketSize: 60, intervalString: '60s' }} />
+    );
 
     expect(getByText('User Experience')).toBeInTheDocument();
     expect(getByText('View in app')).toBeInTheDocument();
@@ -99,7 +101,9 @@ describe('UXSection', () => {
       status: fetcherHook.FETCH_STATUS.LOADING,
       refetch: jest.fn(),
     });
-    const { getByText, queryAllByText, getAllByText } = render(<UXSection bucketSize="60s" />);
+    const { getByText, queryAllByText, getAllByText } = render(
+      <UXSection bucketSize={{ bucketSize: 60, intervalString: '60s' }} />
+    );
 
     expect(getByText('User Experience')).toBeInTheDocument();
     expect(getAllByText('--')).toHaveLength(3);
@@ -112,7 +116,9 @@ describe('UXSection', () => {
       status: fetcherHook.FETCH_STATUS.SUCCESS,
       refetch: jest.fn(),
     });
-    const { getByText, queryAllByText, getAllByText } = render(<UXSection bucketSize="60s" />);
+    const { getByText, queryAllByText, getAllByText } = render(
+      <UXSection bucketSize={{ bucketSize: 60, intervalString: '60s' }} />
+    );
 
     expect(getByText('User Experience')).toBeInTheDocument();
     expect(getAllByText('No data is available.')).toHaveLength(3);
diff --git a/x-pack/plugins/observability/public/components/app/section/ux/index.tsx b/x-pack/plugins/observability/public/components/app/section/ux/index.tsx
index 5aa89eb2d3074..3092c7bf77f7a 100644
--- a/x-pack/plugins/observability/public/components/app/section/ux/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/ux/index.tsx
@@ -13,9 +13,10 @@ import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
 import { useHasData } from '../../../../hooks/use_has_data';
 import { useTimeRange } from '../../../../hooks/use_time_range';
 import CoreVitals from '../../../shared/core_web_vitals';
+import { BucketSize } from '../../../../pages/overview';
 
 interface Props {
-  bucketSize: string;
+  bucketSize: BucketSize;
 }
 
 export function UXSection({ bucketSize }: Props) {
@@ -31,7 +32,7 @@ export function UXSection({ bucketSize }: Props) {
           absoluteTime: { start: absoluteStart, end: absoluteEnd },
           relativeTime: { start: relativeStart, end: relativeEnd },
           serviceName,
-          bucketSize,
+          ...bucketSize,
         });
       }
     },
diff --git a/x-pack/plugins/observability/public/data_handler.test.ts b/x-pack/plugins/observability/public/data_handler.test.ts
index 2beae5d111f7d..8325997e75ec9 100644
--- a/x-pack/plugins/observability/public/data_handler.test.ts
+++ b/x-pack/plugins/observability/public/data_handler.test.ts
@@ -20,7 +20,8 @@ const params = {
     start: 'now-15m',
     end: 'now',
   },
-  bucketSize: '10s',
+  intervalString: '10s',
+  bucketSize: 10,
 };
 
 describe('registerDataHandler', () => {
diff --git a/x-pack/plugins/observability/public/pages/overview/data_sections.tsx b/x-pack/plugins/observability/public/pages/overview/data_sections.tsx
index 82231304e65b2..335f527560c7a 100644
--- a/x-pack/plugins/observability/public/pages/overview/data_sections.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/data_sections.tsx
@@ -13,9 +13,10 @@ import { MetricsSection } from '../../components/app/section/metrics';
 import { UptimeSection } from '../../components/app/section/uptime';
 import { UXSection } from '../../components/app/section/ux';
 import { HasDataMap } from '../../context/has_data_context';
+import { BucketSize } from '.';
 
 interface Props {
-  bucketSize: string;
+  bucketSize: BucketSize;
   hasData?: Partial<HasDataMap>;
 }
 
diff --git a/x-pack/plugins/observability/public/pages/overview/index.tsx b/x-pack/plugins/observability/public/pages/overview/index.tsx
index 26dbf5ece400c..b817a83d59e0d 100644
--- a/x-pack/plugins/observability/public/pages/overview/index.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/index.tsx
@@ -31,7 +31,7 @@ import { LoadingObservability } from './loading_observability';
 interface Props {
   routeParams: RouteParams<'/overview'>;
 }
-
+export type BucketSize = ReturnType<typeof calculateBucketSize>;
 function calculateBucketSize({ start, end }: { start?: number; end?: number }) {
   if (start && end) {
     return getBucketSize({ start, end, minInterval: '60s' });
@@ -106,7 +106,7 @@ export function OverviewPage({ routeParams }: Props) {
           <EuiFlexGroup>
             <EuiFlexItem grow={6}>
               {/* Data sections */}
-              {hasAnyData && <DataSections bucketSize={bucketSize?.intervalString!} />}
+              {hasAnyData && <DataSections bucketSize={bucketSize} />}
               <EmptySections />
               <EuiSpacer size="l" />
               <EuiFlexGroup>
diff --git a/x-pack/plugins/observability/public/typings/fetch_overview_data/index.ts b/x-pack/plugins/observability/public/typings/fetch_overview_data/index.ts
index 197a8c1060cdb..50ce0e392de0e 100644
--- a/x-pack/plugins/observability/public/typings/fetch_overview_data/index.ts
+++ b/x-pack/plugins/observability/public/typings/fetch_overview_data/index.ts
@@ -26,8 +26,11 @@ export interface Series {
 export interface FetchDataParams {
   absoluteTime: { start: number; end: number };
   relativeTime: { start: string; end: string };
-  bucketSize: string;
   serviceName?: string;
+  // Bucket size in seconds (number)
+  bucketSize: number;
+  // Bucket size in seconds (string)
+  intervalString: string;
 }
 
 export interface HasDataParams {
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 583085879af93..2adde7638ebfb 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -6323,7 +6323,6 @@
     "xpack.apm.errorsTable.occurrencesColumnLabel": "オカレンス",
     "xpack.apm.errorsTable.typeColumnLabel": "型",
     "xpack.apm.errorsTable.unhandledLabel": "未対応",
-    "xpack.apm.exactTransactionRateLabel": "{value} { unit, select, minute {tpm} other {tps} }",
     "xpack.apm.failedTransactionsCorrelations.licenseCheckText": "失敗したトランザクションの相関関係機能を使用するには、Elastic Platinumライセンスのサブスクリプションが必要です。",
     "xpack.apm.featureRegistry.apmFeatureName": "APMおよびユーザーエクスペリエンス",
     "xpack.apm.feedbackMenu.appName": "APM",
@@ -6633,9 +6632,7 @@
     "xpack.apm.serviceOverview.mlNudgeMessage.learnMoreButton": "使ってみる",
     "xpack.apm.serviceOverview.throughtputChart.previousPeriodLabel": "前の期間",
     "xpack.apm.serviceOverview.throughtputChartTitle": "スループット",
-    "xpack.apm.serviceOverview.throughtputPerSecondChartTitle": " （秒単位）",
     "xpack.apm.serviceOverview.tpmHelp": "スループットは1分あたりのトランザクション数（tpm）で測定されます",
-    "xpack.apm.serviceOverview.tpsHelp": "スループットは1秒あたりのトランザクション数（tps）で測定されます",
     "xpack.apm.serviceOverview.transactionsTableColumnErrorRate": "失敗したトランザクション率",
     "xpack.apm.serviceOverview.transactionsTableColumnImpact": "インパクト",
     "xpack.apm.serviceOverview.transactionsTableColumnName": "名前",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index efffec39ed98c..7e731a70b656a 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -6374,7 +6374,6 @@
     "xpack.apm.errorsTable.occurrencesColumnLabel": "发生次数",
     "xpack.apm.errorsTable.typeColumnLabel": "类型",
     "xpack.apm.errorsTable.unhandledLabel": "未处理",
-    "xpack.apm.exactTransactionRateLabel": "{value} { unit, select, minute {tpm} other {tps} }",
     "xpack.apm.failedTransactionsCorrelations.licenseCheckText": "要使用失败事务相关性功能，必须订阅 Elastic 白金级许可证。",
     "xpack.apm.featureRegistry.apmFeatureName": "APM 和用户体验",
     "xpack.apm.feedbackMenu.appName": "APM",
@@ -6687,9 +6686,7 @@
     "xpack.apm.serviceOverview.mlNudgeMessage.learnMoreButton": "开始使用",
     "xpack.apm.serviceOverview.throughtputChart.previousPeriodLabel": "上一时段",
     "xpack.apm.serviceOverview.throughtputChartTitle": "吞吐量",
-    "xpack.apm.serviceOverview.throughtputPerSecondChartTitle": " （每秒）",
     "xpack.apm.serviceOverview.tpmHelp": "吞吐量按每分钟事务数 (tpm) 来度量",
-    "xpack.apm.serviceOverview.tpsHelp": "吞吐量按每秒事务数 (tps) 来度量",
     "xpack.apm.serviceOverview.transactionsTableColumnErrorRate": "失败事务率",
     "xpack.apm.serviceOverview.transactionsTableColumnImpact": "影响",
     "xpack.apm.serviceOverview.transactionsTableColumnName": "名称",
diff --git a/x-pack/plugins/uptime/public/apps/uptime_overview_fetcher.ts b/x-pack/plugins/uptime/public/apps/uptime_overview_fetcher.ts
index e1cab29abec4b..8f8cf16d1e383 100644
--- a/x-pack/plugins/uptime/public/apps/uptime_overview_fetcher.ts
+++ b/x-pack/plugins/uptime/public/apps/uptime_overview_fetcher.ts
@@ -13,7 +13,7 @@ import { kibanaService } from '../state/kibana_service';
 async function fetchUptimeOverviewData({
   absoluteTime,
   relativeTime,
-  bucketSize,
+  intervalString,
 }: FetchDataParams) {
   const start = new Date(absoluteTime.start).toISOString();
   const end = new Date(absoluteTime.end).toISOString();
@@ -22,7 +22,11 @@ async function fetchUptimeOverviewData({
     dateRangeEnd: end,
   });
 
-  const pings = await fetchPingHistogram({ dateStart: start, dateEnd: end, bucketSize });
+  const pings = await fetchPingHistogram({
+    dateStart: start,
+    dateEnd: end,
+    bucketSize: intervalString,
+  });
 
   const response: UptimeFetchDataResponse = {
     appLink: `/app/uptime?dateRangeStart=${relativeTime.start}&dateRangeEnd=${relativeTime.end}`,
diff --git a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/archives_metadata.ts b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/archives_metadata.ts
index 3382f0f8ee460..bea2b54d05eeb 100644
--- a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/archives_metadata.ts
+++ b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/archives_metadata.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-/* eslint-disable-next-line*/
-    export default {
+export default {
   'apm_8.0.0': {
     start: '2021-08-03T06:50:15.910Z',
     end: '2021-08-03T07:20:15.910Z',
diff --git a/x-pack/test/apm_api_integration/tests/index.ts b/x-pack/test/apm_api_integration/tests/index.ts
index 49f1ae91c6282..8caae0afe746e 100644
--- a/x-pack/test/apm_api_integration/tests/index.ts
+++ b/x-pack/test/apm_api_integration/tests/index.ts
@@ -96,6 +96,14 @@ export default function apmApiIntegrationTests(providerContext: FtrProviderConte
       loadTestFile(require.resolve('./services/throughput'));
     });
 
+    describe('service apis throughput', function () {
+      loadTestFile(require.resolve('./throughput/service_apis'));
+    });
+
+    describe('dependencies throughput', function () {
+      loadTestFile(require.resolve('./throughput/dependencies_apis'));
+    });
+
     describe('services/top_services', function () {
       loadTestFile(require.resolve('./services/top_services'));
     });
diff --git a/x-pack/test/apm_api_integration/tests/inspect/inspect.ts b/x-pack/test/apm_api_integration/tests/inspect/inspect.ts
index 75b5a02fff800..a010c150124f0 100644
--- a/x-pack/test/apm_api_integration/tests/inspect/inspect.ts
+++ b/x-pack/test/apm_api_integration/tests/inspect/inspect.ts
@@ -49,7 +49,7 @@ export default function customLinksTests({ getService }: FtrProviderContext) {
             },
           });
           expect(status).to.be(200);
-          expect(body._inspect?.length).to.be(2);
+          expect(body._inspect?.length).to.be(1);
 
           // @ts-expect-error
           expect(Object.keys(body._inspect[0])).to.eql([
diff --git a/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts
index b463db81e6c99..458372196452a 100644
--- a/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts
+++ b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts
@@ -4,22 +4,58 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import { service, timerange } from '@elastic/apm-generator';
 import expect from '@kbn/expect';
-import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
+import { meanBy, sumBy } from 'lodash';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { registry } from '../../common/registry';
+import { PromiseReturnType } from '../../../../plugins/observability/typings/common';
+import { roundNumber } from '../../utils';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
-  const supertest = getService('legacySupertestAsApmReadUser');
+  const apmApiClient = getService('apmApiClient');
+
+  const traceData = getService('traceData');
 
-  const archiveName = 'apm_8.0.0';
-  const metadata = archives_metadata[archiveName];
+  const start = new Date('2021-01-01T00:00:00.000Z').getTime();
+  const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
+  const intervalString = '60s';
+  const bucketSize = 60;
 
-  // url parameters
-  const start = encodeURIComponent(metadata.start);
-  const end = encodeURIComponent(metadata.end);
-  const bucketSize = '60s';
+  async function getThroughputValues() {
+    const commonQuery = { start: new Date(start).toISOString(), end: new Date(end).toISOString() };
+    const [serviceInventoryAPIResponse, observabilityOverviewAPIResponse] = await Promise.all([
+      apmApiClient.readUser({
+        endpoint: 'GET /internal/apm/services',
+        params: {
+          query: {
+            ...commonQuery,
+            environment: 'ENVIRONMENT_ALL',
+            kuery: '',
+          },
+        },
+      }),
+      apmApiClient.readUser({
+        endpoint: `GET /internal/apm/observability_overview`,
+        params: {
+          query: {
+            ...commonQuery,
+            bucketSize,
+            intervalString,
+          },
+        },
+      }),
+    ]);
+    const serviceInventoryThroughputSum = roundNumber(
+      sumBy(serviceInventoryAPIResponse.body.items, 'throughput')
+    );
+
+    return {
+      serviceInventoryCount: serviceInventoryAPIResponse.body.items.length,
+      serviceInventoryThroughputSum,
+      observabilityOverview: observabilityOverviewAPIResponse.body,
+    };
+  }
 
   registry.when(
     'Observability overview when data is not loaded',
@@ -27,9 +63,17 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     () => {
       describe('when data is not loaded', () => {
         it('handles the empty state', async () => {
-          const response = await supertest.get(
-            `/internal/apm/observability_overview?start=${start}&end=${end}&bucketSize=${bucketSize}`
-          );
+          const response = await apmApiClient.readUser({
+            endpoint: `GET /internal/apm/observability_overview`,
+            params: {
+              query: {
+                start: new Date(start).toISOString(),
+                end: new Date(end).toISOString(),
+                bucketSize,
+                intervalString,
+              },
+            },
+          });
           expect(response.status).to.be(200);
 
           expect(response.body.serviceCount).to.be(0);
@@ -39,56 +83,89 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     }
   );
 
-  registry.when(
-    'Observability overview when data is loaded',
-    { config: 'basic', archives: [archiveName] },
-    () => {
-      it('returns the service count and transaction coordinates', async () => {
-        const response = await supertest.get(
-          `/internal/apm/observability_overview?start=${start}&end=${end}&bucketSize=${bucketSize}`
+  registry.when('data is loaded', { config: 'basic', archives: ['apm_8.0.0_empty'] }, () => {
+    describe('Observability overview api ', () => {
+      const GO_PROD_RATE = 50;
+      const GO_DEV_RATE = 5;
+      const JAVA_PROD_RATE = 45;
+      before(async () => {
+        const serviceGoProdInstance = service('synth-go', 'production', 'go').instance(
+          'instance-a'
+        );
+        const serviceGoDevInstance = service('synth-go', 'development', 'go').instance(
+          'instance-b'
+        );
+        const serviceJavaInstance = service('synth-java', 'production', 'java').instance(
+          'instance-c'
         );
-        expect(response.status).to.be(200);
 
-        expect(response.body.serviceCount).to.be.greaterThan(0);
-        expect(response.body.transactionPerMinute.timeseries.length).to.be.greaterThan(0);
+        await traceData.index([
+          ...timerange(start, end)
+            .interval('1m')
+            .rate(GO_PROD_RATE)
+            .flatMap((timestamp) =>
+              serviceGoProdInstance
+                .transaction('GET /api/product/list')
+                .duration(1000)
+                .timestamp(timestamp)
+                .serialize()
+            ),
+          ...timerange(start, end)
+            .interval('1m')
+            .rate(GO_DEV_RATE)
+            .flatMap((timestamp) =>
+              serviceGoDevInstance
+                .transaction('GET /api/product/:id')
+                .duration(1000)
+                .timestamp(timestamp)
+                .serialize()
+            ),
+          ...timerange(start, end)
+            .interval('1m')
+            .rate(JAVA_PROD_RATE)
+            .flatMap((timestamp) =>
+              serviceJavaInstance
+                .transaction('POST /api/product/buy')
+                .duration(1000)
+                .timestamp(timestamp)
+                .serialize()
+            ),
+        ]);
+      });
 
-        expectSnapshot(response.body.serviceCount).toMatchInline(`8`);
+      after(() => traceData.clean());
 
-        expectSnapshot(response.body.transactionPerMinute.value).toMatchInline(`58.9`);
-        expectSnapshot(response.body.transactionPerMinute.timeseries.length).toMatchInline(`30`);
+      describe('compare throughput values', () => {
+        let throughputValues: PromiseReturnType<typeof getThroughputValues>;
+        before(async () => {
+          throughputValues = await getThroughputValues();
+        });
 
-        expectSnapshot(
-          response.body.transactionPerMinute.timeseries
-            .slice(0, 5)
-            .map(({ x, y }: { x: number; y: number }) => ({
-              x: new Date(x).toISOString(),
-              y,
-            }))
-        ).toMatchInline(`
-          Array [
-            Object {
-              "x": "2021-08-03T06:50:00.000Z",
-              "y": 36,
-            },
-            Object {
-              "x": "2021-08-03T06:51:00.000Z",
-              "y": 55,
-            },
-            Object {
-              "x": "2021-08-03T06:52:00.000Z",
-              "y": 40,
-            },
-            Object {
-              "x": "2021-08-03T06:53:00.000Z",
-              "y": 53,
-            },
-            Object {
-              "x": "2021-08-03T06:54:00.000Z",
-              "y": 39,
-            },
-          ]
-        `);
+        it('returns same number of service as shown on service inventory API', () => {
+          const { serviceInventoryCount, observabilityOverview } = throughputValues;
+          [serviceInventoryCount, observabilityOverview.serviceCount].forEach((value) =>
+            expect(value).to.be.equal(2)
+          );
+        });
+
+        it('returns same throughput value on service inventory and obs throughput count', () => {
+          const { serviceInventoryThroughputSum, observabilityOverview } = throughputValues;
+          const obsThroughputCount = roundNumber(observabilityOverview.transactionPerMinute.value);
+          [serviceInventoryThroughputSum, obsThroughputCount].forEach((value) =>
+            expect(value).to.be.equal(roundNumber(GO_PROD_RATE + GO_DEV_RATE + JAVA_PROD_RATE))
+          );
+        });
+
+        it('returns same throughput value on service inventory and obs mean throughput timeseries', () => {
+          const { serviceInventoryThroughputSum, observabilityOverview } = throughputValues;
+          const obsThroughputMean = roundNumber(
+            meanBy(observabilityOverview.transactionPerMinute.timeseries, 'y')
+          );
+          [serviceInventoryThroughputSum, obsThroughputMean].forEach((value) =>
+            expect(value).to.be.equal(roundNumber(GO_PROD_RATE + GO_DEV_RATE + JAVA_PROD_RATE))
+          );
+        });
       });
-    }
-  );
+    });
+  });
 }
diff --git a/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts
index 37fe340d75194..ab1be97e0fd8a 100644
--- a/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts
+++ b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts
@@ -301,8 +301,8 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext)
             "avgErrorRate": 0,
             "avgMemoryUsage": 0.202572668763642,
             "transactionStats": Object {
-              "avgRequestsPerMinute": 5.2,
-              "avgTransactionDuration": 53906.6603773585,
+              "avgRequestsPerMinute": 7.13333333333333,
+              "avgTransactionDuration": 53147.5747663551,
             },
           }
         `);
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap b/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap
index 5daadd8079baa..91b0b7f2da6e4 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap
+++ b/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap
@@ -2,7 +2,7 @@
 
 exports[`APM API tests basic apm_8.0.0 Instance details when data is loaded fetch instance details return the correct data 1`] = `
 Object {
-  "@timestamp": "2021-08-03T06:50:50.204Z",
+  "@timestamp": "2021-08-03T06:50:20.205Z",
   "agent": Object {
     "ephemeral_id": "2745d454-f57f-4473-a09b-fe6bef295860",
     "name": "java",
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instances_detailed_statistics.snap b/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instances_detailed_statistics.snap
index 7ae3fa1da3380..971c14262f0b0 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instances_detailed_statistics.snap
+++ b/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instances_detailed_statistics.snap
@@ -73,11 +73,11 @@ Object {
       "errorRate": Array [
         Object {
           "x": 1627974300000,
-          "y": 0,
+          "y": null,
         },
         Object {
           "x": 1627974360000,
-          "y": null,
+          "y": 0,
         },
         Object {
           "x": 1627974420000,
@@ -93,15 +93,15 @@ Object {
         },
         Object {
           "x": 1627974600000,
-          "y": 0.0526315789473684,
+          "y": 0.5,
         },
         Object {
           "x": 1627974660000,
-          "y": 0.142857142857143,
+          "y": 0.4,
         },
         Object {
           "x": 1627974720000,
-          "y": 0.0416666666666667,
+          "y": 0,
         },
         Object {
           "x": 1627974780000,
@@ -109,11 +109,11 @@ Object {
         },
         Object {
           "x": 1627974840000,
-          "y": 0,
+          "y": 0.166666666666667,
         },
         Object {
           "x": 1627974900000,
-          "y": 0.024390243902439,
+          "y": 0,
         },
         Object {
           "x": 1627974960000,
@@ -125,11 +125,11 @@ Object {
         },
         Object {
           "x": 1627975080000,
-          "y": 0,
+          "y": 0.142857142857143,
         },
         Object {
           "x": 1627975140000,
-          "y": 0.0555555555555556,
+          "y": 0.2,
         },
         Object {
           "x": 1627975200000,
@@ -139,63 +139,63 @@ Object {
       "latency": Array [
         Object {
           "x": 1627974300000,
-          "y": 34887.8888888889,
+          "y": null,
         },
         Object {
           "x": 1627974360000,
-          "y": null,
+          "y": 5578,
         },
         Object {
           "x": 1627974420000,
-          "y": 4983,
+          "y": 34851.1666666667,
         },
         Object {
           "x": 1627974480000,
-          "y": 41285.4,
+          "y": 15896.4,
         },
         Object {
           "x": 1627974540000,
-          "y": 13820.3333333333,
+          "y": 15174.1666666667,
         },
         Object {
           "x": 1627974600000,
-          "y": 13782,
+          "y": 9185.16666666667,
         },
         Object {
           "x": 1627974660000,
-          "y": 13392.6,
+          "y": 12363.2,
         },
         Object {
           "x": 1627974720000,
-          "y": 6991,
+          "y": 6206.44444444444,
         },
         Object {
           "x": 1627974780000,
-          "y": 6885.85714285714,
+          "y": 6707,
         },
         Object {
           "x": 1627974840000,
-          "y": 7935,
+          "y": 12409.1666666667,
         },
         Object {
           "x": 1627974900000,
-          "y": 10828.3333333333,
+          "y": 9188.36363636364,
         },
         Object {
           "x": 1627974960000,
-          "y": 6079,
+          "y": 4279.6,
         },
         Object {
           "x": 1627975020000,
-          "y": 5217,
+          "y": 6827.3,
         },
         Object {
           "x": 1627975080000,
-          "y": 8477.76923076923,
+          "y": 7445.78571428571,
         },
         Object {
           "x": 1627975140000,
-          "y": 5937.18181818182,
+          "y": 563288.6,
         },
         Object {
           "x": 1627975200000,
@@ -272,63 +272,63 @@ Object {
       "throughput": Array [
         Object {
           "x": 1627974300000,
-          "y": 21,
+          "y": 0,
         },
         Object {
           "x": 1627974360000,
-          "y": 0,
+          "y": 2,
         },
         Object {
           "x": 1627974420000,
-          "y": 24,
+          "y": 6,
         },
         Object {
           "x": 1627974480000,
-          "y": 17,
+          "y": 5,
         },
         Object {
           "x": 1627974540000,
-          "y": 17,
+          "y": 6,
         },
         Object {
           "x": 1627974600000,
-          "y": 19,
+          "y": 6,
         },
         Object {
           "x": 1627974660000,
-          "y": 21,
+          "y": 5,
         },
         Object {
           "x": 1627974720000,
-          "y": 24,
+          "y": 9,
         },
         Object {
           "x": 1627974780000,
-          "y": 22,
+          "y": 3,
         },
         Object {
           "x": 1627974840000,
-          "y": 19,
+          "y": 6,
         },
         Object {
           "x": 1627974900000,
-          "y": 41,
+          "y": 11,
         },
         Object {
           "x": 1627974960000,
-          "y": 11,
+          "y": 5,
         },
         Object {
           "x": 1627975020000,
-          "y": 23,
+          "y": 10,
         },
         Object {
           "x": 1627975080000,
-          "y": 47,
+          "y": 14,
         },
         Object {
           "x": 1627975140000,
-          "y": 36,
+          "y": 10,
         },
         Object {
           "x": 1627975200000,
@@ -412,15 +412,15 @@ Object {
         },
         Object {
           "x": 1627974360000,
-          "y": 0,
+          "y": 0.25,
         },
         Object {
           "x": 1627974420000,
-          "y": 0.0434782608695652,
+          "y": 0.111111111111111,
         },
         Object {
           "x": 1627974480000,
-          "y": 0.0833333333333333,
+          "y": 0.2,
         },
         Object {
           "x": 1627974540000,
@@ -428,15 +428,15 @@ Object {
         },
         Object {
           "x": 1627974600000,
-          "y": 0,
+          "y": 0.142857142857143,
         },
         Object {
           "x": 1627974660000,
-          "y": 0.03125,
+          "y": 0.1,
         },
         Object {
           "x": 1627974720000,
-          "y": 0.0555555555555556,
+          "y": 0.125,
         },
         Object {
           "x": 1627974780000,
@@ -444,15 +444,15 @@ Object {
         },
         Object {
           "x": 1627974840000,
-          "y": 0,
+          "y": 0.111111111111111,
         },
         Object {
           "x": 1627974900000,
-          "y": 0.0232558139534884,
+          "y": 0,
         },
         Object {
           "x": 1627974960000,
-          "y": 0.032258064516129,
+          "y": 0.333333333333333,
         },
         Object {
           "x": 1627975020000,
@@ -460,81 +460,81 @@ Object {
         },
         Object {
           "x": 1627975080000,
-          "y": 0.027027027027027,
+          "y": 0.0833333333333333,
         },
         Object {
           "x": 1627975140000,
-          "y": 0.0571428571428571,
+          "y": 0.1,
         },
         Object {
           "x": 1627975200000,
-          "y": null,
+          "y": 0,
         },
       ],
       "latency": Array [
         Object {
           "x": 1627974300000,
-          "y": 11839,
+          "y": 5372.5,
         },
         Object {
           "x": 1627974360000,
-          "y": 7407,
+          "y": 1441598.25,
         },
         Object {
           "x": 1627974420000,
-          "y": 1925569.66666667,
+          "y": 9380.22222222222,
         },
         Object {
           "x": 1627974480000,
-          "y": 9017.18181818182,
+          "y": 10949.4,
         },
         Object {
           "x": 1627974540000,
-          "y": 63575,
+          "y": 77148.6666666667,
         },
         Object {
           "x": 1627974600000,
-          "y": 7577.66666666667,
+          "y": 6461,
         },
         Object {
           "x": 1627974660000,
-          "y": 6844.33333333333,
+          "y": 549308.4,
         },
         Object {
           "x": 1627974720000,
-          "y": 503471,
+          "y": 10797.75,
         },
         Object {
           "x": 1627974780000,
-          "y": 6247.8,
+          "y": 9758.53846153846,
         },
         Object {
           "x": 1627974840000,
-          "y": 1137247,
+          "y": 1281052.66666667,
         },
         Object {
           "x": 1627974900000,
-          "y": 27951.6666666667,
+          "y": 9511.0625,
         },
         Object {
           "x": 1627974960000,
-          "y": 10248.8461538462,
+          "y": 11151203.3333333,
         },
         Object {
           "x": 1627975020000,
-          "y": 13529,
+          "y": 8647.2,
         },
         Object {
           "x": 1627975080000,
-          "y": 6691247.8,
+          "y": 9048.33333333333,
         },
         Object {
           "x": 1627975140000,
-          "y": 12098.6923076923,
+          "y": 12671.6,
         },
         Object {
           "x": 1627975200000,
-          "y": null,
+          "y": 57275.4,
         },
       ],
       "memoryUsage": Array [
@@ -607,67 +607,67 @@ Object {
       "throughput": Array [
         Object {
           "x": 1627974300000,
-          "y": 15,
+          "y": 2,
         },
         Object {
           "x": 1627974360000,
-          "y": 13,
+          "y": 4,
         },
         Object {
           "x": 1627974420000,
-          "y": 23,
+          "y": 9,
         },
         Object {
           "x": 1627974480000,
-          "y": 24,
+          "y": 5,
         },
         Object {
           "x": 1627974540000,
-          "y": 10,
+          "y": 3,
         },
         Object {
           "x": 1627974600000,
-          "y": 18,
+          "y": 7,
         },
         Object {
           "x": 1627974660000,
-          "y": 32,
+          "y": 10,
         },
         Object {
           "x": 1627974720000,
-          "y": 36,
+          "y": 8,
         },
         Object {
           "x": 1627974780000,
-          "y": 36,
+          "y": 13,
         },
         Object {
           "x": 1627974840000,
-          "y": 22,
+          "y": 9,
         },
         Object {
           "x": 1627974900000,
-          "y": 43,
+          "y": 16,
         },
         Object {
           "x": 1627974960000,
-          "y": 31,
+          "y": 6,
         },
         Object {
           "x": 1627975020000,
-          "y": 35,
+          "y": 10,
         },
         Object {
           "x": 1627975080000,
-          "y": 37,
+          "y": 12,
         },
         Object {
           "x": 1627975140000,
-          "y": 35,
+          "y": 10,
         },
         Object {
           "x": 1627975200000,
-          "y": 0,
+          "y": 5,
         },
       ],
     },
@@ -812,15 +812,15 @@ Object {
         },
         Object {
           "x": 1627973460000,
-          "y": 0,
+          "y": 0.25,
         },
         Object {
           "x": 1627973520000,
-          "y": 0.0434782608695652,
+          "y": 0.111111111111111,
         },
         Object {
           "x": 1627973580000,
-          "y": 0.0833333333333333,
+          "y": 0.2,
         },
         Object {
           "x": 1627973640000,
@@ -828,15 +828,15 @@ Object {
         },
         Object {
           "x": 1627973700000,
-          "y": 0,
+          "y": 0.142857142857143,
         },
         Object {
           "x": 1627973760000,
-          "y": 0.03125,
+          "y": 0.1,
         },
         Object {
           "x": 1627973820000,
-          "y": 0.0555555555555556,
+          "y": 0.125,
         },
         Object {
           "x": 1627973880000,
@@ -844,15 +844,15 @@ Object {
         },
         Object {
           "x": 1627973940000,
-          "y": 0,
+          "y": 0.111111111111111,
         },
         Object {
           "x": 1627974000000,
-          "y": 0.0232558139534884,
+          "y": 0,
         },
         Object {
           "x": 1627974060000,
-          "y": 0.032258064516129,
+          "y": 0.333333333333333,
         },
         Object {
           "x": 1627974120000,
@@ -860,11 +860,11 @@ Object {
         },
         Object {
           "x": 1627974180000,
-          "y": 0.027027027027027,
+          "y": 0.0833333333333333,
         },
         Object {
           "x": 1627974240000,
-          "y": 0.0571428571428571,
+          "y": 0.1,
         },
         Object {
           "x": 1627974300000,
@@ -872,7 +872,7 @@ Object {
         },
         Object {
           "x": 1627974360000,
-          "y": null,
+          "y": 0,
         },
         Object {
           "x": 1627974420000,
@@ -888,15 +888,15 @@ Object {
         },
         Object {
           "x": 1627974600000,
-          "y": 0.0526315789473684,
+          "y": 0.5,
         },
         Object {
           "x": 1627974660000,
-          "y": 0.142857142857143,
+          "y": 0.4,
         },
         Object {
           "x": 1627974720000,
-          "y": 0.0416666666666667,
+          "y": 0,
         },
         Object {
           "x": 1627974780000,
@@ -904,11 +904,11 @@ Object {
         },
         Object {
           "x": 1627974840000,
-          "y": 0,
+          "y": 0.166666666666667,
         },
         Object {
           "x": 1627974900000,
-          "y": 0.024390243902439,
+          "y": 0,
         },
         Object {
           "x": 1627974960000,
@@ -920,11 +920,11 @@ Object {
         },
         Object {
           "x": 1627975080000,
-          "y": 0,
+          "y": 0.142857142857143,
         },
         Object {
           "x": 1627975140000,
-          "y": 0.0555555555555556,
+          "y": 0.2,
         },
         Object {
           "x": 1627975200000,
@@ -934,123 +934,123 @@ Object {
       "latency": Array [
         Object {
           "x": 1627973400000,
-          "y": 11839,
+          "y": 5372.5,
         },
         Object {
           "x": 1627973460000,
-          "y": 7407,
+          "y": 1441598.25,
         },
         Object {
           "x": 1627973520000,
-          "y": 1925569.66666667,
+          "y": 9380.22222222222,
         },
         Object {
           "x": 1627973580000,
-          "y": 9017.18181818182,
+          "y": 10949.4,
         },
         Object {
           "x": 1627973640000,
-          "y": 63575,
+          "y": 77148.6666666667,
         },
         Object {
           "x": 1627973700000,
-          "y": 7577.66666666667,
+          "y": 6461,
         },
         Object {
           "x": 1627973760000,
-          "y": 6844.33333333333,
+          "y": 549308.4,
         },
         Object {
           "x": 1627973820000,
-          "y": 503471,
+          "y": 10797.75,
         },
         Object {
           "x": 1627973880000,
-          "y": 6247.8,
+          "y": 9758.53846153846,
         },
         Object {
           "x": 1627973940000,
-          "y": 1137247,
+          "y": 1281052.66666667,
         },
         Object {
           "x": 1627974000000,
-          "y": 27951.6666666667,
+          "y": 9511.0625,
         },
         Object {
           "x": 1627974060000,
-          "y": 10248.8461538462,
+          "y": 11151203.3333333,
         },
         Object {
           "x": 1627974120000,
-          "y": 13529,
+          "y": 8647.2,
         },
         Object {
           "x": 1627974180000,
-          "y": 6691247.8,
+          "y": 9048.33333333333,
         },
         Object {
           "x": 1627974240000,
-          "y": 12098.6923076923,
+          "y": 12671.6,
         },
         Object {
           "x": 1627974300000,
-          "y": 34887.8888888889,
+          "y": 57275.4,
         },
         Object {
           "x": 1627974360000,
-          "y": null,
+          "y": 5578,
         },
         Object {
           "x": 1627974420000,
-          "y": 4983,
+          "y": 34851.1666666667,
         },
         Object {
           "x": 1627974480000,
-          "y": 41285.4,
+          "y": 15896.4,
         },
         Object {
           "x": 1627974540000,
-          "y": 13820.3333333333,
+          "y": 15174.1666666667,
         },
         Object {
           "x": 1627974600000,
-          "y": 13782,
+          "y": 9185.16666666667,
         },
         Object {
           "x": 1627974660000,
-          "y": 13392.6,
+          "y": 12363.2,
         },
         Object {
           "x": 1627974720000,
-          "y": 6991,
+          "y": 6206.44444444444,
         },
         Object {
           "x": 1627974780000,
-          "y": 6885.85714285714,
+          "y": 6707,
         },
         Object {
           "x": 1627974840000,
-          "y": 7935,
+          "y": 12409.1666666667,
         },
         Object {
           "x": 1627974900000,
-          "y": 10828.3333333333,
+          "y": 9188.36363636364,
         },
         Object {
           "x": 1627974960000,
-          "y": 6079,
+          "y": 4279.6,
         },
         Object {
           "x": 1627975020000,
-          "y": 5217,
+          "y": 6827.3,
         },
         Object {
           "x": 1627975080000,
-          "y": 8477.76923076923,
+          "y": 7445.78571428571,
         },
         Object {
           "x": 1627975140000,
-          "y": 5937.18181818182,
+          "y": 563288.6,
         },
         Object {
           "x": 1627975200000,
@@ -1187,123 +1187,123 @@ Object {
       "throughput": Array [
         Object {
           "x": 1627973400000,
-          "y": 15,
+          "y": 2,
         },
         Object {
           "x": 1627973460000,
-          "y": 13,
+          "y": 4,
         },
         Object {
           "x": 1627973520000,
-          "y": 23,
+          "y": 9,
         },
         Object {
           "x": 1627973580000,
-          "y": 24,
+          "y": 5,
         },
         Object {
           "x": 1627973640000,
-          "y": 10,
+          "y": 3,
         },
         Object {
           "x": 1627973700000,
-          "y": 18,
+          "y": 7,
         },
         Object {
           "x": 1627973760000,
-          "y": 32,
+          "y": 10,
         },
         Object {
           "x": 1627973820000,
-          "y": 36,
+          "y": 8,
         },
         Object {
           "x": 1627973880000,
-          "y": 36,
+          "y": 13,
         },
         Object {
           "x": 1627973940000,
-          "y": 22,
+          "y": 9,
         },
         Object {
           "x": 1627974000000,
-          "y": 43,
+          "y": 16,
         },
         Object {
           "x": 1627974060000,
-          "y": 31,
+          "y": 6,
         },
         Object {
           "x": 1627974120000,
-          "y": 35,
+          "y": 10,
         },
         Object {
           "x": 1627974180000,
-          "y": 37,
+          "y": 12,
         },
         Object {
           "x": 1627974240000,
-          "y": 35,
+          "y": 10,
         },
         Object {
           "x": 1627974300000,
-          "y": 21,
+          "y": 5,
         },
         Object {
           "x": 1627974360000,
-          "y": 0,
+          "y": 2,
         },
         Object {
           "x": 1627974420000,
-          "y": 24,
+          "y": 6,
         },
         Object {
           "x": 1627974480000,
-          "y": 17,
+          "y": 5,
         },
         Object {
           "x": 1627974540000,
-          "y": 17,
+          "y": 6,
         },
         Object {
           "x": 1627974600000,
-          "y": 19,
+          "y": 6,
         },
         Object {
           "x": 1627974660000,
-          "y": 21,
+          "y": 5,
         },
         Object {
           "x": 1627974720000,
-          "y": 24,
+          "y": 9,
         },
         Object {
           "x": 1627974780000,
-          "y": 22,
+          "y": 3,
         },
         Object {
           "x": 1627974840000,
-          "y": 19,
+          "y": 6,
         },
         Object {
           "x": 1627974900000,
-          "y": 41,
+          "y": 11,
         },
         Object {
           "x": 1627974960000,
-          "y": 11,
+          "y": 5,
         },
         Object {
           "x": 1627975020000,
-          "y": 23,
+          "y": 10,
         },
         Object {
           "x": 1627975080000,
-          "y": 47,
+          "y": 14,
         },
         Object {
           "x": 1627975140000,
-          "y": 36,
+          "y": 10,
         },
         Object {
           "x": 1627975200000,
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts
index cdf62053a821b..5585a292d317e 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts
@@ -122,10 +122,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           expectSnapshot(values).toMatchInline(`
             Object {
               "cpuUsage": 0.002,
-              "errorRate": 0.0252659574468085,
-              "latency": 411589.785714286,
+              "errorRate": 0.092511013215859,
+              "latency": 430318.696035242,
               "memoryUsage": 0.786029688517253,
-              "throughput": 25.0666666666667,
+              "throughput": 7.56666666666667,
             }
           `);
         });
@@ -183,9 +183,9 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           expectSnapshot(values).toMatchInline(`
             Object {
               "cpuUsage": 0.001,
-              "errorRate": 0.000907441016333938,
-              "latency": 40989.5802047782,
-              "throughput": 36.7333333333333,
+              "errorRate": 0.00343642611683849,
+              "latency": 21520.4776632302,
+              "throughput": 9.7,
             }
           `);
 
@@ -272,10 +272,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           expectSnapshot(values).toMatchInline(`
             Object {
               "cpuUsage": 0.00223333333333333,
-              "errorRate": 0.0268292682926829,
-              "latency": 739013.634146341,
+              "errorRate": 0.0852713178294574,
+              "latency": 706173.046511628,
               "memoryUsage": 0.783296203613281,
-              "throughput": 27.3333333333333,
+              "throughput": 8.6,
             }
           `);
         });
diff --git a/x-pack/test/apm_api_integration/tests/services/__snapshots__/throughput.snap b/x-pack/test/apm_api_integration/tests/services/__snapshots__/throughput.snap
deleted file mode 100644
index a27f7047bb9b3..0000000000000
--- a/x-pack/test/apm_api_integration/tests/services/__snapshots__/throughput.snap
+++ /dev/null
@@ -1,139 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`APM API tests basic apm_8.0.0 Throughput when data is loaded with time comparison has the correct throughput in tpm 1`] = `
-Object {
-  "currentPeriod": Array [
-    Object {
-      "x": 1627974300000,
-      "y": 6,
-    },
-    Object {
-      "x": 1627974360000,
-      "y": 0,
-    },
-    Object {
-      "x": 1627974420000,
-      "y": 4,
-    },
-    Object {
-      "x": 1627974480000,
-      "y": 3,
-    },
-    Object {
-      "x": 1627974540000,
-      "y": 5,
-    },
-    Object {
-      "x": 1627974600000,
-      "y": 5,
-    },
-    Object {
-      "x": 1627974660000,
-      "y": 5,
-    },
-    Object {
-      "x": 1627974720000,
-      "y": 4,
-    },
-    Object {
-      "x": 1627974780000,
-      "y": 7,
-    },
-    Object {
-      "x": 1627974840000,
-      "y": 2,
-    },
-    Object {
-      "x": 1627974900000,
-      "y": 14,
-    },
-    Object {
-      "x": 1627974960000,
-      "y": 3,
-    },
-    Object {
-      "x": 1627975020000,
-      "y": 6,
-    },
-    Object {
-      "x": 1627975080000,
-      "y": 12,
-    },
-    Object {
-      "x": 1627975140000,
-      "y": 8,
-    },
-    Object {
-      "x": 1627975200000,
-      "y": 0,
-    },
-  ],
-  "previousPeriod": Array [
-    Object {
-      "x": 1627974300000,
-      "y": 4,
-    },
-    Object {
-      "x": 1627974360000,
-      "y": 2,
-    },
-    Object {
-      "x": 1627974420000,
-      "y": 3,
-    },
-    Object {
-      "x": 1627974480000,
-      "y": 8,
-    },
-    Object {
-      "x": 1627974540000,
-      "y": 4,
-    },
-    Object {
-      "x": 1627974600000,
-      "y": 4,
-    },
-    Object {
-      "x": 1627974660000,
-      "y": 6,
-    },
-    Object {
-      "x": 1627974720000,
-      "y": 10,
-    },
-    Object {
-      "x": 1627974780000,
-      "y": 8,
-    },
-    Object {
-      "x": 1627974840000,
-      "y": 9,
-    },
-    Object {
-      "x": 1627974900000,
-      "y": 10,
-    },
-    Object {
-      "x": 1627974960000,
-      "y": 11,
-    },
-    Object {
-      "x": 1627975020000,
-      "y": 7,
-    },
-    Object {
-      "x": 1627975080000,
-      "y": 10,
-    },
-    Object {
-      "x": 1627975140000,
-      "y": 12,
-    },
-    Object {
-      "x": 1627975200000,
-      "y": 0,
-    },
-  ],
-  "throughputUnit": "minute",
-}
-`;
diff --git a/x-pack/test/apm_api_integration/tests/services/throughput.ts b/x-pack/test/apm_api_integration/tests/services/throughput.ts
index d960cccc2877e..561680e2725cf 100644
--- a/x-pack/test/apm_api_integration/tests/services/throughput.ts
+++ b/x-pack/test/apm_api_integration/tests/services/throughput.ts
@@ -7,15 +7,17 @@
 
 import { service, timerange } from '@elastic/apm-generator';
 import expect from '@kbn/expect';
-import { first, last, mean, uniq } from 'lodash';
+import { first, last, meanBy } from 'lodash';
 import moment from 'moment';
-import { ENVIRONMENT_ALL } from '../../../../plugins/apm/common/environment_filter_values';
 import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/createCallApmApi';
-import { PromiseReturnType } from '../../../../plugins/observability/typings/common';
-import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
+import {
+  APIClientRequestParamsOf,
+  APIReturnType,
+} from '../../../../plugins/apm/public/services/rest/createCallApmApi';
+import { RecursivePartial } from '../../../../plugins/apm/typings/common';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { registry } from '../../common/registry';
+import { roundNumber } from '../../utils';
 
 type ThroughputReturn = APIReturnType<'GET /internal/apm/services/{serviceName}/throughput'>;
 
@@ -23,34 +25,65 @@ export default function ApiTest({ getService }: FtrProviderContext) {
   const apmApiClient = getService('apmApiClient');
   const traceData = getService('traceData');
 
-  const archiveName = 'apm_8.0.0';
-  const metadata = archives_metadata[archiveName];
+  const serviceName = 'synth-go';
+  const start = new Date('2021-01-01T00:00:00.000Z').getTime();
+  const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
+
+  async function callApi(
+    overrides?: RecursivePartial<
+      APIClientRequestParamsOf<'GET /internal/apm/services/{serviceName}/throughput'>['params']
+    >
+  ) {
+    const response = await apmApiClient.readUser({
+      endpoint: 'GET /internal/apm/services/{serviceName}/throughput',
+      params: {
+        path: {
+          serviceName: 'synth-go',
+          ...overrides?.path,
+        },
+        query: {
+          start: new Date(start).toISOString(),
+          end: new Date(end).toISOString(),
+          transactionType: 'request',
+          environment: 'ENVIRONMENT_ALL',
+          kuery: '',
+          ...overrides?.query,
+        },
+      },
+    });
+    return response;
+  }
 
-  registry.when(
-    'Throughput with statically generated data',
-    { config: 'basic', archives: ['apm_8.0.0_empty'] },
-    () => {
-      const start = new Date('2021-01-01T00:00:00.000Z').getTime();
-      const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
+  registry.when('Throughput when data is not loaded', { config: 'basic', archives: [] }, () => {
+    it('handles the empty state', async () => {
+      const response = await callApi();
+      expect(response.status).to.be(200);
+      expect(response.body.currentPeriod.length).to.be(0);
+      expect(response.body.previousPeriod.length).to.be(0);
+    });
+  });
 
-      const GO_PROD_RATE = 10;
+  registry.when('data is loaded', { config: 'basic', archives: ['apm_8.0.0_empty'] }, () => {
+    describe('Throughput chart api', () => {
+      const GO_PROD_RATE = 50;
       const GO_DEV_RATE = 5;
-      const JAVA_PROD_RATE = 20;
+      const JAVA_PROD_RATE = 45;
 
       before(async () => {
-        const serviceGoProdInstance = service('synth-go', 'production', 'go').instance(
+        const serviceGoProdInstance = service(serviceName, 'production', 'go').instance(
           'instance-a'
         );
-        const serviceGoDevInstance = service('synth-go', 'development', 'go').instance(
+        const serviceGoDevInstance = service(serviceName, 'development', 'go').instance(
           'instance-b'
         );
-        const serviceJavaInstance = service('synth-java', 'production', 'java').instance(
+
+        const serviceJavaInstance = service('synth-java', 'development', 'java').instance(
           'instance-c'
         );
 
         await traceData.index([
           ...timerange(start, end)
-            .interval('1s')
+            .interval('1m')
             .rate(GO_PROD_RATE)
             .flatMap((timestamp) =>
               serviceGoProdInstance
@@ -60,7 +93,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                 .serialize()
             ),
           ...timerange(start, end)
-            .interval('1s')
+            .interval('1m')
             .rate(GO_DEV_RATE)
             .flatMap((timestamp) =>
               serviceGoDevInstance
@@ -70,7 +103,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                 .serialize()
             ),
           ...timerange(start, end)
-            .interval('1s')
+            .interval('1m')
             .rate(JAVA_PROD_RATE)
             .flatMap((timestamp) =>
               serviceJavaInstance
@@ -84,129 +117,104 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       after(() => traceData.clean());
 
-      async function callApi(overrides?: {
-        start?: string;
-        end?: string;
-        transactionType?: string;
-        environment?: string;
-        kuery?: string;
-      }) {
-        const response = await apmApiClient.readUser({
-          endpoint: 'GET /internal/apm/services/{serviceName}/throughput',
-          params: {
-            path: {
-              serviceName: 'synth-go',
-            },
-            query: {
-              start: new Date(start).toISOString(),
-              end: new Date(end).toISOString(),
-              transactionType: 'request',
-              environment: 'production',
-              kuery: 'processor.event:transaction',
-              ...overrides,
-            },
-          },
+      describe('compare transactions and metrics based throughput', () => {
+        let throughputMetrics: ThroughputReturn;
+        let throughputTransactions: ThroughputReturn;
+
+        before(async () => {
+          const [throughputMetricsResponse, throughputTransactionsResponse] = await Promise.all([
+            callApi({ query: { kuery: 'processor.event : "metric"' } }),
+            callApi({ query: { kuery: 'processor.event : "transaction"' } }),
+          ]);
+          throughputMetrics = throughputMetricsResponse.body;
+          throughputTransactions = throughputTransactionsResponse.body;
         });
 
-        return response.body;
-      }
+        it('returns some transactions data', () => {
+          expect(throughputTransactions.currentPeriod.length).to.be.greaterThan(0);
+          const hasData = throughputTransactions.currentPeriod.some(({ y }) => isFiniteNumber(y));
+          expect(hasData).to.equal(true);
+        });
 
-      describe('when calling it with the default parameters', () => {
-        let body: PromiseReturnType<typeof callApi>;
+        it('returns some metrics data', () => {
+          expect(throughputMetrics.currentPeriod.length).to.be.greaterThan(0);
+          const hasData = throughputMetrics.currentPeriod.some(({ y }) => isFiniteNumber(y));
+          expect(hasData).to.equal(true);
+        });
 
-        before(async () => {
-          body = await callApi();
+        it('has same mean value for metrics and transactions data', () => {
+          const transactionsMean = meanBy(throughputTransactions.currentPeriod, 'y');
+          const metricsMean = meanBy(throughputMetrics.currentPeriod, 'y');
+          [transactionsMean, metricsMean].forEach((value) =>
+            expect(roundNumber(value)).to.be.equal(roundNumber(GO_PROD_RATE + GO_DEV_RATE))
+          );
         });
 
-        it('returns the throughput in seconds', () => {
-          expect(body.throughputUnit).to.eql('second');
+        it('has a bucket size of 10 seconds for transactions data', () => {
+          const firstTimerange = throughputTransactions.currentPeriod[0].x;
+          const secondTimerange = throughputTransactions.currentPeriod[1].x;
+          const timeIntervalAsSeconds = (secondTimerange - firstTimerange) / 1000;
+          expect(timeIntervalAsSeconds).to.equal(10);
         });
 
-        it('returns the expected throughput', () => {
-          const throughputValues = uniq(body.currentPeriod.map((coord) => coord.y));
-          expect(throughputValues).to.eql([GO_PROD_RATE]);
+        it('has a bucket size of 1 minute for metrics data', () => {
+          const firstTimerange = throughputMetrics.currentPeriod[0].x;
+          const secondTimerange = throughputMetrics.currentPeriod[1].x;
+          const timeIntervalAsMinutes = (secondTimerange - firstTimerange) / 1000 / 60;
+          expect(timeIntervalAsMinutes).to.equal(1);
         });
       });
 
-      describe('when setting environment to all', () => {
-        let body: PromiseReturnType<typeof callApi>;
+      describe('production environment', () => {
+        let throughput: ThroughputReturn;
 
         before(async () => {
-          body = await callApi({
-            environment: ENVIRONMENT_ALL.value,
-          });
+          const throughputResponse = await callApi({ query: { environment: 'production' } });
+          throughput = throughputResponse.body;
+        });
+
+        it('returns some data', () => {
+          expect(throughput.currentPeriod.length).to.be.greaterThan(0);
+          const hasData = throughput.currentPeriod.some(({ y }) => isFiniteNumber(y));
+          expect(hasData).to.equal(true);
         });
 
-        it('returns data for all environments', () => {
-          const throughputValues = body.currentPeriod.map(({ y }) => y);
-          expect(uniq(throughputValues)).to.eql([GO_PROD_RATE + GO_DEV_RATE]);
-          expect(body.throughputUnit).to.eql('second');
+        it('returns correct average throughput', () => {
+          const throughputMean = meanBy(throughput.currentPeriod, 'y');
+          expect(roundNumber(throughputMean)).to.be.equal(roundNumber(GO_PROD_RATE));
         });
       });
 
-      describe('when defining a kuery', () => {
-        let body: PromiseReturnType<typeof callApi>;
+      describe('when synth-java is selected', () => {
+        let throughput: ThroughputReturn;
 
         before(async () => {
-          body = await callApi({
-            kuery: `processor.event:transaction and transaction.name:"GET /api/product/:id"`,
-            environment: ENVIRONMENT_ALL.value,
-          });
+          const throughputResponse = await callApi({ path: { serviceName: 'synth-java' } });
+          throughput = throughputResponse.body;
         });
 
-        it('returns data that matches the kuery', () => {
-          const throughputValues = body.currentPeriod.map(({ y }) => y);
-          expect(uniq(throughputValues)).to.eql([GO_DEV_RATE]);
-          expect(body.throughputUnit).to.eql('second');
+        it('returns some data', () => {
+          expect(throughput.currentPeriod.length).to.be.greaterThan(0);
+          const hasData = throughput.currentPeriod.some(({ y }) => isFiniteNumber(y));
+          expect(hasData).to.equal(true);
         });
-      });
-    }
-  );
 
-  registry.when('Throughput when data is not loaded', { config: 'basic', archives: [] }, () => {
-    it('handles the empty state', async () => {
-      const response = await apmApiClient.readUser({
-        endpoint: 'GET /internal/apm/services/{serviceName}/throughput',
-        params: {
-          path: {
-            serviceName: 'opbeans-java',
-          },
-          query: {
-            start: metadata.start,
-            end: metadata.end,
-            transactionType: 'request',
-            environment: 'ENVIRONMENT_ALL',
-            kuery: '',
-          },
-        },
+        it('returns throughput related to java agent', () => {
+          const throughputMean = meanBy(throughput.currentPeriod, 'y');
+          expect(roundNumber(throughputMean)).to.be.equal(roundNumber(JAVA_PROD_RATE));
+        });
       });
 
-      expect(response.status).to.be(200);
-      expect(response.body.currentPeriod.length).to.be(0);
-      expect(response.body.previousPeriod.length).to.be(0);
-    });
-  });
+      describe('time comparisons', () => {
+        let throughputResponse: ThroughputReturn;
 
-  let throughputResponse: ThroughputReturn;
-  registry.when(
-    'Throughput when data is loaded',
-    { config: 'basic', archives: [archiveName] },
-    () => {
-      describe('when querying without kql filter', () => {
         before(async () => {
-          const response = await apmApiClient.readUser({
-            endpoint: 'GET /internal/apm/services/{serviceName}/throughput',
-            params: {
-              path: {
-                serviceName: 'opbeans-java',
-              },
-              query: {
-                start: metadata.start,
-                end: metadata.end,
-                transactionType: 'request',
-                environment: 'ENVIRONMENT_ALL',
-                kuery: '',
-              },
+          const response = await callApi({
+            query: {
+              start: moment(end).subtract(7, 'minutes').toISOString(),
+              end: new Date(end).toISOString(),
+              comparisonStart: new Date(start).toISOString(),
+              comparisonEnd: moment(start).add(7, 'minutes').toISOString(),
             },
           });
           throughputResponse = response.body;
@@ -214,141 +222,58 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         it('returns some data', () => {
           expect(throughputResponse.currentPeriod.length).to.be.greaterThan(0);
-          expect(throughputResponse.previousPeriod.length).not.to.be.greaterThan(0);
+          expect(throughputResponse.previousPeriod.length).to.be.greaterThan(0);
 
-          const nonNullDataPoints = throughputResponse.currentPeriod.filter(({ y }) =>
+          const hasCurrentPeriodData = throughputResponse.currentPeriod.some(({ y }) =>
+            isFiniteNumber(y)
+          );
+          const hasPreviousPeriodData = throughputResponse.previousPeriod.some(({ y }) =>
             isFiniteNumber(y)
           );
 
-          expect(nonNullDataPoints.length).to.be.greaterThan(0);
-        });
-
-        it('has the correct start date', () => {
-          expectSnapshot(
-            new Date(first(throughputResponse.currentPeriod)?.x ?? NaN).toISOString()
-          ).toMatchInline(`"2021-08-03T06:50:00.000Z"`);
-        });
-
-        it('has the correct end date', () => {
-          expectSnapshot(
-            new Date(last(throughputResponse.currentPeriod)?.x ?? NaN).toISOString()
-          ).toMatchInline(`"2021-08-03T07:20:00.000Z"`);
+          expect(hasCurrentPeriodData).to.equal(true);
+          expect(hasPreviousPeriodData).to.equal(true);
         });
 
-        it('has the correct number of buckets', () => {
-          expectSnapshot(throughputResponse.currentPeriod.length).toMatchInline(`31`);
+        it('has same start time for both periods', () => {
+          expect(first(throughputResponse.currentPeriod)?.x).to.equal(
+            first(throughputResponse.previousPeriod)?.x
+          );
         });
 
-        it('has the correct throughput in tpm', () => {
-          const avg = mean(throughputResponse.currentPeriod.map((d) => d.y));
-          expectSnapshot(avg).toMatchInline(`6.19354838709677`);
-          expectSnapshot(throughputResponse.throughputUnit).toMatchInline(`"minute"`);
-        });
-      });
-
-      describe('with kql filter to force transaction-based UI', () => {
-        before(async () => {
-          const response = await apmApiClient.readUser({
-            endpoint: 'GET /internal/apm/services/{serviceName}/throughput',
-            params: {
-              path: {
-                serviceName: 'opbeans-java',
-              },
-              query: {
-                kuery: 'processor.event : "transaction"',
-                start: metadata.start,
-                end: metadata.end,
-                transactionType: 'request',
-                environment: 'ENVIRONMENT_ALL',
-              },
-            },
-          });
-          throughputResponse = response.body;
+        it('has same end time for both periods', () => {
+          expect(last(throughputResponse.currentPeriod)?.x).to.equal(
+            last(throughputResponse.previousPeriod)?.x
+          );
         });
 
-        it('has the correct throughput in tps', async () => {
-          const avgTps = mean(throughputResponse.currentPeriod.map((d) => d.y));
-          expectSnapshot(avgTps).toMatchInline(`0.124043715846995`);
-          expectSnapshot(throughputResponse.throughputUnit).toMatchInline(`"second"`);
-
-          // this tpm value must be similar tp tpm value calculated in the previous spec where metric docs were used
-          const avgTpm = avgTps * 60;
-          expectSnapshot(avgTpm).toMatchInline(`7.44262295081967`);
+        it('returns same number of buckets for both periods', () => {
+          expect(throughputResponse.currentPeriod.length).to.be(
+            throughputResponse.previousPeriod.length
+          );
         });
-      });
-    }
-  );
 
-  registry.when(
-    'Throughput when data is loaded with time comparison',
-    { config: 'basic', archives: [archiveName] },
-    () => {
-      before(async () => {
-        const response = await apmApiClient.readUser({
-          endpoint: 'GET /internal/apm/services/{serviceName}/throughput',
-          params: {
-            path: {
-              serviceName: 'opbeans-java',
-            },
-            query: {
-              transactionType: 'request',
-              start: moment(metadata.end).subtract(15, 'minutes').toISOString(),
-              end: metadata.end,
-              comparisonStart: metadata.start,
-              comparisonEnd: moment(metadata.start).add(15, 'minutes').toISOString(),
-              environment: 'ENVIRONMENT_ALL',
-              kuery: '',
-            },
-          },
+        it('has same mean value for both periods', () => {
+          const currentPeriodMean = meanBy(
+            throughputResponse.currentPeriod.filter((item) => isFiniteNumber(item.y) && item.y > 0),
+            'y'
+          );
+          const previousPeriodMean = meanBy(
+            throughputResponse.previousPeriod.filter(
+              (item) => isFiniteNumber(item.y) && item.y > 0
+            ),
+            'y'
+          );
+          const currentPeriod = throughputResponse.currentPeriod;
+          const bucketSize = currentPeriod[1].x - currentPeriod[0].x;
+          const durationAsMinutes = bucketSize / 1000 / 60;
+          [currentPeriodMean, previousPeriodMean].every((value) =>
+            expect(roundNumber(value)).to.be.equal(
+              roundNumber((GO_PROD_RATE + GO_DEV_RATE) / durationAsMinutes)
+            )
+          );
         });
-
-        throughputResponse = response.body;
       });
-
-      it('returns some data', () => {
-        expect(throughputResponse.currentPeriod.length).to.be.greaterThan(0);
-        expect(throughputResponse.previousPeriod.length).to.be.greaterThan(0);
-
-        const currentPeriodNonNullDataPoints = throughputResponse.currentPeriod.filter(({ y }) =>
-          isFiniteNumber(y)
-        );
-        const previousPeriodNonNullDataPoints = throughputResponse.previousPeriod.filter(({ y }) =>
-          isFiniteNumber(y)
-        );
-
-        expect(currentPeriodNonNullDataPoints.length).to.be.greaterThan(0);
-        expect(previousPeriodNonNullDataPoints.length).to.be.greaterThan(0);
-      });
-
-      it('has the correct start date', () => {
-        expectSnapshot(
-          new Date(first(throughputResponse.currentPeriod)?.x ?? NaN).toISOString()
-        ).toMatchInline(`"2021-08-03T07:05:00.000Z"`);
-
-        expectSnapshot(
-          new Date(first(throughputResponse.previousPeriod)?.x ?? NaN).toISOString()
-        ).toMatchInline(`"2021-08-03T07:05:00.000Z"`);
-      });
-
-      it('has the correct end date', () => {
-        expectSnapshot(
-          new Date(last(throughputResponse.currentPeriod)?.x ?? NaN).toISOString()
-        ).toMatchInline(`"2021-08-03T07:20:00.000Z"`);
-
-        expectSnapshot(
-          new Date(last(throughputResponse.previousPeriod)?.x ?? NaN).toISOString()
-        ).toMatchInline(`"2021-08-03T07:20:00.000Z"`);
-      });
-
-      it('has the correct number of buckets', () => {
-        expectSnapshot(throughputResponse.currentPeriod.length).toMatchInline(`16`);
-        expectSnapshot(throughputResponse.previousPeriod.length).toMatchInline(`16`);
-      });
-
-      it('has the correct throughput in tpm', () => {
-        expectSnapshot(throughputResponse).toMatch();
-        expectSnapshot(throughputResponse.throughputUnit).toMatchInline(`"minute"`);
-      });
-    }
-  );
+    });
+  });
 }
diff --git a/x-pack/test/apm_api_integration/tests/services/top_services.ts b/x-pack/test/apm_api_integration/tests/services/top_services.ts
index 18700fb041252..d85331b8be45d 100644
--- a/x-pack/test/apm_api_integration/tests/services/top_services.ts
+++ b/x-pack/test/apm_api_integration/tests/services/top_services.ts
@@ -91,37 +91,37 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           Array [
             Object {},
             Object {
-              "latency": 520294.126436782,
-              "throughput": 11.6,
-              "transactionErrorRate": 0.0316091954022989,
+              "latency": 496794.054441261,
+              "throughput": 11.6333333333333,
+              "transactionErrorRate": 0.0315186246418338,
             },
             Object {
-              "latency": 74805.1452830189,
-              "throughput": 17.6666666666667,
-              "transactionErrorRate": 0.00566037735849057,
+              "latency": 83395.638576779,
+              "throughput": 17.8,
+              "transactionErrorRate": 0.00936329588014981,
             },
             Object {
-              "latency": 411589.785714286,
-              "throughput": 7.46666666666667,
-              "transactionErrorRate": 0.0848214285714286,
+              "latency": 430318.696035242,
+              "throughput": 7.56666666666667,
+              "transactionErrorRate": 0.092511013215859,
             },
             Object {
-              "latency": 53906.6603773585,
-              "throughput": 7.06666666666667,
+              "latency": 53147.5747663551,
+              "throughput": 7.13333333333333,
               "transactionErrorRate": 0,
             },
             Object {
-              "latency": 420634.9,
+              "latency": 419826.24375,
               "throughput": 5.33333333333333,
               "transactionErrorRate": 0.025,
             },
             Object {
-              "latency": 40989.5802047782,
-              "throughput": 9.76666666666667,
-              "transactionErrorRate": 0.00341296928327645,
+              "latency": 21520.4776632302,
+              "throughput": 9.7,
+              "transactionErrorRate": 0.00343642611683849,
             },
             Object {
-              "latency": 1040880.77777778,
+              "latency": 1040388.88888889,
               "throughput": 2.4,
               "transactionErrorRate": null,
             },
diff --git a/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.ts b/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.ts
new file mode 100644
index 0000000000000..4b3820ee7f033
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.ts
@@ -0,0 +1,236 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { service, timerange } from '@elastic/apm-generator';
+import expect from '@kbn/expect';
+import { meanBy, sumBy } from 'lodash';
+import { BackendNode, ServiceNode } from '../../../../plugins/apm/common/connections';
+import { PromiseReturnType } from '../../../../plugins/observability/typings/common';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
+import { roundNumber } from '../../utils';
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+  const apmApiClient = getService('apmApiClient');
+  const traceData = getService('traceData');
+
+  const start = new Date('2021-01-01T00:00:00.000Z').getTime();
+  const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
+
+  async function getThroughputValues(overrides?: { serviceName?: string; backendName?: string }) {
+    const commonQuery = {
+      start: new Date(start).toISOString(),
+      end: new Date(end).toISOString(),
+      environment: 'ENVIRONMENT_ALL',
+    };
+    const [topBackendsAPIResponse, backendThroughputChartAPIResponse, upstreamServicesApiResponse] =
+      await Promise.all([
+        apmApiClient.readUser({
+          endpoint: `GET /internal/apm/backends/top_backends`,
+          params: {
+            query: {
+              ...commonQuery,
+              numBuckets: 20,
+              kuery: '',
+            },
+          },
+        }),
+        apmApiClient.readUser({
+          endpoint: `GET /internal/apm/backends/{backendName}/charts/throughput`,
+          params: {
+            path: { backendName: overrides?.backendName || 'elasticsearch' },
+            query: {
+              ...commonQuery,
+              kuery: '',
+            },
+          },
+        }),
+        apmApiClient.readUser({
+          endpoint: `GET /internal/apm/backends/{backendName}/upstream_services`,
+          params: {
+            path: { backendName: overrides?.backendName || 'elasticsearch' },
+            query: {
+              ...commonQuery,
+              numBuckets: 20,
+              offset: '1d',
+              kuery: '',
+            },
+          },
+        }),
+      ]);
+    const backendThroughputChartMean = roundNumber(
+      meanBy(backendThroughputChartAPIResponse.body.currentTimeseries, 'y')
+    );
+
+    const upstreamServicesThroughput = upstreamServicesApiResponse.body.services.map(
+      (upstreamService) => {
+        return {
+          serviceName: (upstreamService.location as ServiceNode).serviceName,
+          throughput: upstreamService.currentStats.throughput.value,
+        };
+      }
+    );
+
+    return {
+      topBackends: topBackendsAPIResponse.body.backends.map((item) => [
+        (item.location as BackendNode).backendName,
+        roundNumber(item.currentStats.throughput.value),
+      ]),
+      backendThroughputChartMean,
+      upstreamServicesThroughput,
+    };
+  }
+
+  let throughputValues: PromiseReturnType<typeof getThroughputValues>;
+
+  registry.when(
+    'Dependencies throughput value',
+    { config: 'basic', archives: ['apm_8.0.0_empty'] },
+    () => {
+      describe('when data is loaded', () => {
+        const GO_PROD_RATE = 75;
+        const JAVA_PROD_RATE = 25;
+        before(async () => {
+          const serviceGoProdInstance = service('synth-go', 'production', 'go').instance(
+            'instance-a'
+          );
+          const serviceJavaInstance = service('synth-java', 'development', 'java').instance(
+            'instance-c'
+          );
+
+          await traceData.index([
+            ...timerange(start, end)
+              .interval('1m')
+              .rate(GO_PROD_RATE)
+              .flatMap((timestamp) =>
+                serviceGoProdInstance
+                  .transaction('GET /api/product/list')
+                  .duration(1000)
+                  .timestamp(timestamp)
+                  .children(
+                    serviceGoProdInstance
+                      .span('GET apm-*/_search', 'db', 'elasticsearch')
+                      .duration(1000)
+                      .success()
+                      .destination('elasticsearch')
+                      .timestamp(timestamp),
+                    serviceGoProdInstance
+                      .span('custom_operation', 'app')
+                      .duration(550)
+                      .children(
+                        serviceGoProdInstance
+                          .span('SELECT FROM products', 'db', 'postgresql')
+                          .duration(500)
+                          .success()
+                          .destination('postgresql')
+                          .timestamp(timestamp)
+                      )
+                      .success()
+                      .timestamp(timestamp)
+                  )
+                  .serialize()
+              ),
+            ...timerange(start, end)
+              .interval('1m')
+              .rate(JAVA_PROD_RATE)
+              .flatMap((timestamp) =>
+                serviceJavaInstance
+                  .transaction('POST /api/product/buy')
+                  .duration(1000)
+                  .timestamp(timestamp)
+                  .children(
+                    serviceJavaInstance
+                      .span('GET apm-*/_search', 'db', 'elasticsearch')
+                      .duration(1000)
+                      .success()
+                      .destination('elasticsearch')
+                      .timestamp(timestamp),
+                    serviceJavaInstance
+                      .span('custom_operation', 'app')
+                      .duration(50)
+                      .success()
+                      .timestamp(timestamp)
+                  )
+                  .serialize()
+              ),
+          ]);
+        });
+
+        after(() => traceData.clean());
+
+        describe('verify top dependencies', () => {
+          before(async () => {
+            throughputValues = await getThroughputValues();
+          });
+
+          it('returns elasticsearch and postgresql as dependencies', () => {
+            const { topBackends } = throughputValues;
+            const topBackendsAsObj = Object.fromEntries(topBackends);
+            expect(topBackendsAsObj.elasticsearch).to.equal(
+              roundNumber(JAVA_PROD_RATE + GO_PROD_RATE)
+            );
+            expect(topBackendsAsObj.postgresql).to.equal(roundNumber(GO_PROD_RATE));
+          });
+        });
+
+        describe('compare throughput value between top backends, backend throughput chart and upstream services apis', () => {
+          describe('elasticsearch dependency', () => {
+            before(async () => {
+              throughputValues = await getThroughputValues({ backendName: 'elasticsearch' });
+            });
+
+            it('matches throughput values between throughput chart and top dependency', () => {
+              const { topBackends, backendThroughputChartMean } = throughputValues;
+              const topBackendsAsObj = Object.fromEntries(topBackends);
+              const elasticsearchDependency = topBackendsAsObj.elasticsearch;
+              [elasticsearchDependency, backendThroughputChartMean].forEach((value) =>
+                expect(value).to.be.equal(roundNumber(JAVA_PROD_RATE + GO_PROD_RATE))
+              );
+            });
+
+            it('matches throughput values between upstream services and top dependency', () => {
+              const { topBackends, upstreamServicesThroughput } = throughputValues;
+              const topBackendsAsObj = Object.fromEntries(topBackends);
+              const elasticsearchDependency = topBackendsAsObj.elasticsearch;
+              const upstreamServiceThroughputSum = roundNumber(
+                sumBy(upstreamServicesThroughput, 'throughput')
+              );
+              [elasticsearchDependency, upstreamServiceThroughputSum].forEach((value) =>
+                expect(value).to.be.equal(roundNumber(JAVA_PROD_RATE + GO_PROD_RATE))
+              );
+            });
+          });
+          describe('postgresql dependency', () => {
+            before(async () => {
+              throughputValues = await getThroughputValues({ backendName: 'postgresql' });
+            });
+
+            it('matches throughput values between throughput chart and top dependency', () => {
+              const { topBackends, backendThroughputChartMean } = throughputValues;
+              const topBackendsAsObj = Object.fromEntries(topBackends);
+              const postgresqlDependency = topBackendsAsObj.postgresql;
+              [postgresqlDependency, backendThroughputChartMean].forEach((value) =>
+                expect(value).to.be.equal(roundNumber(GO_PROD_RATE))
+              );
+            });
+
+            it('matches throughput values between upstream services and top dependency', () => {
+              const { topBackends, upstreamServicesThroughput } = throughputValues;
+              const topBackendsAsObj = Object.fromEntries(topBackends);
+              const postgresqlDependency = topBackendsAsObj.postgresql;
+              const upstreamServiceThroughputSum = roundNumber(
+                sumBy(upstreamServicesThroughput, 'throughput')
+              );
+              [postgresqlDependency, upstreamServiceThroughputSum].forEach((value) =>
+                expect(value).to.be.equal(roundNumber(GO_PROD_RATE))
+              );
+            });
+          });
+        });
+      });
+    }
+  );
+}
diff --git a/x-pack/test/apm_api_integration/tests/throughput/service_apis.ts b/x-pack/test/apm_api_integration/tests/throughput/service_apis.ts
new file mode 100644
index 0000000000000..6bf0e8c14fb23
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/throughput/service_apis.ts
@@ -0,0 +1,163 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { service, timerange } from '@elastic/apm-generator';
+import expect from '@kbn/expect';
+import { meanBy, sumBy } from 'lodash';
+import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
+import { PromiseReturnType } from '../../../../plugins/observability/typings/common';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
+import { roundNumber } from '../../utils';
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+  const apmApiClient = getService('apmApiClient');
+  const traceData = getService('traceData');
+
+  const serviceName = 'synth-go';
+  const start = new Date('2021-01-01T00:00:00.000Z').getTime();
+  const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
+
+  async function getThroughputValues(processorEvent: 'transaction' | 'metric') {
+    const commonQuery = {
+      start: new Date(start).toISOString(),
+      end: new Date(end).toISOString(),
+      environment: 'ENVIRONMENT_ALL',
+    };
+    const [
+      serviceInventoryAPIResponse,
+      serviceThroughputAPIResponse,
+      transactionsGroupDetailsAPIResponse,
+      serviceInstancesAPIResponse,
+    ] = await Promise.all([
+      apmApiClient.readUser({
+        endpoint: 'GET /internal/apm/services',
+        params: {
+          query: {
+            ...commonQuery,
+            kuery: `service.name : "${serviceName}" and processor.event : "${processorEvent}"`,
+          },
+        },
+      }),
+      apmApiClient.readUser({
+        endpoint: 'GET /internal/apm/services/{serviceName}/throughput',
+        params: {
+          path: { serviceName },
+          query: {
+            ...commonQuery,
+            kuery: `processor.event : "${processorEvent}"`,
+            transactionType: 'request',
+          },
+        },
+      }),
+      apmApiClient.readUser({
+        endpoint: `GET /internal/apm/services/{serviceName}/transactions/groups/main_statistics`,
+        params: {
+          path: { serviceName },
+          query: {
+            ...commonQuery,
+            kuery: `processor.event : "${processorEvent}"`,
+            transactionType: 'request',
+            latencyAggregationType: 'avg' as LatencyAggregationType,
+          },
+        },
+      }),
+      apmApiClient.readUser({
+        endpoint: `GET /internal/apm/services/{serviceName}/service_overview_instances/main_statistics`,
+        params: {
+          path: { serviceName },
+          query: {
+            ...commonQuery,
+            kuery: `processor.event : "${processorEvent}"`,
+            transactionType: 'request',
+            latencyAggregationType: 'avg' as LatencyAggregationType,
+          },
+        },
+      }),
+    ]);
+
+    const serviceInventoryThroughput = serviceInventoryAPIResponse.body.items[0].throughput;
+
+    const throughputChartApiMean = meanBy(serviceThroughputAPIResponse.body.currentPeriod, 'y');
+
+    const transactionsGroupThroughputSum = sumBy(
+      transactionsGroupDetailsAPIResponse.body.transactionGroups,
+      'throughput'
+    );
+
+    const serviceInstancesThroughputSum = sumBy(
+      serviceInstancesAPIResponse.body.currentPeriod,
+      'throughput'
+    );
+
+    return {
+      serviceInventoryThroughput,
+      throughputChartApiMean,
+      transactionsGroupThroughputSum,
+      serviceInstancesThroughputSum,
+    };
+  }
+
+  let throughputMetricValues: PromiseReturnType<typeof getThroughputValues>;
+  let throughputTransactionValues: PromiseReturnType<typeof getThroughputValues>;
+
+  registry.when('Services APIs', { config: 'basic', archives: ['apm_8.0.0_empty'] }, () => {
+    describe('when data is loaded ', () => {
+      const GO_PROD_RATE = 80;
+      const GO_DEV_RATE = 20;
+      before(async () => {
+        const serviceGoProdInstance = service(serviceName, 'production', 'go').instance(
+          'instance-a'
+        );
+        const serviceGoDevInstance = service(serviceName, 'development', 'go').instance(
+          'instance-b'
+        );
+        await traceData.index([
+          ...timerange(start, end)
+            .interval('1m')
+            .rate(GO_PROD_RATE)
+            .flatMap((timestamp) =>
+              serviceGoProdInstance
+                .transaction('GET /api/product/list')
+                .duration(1000)
+                .timestamp(timestamp)
+                .serialize()
+            ),
+          ...timerange(start, end)
+            .interval('1m')
+            .rate(GO_DEV_RATE)
+            .flatMap((timestamp) =>
+              serviceGoDevInstance
+                .transaction('GET /api/product/:id')
+                .duration(1000)
+                .timestamp(timestamp)
+                .serialize()
+            ),
+        ]);
+      });
+
+      after(() => traceData.clean());
+
+      describe('compare throughput value between service inventory, throughput chart, service inventory and transactions apis', () => {
+        before(async () => {
+          [throughputTransactionValues, throughputMetricValues] = await Promise.all([
+            getThroughputValues('transaction'),
+            getThroughputValues('metric'),
+          ]);
+        });
+
+        it('returns same throughput value for Transaction-based and Metric-based data', () => {
+          [
+            ...Object.values(throughputTransactionValues),
+            ...Object.values(throughputMetricValues),
+          ].forEach((value) =>
+            expect(roundNumber(value)).to.be.equal(roundNumber(GO_PROD_RATE + GO_DEV_RATE))
+          );
+        });
+      });
+    });
+  });
+}
diff --git a/x-pack/test/apm_api_integration/tests/traces/__snapshots__/top_traces.snap b/x-pack/test/apm_api_integration/tests/traces/__snapshots__/top_traces.snap
index 604348355f38c..64e1754c9570f 100644
--- a/x-pack/test/apm_api_integration/tests/traces/__snapshots__/top_traces.snap
+++ b/x-pack/test/apm_api_integration/tests/traces/__snapshots__/top_traces.snap
@@ -3,7 +3,7 @@
 exports[`APM API tests basic apm_8.0.0 Top traces when data is loaded returns the correct buckets 1`] = `
 Array [
   Object {
-    "averageResponseTime": 1639,
+    "averageResponseTime": 1638,
     "impact": 0,
     "key": Object {
       "service.name": "opbeans-java",
@@ -15,8 +15,8 @@ Array [
     "transactionsPerMinute": 0.0333333333333333,
   },
   Object {
-    "averageResponseTime": 3279,
-    "impact": 0.00144735571024101,
+    "averageResponseTime": 3278,
+    "impact": 0.00153950779720334,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "POST /api/orders",
@@ -27,8 +27,8 @@ Array [
     "transactionsPerMinute": 0.0333333333333333,
   },
   Object {
-    "averageResponseTime": 6175,
-    "impact": 0.00400317408637392,
+    "averageResponseTime": 6169,
+    "impact": 0.00425335965190752,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "GET /api/products/:id",
@@ -39,8 +39,8 @@ Array [
     "transactionsPerMinute": 0.0333333333333333,
   },
   Object {
-    "averageResponseTime": 3495,
-    "impact": 0.00472243927164613,
+    "averageResponseTime": 3486,
+    "impact": 0.00500715523797721,
     "key": Object {
       "service.name": "opbeans-dotnet",
       "transaction.name": "POST Orders/Post",
@@ -51,8 +51,8 @@ Array [
     "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 7039,
-    "impact": 0.00476568343615943,
+    "averageResponseTime": 7022,
+    "impact": 0.00505409145130658,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "GET opbeans.views.product",
@@ -63,8 +63,8 @@ Array [
     "transactionsPerMinute": 0.0333333333333333,
   },
   Object {
-    "averageResponseTime": 6303,
-    "impact": 0.00967875004525193,
+    "averageResponseTime": 6279,
+    "impact": 0.0102508689911344,
     "key": Object {
       "service.name": "opbeans-ruby",
       "transaction.name": "Api::OrdersController#create",
@@ -75,8 +75,8 @@ Array [
     "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 7209.66666666667,
-    "impact": 0.0176418540534865,
+    "averageResponseTime": 7959,
+    "impact": 0.0134049825268681,
     "key": Object {
       "service.name": "opbeans-java",
       "transaction.name": "APIRestController#products",
@@ -84,35 +84,47 @@ Array [
     "serviceName": "opbeans-java",
     "transactionName": "APIRestController#products",
     "transactionType": "request",
+    "transactionsPerMinute": 0.0666666666666667,
+  },
+  Object {
+    "averageResponseTime": 7411.33333333333,
+    "impact": 0.0193339649946342,
+    "key": Object {
+      "service.name": "opbeans-python",
+      "transaction.name": "GET opbeans.views.order",
+    },
+    "serviceName": "opbeans-python",
+    "transactionName": "GET opbeans.views.order",
+    "transactionType": "request",
     "transactionsPerMinute": 0.1,
   },
   Object {
-    "averageResponseTime": 4511,
-    "impact": 0.0224401912465233,
+    "averageResponseTime": 11729,
+    "impact": 0.0204829634969371,
     "key": Object {
-      "service.name": "opbeans-java",
-      "transaction.name": "APIRestController#orders",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Api::OrdersController#show",
     },
-    "serviceName": "opbeans-java",
-    "transactionName": "APIRestController#orders",
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Api::OrdersController#show",
     "transactionType": "request",
-    "transactionsPerMinute": 0.2,
+    "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 7607,
-    "impact": 0.0254072704525173,
+    "averageResponseTime": 4499.16666666667,
+    "impact": 0.0238032312278568,
     "key": Object {
-      "service.name": "opbeans-python",
-      "transaction.name": "GET opbeans.views.order",
+      "service.name": "opbeans-java",
+      "transaction.name": "APIRestController#orders",
     },
-    "serviceName": "opbeans-python",
-    "transactionName": "GET opbeans.views.order",
+    "serviceName": "opbeans-java",
+    "transactionName": "APIRestController#orders",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.2,
   },
   Object {
-    "averageResponseTime": 10143,
-    "impact": 0.025408152986487,
+    "averageResponseTime": 10126.3333333333,
+    "impact": 0.0269798741459886,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "GET /api/types",
@@ -123,32 +135,32 @@ Array [
     "transactionsPerMinute": 0.1,
   },
   Object {
-    "averageResponseTime": 6105.66666666667,
-    "impact": 0.0308842762682221,
+    "averageResponseTime": 6089.83333333333,
+    "impact": 0.032762415628167,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Api::TypesController#index",
+      "service.name": "opbeans-java",
+      "transaction.name": "APIRestController#customerWhoBought",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Api::TypesController#index",
+    "serviceName": "opbeans-java",
+    "transactionName": "APIRestController#customerWhoBought",
     "transactionType": "request",
     "transactionsPerMinute": 0.2,
   },
   Object {
-    "averageResponseTime": 6116.33333333333,
-    "impact": 0.0309407584422802,
+    "averageResponseTime": 6094.83333333333,
+    "impact": 0.0327905773561646,
     "key": Object {
-      "service.name": "opbeans-java",
-      "transaction.name": "APIRestController#customerWhoBought",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Api::TypesController#index",
     },
-    "serviceName": "opbeans-java",
-    "transactionName": "APIRestController#customerWhoBought",
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Api::TypesController#index",
     "transactionType": "request",
     "transactionsPerMinute": 0.2,
   },
   Object {
-    "averageResponseTime": 12543,
-    "impact": 0.0317623975680329,
+    "averageResponseTime": 12527.3333333333,
+    "impact": 0.0337415050382176,
     "key": Object {
       "service.name": "opbeans-java",
       "transaction.name": "APIRestController#customers",
@@ -159,8 +171,8 @@ Array [
     "transactionsPerMinute": 0.1,
   },
   Object {
-    "averageResponseTime": 5551,
-    "impact": 0.0328461492827744,
+    "averageResponseTime": 5534.85714285714,
+    "impact": 0.0348323026359922,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "GET /api/orders/:id",
@@ -171,8 +183,8 @@ Array [
     "transactionsPerMinute": 0.233333333333333,
   },
   Object {
-    "averageResponseTime": 13183,
-    "impact": 0.0334568627897785,
+    "averageResponseTime": 13149.3333333333,
+    "impact": 0.0354931645196697,
     "key": Object {
       "service.name": "opbeans-java",
       "transaction.name": "APIRestController#stats",
@@ -183,8 +195,8 @@ Array [
     "transactionsPerMinute": 0.1,
   },
   Object {
-    "averageResponseTime": 8050.2,
-    "impact": 0.0340764016364792,
+    "averageResponseTime": 8025.8,
+    "impact": 0.0361324357452157,
     "key": Object {
       "service.name": "opbeans-go",
       "transaction.name": "POST /api/orders",
@@ -195,20 +207,8 @@ Array [
     "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 10079,
-    "impact": 0.0341337663445071,
-    "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Api::OrdersController#show",
-    },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Api::OrdersController#show",
-    "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
-  },
-  Object {
-    "averageResponseTime": 8463,
-    "impact": 0.0358979517498557,
+    "averageResponseTime": 8432.8,
+    "impact": 0.0380427396277211,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "GET /api/products/:id/customers",
@@ -219,32 +219,32 @@ Array [
     "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 10799,
-    "impact": 0.0366754641771254,
+    "averageResponseTime": 7408,
+    "impact": 0.0401867858526067,
     "key": Object {
       "service.name": "opbeans-ruby",
-      "transaction.name": "Api::ProductsController#show",
+      "transaction.name": "Api::TypesController#show",
     },
     "serviceName": "opbeans-ruby",
-    "transactionName": "Api::ProductsController#show",
+    "transactionName": "Api::TypesController#show",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.2,
   },
   Object {
-    "averageResponseTime": 7428.33333333333,
-    "impact": 0.0378880658514371,
+    "averageResponseTime": 6869.42857142857,
+    "impact": 0.0436018647344517,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Api::TypesController#show",
+      "service.name": "opbeans-java",
+      "transaction.name": "APIRestController#order",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Api::TypesController#show",
+    "serviceName": "opbeans-java",
+    "transactionName": "APIRestController#order",
     "transactionType": "request",
-    "transactionsPerMinute": 0.2,
+    "transactionsPerMinute": 0.233333333333333,
   },
   Object {
-    "averageResponseTime": 3105.13333333333,
-    "impact": 0.039659311528543,
+    "averageResponseTime": 3050,
+    "impact": 0.0442721138607951,
     "key": Object {
       "service.name": "opbeans-java",
       "transaction.name": "ResourceHttpRequestHandler",
@@ -252,23 +252,23 @@ Array [
     "serviceName": "opbeans-java",
     "transactionName": "ResourceHttpRequestHandler",
     "transactionType": "request",
-    "transactionsPerMinute": 0.5,
+    "transactionsPerMinute": 0.533333333333333,
   },
   Object {
-    "averageResponseTime": 6883.57142857143,
-    "impact": 0.0410784261517549,
+    "averageResponseTime": 10786.2,
+    "impact": 0.0490887080726551,
     "key": Object {
-      "service.name": "opbeans-java",
-      "transaction.name": "APIRestController#order",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Api::ProductsController#show",
     },
-    "serviceName": "opbeans-java",
-    "transactionName": "APIRestController#order",
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Api::ProductsController#show",
     "transactionType": "request",
-    "transactionsPerMinute": 0.233333333333333,
+    "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 3505,
-    "impact": 0.0480460318422139,
+    "averageResponseTime": 3497.6875,
+    "impact": 0.0509961957823607,
     "key": Object {
       "service.name": "opbeans-dotnet",
       "transaction.name": "GET Products/Get",
@@ -279,8 +279,8 @@ Array [
     "transactionsPerMinute": 0.533333333333333,
   },
   Object {
-    "averageResponseTime": 5621.4,
-    "impact": 0.0481642913941483,
+    "averageResponseTime": 5604.9,
+    "impact": 0.0510769260692872,
     "key": Object {
       "service.name": "opbeans-java",
       "transaction.name": "APIRestController#topProducts",
@@ -291,44 +291,44 @@ Array [
     "transactionsPerMinute": 0.333333333333333,
   },
   Object {
-    "averageResponseTime": 8428.71428571429,
-    "impact": 0.0506239135675883,
+    "averageResponseTime": 8500.57142857143,
+    "impact": 0.0543202184103467,
     "key": Object {
       "service.name": "opbeans-node",
-      "transaction.name": "GET /api/orders",
+      "transaction.name": "GET /api/customers/:id",
     },
     "serviceName": "opbeans-node",
-    "transactionName": "GET /api/orders",
+    "transactionName": "GET /api/customers/:id",
     "transactionType": "request",
     "transactionsPerMinute": 0.233333333333333,
   },
   Object {
-    "averageResponseTime": 8520.14285714286,
-    "impact": 0.0511887353081702,
+    "averageResponseTime": 6658.88888888889,
+    "impact": 0.0547201149479129,
     "key": Object {
       "service.name": "opbeans-node",
-      "transaction.name": "GET /api/customers/:id",
+      "transaction.name": "GET /api/products/top",
     },
     "serviceName": "opbeans-node",
-    "transactionName": "GET /api/customers/:id",
+    "transactionName": "GET /api/products/top",
     "transactionType": "request",
-    "transactionsPerMinute": 0.233333333333333,
+    "transactionsPerMinute": 0.3,
   },
   Object {
-    "averageResponseTime": 6683.44444444444,
-    "impact": 0.0516388276326964,
+    "averageResponseTime": 8141.125,
+    "impact": 0.0596005424099008,
     "key": Object {
       "service.name": "opbeans-node",
-      "transaction.name": "GET /api/products/top",
+      "transaction.name": "GET /api/orders",
     },
     "serviceName": "opbeans-node",
-    "transactionName": "GET /api/products/top",
+    "transactionName": "GET /api/orders",
     "transactionType": "request",
-    "transactionsPerMinute": 0.3,
+    "transactionsPerMinute": 0.266666666666667,
   },
   Object {
-    "averageResponseTime": 3482.78947368421,
-    "impact": 0.0569534471979838,
+    "averageResponseTime": 3473.52631578947,
+    "impact": 0.0604153550732987,
     "key": Object {
       "service.name": "opbeans-dotnet",
       "transaction.name": "GET Types/Get",
@@ -339,20 +339,20 @@ Array [
     "transactionsPerMinute": 0.633333333333333,
   },
   Object {
-    "averageResponseTime": 16703,
-    "impact": 0.057517386404596,
+    "averageResponseTime": 7875,
+    "impact": 0.064994452045712,
     "key": Object {
-      "service.name": "opbeans-python",
-      "transaction.name": "GET opbeans.views.product_type",
+      "service.name": "opbeans-node",
+      "transaction.name": "GET /api/types/:id",
     },
-    "serviceName": "opbeans-python",
-    "transactionName": "GET opbeans.views.product_type",
+    "serviceName": "opbeans-node",
+    "transactionName": "GET /api/types/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.3,
   },
   Object {
-    "averageResponseTime": 4943,
-    "impact": 0.0596266425920813,
+    "averageResponseTime": 4889,
+    "impact": 0.0673037137415171,
     "key": Object {
       "service.name": "opbeans-dotnet",
       "transaction.name": "GET Products/Get {id}",
@@ -360,23 +360,23 @@ Array [
     "serviceName": "opbeans-dotnet",
     "transactionName": "GET Products/Get {id}",
     "transactionType": "request",
-    "transactionsPerMinute": 0.466666666666667,
+    "transactionsPerMinute": 0.5,
   },
   Object {
-    "averageResponseTime": 7892.33333333333,
-    "impact": 0.0612407972225879,
+    "averageResponseTime": 14902.4,
+    "impact": 0.0684085922032904,
     "key": Object {
-      "service.name": "opbeans-node",
-      "transaction.name": "GET /api/types/:id",
+      "service.name": "opbeans-python",
+      "transaction.name": "GET opbeans.views.product_type",
     },
-    "serviceName": "opbeans-node",
-    "transactionName": "GET /api/types/:id",
+    "serviceName": "opbeans-python",
+    "transactionName": "GET opbeans.views.product_type",
     "transactionType": "request",
-    "transactionsPerMinute": 0.3,
+    "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 6346.42857142857,
-    "impact": 0.0769666700279444,
+    "averageResponseTime": 6329.35714285714,
+    "impact": 0.0816436656379062,
     "key": Object {
       "service.name": "opbeans-dotnet",
       "transaction.name": "GET Orders/Get {id}",
@@ -387,8 +387,8 @@ Array [
     "transactionsPerMinute": 0.466666666666667,
   },
   Object {
-    "averageResponseTime": 7052.84615384615,
-    "impact": 0.0794704188998674,
+    "averageResponseTime": 6627.42857142857,
+    "impact": 0.0855609620023755,
     "key": Object {
       "service.name": "opbeans-go",
       "transaction.name": "GET /api/products",
@@ -396,11 +396,11 @@ Array [
     "serviceName": "opbeans-go",
     "transactionName": "GET /api/products",
     "transactionType": "request",
-    "transactionsPerMinute": 0.433333333333333,
+    "transactionsPerMinute": 0.466666666666667,
   },
   Object {
-    "averageResponseTime": 10484.3333333333,
-    "impact": 0.0818285496667966,
+    "averageResponseTime": 10459,
+    "impact": 0.0868254235894687,
     "key": Object {
       "service.name": "opbeans-java",
       "transaction.name": "APIRestController#product",
@@ -411,8 +411,8 @@ Array [
     "transactionsPerMinute": 0.3,
   },
   Object {
-    "averageResponseTime": 23711,
-    "impact": 0.0822565786420813,
+    "averageResponseTime": 23652.5,
+    "impact": 0.087275072513164,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "GET /api/stats",
@@ -423,8 +423,8 @@ Array [
     "transactionsPerMinute": 0.133333333333333,
   },
   Object {
-    "averageResponseTime": 4491.36363636364,
-    "impact": 0.0857567083657495,
+    "averageResponseTime": 4480.95454545455,
+    "impact": 0.0910027465757826,
     "key": Object {
       "service.name": "opbeans-dotnet",
       "transaction.name": "GET Types/Get {id}",
@@ -435,8 +435,8 @@ Array [
     "transactionsPerMinute": 0.733333333333333,
   },
   Object {
-    "averageResponseTime": 20715.8,
-    "impact": 0.089965512867054,
+    "averageResponseTime": 20677.4,
+    "impact": 0.0955142554010017,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "GET opbeans.views.stats",
@@ -447,8 +447,8 @@ Array [
     "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 9036.33333333333,
-    "impact": 0.0942519803576885,
+    "averageResponseTime": 9015.33333333333,
+    "impact": 0.100017315707821,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "GET /api/products",
@@ -459,8 +459,20 @@ Array [
     "transactionsPerMinute": 0.4,
   },
   Object {
-    "averageResponseTime": 7504.06666666667,
-    "impact": 0.0978924329825326,
+    "averageResponseTime": 12096.8888888889,
+    "impact": 0.100663158003234,
+    "key": Object {
+      "service.name": "opbeans-go",
+      "transaction.name": "GET /api/customers",
+    },
+    "serviceName": "opbeans-go",
+    "transactionName": "GET /api/customers",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.3,
+  },
+  Object {
+    "averageResponseTime": 7361.46666666667,
+    "impact": 0.102118180616444,
     "key": Object {
       "service.name": "opbeans-java",
       "transaction.name": "APIRestController#customer",
@@ -471,8 +483,8 @@ Array [
     "transactionsPerMinute": 0.5,
   },
   Object {
-    "averageResponseTime": 4250.55555555556,
-    "impact": 0.0998375378516613,
+    "averageResponseTime": 4141.07142857143,
+    "impact": 0.107307448362139,
     "key": Object {
       "service.name": "opbeans-go",
       "transaction.name": "GET /api/types/:id",
@@ -480,11 +492,11 @@ Array [
     "serviceName": "opbeans-go",
     "transactionName": "GET /api/types/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.9,
+    "transactionsPerMinute": 0.933333333333333,
   },
   Object {
-    "averageResponseTime": 21343,
-    "impact": 0.11156906191034,
+    "averageResponseTime": 21277,
+    "impact": 0.118301786972411,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "GET /api/customers",
@@ -495,8 +507,8 @@ Array [
     "transactionsPerMinute": 0.2,
   },
   Object {
-    "averageResponseTime": 16655,
-    "impact": 0.116142352941114,
+    "averageResponseTime": 16602.25,
+    "impact": 0.123141849290936,
     "key": Object {
       "service.name": "opbeans-ruby",
       "transaction.name": "Api::ProductsController#top",
@@ -507,20 +519,8 @@ Array [
     "transactionsPerMinute": 0.266666666666667,
   },
   Object {
-    "averageResponseTime": 5749,
-    "impact": 0.12032203382142,
-    "key": Object {
-      "service.name": "opbeans-go",
-      "transaction.name": "GET /api/types",
-    },
-    "serviceName": "opbeans-go",
-    "transactionName": "GET /api/types",
-    "transactionType": "request",
-    "transactionsPerMinute": 0.8,
-  },
-  Object {
-    "averageResponseTime": 9951,
-    "impact": 0.121502864272824,
+    "averageResponseTime": 9924.07142857143,
+    "impact": 0.128885903078184,
     "key": Object {
       "service.name": "opbeans-ruby",
       "transaction.name": "Api::StatsController#index",
@@ -531,20 +531,20 @@ Array [
     "transactionsPerMinute": 0.466666666666667,
   },
   Object {
-    "averageResponseTime": 14040.6,
-    "impact": 0.122466591367692,
+    "averageResponseTime": 5444.5,
+    "impact": 0.131345360656643,
     "key": Object {
       "service.name": "opbeans-go",
-      "transaction.name": "GET /api/customers",
+      "transaction.name": "GET /api/types",
     },
     "serviceName": "opbeans-go",
-    "transactionName": "GET /api/customers",
+    "transactionName": "GET /api/types",
     "transactionType": "request",
-    "transactionsPerMinute": 0.333333333333333,
+    "transactionsPerMinute": 0.866666666666667,
   },
   Object {
-    "averageResponseTime": 20963.5714285714,
-    "impact": 0.128060974201361,
+    "averageResponseTime": 20932.4285714286,
+    "impact": 0.136010820261582,
     "key": Object {
       "service.name": "opbeans-ruby",
       "transaction.name": "Api::OrdersController#index",
@@ -555,8 +555,20 @@ Array [
     "transactionsPerMinute": 0.233333333333333,
   },
   Object {
-    "averageResponseTime": 22874.4285714286,
-    "impact": 0.139865748579522,
+    "averageResponseTime": 12301.3333333333,
+    "impact": 0.137033090987896,
+    "key": Object {
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Api::ProductsController#index",
+    },
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Api::ProductsController#index",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.4,
+  },
+  Object {
+    "averageResponseTime": 22818.7142857143,
+    "impact": 0.148405735477602,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "GET opbeans.views.customer",
@@ -567,8 +579,8 @@ Array [
     "transactionsPerMinute": 0.233333333333333,
   },
   Object {
-    "averageResponseTime": 32203.8,
-    "impact": 0.140658264084276,
+    "averageResponseTime": 32098.4,
+    "impact": 0.149120104644475,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "GET opbeans.views.customers",
@@ -579,8 +591,8 @@ Array [
     "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 4482.11111111111,
-    "impact": 0.140955678032051,
+    "averageResponseTime": 4585.91428571429,
+    "impact": 0.149134185508474,
     "key": Object {
       "service.name": "opbeans-go",
       "transaction.name": "GET /api/customers/:id",
@@ -588,23 +600,23 @@ Array [
     "serviceName": "opbeans-go",
     "transactionName": "GET /api/customers/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 1.2,
+    "transactionsPerMinute": 1.16666666666667,
   },
   Object {
-    "averageResponseTime": 12582.3846153846,
-    "impact": 0.142910490774846,
+    "averageResponseTime": 20449.3333333333,
+    "impact": 0.171228938571142,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Api::ProductsController#index",
+      "service.name": "opbeans-python",
+      "transaction.name": "GET opbeans.views.orders",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Api::ProductsController#index",
+    "serviceName": "opbeans-python",
+    "transactionName": "GET opbeans.views.orders",
     "transactionType": "request",
-    "transactionsPerMinute": 0.433333333333333,
+    "transactionsPerMinute": 0.3,
   },
   Object {
-    "averageResponseTime": 10009.9473684211,
-    "impact": 0.166401779979233,
+    "averageResponseTime": 9981.1052631579,
+    "impact": 0.176482978291232,
     "key": Object {
       "service.name": "opbeans-ruby",
       "transaction.name": "Api::CustomersController#show",
@@ -615,8 +627,8 @@ Array [
     "transactionsPerMinute": 0.633333333333333,
   },
   Object {
-    "averageResponseTime": 27825.2857142857,
-    "impact": 0.170450845832029,
+    "averageResponseTime": 27758.7142857143,
+    "impact": 0.180866820616195,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "GET opbeans.views.product_types",
@@ -627,20 +639,20 @@ Array [
     "transactionsPerMinute": 0.233333333333333,
   },
   Object {
-    "averageResponseTime": 20562.2,
-    "impact": 0.180021926732983,
+    "averageResponseTime": 8332.06896551724,
+    "impact": 0.225286314186844,
     "key": Object {
-      "service.name": "opbeans-python",
-      "transaction.name": "GET opbeans.views.orders",
+      "service.name": "opbeans-go",
+      "transaction.name": "GET /api/orders/:id",
     },
-    "serviceName": "opbeans-python",
-    "transactionName": "GET opbeans.views.orders",
+    "serviceName": "opbeans-go",
+    "transactionName": "GET /api/orders/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.333333333333333,
+    "transactionsPerMinute": 0.966666666666667,
   },
   Object {
-    "averageResponseTime": 7106.76470588235,
-    "impact": 0.21180020991247,
+    "averageResponseTime": 6976.62857142857,
+    "impact": 0.227681938515175,
     "key": Object {
       "service.name": "opbeans-dotnet",
       "transaction.name": "GET Customers/Get {id}",
@@ -648,23 +660,11 @@ Array [
     "serviceName": "opbeans-dotnet",
     "transactionName": "GET Customers/Get {id}",
     "transactionType": "request",
-    "transactionsPerMinute": 1.13333333333333,
-  },
-  Object {
-    "averageResponseTime": 8612.51724137931,
-    "impact": 0.218977858687708,
-    "key": Object {
-      "service.name": "opbeans-go",
-      "transaction.name": "GET /api/orders/:id",
-    },
-    "serviceName": "opbeans-go",
-    "transactionName": "GET /api/orders/:id",
-    "transactionType": "request",
-    "transactionsPerMinute": 0.966666666666667,
+    "transactionsPerMinute": 1.16666666666667,
   },
   Object {
-    "averageResponseTime": 11295,
-    "impact": 0.277663720068132,
+    "averageResponseTime": 11321.7777777778,
+    "impact": 0.2854191132559,
     "key": Object {
       "service.name": "opbeans-ruby",
       "transaction.name": "Api::CustomersController#index",
@@ -672,11 +672,11 @@ Array [
     "serviceName": "opbeans-ruby",
     "transactionName": "Api::CustomersController#index",
     "transactionType": "request",
-    "transactionsPerMinute": 0.933333333333333,
+    "transactionsPerMinute": 0.9,
   },
   Object {
-    "averageResponseTime": 65035.8,
-    "impact": 0.285535040543522,
+    "averageResponseTime": 64824.2,
+    "impact": 0.302722617661906,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "GET opbeans.views.product_customers",
@@ -687,8 +687,8 @@ Array [
     "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 30999.4705882353,
-    "impact": 0.463640986028375,
+    "averageResponseTime": 32155.5625,
+    "impact": 0.481425678843616,
     "key": Object {
       "service.name": "opbeans-go",
       "transaction.name": "GET /api/stats",
@@ -696,11 +696,23 @@ Array [
     "serviceName": "opbeans-go",
     "transactionName": "GET /api/stats",
     "transactionType": "request",
-    "transactionsPerMinute": 0.566666666666667,
+    "transactionsPerMinute": 0.533333333333333,
   },
   Object {
-    "averageResponseTime": 20197.4,
-    "impact": 0.622424732781511,
+    "averageResponseTime": 32890.5714285714,
+    "impact": 0.646841098031782,
+    "key": Object {
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Customers/Get",
+    },
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Customers/Get",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.7,
+  },
+  Object {
+    "averageResponseTime": 20133.0571428571,
+    "impact": 0.65994099517201,
     "key": Object {
       "service.name": "opbeans-go",
       "transaction.name": "GET /api/products/:id/customers",
@@ -711,8 +723,8 @@ Array [
     "transactionsPerMinute": 1.16666666666667,
   },
   Object {
-    "averageResponseTime": 64681.6666666667,
-    "impact": 0.68355874339377,
+    "averageResponseTime": 64534,
+    "impact": 0.725417951490748,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "GET opbeans.views.top_products",
@@ -723,20 +735,8 @@ Array [
     "transactionsPerMinute": 0.4,
   },
   Object {
-    "averageResponseTime": 41416.1428571429,
-    "impact": 0.766127739061111,
-    "key": Object {
-      "service.name": "opbeans-dotnet",
-      "transaction.name": "GET Customers/Get",
-    },
-    "serviceName": "opbeans-dotnet",
-    "transactionName": "GET Customers/Get",
-    "transactionType": "request",
-    "transactionsPerMinute": 0.7,
-  },
-  Object {
-    "averageResponseTime": 19429,
-    "impact": 0.821597646656097,
+    "averageResponseTime": 19259.8775510204,
+    "impact": 0.884368376654926,
     "key": Object {
       "service.name": "opbeans-go",
       "transaction.name": "GET /api/products/:id",
@@ -744,11 +744,11 @@ Array [
     "serviceName": "opbeans-go",
     "transactionName": "GET /api/products/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 1.6,
+    "transactionsPerMinute": 1.63333333333333,
   },
   Object {
-    "averageResponseTime": 62390.652173913,
-    "impact": 1.26497653527507,
+    "averageResponseTime": 62237.5652173913,
+    "impact": 1.3422123631976,
     "key": Object {
       "service.name": "opbeans-dotnet",
       "transaction.name": "GET Products/Customerwhobought {id}",
@@ -759,8 +759,8 @@ Array [
     "transactionsPerMinute": 0.766666666666667,
   },
   Object {
-    "averageResponseTime": 33266.2,
-    "impact": 1.76006661931225,
+    "averageResponseTime": 33203.5666666667,
+    "impact": 1.86860199568649,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "opbeans.tasks.sync_orders",
@@ -771,8 +771,8 @@ Array [
     "transactionsPerMinute": 2,
   },
   Object {
-    "averageResponseTime": 38491.4444444444,
-    "impact": 1.83293391905112,
+    "averageResponseTime": 37042.1607142857,
+    "impact": 1.94571537801384,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "GET /api",
@@ -780,11 +780,11 @@ Array [
     "serviceName": "opbeans-node",
     "transactionName": "GET /api",
     "transactionType": "request",
-    "transactionsPerMinute": 1.8,
+    "transactionsPerMinute": 1.86666666666667,
   },
   Object {
-    "averageResponseTime": 118488.6,
-    "impact": 2.08995781717084,
+    "averageResponseTime": 116654.571428571,
+    "impact": 2.29809838682675,
     "key": Object {
       "service.name": "opbeans-dotnet",
       "transaction.name": "GET Stats/Get",
@@ -792,47 +792,35 @@ Array [
     "serviceName": "opbeans-dotnet",
     "transactionName": "GET Stats/Get",
     "transactionType": "request",
-    "transactionsPerMinute": 0.666666666666667,
-  },
-  Object {
-    "averageResponseTime": 250440.142857143,
-    "impact": 4.64001412901584,
-    "key": Object {
-      "service.name": "opbeans-dotnet",
-      "transaction.name": "GET Products/Top",
-    },
-    "serviceName": "opbeans-dotnet",
-    "transactionName": "GET Products/Top",
-    "transactionType": "request",
     "transactionsPerMinute": 0.7,
   },
   Object {
-    "averageResponseTime": 312096.523809524,
-    "impact": 5.782704992387,
+    "averageResponseTime": 28741.0333333333,
+    "impact": 2.4266538589631,
     "key": Object {
-      "service.name": "opbeans-java",
-      "transaction.name": "DispatcherServlet#doGet",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Rack",
     },
-    "serviceName": "opbeans-java",
-    "transactionName": "DispatcherServlet#doGet",
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Rack",
     "transactionType": "request",
-    "transactionsPerMinute": 0.7,
+    "transactionsPerMinute": 3,
   },
   Object {
-    "averageResponseTime": 91519.7032967033,
-    "impact": 7.34855500859826,
+    "averageResponseTime": 249714.952380952,
+    "impact": 4.9211455657754,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Rack",
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Products/Top",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Rack",
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Products/Top",
     "transactionType": "request",
-    "transactionsPerMinute": 3.03333333333333,
+    "transactionsPerMinute": 0.7,
   },
   Object {
-    "averageResponseTime": 648269.769230769,
-    "impact": 7.43611473386403,
+    "averageResponseTime": 653461.538461538,
+    "impact": 7.97292501431132,
     "key": Object {
       "service.name": "opbeans-rum",
       "transaction.name": "/customers",
@@ -843,8 +831,20 @@ Array [
     "transactionsPerMinute": 0.433333333333333,
   },
   Object {
-    "averageResponseTime": 1398919.72727273,
-    "impact": 13.5790895084132,
+    "averageResponseTime": 575328.095238095,
+    "impact": 11.340025698891,
+    "key": Object {
+      "service.name": "opbeans-java",
+      "transaction.name": "DispatcherServlet#doGet",
+    },
+    "serviceName": "opbeans-java",
+    "transactionName": "DispatcherServlet#doGet",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.7,
+  },
+  Object {
+    "averageResponseTime": 1534606.6,
+    "impact": 14.4041869205032,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "GET opbeans.views.products",
@@ -852,11 +852,11 @@ Array [
     "serviceName": "opbeans-python",
     "transactionName": "GET opbeans.views.products",
     "transactionType": "request",
-    "transactionsPerMinute": 0.366666666666667,
+    "transactionsPerMinute": 0.333333333333333,
   },
   Object {
-    "averageResponseTime": 1199907.57142857,
-    "impact": 14.8239822181408,
+    "averageResponseTime": 1197500,
+    "impact": 15.7361746989891,
     "key": Object {
       "service.name": "opbeans-rum",
       "transaction.name": "/orders",
@@ -867,8 +867,8 @@ Array [
     "transactionsPerMinute": 0.466666666666667,
   },
   Object {
-    "averageResponseTime": 955876.052631579,
-    "impact": 16.026822184214,
+    "averageResponseTime": 953684.210526316,
+    "impact": 17.0081460802151,
     "key": Object {
       "service.name": "opbeans-rum",
       "transaction.name": "/products",
@@ -879,8 +879,8 @@ Array [
     "transactionsPerMinute": 0.633333333333333,
   },
   Object {
-    "averageResponseTime": 965009.526315789,
-    "impact": 16.1799735991728,
+    "averageResponseTime": 962252.473684211,
+    "impact": 17.1609675746427,
     "key": Object {
       "service.name": "opbeans-go",
       "transaction.name": "GET /api/orders",
@@ -891,8 +891,8 @@ Array [
     "transactionsPerMinute": 0.633333333333333,
   },
   Object {
-    "averageResponseTime": 1213675.30769231,
-    "impact": 27.8474053933734,
+    "averageResponseTime": 1212615.38461538,
+    "impact": 29.594561046619,
     "key": Object {
       "service.name": "opbeans-rum",
       "transaction.name": "/dashboard",
@@ -903,8 +903,8 @@ Array [
     "transactionsPerMinute": 0.866666666666667,
   },
   Object {
-    "averageResponseTime": 924019.363636364,
-    "impact": 35.8796065162284,
+    "averageResponseTime": 896783.309523809,
+    "impact": 35.3554170595149,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "Update shipping status",
@@ -912,23 +912,11 @@ Array [
     "serviceName": "opbeans-node",
     "transactionName": "Update shipping status",
     "transactionType": "Worker",
-    "transactionsPerMinute": 1.46666666666667,
-  },
-  Object {
-    "averageResponseTime": 1060469.15384615,
-    "impact": 36.498655556576,
-    "key": Object {
-      "service.name": "opbeans-node",
-      "transaction.name": "Process payment",
-    },
-    "serviceName": "opbeans-node",
-    "transactionName": "Process payment",
-    "transactionType": "Worker",
-    "transactionsPerMinute": 1.3,
+    "transactionsPerMinute": 1.4,
   },
   Object {
-    "averageResponseTime": 118686.822222222,
-    "impact": 37.7068083771466,
+    "averageResponseTime": 119062.672222222,
+    "impact": 40.2345894471584,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "opbeans.tasks.update_stats",
@@ -939,8 +927,20 @@ Array [
     "transactionsPerMinute": 12,
   },
   Object {
-    "averageResponseTime": 1039228.27659574,
-    "impact": 43.1048035741496,
+    "averageResponseTime": 1078328.675,
+    "impact": 40.488594152833,
+    "key": Object {
+      "service.name": "opbeans-node",
+      "transaction.name": "Process payment",
+    },
+    "serviceName": "opbeans-node",
+    "transactionName": "Process payment",
+    "transactionType": "Worker",
+    "transactionsPerMinute": 1.33333333333333,
+  },
+  Object {
+    "averageResponseTime": 1057995.65957447,
+    "impact": 46.6772737502262,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "Process completed order",
@@ -951,8 +951,8 @@ Array [
     "transactionsPerMinute": 1.56666666666667,
   },
   Object {
-    "averageResponseTime": 1949922.55555556,
-    "impact": 61.9499776921889,
+    "averageResponseTime": 1947354.08333333,
+    "impact": 65.8074895815218,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "opbeans.tasks.sync_customers",
@@ -963,7 +963,7 @@ Array [
     "transactionsPerMinute": 1.2,
   },
   Object {
-    "averageResponseTime": 5963775,
+    "averageResponseTime": 5918288.44444444,
     "impact": 100,
     "key": Object {
       "service.name": "opbeans-dotnet",
@@ -972,7 +972,7 @@ Array [
     "serviceName": "opbeans-dotnet",
     "transactionName": "GET Orders/Get",
     "transactionType": "request",
-    "transactionsPerMinute": 0.633333333333333,
+    "transactionsPerMinute": 0.6,
   },
 ]
 `;
diff --git a/x-pack/test/apm_api_integration/tests/traces/top_traces.ts b/x-pack/test/apm_api_integration/tests/traces/top_traces.ts
index 4968732f82203..e67c2cb66df69 100644
--- a/x-pack/test/apm_api_integration/tests/traces/top_traces.ts
+++ b/x-pack/test/apm_api_integration/tests/traces/top_traces.ts
@@ -63,7 +63,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         expectSnapshot(firstItem).toMatchInline(`
           Object {
-            "averageResponseTime": 1639,
+            "averageResponseTime": 1638,
             "impact": 0,
             "key": Object {
               "service.name": "opbeans-java",
@@ -78,7 +78,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         expectSnapshot(lastItem).toMatchInline(`
           Object {
-            "averageResponseTime": 5963775,
+            "averageResponseTime": 5918288.44444444,
             "impact": 100,
             "key": Object {
               "service.name": "opbeans-dotnet",
@@ -87,7 +87,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             "serviceName": "opbeans-dotnet",
             "transactionName": "GET Orders/Get",
             "transactionType": "request",
-            "transactionsPerMinute": 0.633333333333333,
+            "transactionsPerMinute": 0.6,
           }
         `);
 
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap
index c4dfaf346d015..878e5775c4ef5 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap
+++ b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap
@@ -6,121 +6,241 @@ Array [
     "x": 1627973400000,
     "y": 0,
   },
+  Object {
+    "x": 1627973430000,
+    "y": 0,
+  },
   Object {
     "x": 1627973460000,
     "y": 0,
   },
   Object {
-    "x": 1627973520000,
+    "x": 1627973490000,
     "y": 0.333333333333333,
   },
+  Object {
+    "x": 1627973520000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627973550000,
+    "y": 0.125,
+  },
   Object {
     "x": 1627973580000,
-    "y": 0.181818181818182,
+    "y": 0.25,
+  },
+  Object {
+    "x": 1627973610000,
+    "y": 0,
   },
   Object {
     "x": 1627973640000,
     "y": 0,
   },
+  Object {
+    "x": 1627973670000,
+    "y": 0,
+  },
   Object {
     "x": 1627973700000,
     "y": 0,
   },
+  Object {
+    "x": 1627973730000,
+    "y": 0.333333333333333,
+  },
   Object {
     "x": 1627973760000,
     "y": 0.166666666666667,
   },
+  Object {
+    "x": 1627973790000,
+    "y": 0,
+  },
   Object {
     "x": 1627973820000,
-    "y": 0.181818181818182,
+    "y": 0.2,
+  },
+  Object {
+    "x": 1627973850000,
+    "y": 0,
   },
   Object {
     "x": 1627973880000,
     "y": 0,
   },
+  Object {
+    "x": 1627973910000,
+    "y": 0,
+  },
   Object {
     "x": 1627973940000,
     "y": 0,
   },
+  Object {
+    "x": 1627973970000,
+    "y": 0.166666666666667,
+  },
   Object {
     "x": 1627974000000,
-    "y": 0.0833333333333333,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974030000,
+    "y": 0,
   },
   Object {
     "x": 1627974060000,
-    "y": 0.0769230769230769,
+    "y": 0.25,
+  },
+  Object {
+    "x": 1627974090000,
+    "y": 0.5,
   },
   Object {
     "x": 1627974120000,
     "y": 0,
   },
+  Object {
+    "x": 1627974150000,
+    "y": 0,
+  },
   Object {
     "x": 1627974180000,
-    "y": 0.1,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974210000,
+    "y": 0.2,
   },
   Object {
     "x": 1627974240000,
-    "y": 0.153846153846154,
+    "y": 0.142857142857143,
+  },
+  Object {
+    "x": 1627974270000,
+    "y": 0,
   },
   Object {
     "x": 1627974300000,
     "y": 0,
   },
+  Object {
+    "x": 1627974330000,
+    "y": null,
+  },
   Object {
     "x": 1627974360000,
     "y": null,
   },
+  Object {
+    "x": 1627974390000,
+    "y": 0,
+  },
   Object {
     "x": 1627974420000,
     "y": 0,
   },
+  Object {
+    "x": 1627974450000,
+    "y": 0,
+  },
   Object {
     "x": 1627974480000,
     "y": 0,
   },
+  Object {
+    "x": 1627974510000,
+    "y": 0,
+  },
   Object {
     "x": 1627974540000,
     "y": 0,
   },
+  Object {
+    "x": 1627974570000,
+    "y": 0,
+  },
   Object {
     "x": 1627974600000,
-    "y": 0.125,
+    "y": 0.4,
+  },
+  Object {
+    "x": 1627974630000,
+    "y": 1,
   },
   Object {
     "x": 1627974660000,
-    "y": 0.6,
+    "y": 0.333333333333333,
+  },
+  Object {
+    "x": 1627974690000,
+    "y": 0.5,
   },
   Object {
     "x": 1627974720000,
-    "y": 0.2,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974750000,
+    "y": 0,
   },
   Object {
     "x": 1627974780000,
     "y": 0,
   },
+  Object {
+    "x": 1627974810000,
+    "y": 0,
+  },
   Object {
     "x": 1627974840000,
+    "y": 0.333333333333333,
+  },
+  Object {
+    "x": 1627974870000,
     "y": 0,
   },
   Object {
     "x": 1627974900000,
-    "y": 0.0666666666666667,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974930000,
+    "y": 0,
   },
   Object {
     "x": 1627974960000,
     "y": 0,
   },
+  Object {
+    "x": 1627974990000,
+    "y": 0,
+  },
   Object {
     "x": 1627975020000,
     "y": 0,
   },
+  Object {
+    "x": 1627975050000,
+    "y": 0,
+  },
   Object {
     "x": 1627975080000,
     "y": 0,
   },
+  Object {
+    "x": 1627975110000,
+    "y": 0.4,
+  },
   Object {
     "x": 1627975140000,
-    "y": 0.181818181818182,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975170000,
+    "y": 0.333333333333333,
   },
   Object {
     "x": 1627975200000,
@@ -132,136 +252,736 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Error rate when data is loaded returns the transaction error rate with comparison data has the correct error rate 1`] = `
 Array [
   Object {
-    "x": 1627974300000,
-    "y": 0,
+    "x": 1627974310000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974320000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974330000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974340000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974350000,
+    "y": null,
   },
   Object {
     "x": 1627974360000,
     "y": null,
   },
+  Object {
+    "x": 1627974370000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974380000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974390000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974400000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974410000,
+    "y": 0,
+  },
   Object {
     "x": 1627974420000,
     "y": 0,
   },
   Object {
-    "x": 1627974480000,
+    "x": 1627974430000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974440000,
     "y": 0,
   },
   Object {
-    "x": 1627974540000,
+    "x": 1627974450000,
     "y": 0,
   },
   Object {
-    "x": 1627974600000,
-    "y": 0.125,
+    "x": 1627974460000,
+    "y": 0,
   },
   Object {
-    "x": 1627974660000,
-    "y": 0.6,
+    "x": 1627974470000,
+    "y": null,
   },
   Object {
-    "x": 1627974720000,
-    "y": 0.2,
+    "x": 1627974480000,
+    "y": 0,
   },
   Object {
-    "x": 1627974780000,
+    "x": 1627974490000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974500000,
     "y": 0,
   },
   Object {
-    "x": 1627974840000,
+    "x": 1627974510000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974520000,
     "y": 0,
   },
   Object {
-    "x": 1627974900000,
-    "y": 0.0666666666666667,
+    "x": 1627974530000,
+    "y": null,
   },
   Object {
-    "x": 1627974960000,
+    "x": 1627974540000,
     "y": 0,
   },
   Object {
-    "x": 1627975020000,
+    "x": 1627974550000,
     "y": 0,
   },
   Object {
-    "x": 1627975080000,
+    "x": 1627974560000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974570000,
     "y": 0,
   },
   Object {
-    "x": 1627975140000,
-    "y": 0.181818181818182,
+    "x": 1627974580000,
+    "y": null,
   },
   Object {
-    "x": 1627975200000,
+    "x": 1627974590000,
     "y": null,
   },
-]
-`;
-
-exports[`APM API tests basic apm_8.0.0 Error rate when data is loaded returns the transaction error rate with comparison data has the correct error rate 2`] = `
-Array [
   Object {
-    "x": 1627974300000,
+    "x": 1627974600000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974610000,
     "y": 0,
   },
   Object {
-    "x": 1627974360000,
+    "x": 1627974620000,
+    "y": 1,
+  },
+  Object {
+    "x": 1627974630000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974640000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974650000,
+    "y": 1,
+  },
+  Object {
+    "x": 1627974660000,
     "y": 0,
   },
   Object {
-    "x": 1627974420000,
-    "y": 0.333333333333333,
+    "x": 1627974670000,
+    "y": 0.5,
   },
   Object {
-    "x": 1627974480000,
-    "y": 0.181818181818182,
+    "x": 1627974680000,
+    "y": null,
   },
   Object {
-    "x": 1627974540000,
+    "x": 1627974690000,
+    "y": 1,
+  },
+  Object {
+    "x": 1627974700000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974710000,
     "y": 0,
   },
   Object {
-    "x": 1627974600000,
+    "x": 1627974720000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974730000,
     "y": 0,
   },
   Object {
-    "x": 1627974660000,
-    "y": 0.166666666666667,
+    "x": 1627974740000,
+    "y": 0,
   },
   Object {
-    "x": 1627974720000,
-    "y": 0.181818181818182,
+    "x": 1627974750000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974760000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974770000,
+    "y": 0,
   },
   Object {
     "x": 1627974780000,
     "y": 0,
   },
+  Object {
+    "x": 1627974790000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974800000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974810000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974820000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974830000,
+    "y": null,
+  },
   Object {
     "x": 1627974840000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974850000,
+    "y": 0.5,
+  },
+  Object {
+    "x": 1627974860000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974870000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974880000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974890000,
     "y": 0,
   },
   Object {
     "x": 1627974900000,
-    "y": 0.0833333333333333,
+    "y": 0,
   },
   Object {
-    "x": 1627974960000,
-    "y": 0.0769230769230769,
+    "x": 1627974910000,
+    "y": 0,
   },
   Object {
-    "x": 1627975020000,
+    "x": 1627974920000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974930000,
     "y": 0,
   },
   Object {
-    "x": 1627975080000,
-    "y": 0.1,
+    "x": 1627974940000,
+    "y": null,
   },
   Object {
-    "x": 1627975140000,
-    "y": 0.153846153846154,
+    "x": 1627974950000,
+    "y": null,
   },
   Object {
-    "x": 1627975200000,
+    "x": 1627974960000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974970000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974980000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974990000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975000000,
+    "y": null,
+  },
+  Object {
+    "x": 1627975010000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975020000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975030000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975040000,
+    "y": null,
+  },
+  Object {
+    "x": 1627975050000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975060000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975070000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975080000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975090000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975100000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975110000,
+    "y": 0.333333333333333,
+  },
+  Object {
+    "x": 1627975120000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975130000,
+    "y": 1,
+  },
+  Object {
+    "x": 1627975140000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975150000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975160000,
+    "y": null,
+  },
+  Object {
+    "x": 1627975170000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975180000,
+    "y": 0.25,
+  },
+  Object {
+    "x": 1627975190000,
+    "y": 1,
+  },
+  Object {
+    "x": 1627975200000,
+    "y": null,
+  },
+  Object {
+    "x": 1627975210000,
+    "y": null,
+  },
+]
+`;
+
+exports[`APM API tests basic apm_8.0.0 Error rate when data is loaded returns the transaction error rate with comparison data has the correct error rate 2`] = `
+Array [
+  Object {
+    "x": 1627974310000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974320000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974330000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974340000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974350000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974360000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974370000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974380000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974390000,
+    "y": 0.5,
+  },
+  Object {
+    "x": 1627974400000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974410000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974420000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974430000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974440000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974450000,
+    "y": 0.142857142857143,
+  },
+  Object {
+    "x": 1627974460000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974470000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974480000,
+    "y": 0.5,
+  },
+  Object {
+    "x": 1627974490000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974500000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974510000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974520000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974530000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974540000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974550000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974560000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974570000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974580000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974590000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974600000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974610000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974620000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974630000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974640000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974650000,
+    "y": 0.5,
+  },
+  Object {
+    "x": 1627974660000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974670000,
+    "y": 0.5,
+  },
+  Object {
+    "x": 1627974680000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974690000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974700000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974710000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974720000,
+    "y": 0.25,
+  },
+  Object {
+    "x": 1627974730000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974740000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974750000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974760000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974770000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974780000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974790000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974800000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974810000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974820000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974830000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974840000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974850000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974860000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974870000,
+    "y": 0.5,
+  },
+  Object {
+    "x": 1627974880000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974890000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974900000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974910000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974920000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974930000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974940000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974950000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974960000,
+    "y": 0.333333333333333,
+  },
+  Object {
+    "x": 1627974970000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627974980000,
+    "y": null,
+  },
+  Object {
+    "x": 1627974990000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975000000,
+    "y": 1,
+  },
+  Object {
+    "x": 1627975010000,
+    "y": null,
+  },
+  Object {
+    "x": 1627975020000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975030000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975040000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975050000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975060000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975070000,
+    "y": null,
+  },
+  Object {
+    "x": 1627975080000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975090000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975100000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975110000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975120000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975130000,
+    "y": 0.333333333333333,
+  },
+  Object {
+    "x": 1627975140000,
+    "y": 0.333333333333333,
+  },
+  Object {
+    "x": 1627975150000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975160000,
+    "y": null,
+  },
+  Object {
+    "x": 1627975170000,
+    "y": null,
+  },
+  Object {
+    "x": 1627975180000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975190000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975200000,
+    "y": 0,
+  },
+  Object {
+    "x": 1627975210000,
     "y": null,
   },
 ]
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/latency.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/latency.snap
index ff9e52b57aeaa..25b995acb87f1 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/latency.snap
+++ b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/latency.snap
@@ -3,64 +3,196 @@
 exports[`APM API tests basic apm_8.0.0 Latency with a basic license when data is loaded time comparison returns some data 1`] = `
 Array [
   Object {
-    "x": 1627974300000,
-    "y": 22799,
+    "x": 1627974350000,
+    "y": 32153,
   },
   Object {
-    "x": 1627974360000,
-    "y": 3227391,
+    "x": 1627974390000,
+    "y": 15341.3333333333,
+  },
+  Object {
+    "x": 1627974410000,
+    "y": 15170.5,
   },
   Object {
     "x": 1627974420000,
-    "y": 15565.2222222222,
+    "y": 17329,
+  },
+  Object {
+    "x": 1627974460000,
+    "y": 50039,
   },
   Object {
     "x": 1627974480000,
-    "y": 54307.5714285714,
+    "y": 55816.6,
+  },
+  Object {
+    "x": 1627974490000,
+    "y": 17533,
+  },
+  Object {
+    "x": 1627974510000,
+    "y": 14888,
   },
   Object {
     "x": 1627974540000,
-    "y": 16655,
+    "y": 12191.5,
+  },
+  Object {
+    "x": 1627974550000,
+    "y": 20445.5,
+  },
+  Object {
+    "x": 1627974590000,
+    "y": 9859,
   },
   Object {
     "x": 1627974600000,
-    "y": 9453,
+    "y": 11796,
+  },
+  Object {
+    "x": 1627974610000,
+    "y": 8774.4,
+  },
+  Object {
+    "x": 1627974620000,
+    "y": 42225.6666666667,
+  },
+  Object {
+    "x": 1627974630000,
+    "y": 16168,
+  },
+  Object {
+    "x": 1627974640000,
+    "y": 7851.33333333333,
   },
   Object {
     "x": 1627974660000,
-    "y": 31119,
+    "y": 45852,
   },
   Object {
-    "x": 1627974720000,
-    "y": 15282.2,
+    "x": 1627974700000,
+    "y": 21823,
+  },
+  Object {
+    "x": 1627974710000,
+    "y": 4156,
+  },
+  Object {
+    "x": 1627974730000,
+    "y": 14191.5,
+  },
+  Object {
+    "x": 1627974740000,
+    "y": 3997,
+  },
+  Object {
+    "x": 1627974750000,
+    "y": 21823.75,
+  },
+  Object {
+    "x": 1627974760000,
+    "y": 58178.5,
+  },
+  Object {
+    "x": 1627974770000,
+    "y": 24291.5,
   },
   Object {
     "x": 1627974780000,
-    "y": 18709,
+    "y": 7527.75,
   },
   Object {
     "x": 1627974840000,
-    "y": 12095,
+    "y": 12028,
   },
   Object {
-    "x": 1627974900000,
-    "y": 16291,
+    "x": 1627974860000,
+    "y": 6773.8,
   },
   Object {
-    "x": 1627974960000,
-    "y": 13444.3333333333,
+    "x": 1627974870000,
+    "y": 37030,
   },
   Object {
-    "x": 1627975020000,
-    "y": 13241.6666666667,
+    "x": 1627974890000,
+    "y": 29564,
+  },
+  Object {
+    "x": 1627974910000,
+    "y": 15606,
+  },
+  Object {
+    "x": 1627974930000,
+    "y": 11747,
+  },
+  Object {
+    "x": 1627974940000,
+    "y": 9425,
+  },
+  Object {
+    "x": 1627974950000,
+    "y": 20220,
+  },
+  Object {
+    "x": 1627975000000,
+    "y": 12995.5,
+  },
+  Object {
+    "x": 1627975030000,
+    "y": 13606,
+  },
+  Object {
+    "x": 1627975050000,
+    "y": 22030,
+  },
+  Object {
+    "x": 1627975060000,
+    "y": 10819,
+  },
+  Object {
+    "x": 1627975070000,
+    "y": 26343,
   },
   Object {
     "x": 1627975080000,
-    "y": 25535,
+    "y": 33080.5,
   },
   Object {
-    "x": 1627975140000,
-    "y": 11024.6,
+    "x": 1627975090000,
+    "y": 11899,
+  },
+  Object {
+    "x": 1627975100000,
+    "y": 5253,
+  },
+  Object {
+    "x": 1627975110000,
+    "y": 16502,
+  },
+  Object {
+    "x": 1627975120000,
+    "y": 6945.5,
+  },
+  Object {
+    "x": 1627975130000,
+    "y": 7244,
+  },
+  Object {
+    "x": 1627975150000,
+    "y": 22631.5,
+  },
+  Object {
+    "x": 1627975180000,
+    "y": 23489,
+  },
+  Object {
+    "x": 1627975190000,
+    "y": 10133.3333333333,
+  },
+  Object {
+    "x": 1627975210000,
+    "y": 52108,
   },
 ]
 `;
@@ -68,64 +200,200 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Latency with a basic license when data is loaded time comparison returns some data 2`] = `
 Array [
   Object {
-    "x": 1627974300000,
-    "y": 34866.2,
+    "x": 1627974310000,
+    "y": 107053.5,
   },
   Object {
-    "x": 1627974360000,
-    "y": 104799,
+    "x": 1627974370000,
+    "y": 9857,
   },
   Object {
-    "x": 1627974420000,
-    "y": 36247,
+    "x": 1627974380000,
+    "y": 266341,
+  },
+  Object {
+    "x": 1627974390000,
+    "y": 11715.75,
+  },
+  Object {
+    "x": 1627974410000,
+    "y": 7805.25,
+  },
+  Object {
+    "x": 1627974430000,
+    "y": 15880,
+  },
+  Object {
+    "x": 1627974460000,
+    "y": 21836,
+  },
+  Object {
+    "x": 1627974470000,
+    "y": 23962,
   },
   Object {
     "x": 1627974480000,
-    "y": 22207,
+    "y": 21352.5,
   },
   Object {
-    "x": 1627974540000,
-    "y": 80191,
+    "x": 1627974490000,
+    "y": 21639,
   },
   Object {
-    "x": 1627974600000,
-    "y": 11520.4545454545,
+    "x": 1627974530000,
+    "y": 13970,
+  },
+  Object {
+    "x": 1627974550000,
+    "y": 58140,
+  },
+  Object {
+    "x": 1627974570000,
+    "y": 9853.75,
+  },
+  Object {
+    "x": 1627974580000,
+    "y": 6490,
+  },
+  Object {
+    "x": 1627974590000,
+    "y": 18894,
+  },
+  Object {
+    "x": 1627974610000,
+    "y": 14125,
+  },
+  Object {
+    "x": 1627974640000,
+    "y": 86268.25,
   },
   Object {
     "x": 1627974660000,
-    "y": 47031.8888888889,
+    "y": 14218,
+  },
+  Object {
+    "x": 1627974670000,
+    "y": 19127,
+  },
+  Object {
+    "x": 1627974680000,
+    "y": 31538,
   },
   Object {
     "x": 1627974720000,
-    "y": 30249.6666666667,
+    "y": 29535,
   },
   Object {
-    "x": 1627974780000,
-    "y": 14868.3333333333,
+    "x": 1627974740000,
+    "y": 11229,
+  },
+  Object {
+    "x": 1627974750000,
+    "y": 23940,
+  },
+  Object {
+    "x": 1627974760000,
+    "y": 9262,
+  },
+  Object {
+    "x": 1627974790000,
+    "y": 15650,
   },
   Object {
     "x": 1627974840000,
-    "y": 17199,
+    "y": 17656.3333333333,
+  },
+  Object {
+    "x": 1627974880000,
+    "y": 8371.5,
+  },
+  Object {
+    "x": 1627974890000,
+    "y": 11386.5,
   },
   Object {
     "x": 1627974900000,
-    "y": 19837.2222222222,
+    "y": 28923.75,
+  },
+  Object {
+    "x": 1627974910000,
+    "y": 22670,
+  },
+  Object {
+    "x": 1627974920000,
+    "y": 13607.6666666667,
+  },
+  Object {
+    "x": 1627974930000,
+    "y": 19640,
+  },
+  Object {
+    "x": 1627974940000,
+    "y": 20511,
   },
   Object {
     "x": 1627974960000,
-    "y": 19397.6666666667,
+    "y": 34862,
+  },
+  Object {
+    "x": 1627974990000,
+    "y": 27929.2,
   },
   Object {
     "x": 1627975020000,
-    "y": 22473.6666666667,
+    "y": 25569,
+  },
+  Object {
+    "x": 1627975030000,
+    "y": 6817.33333333333,
+  },
+  Object {
+    "x": 1627975040000,
+    "y": 10467.6666666667,
+  },
+  Object {
+    "x": 1627975060000,
+    "y": 6754.33333333333,
+  },
+  Object {
+    "x": 1627975070000,
+    "y": 22049,
   },
   Object {
     "x": 1627975080000,
-    "y": 11362.2,
+    "y": 15029,
+  },
+  Object {
+    "x": 1627975090000,
+    "y": 14744,
+  },
+  Object {
+    "x": 1627975110000,
+    "y": 32192.3333333333,
+  },
+  Object {
+    "x": 1627975130000,
+    "y": 8321,
+  },
+  Object {
+    "x": 1627975160000,
+    "y": 11648,
+  },
+  Object {
+    "x": 1627975170000,
+    "y": 13157,
+  },
+  Object {
+    "x": 1627975190000,
+    "y": 12855,
+  },
+  Object {
+    "x": 1627975200000,
+    "y": 1322026.8,
   },
   Object {
-    "x": 1627975140000,
-    "y": 26319,
+    "x": 1627975210000,
+    "y": 4650.33333333333,
   },
 ]
 `;
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transactions_groups_detailed_statistics.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transactions_groups_detailed_statistics.snap
deleted file mode 100644
index 0c9bbb378f74c..0000000000000
--- a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transactions_groups_detailed_statistics.snap
+++ /dev/null
@@ -1,931 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns data with previous period returns correct error rate data 1`] = `
-Array [
-  Object {
-    "x": 1627974300000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974360000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974420000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974480000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974540000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974600000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974660000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974720000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974780000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974840000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974900000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974960000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975020000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975080000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627975140000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975200000,
-    "y": null,
-  },
-]
-`;
-
-exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns data with previous period returns correct error rate data 2`] = `
-Array [
-  Object {
-    "x": 1627974300000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974360000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974420000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627974480000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974540000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974600000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974660000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974720000,
-    "y": 0.25,
-  },
-  Object {
-    "x": 1627974780000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974840000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974900000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974960000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627975020000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627975080000,
-    "y": 0.5,
-  },
-  Object {
-    "x": 1627975140000,
-    "y": 0.25,
-  },
-  Object {
-    "x": 1627975200000,
-    "y": null,
-  },
-]
-`;
-
-exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns data with previous period returns correct latency data 1`] = `
-Array [
-  Object {
-    "x": 1627974300000,
-    "y": 72303,
-  },
-  Object {
-    "x": 1627974360000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974420000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974480000,
-    "y": 173055,
-  },
-  Object {
-    "x": 1627974540000,
-    "y": 26687,
-  },
-  Object {
-    "x": 1627974600000,
-    "y": 17867.8,
-  },
-  Object {
-    "x": 1627974660000,
-    "y": 24319,
-  },
-  Object {
-    "x": 1627974720000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974780000,
-    "y": 15743,
-  },
-  Object {
-    "x": 1627974840000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974900000,
-    "y": 31679,
-  },
-  Object {
-    "x": 1627974960000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975020000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975080000,
-    "y": 14391,
-  },
-  Object {
-    "x": 1627975140000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975200000,
-    "y": null,
-  },
-]
-`;
-
-exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns data with previous period returns correct latency data 2`] = `
-Array [
-  Object {
-    "x": 1627974300000,
-    "y": 34047,
-  },
-  Object {
-    "x": 1627974360000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974420000,
-    "y": 5767167,
-  },
-  Object {
-    "x": 1627974480000,
-    "y": 10335,
-  },
-  Object {
-    "x": 1627974540000,
-    "y": 118015,
-  },
-  Object {
-    "x": 1627974600000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974660000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974720000,
-    "y": 1371695,
-  },
-  Object {
-    "x": 1627974780000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974840000,
-    "y": 3769087,
-  },
-  Object {
-    "x": 1627974900000,
-    "y": 19015,
-  },
-  Object {
-    "x": 1627974960000,
-    "y": 22356.3333333333,
-  },
-  Object {
-    "x": 1627975020000,
-    "y": 28447,
-  },
-  Object {
-    "x": 1627975080000,
-    "y": 33434367,
-  },
-  Object {
-    "x": 1627975140000,
-    "y": 23407,
-  },
-  Object {
-    "x": 1627975200000,
-    "y": null,
-  },
-]
-`;
-
-exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns data with previous period returns correct throughput data 1`] = `
-Array [
-  Object {
-    "x": 1627974300000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627974360000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974420000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974480000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627974540000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627974600000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627974660000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627974720000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974780000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627974840000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974900000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627974960000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627975020000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627975080000,
-    "y": 4,
-  },
-  Object {
-    "x": 1627975140000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627975200000,
-    "y": 0,
-  },
-]
-`;
-
-exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns data with previous period returns correct throughput data 2`] = `
-Array [
-  Object {
-    "x": 1627974300000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627974360000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974420000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627974480000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627974540000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627974600000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974660000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974720000,
-    "y": 3,
-  },
-  Object {
-    "x": 1627974780000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974840000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627974900000,
-    "y": 3,
-  },
-  Object {
-    "x": 1627974960000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627975020000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627975080000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627975140000,
-    "y": 3,
-  },
-  Object {
-    "x": 1627975200000,
-    "y": 0,
-  },
-]
-`;
-
-exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns the correct data 1`] = `
-Array [
-  Object {
-    "x": 1627973400000,
-    "y": 34047,
-  },
-  Object {
-    "x": 1627973460000,
-    "y": null,
-  },
-  Object {
-    "x": 1627973520000,
-    "y": 5767167,
-  },
-  Object {
-    "x": 1627973580000,
-    "y": 10335,
-  },
-  Object {
-    "x": 1627973640000,
-    "y": 118015,
-  },
-  Object {
-    "x": 1627973700000,
-    "y": null,
-  },
-  Object {
-    "x": 1627973760000,
-    "y": null,
-  },
-  Object {
-    "x": 1627973820000,
-    "y": 1371695,
-  },
-  Object {
-    "x": 1627973880000,
-    "y": null,
-  },
-  Object {
-    "x": 1627973940000,
-    "y": 3769087,
-  },
-  Object {
-    "x": 1627974000000,
-    "y": 19015,
-  },
-  Object {
-    "x": 1627974060000,
-    "y": 22356.3333333333,
-  },
-  Object {
-    "x": 1627974120000,
-    "y": 28447,
-  },
-  Object {
-    "x": 1627974180000,
-    "y": 33434367,
-  },
-  Object {
-    "x": 1627974240000,
-    "y": 23407,
-  },
-  Object {
-    "x": 1627974300000,
-    "y": 72303,
-  },
-  Object {
-    "x": 1627974360000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974420000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974480000,
-    "y": 173055,
-  },
-  Object {
-    "x": 1627974540000,
-    "y": 26687,
-  },
-  Object {
-    "x": 1627974600000,
-    "y": 17867.8,
-  },
-  Object {
-    "x": 1627974660000,
-    "y": 24319,
-  },
-  Object {
-    "x": 1627974720000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974780000,
-    "y": 15743,
-  },
-  Object {
-    "x": 1627974840000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974900000,
-    "y": 31679,
-  },
-  Object {
-    "x": 1627974960000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975020000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975080000,
-    "y": 14391,
-  },
-  Object {
-    "x": 1627975140000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975200000,
-    "y": null,
-  },
-]
-`;
-
-exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns the correct data 2`] = `
-Array [
-  Object {
-    "x": 1627973400000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627973460000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627973520000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627973580000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627973640000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627973700000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627973760000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627973820000,
-    "y": 3,
-  },
-  Object {
-    "x": 1627973880000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627973940000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627974000000,
-    "y": 3,
-  },
-  Object {
-    "x": 1627974060000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627974120000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627974180000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627974240000,
-    "y": 3,
-  },
-  Object {
-    "x": 1627974300000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627974360000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974420000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974480000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627974540000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627974600000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627974660000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627974720000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974780000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627974840000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974900000,
-    "y": 2,
-  },
-  Object {
-    "x": 1627974960000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627975020000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627975080000,
-    "y": 4,
-  },
-  Object {
-    "x": 1627975140000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627975200000,
-    "y": 0,
-  },
-]
-`;
-
-exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns the correct data 3`] = `
-Array [
-  Object {
-    "x": 1627973400000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627973460000,
-    "y": null,
-  },
-  Object {
-    "x": 1627973520000,
-    "y": 1,
-  },
-  Object {
-    "x": 1627973580000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627973640000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627973700000,
-    "y": null,
-  },
-  Object {
-    "x": 1627973760000,
-    "y": null,
-  },
-  Object {
-    "x": 1627973820000,
-    "y": 0.25,
-  },
-  Object {
-    "x": 1627973880000,
-    "y": null,
-  },
-  Object {
-    "x": 1627973940000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974000000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974060000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974120000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974180000,
-    "y": 0.5,
-  },
-  Object {
-    "x": 1627974240000,
-    "y": 0.25,
-  },
-  Object {
-    "x": 1627974300000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974360000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974420000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974480000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974540000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974600000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974660000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974720000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974780000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974840000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974900000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627974960000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975020000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975080000,
-    "y": 0,
-  },
-  Object {
-    "x": 1627975140000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975200000,
-    "y": null,
-  },
-]
-`;
-
-exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns the correct data for latency aggregation 99th percentile 1`] = `
-Array [
-  Object {
-    "x": 1627973400000,
-    "y": 34047,
-  },
-  Object {
-    "x": 1627973460000,
-    "y": null,
-  },
-  Object {
-    "x": 1627973520000,
-    "y": 5767167,
-  },
-  Object {
-    "x": 1627973580000,
-    "y": 16127,
-  },
-  Object {
-    "x": 1627973640000,
-    "y": 214015,
-  },
-  Object {
-    "x": 1627973700000,
-    "y": null,
-  },
-  Object {
-    "x": 1627973760000,
-    "y": null,
-  },
-  Object {
-    "x": 1627973820000,
-    "y": 5439487,
-  },
-  Object {
-    "x": 1627973880000,
-    "y": null,
-  },
-  Object {
-    "x": 1627973940000,
-    "y": 5668863,
-  },
-  Object {
-    "x": 1627974000000,
-    "y": 32255,
-  },
-  Object {
-    "x": 1627974060000,
-    "y": 28159,
-  },
-  Object {
-    "x": 1627974120000,
-    "y": 44287,
-  },
-  Object {
-    "x": 1627974180000,
-    "y": 66846719,
-  },
-  Object {
-    "x": 1627974240000,
-    "y": 42751,
-  },
-  Object {
-    "x": 1627974300000,
-    "y": 140287,
-  },
-  Object {
-    "x": 1627974360000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974420000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974480000,
-    "y": 173055,
-  },
-  Object {
-    "x": 1627974540000,
-    "y": 28927,
-  },
-  Object {
-    "x": 1627974600000,
-    "y": 39679,
-  },
-  Object {
-    "x": 1627974660000,
-    "y": 24319,
-  },
-  Object {
-    "x": 1627974720000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974780000,
-    "y": 15743,
-  },
-  Object {
-    "x": 1627974840000,
-    "y": null,
-  },
-  Object {
-    "x": 1627974900000,
-    "y": 33791,
-  },
-  Object {
-    "x": 1627974960000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975020000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975080000,
-    "y": 23167,
-  },
-  Object {
-    "x": 1627975140000,
-    "y": null,
-  },
-  Object {
-    "x": 1627975200000,
-    "y": null,
-  },
-]
-`;
diff --git a/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts b/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts
index 2ddaa4677394c..89f818f58e875 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts
@@ -117,13 +117,13 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         it('has the correct number of buckets', () => {
           expectSnapshot(errorRateResponse.currentPeriod.transactionErrorRate.length).toMatchInline(
-            `31`
+            `61`
           );
         });
 
         it('has the correct calculation for average', () => {
           expectSnapshot(errorRateResponse.currentPeriod.average).toMatchInline(
-            `0.0848214285714286`
+            `0.092511013215859`
           );
         });
 
@@ -175,12 +175,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             new Date(
               first(errorRateResponse.currentPeriod.transactionErrorRate)?.x ?? NaN
             ).toISOString()
-          ).toMatchInline(`"2021-08-03T07:05:00.000Z"`);
+          ).toMatchInline(`"2021-08-03T07:05:10.000Z"`);
           expectSnapshot(
             new Date(
               first(errorRateResponse.previousPeriod.transactionErrorRate)?.x ?? NaN
             ).toISOString()
-          ).toMatchInline(`"2021-08-03T07:05:00.000Z"`);
+          ).toMatchInline(`"2021-08-03T07:05:10.000Z"`);
         });
 
         it('has the correct end date', () => {
@@ -188,29 +188,29 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             new Date(
               last(errorRateResponse.currentPeriod.transactionErrorRate)?.x ?? NaN
             ).toISOString()
-          ).toMatchInline(`"2021-08-03T07:20:00.000Z"`);
+          ).toMatchInline(`"2021-08-03T07:20:10.000Z"`);
           expectSnapshot(
             new Date(
               last(errorRateResponse.previousPeriod.transactionErrorRate)?.x ?? NaN
             ).toISOString()
-          ).toMatchInline(`"2021-08-03T07:20:00.000Z"`);
+          ).toMatchInline(`"2021-08-03T07:20:10.000Z"`);
         });
 
         it('has the correct number of buckets', () => {
           expectSnapshot(errorRateResponse.currentPeriod.transactionErrorRate.length).toMatchInline(
-            `16`
+            `91`
           );
           expectSnapshot(
             errorRateResponse.previousPeriod.transactionErrorRate.length
-          ).toMatchInline(`16`);
+          ).toMatchInline(`91`);
         });
 
         it('has the correct calculation for average', () => {
           expectSnapshot(errorRateResponse.currentPeriod.average).toMatchInline(
-            `0.0792079207920792`
+            `0.102040816326531`
           );
           expectSnapshot(errorRateResponse.previousPeriod.average).toMatchInline(
-            `0.0894308943089431`
+            `0.0852713178294574`
           );
         });
 
diff --git a/x-pack/test/apm_api_integration/tests/transactions/latency.ts b/x-pack/test/apm_api_integration/tests/transactions/latency.ts
index beaff7647868a..d021e59ecff6c 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/latency.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/latency.ts
@@ -113,7 +113,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           expect(response.status).to.be(200);
           const latencyChartReturn = response.body as LatencyChartReturnType;
           expect(latencyChartReturn.currentPeriod.overallAvgDuration).not.to.be(null);
-          expect(latencyChartReturn.currentPeriod.latencyTimeseries.length).to.be.eql(31);
+          expect(latencyChartReturn.currentPeriod.latencyTimeseries.length).to.be.eql(61);
         });
       });
 
@@ -138,7 +138,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           expect(response.status).to.be(200);
           const latencyChartReturn = response.body as LatencyChartReturnType;
           expect(latencyChartReturn.currentPeriod.overallAvgDuration).not.to.be(null);
-          expect(latencyChartReturn.currentPeriod.latencyTimeseries.length).to.be.eql(31);
+          expect(latencyChartReturn.currentPeriod.latencyTimeseries.length).to.be.eql(61);
         });
       });
 
@@ -165,10 +165,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
           expect(latencyChartReturn.currentPeriod.overallAvgDuration).not.to.be(null);
           expectSnapshot(latencyChartReturn.currentPeriod.overallAvgDuration).toMatchInline(
-            `53906.6603773585`
+            `53147.5747663551`
           );
 
-          expect(latencyChartReturn.currentPeriod.latencyTimeseries.length).to.be.eql(31);
+          expect(latencyChartReturn.currentPeriod.latencyTimeseries.length).to.be.eql(61);
         });
       });
 
diff --git a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts
index add954f490db1..100d3c306b7de 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts
@@ -4,293 +4,247 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import { service, timerange } from '@elastic/apm-generator';
 import expect from '@kbn/expect';
-import url from 'url';
+import { first, isEmpty, last, meanBy } from 'lodash';
 import moment from 'moment';
-import { pick } from 'lodash';
+import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
+import { asPercent } from '../../../../plugins/apm/common/utils/formatters';
 import { APIReturnType } from '../../../../plugins/apm/public/services/rest/createCallApmApi';
-import archives from '../../common/fixtures/es_archiver/archives_metadata';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { registry } from '../../common/registry';
-import { removeEmptyCoordinates, roundNumber } from '../../utils';
+import { roundNumber } from '../../utils';
 
 type TransactionsGroupsDetailedStatistics =
   APIReturnType<'GET /internal/apm/services/{serviceName}/transactions/groups/detailed_statistics'>;
 
 export default function ApiTest({ getService }: FtrProviderContext) {
-  const supertest = getService('legacySupertestAsApmReadUser');
-
-  const archiveName = 'apm_8.0.0';
-  const { start, end } = archives[archiveName];
-  const transactionNames = ['DispatcherServlet#doGet', 'APIRestController#customers'];
+  const apmApiClient = getService('apmApiClient');
+  const traceData = getService('traceData');
+
+  const serviceName = 'synth-go';
+  const start = new Date('2021-01-01T00:00:00.000Z').getTime();
+  const end = new Date('2021-01-01T00:15:59.999Z').getTime();
+  const transactionNames = ['GET /api/product/list'];
+
+  async function callApi(overrides?: {
+    path?: {
+      serviceName?: string;
+    };
+    query?: {
+      start?: string;
+      end?: string;
+      transactionType?: string;
+      environment?: string;
+      kuery?: string;
+      comparisonStart?: string;
+      comparisonEnd?: string;
+      transactionNames?: string;
+      latencyAggregationType?: LatencyAggregationType;
+      numBuckets?: number;
+    };
+  }) {
+    const response = await apmApiClient.readUser({
+      endpoint: 'GET /internal/apm/services/{serviceName}/transactions/groups/detailed_statistics',
+      params: {
+        path: { serviceName, ...overrides?.path },
+        query: {
+          start: new Date(start).toISOString(),
+          end: new Date(end).toISOString(),
+          numBuckets: 20,
+          transactionType: 'request',
+          latencyAggregationType: 'avg' as LatencyAggregationType,
+          transactionNames: JSON.stringify(transactionNames),
+          environment: 'ENVIRONMENT_ALL',
+          kuery: '',
+          ...overrides?.query,
+        },
+      },
+    });
+    expect(response.status).to.be(200);
+    return response.body;
+  }
 
   registry.when(
     'Transaction groups detailed statistics when data is not loaded',
     { config: 'basic', archives: [] },
     () => {
       it('handles the empty state', async () => {
-        const response = await supertest.get(
-          url.format({
-            pathname: `/internal/apm/services/opbeans-java/transactions/groups/detailed_statistics`,
-            query: {
-              start,
-              end,
-              numBuckets: 20,
-              latencyAggregationType: 'avg',
-              transactionType: 'request',
-              transactionNames: JSON.stringify(transactionNames),
-              environment: 'ENVIRONMENT_ALL',
-              kuery: '',
-            },
-          })
-        );
-
-        expect(response.status).to.be(200);
-        expect(response.body).to.be.eql({ currentPeriod: {}, previousPeriod: {} });
+        const response = await callApi();
+        expect(response).to.be.eql({ currentPeriod: {}, previousPeriod: {} });
       });
     }
   );
 
-  registry.when(
-    'Transaction groups detailed statistics when data is loaded',
-    { config: 'basic', archives: [archiveName] },
-    () => {
-      it('returns the correct data', async () => {
-        const response = await supertest.get(
-          url.format({
-            pathname: `/internal/apm/services/opbeans-java/transactions/groups/detailed_statistics`,
-            query: {
-              start,
-              end,
-              numBuckets: 20,
-              transactionType: 'request',
-              latencyAggregationType: 'avg',
-              transactionNames: JSON.stringify(transactionNames),
-              environment: 'ENVIRONMENT_ALL',
-              kuery: '',
-            },
-          })
+  registry.when('data is loaded', { config: 'basic', archives: ['apm_8.0.0_empty'] }, () => {
+    describe('transactions groups detailed stats', () => {
+      const GO_PROD_RATE = 75;
+      const GO_PROD_ERROR_RATE = 25;
+      before(async () => {
+        const serviceGoProdInstance = service(serviceName, 'production', 'go').instance(
+          'instance-a'
         );
 
-        expect(response.status).to.be(200);
-
-        const { currentPeriod, previousPeriod } =
-          response.body as TransactionsGroupsDetailedStatistics;
-
-        expect(Object.keys(currentPeriod).sort()).to.be.eql(transactionNames.sort());
-
-        const currentPeriodItems = Object.values(currentPeriod);
-        const previousPeriodItems = Object.values(previousPeriod);
-
-        expect(previousPeriodItems.length).to.be.eql(0);
-
-        transactionNames.forEach((transactionName) => {
-          expect(currentPeriod[transactionName]).not.to.be.empty();
-        });
-
-        const firstItem = currentPeriodItems[0];
-        const { latency, throughput, errorRate, impact } = pick(
-          firstItem,
-          'latency',
-          'throughput',
-          'errorRate',
-          'impact'
-        );
-
-        expect(removeEmptyCoordinates(latency).length).to.be.greaterThan(0);
-        expectSnapshot(latency).toMatch();
-
-        expect(removeEmptyCoordinates(throughput).length).to.be.greaterThan(0);
-        expectSnapshot(throughput).toMatch();
-
-        expect(removeEmptyCoordinates(errorRate).length).to.be.greaterThan(0);
-        expectSnapshot(errorRate).toMatch();
-
-        expectSnapshot(roundNumber(impact)).toMatchInline(`"98.49"`);
+        const transactionName = 'GET /api/product/list';
+
+        await traceData.index([
+          ...timerange(start, end)
+            .interval('1m')
+            .rate(GO_PROD_RATE)
+            .flatMap((timestamp) =>
+              serviceGoProdInstance
+                .transaction(transactionName)
+                .timestamp(timestamp)
+                .duration(1000)
+                .success()
+                .serialize()
+            ),
+          ...timerange(start, end)
+            .interval('1m')
+            .rate(GO_PROD_ERROR_RATE)
+            .flatMap((timestamp) =>
+              serviceGoProdInstance
+                .transaction(transactionName)
+                .duration(1000)
+                .timestamp(timestamp)
+                .failure()
+                .serialize()
+            ),
+        ]);
       });
 
-      it('returns the correct data for latency aggregation 99th percentile', async () => {
-        const response = await supertest.get(
-          url.format({
-            pathname: `/internal/apm/services/opbeans-java/transactions/groups/detailed_statistics`,
-            query: {
-              start,
-              end,
-              numBuckets: 20,
-              transactionType: 'request',
-              latencyAggregationType: 'p99',
-              transactionNames: JSON.stringify(transactionNames),
-              environment: 'ENVIRONMENT_ALL',
-              kuery: '',
-            },
-          })
-        );
-
-        expect(response.status).to.be(200);
-
-        const { currentPeriod, previousPeriod } =
-          response.body as TransactionsGroupsDetailedStatistics;
+      after(() => traceData.clean());
 
-        expect(Object.keys(currentPeriod).sort()).to.be.eql(transactionNames.sort());
-
-        const currentPeriodItems = Object.values(currentPeriod);
-        const previousPeriodItems = Object.values(previousPeriod);
-
-        expect(previousPeriodItems).to.be.empty();
-
-        transactionNames.forEach((transactionName) => {
-          expect(currentPeriod[transactionName]).not.to.be.empty();
+      describe('without comparisons', () => {
+        let transactionsStatistics: TransactionsGroupsDetailedStatistics;
+        let metricsStatistics: TransactionsGroupsDetailedStatistics;
+        before(async () => {
+          [metricsStatistics, transactionsStatistics] = await Promise.all([
+            callApi({ query: { kuery: 'processor.event : "metric"' } }),
+            callApi({ query: { kuery: 'processor.event : "transaction"' } }),
+          ]);
         });
 
-        const firstItem = currentPeriodItems[0];
-        const { latency, throughput, errorRate } = pick(
-          firstItem,
-          'latency',
-          'throughput',
-          'errorRate'
-        );
-
-        expect(removeEmptyCoordinates(latency).length).to.be.greaterThan(0);
-        expectSnapshot(latency).toMatch();
-
-        expect(removeEmptyCoordinates(throughput).length).to.be.greaterThan(0);
-        expect(removeEmptyCoordinates(errorRate).length).to.be.greaterThan(0);
-      });
-
-      it('returns empty when transaction name is not found', async () => {
-        const response = await supertest.get(
-          url.format({
-            pathname: `/internal/apm/services/opbeans-java/transactions/groups/detailed_statistics`,
-            query: {
-              start,
-              end,
-              numBuckets: 20,
-              transactionType: 'request',
-              latencyAggregationType: 'avg',
-              transactionNames: JSON.stringify(['foo']),
-              environment: 'ENVIRONMENT_ALL',
-              kuery: '',
-            },
-          })
-        );
+        it('returns some transactions data', () => {
+          expect(isEmpty(transactionsStatistics.currentPeriod)).to.be.equal(false);
+        });
 
-        expect(response.status).to.be(200);
-        expect(response.body).to.be.eql({ currentPeriod: {}, previousPeriod: {} });
-      });
+        it('returns some metrics data', () => {
+          expect(isEmpty(metricsStatistics.currentPeriod)).to.be.equal(false);
+        });
 
-      describe('returns data with previous period', async () => {
-        let currentPeriod: TransactionsGroupsDetailedStatistics['currentPeriod'];
-        let previousPeriod: TransactionsGroupsDetailedStatistics['previousPeriod'];
-        before(async () => {
-          const response = await supertest.get(
-            url.format({
-              pathname: `/internal/apm/services/opbeans-java/transactions/groups/detailed_statistics`,
-              query: {
-                numBuckets: 20,
-                transactionType: 'request',
-                latencyAggregationType: 'avg',
-                transactionNames: JSON.stringify(transactionNames),
-                start: moment(end).subtract(15, 'minutes').toISOString(),
-                end,
-                comparisonStart: start,
-                comparisonEnd: moment(start).add(15, 'minutes').toISOString(),
-                environment: 'ENVIRONMENT_ALL',
-                kuery: '',
-              },
-            })
+        it('has same latency mean value for metrics and transactions data', () => {
+          const transactionsCurrentPeriod =
+            transactionsStatistics.currentPeriod[transactionNames[0]];
+          const metricsCurrentPeriod = metricsStatistics.currentPeriod[transactionNames[0]];
+          const transactionsLatencyMean = meanBy(transactionsCurrentPeriod.latency, 'y');
+          const metricsLatencyMean = meanBy(metricsCurrentPeriod.latency, 'y');
+          [transactionsLatencyMean, metricsLatencyMean].forEach((value) =>
+            expect(value).to.be.equal(1000000)
           );
-
-          expect(response.status).to.be(200);
-          currentPeriod = response.body.currentPeriod;
-          previousPeriod = response.body.previousPeriod;
         });
 
-        it('returns correct number of items', () => {
-          expect(Object.keys(currentPeriod).sort()).to.be.eql(transactionNames.sort());
-          expect(Object.keys(previousPeriod).sort()).to.be.eql(transactionNames.sort());
+        it('has same error rate mean value for metrics and transactions data', () => {
+          const transactionsCurrentPeriod =
+            transactionsStatistics.currentPeriod[transactionNames[0]];
+          const metricsCurrentPeriod = metricsStatistics.currentPeriod[transactionNames[0]];
 
-          transactionNames.forEach((transactionName) => {
-            expect(currentPeriod[transactionName]).not.to.be.empty();
-            expect(previousPeriod[transactionName]).not.to.be.empty();
-          });
+          const transactionsErrorRateMean = meanBy(transactionsCurrentPeriod.errorRate, 'y');
+          const metricsErrorRateMean = meanBy(metricsCurrentPeriod.errorRate, 'y');
+          [transactionsErrorRateMean, metricsErrorRateMean].forEach((value) =>
+            expect(asPercent(value, 1)).to.be.equal(`${GO_PROD_ERROR_RATE}%`)
+          );
         });
 
-        it('returns correct latency data', () => {
-          const currentPeriodItems = Object.values(currentPeriod);
-          const previousPeriodItems = Object.values(previousPeriod);
-
-          const currentPeriodFirstItem = currentPeriodItems[0];
-          const previousPeriodFirstItem = previousPeriodItems[0];
-
-          expect(removeEmptyCoordinates(currentPeriodFirstItem.latency).length).to.be.greaterThan(
-            0
+        it('has same throughput mean value for metrics and transactions data', () => {
+          const transactionsCurrentPeriod =
+            transactionsStatistics.currentPeriod[transactionNames[0]];
+          const metricsCurrentPeriod = metricsStatistics.currentPeriod[transactionNames[0]];
+          const transactionsThroughputMean = roundNumber(
+            meanBy(transactionsCurrentPeriod.throughput, 'y')
           );
-          expect(removeEmptyCoordinates(previousPeriodFirstItem.latency).length).to.be.greaterThan(
-            0
+          const metricsThroughputMean = roundNumber(meanBy(metricsCurrentPeriod.throughput, 'y'));
+          [transactionsThroughputMean, metricsThroughputMean].forEach((value) =>
+            expect(value).to.be.equal(roundNumber(GO_PROD_RATE + GO_PROD_ERROR_RATE))
           );
-          expectSnapshot(currentPeriodFirstItem.latency).toMatch();
-          expectSnapshot(previousPeriodFirstItem.latency).toMatch();
         });
 
-        it('returns correct throughput data', () => {
-          const currentPeriodItems = Object.values(currentPeriod);
-          const previousPeriodItems = Object.values(previousPeriod);
+        it('has same impact value for metrics and transactions data', () => {
+          const transactionsCurrentPeriod =
+            transactionsStatistics.currentPeriod[transactionNames[0]];
+          const metricsCurrentPeriod = metricsStatistics.currentPeriod[transactionNames[0]];
 
-          const currentPeriodFirstItem = currentPeriodItems[0];
-          const previousPeriodFirstItem = previousPeriodItems[0];
-
-          expect(
-            removeEmptyCoordinates(currentPeriodFirstItem.throughput).length
-          ).to.be.greaterThan(0);
-          expect(
-            removeEmptyCoordinates(previousPeriodFirstItem.throughput).length
-          ).to.be.greaterThan(0);
-          expectSnapshot(currentPeriodFirstItem.throughput).toMatch();
-          expectSnapshot(previousPeriodFirstItem.throughput).toMatch();
+          const transactionsImpact = transactionsCurrentPeriod.impact;
+          const metricsImpact = metricsCurrentPeriod.impact;
+          [transactionsImpact, metricsImpact].forEach((value) => expect(value).to.be.equal(100));
         });
+      });
 
-        it('returns correct error rate data', () => {
-          const currentPeriodItems = Object.values(currentPeriod);
-          const previousPeriodItems = Object.values(previousPeriod);
-
-          const currentPeriodFirstItem = currentPeriodItems[0];
-          const previousPeriodFirstItem = previousPeriodItems[0];
-
-          expect(removeEmptyCoordinates(currentPeriodFirstItem.errorRate).length).to.be.greaterThan(
-            0
-          );
-          expect(
-            removeEmptyCoordinates(previousPeriodFirstItem.errorRate).length
-          ).to.be.greaterThan(0);
-
-          expectSnapshot(currentPeriodFirstItem.errorRate).toMatch();
-          expectSnapshot(previousPeriodFirstItem.errorRate).toMatch();
+      describe('with comparisons', () => {
+        let transactionsStatistics: TransactionsGroupsDetailedStatistics;
+        before(async () => {
+          transactionsStatistics = await callApi({
+            query: {
+              start: moment(end).subtract(7, 'minutes').toISOString(),
+              end: new Date(end).toISOString(),
+              comparisonStart: new Date(start).toISOString(),
+              comparisonEnd: moment(start).add(7, 'minutes').toISOString(),
+            },
+          });
         });
 
-        it('matches x-axis on current period and previous period', () => {
-          const currentPeriodItems = Object.values(currentPeriod);
-          const previousPeriodItems = Object.values(previousPeriod);
-
-          const currentPeriodFirstItem = currentPeriodItems[0];
-          const previousPeriodFirstItem = previousPeriodItems[0];
-
-          expect(currentPeriodFirstItem.errorRate.map(({ x }) => x)).to.be.eql(
-            previousPeriodFirstItem.errorRate.map(({ x }) => x)
-          );
+        it('returns some data for both periods', () => {
+          expect(isEmpty(transactionsStatistics.currentPeriod)).to.be.equal(false);
+          expect(isEmpty(transactionsStatistics.previousPeriod)).to.be.equal(false);
         });
 
-        it('returns correct impact data', () => {
-          const currentPeriodItems = Object.values(currentPeriod);
-          const previousPeriodItems = Object.values(previousPeriod);
-
-          const currentPeriodFirstItem = currentPeriodItems[0];
-          const previousPeriodFirstItem = previousPeriodItems[0];
+        it('has same start time for both periods', () => {
+          const currentPeriod = transactionsStatistics.currentPeriod[transactionNames[0]];
+          const previousPeriod = transactionsStatistics.previousPeriod[transactionNames[0]];
+          [
+            [currentPeriod.latency, previousPeriod.latency],
+            [currentPeriod.errorRate, previousPeriod.errorRate],
+            [currentPeriod.throughput, previousPeriod.throughput],
+          ].forEach(([currentTimeseries, previousTimeseries]) => {
+            const firstCurrentPeriodDate = new Date(
+              first(currentTimeseries)?.x ?? NaN
+            ).toISOString();
+            const firstPreviousPeriodDate = new Date(
+              first(previousPeriod.latency)?.x ?? NaN
+            ).toISOString();
+
+            expect(firstCurrentPeriodDate).to.equal(firstPreviousPeriodDate);
+          });
+        });
+        it('has same end time for both periods', () => {
+          const currentPeriod = transactionsStatistics.currentPeriod[transactionNames[0]];
+          const previousPeriod = transactionsStatistics.previousPeriod[transactionNames[0]];
+          [
+            [currentPeriod.latency, previousPeriod.latency],
+            [currentPeriod.errorRate, previousPeriod.errorRate],
+            [currentPeriod.throughput, previousPeriod.throughput],
+          ].forEach(([currentTimeseries, previousTimeseries]) => {
+            const lastCurrentPeriodDate = new Date(last(currentTimeseries)?.x ?? NaN).toISOString();
+            const lastPreviousPeriodDate = new Date(
+              last(previousPeriod.latency)?.x ?? NaN
+            ).toISOString();
+
+            expect(lastCurrentPeriodDate).to.equal(lastPreviousPeriodDate);
+          });
+        });
 
-          expectSnapshot(roundNumber(currentPeriodFirstItem.impact)).toMatchInline(`"59.04"`);
-          expectSnapshot(roundNumber(previousPeriodFirstItem.impact)).toMatchInline(`"99.05"`);
+        it('returns same number of buckets for both periods', () => {
+          const currentPeriod = transactionsStatistics.currentPeriod[transactionNames[0]];
+          const previousPeriod = transactionsStatistics.previousPeriod[transactionNames[0]];
+          [
+            [currentPeriod.latency, previousPeriod.latency],
+            [currentPeriod.errorRate, previousPeriod.errorRate],
+            [currentPeriod.throughput, previousPeriod.throughput],
+          ].forEach(([currentTimeseries, previousTimeseries]) => {
+            expect(currentTimeseries.length).to.equal(previousTimeseries.length);
+          });
         });
       });
-    }
-  );
+    });
+  });
 }
diff --git a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts
index 7664d28271e14..f95d153b1c96e 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts
@@ -98,18 +98,18 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         );
         expectSnapshot(impacts).toMatchInline(`
           Array [
-            98.4867713293593,
-            0.0910992862692518,
-            0.217172932411727,
-            0.197499651612207,
-            0.117088451625813,
-            0.203168003440319,
-            0.0956764857936742,
-            0.353287132108131,
-            0.043688393280619,
-            0.0754467823979389,
-            0.115710953190738,
-            0.00339059851027124,
+            98.5616469236242,
+            0.088146942911198,
+            0.208815627929649,
+            0.189536811278812,
+            0.110293217369968,
+            0.191163512620049,
+            0.0899742946381385,
+            0.341831477754056,
+            0.0411384477014597,
+            0.0652338973356331,
+            0.109023796562458,
+            0.00319505027438735,
           ]
         `);
 
@@ -120,9 +120,9 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         expectSnapshot(pick(firstItem, 'name', 'latency', 'throughput', 'errorRate', 'impact'))
           .toMatchInline(`
           Object {
-            "errorRate": 0.08,
-            "impact": 98.4867713293593,
-            "latency": 1816019.48,
+            "errorRate": 0.1,
+            "impact": 98.5616469236242,
+            "latency": 1925546.54,
             "name": "DispatcherServlet#doGet",
             "throughput": 1.66666666666667,
           }
@@ -150,7 +150,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           response.body as TransactionsGroupsPrimaryStatistics;
 
         const firstItem = transctionsGroupsPrimaryStatistics.transactionGroups[0];
-        expectSnapshot(firstItem.latency).toMatchInline(`66846719`);
+        expectSnapshot(firstItem.latency).toMatchInline(`66836803`);
       });
     }
   );

From e22974a85f60e0a10d9138ccab6b582958217de5 Mon Sep 17 00:00:00 2001
From: Kyle Pollich <kyle.pollich@elastic.co>
Date: Thu, 14 Oct 2021 15:16:58 -0400
Subject: [PATCH 099/117] Validate package policy immediately after dry run
 data is available (#115060)

---
 .../edit_package_policy_page/index.tsx            | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
index 4d940534c4a7b..840a5a71a63c7 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
@@ -200,10 +200,19 @@ export const EditPackagePolicyForm = memo<{
 
             if (packageData?.response) {
               setPackageInfo(packageData.response);
-              setValidationResults(
-                validatePackagePolicy(newPackagePolicy, packageData.response, safeLoad)
+
+              const newValidationResults = validatePackagePolicy(
+                newPackagePolicy,
+                packageData.response,
+                safeLoad
               );
-              setFormState('VALID');
+              setValidationResults(newValidationResults);
+
+              if (validationHasErrors(newValidationResults)) {
+                setFormState('INVALID');
+              } else {
+                setFormState('VALID');
+              }
             }
           }
         }

From 065b42b6617a199138897eec92c6d2e6a6888a9f Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Thu, 14 Oct 2021 15:28:43 -0400
Subject: [PATCH 100/117] [Fleet] Remove escaping numeric value in agent
 template (#114123)

---
 .../server/services/epm/agent/agent.test.ts    | 14 ++++++++------
 .../fleet/server/services/epm/agent/agent.ts   | 18 ------------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/x-pack/plugins/fleet/server/services/epm/agent/agent.test.ts b/x-pack/plugins/fleet/server/services/epm/agent/agent.test.ts
index 1be0f73a347e9..ed5d6473760ff 100644
--- a/x-pack/plugins/fleet/server/services/epm/agent/agent.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/agent/agent.test.ts
@@ -29,7 +29,7 @@ foo: {{bar}}
 some_text_field: {{should_be_text}}
 multi_text_field:
 {{#each multi_text}}
-  - {{this}}
+  - !!str {{this}}
 {{/each}}
       `;
     const vars = {
@@ -37,7 +37,7 @@ multi_text_field:
       password: { type: 'password', value: '' },
       optional_field: { type: 'text', value: undefined },
       bar: { type: 'text', value: 'bar' },
-      should_be_text: { type: 'text', value: '1234' },
+      should_be_text: { type: 'text', value: 'textvalue' },
       multi_text: { type: 'text', value: ['1234', 'foo', 'bar'] },
     };
 
@@ -49,7 +49,7 @@ multi_text_field:
       processors: [{ add_locale: null }],
       password: '',
       foo: 'bar',
-      some_text_field: '1234',
+      some_text_field: 'textvalue',
       multi_text_field: ['1234', 'foo', 'bar'],
     });
   });
@@ -217,12 +217,13 @@ input: logs
     });
   });
 
-  it('should escape string values when necessary', () => {
+  it('should suport !!str for string values', () => {
     const stringTemplate = `
 my-package:
     asteriskOnly: {{asteriskOnly}}
     startsWithAsterisk: {{startsWithAsterisk}}
-    numeric: {{numeric}}
+    numeric_with_str: !!str {{numeric}}
+    numeric_without_str: {{numeric}}
     mixed: {{mixed}}
     concatenatedEnd: {{a}}{{b}}
     concatenatedMiddle: {{c}}{{d}}
@@ -245,7 +246,8 @@ my-package:
       'my-package': {
         asteriskOnly: '*',
         startsWithAsterisk: '*lala',
-        numeric: '100',
+        numeric_with_str: '100',
+        numeric_without_str: 100,
         mixed: '1s',
         concatenatedEnd: '/opt/package/*/logs/my.log*',
         concatenatedMiddle: '/opt/*/package/logs/*my.log',
diff --git a/x-pack/plugins/fleet/server/services/epm/agent/agent.ts b/x-pack/plugins/fleet/server/services/epm/agent/agent.ts
index a0d14e6962a8d..a01643b22cf9d 100644
--- a/x-pack/plugins/fleet/server/services/epm/agent/agent.ts
+++ b/x-pack/plugins/fleet/server/services/epm/agent/agent.ts
@@ -58,14 +58,6 @@ function replaceVariablesInYaml(yamlVariables: { [k: string]: any }, yaml: any)
   return yaml;
 }
 
-const maybeEscapeString = (value: string) => {
-  // Numeric strings need to be quoted to stay strings.
-  if (value.length && !isNaN(+value)) {
-    return `"${value}"`;
-  }
-  return value;
-};
-
 function buildTemplateVariables(variables: PackagePolicyConfigRecord, templateStr: string) {
   const yamlValues: { [k: string]: any } = {};
   const vars = Object.entries(variables).reduce((acc, [key, recordEntry]) => {
@@ -92,16 +84,6 @@ function buildTemplateVariables(variables: PackagePolicyConfigRecord, templateSt
       const yamlKeyPlaceholder = `##${key}##`;
       varPart[lastKeyPart] = recordEntry.value ? `"${yamlKeyPlaceholder}"` : null;
       yamlValues[yamlKeyPlaceholder] = recordEntry.value ? safeLoad(recordEntry.value) : null;
-    } else if (
-      recordEntry.type &&
-      (recordEntry.type === 'text' || recordEntry.type === 'string') &&
-      recordEntry.value?.length
-    ) {
-      if (Array.isArray(recordEntry.value)) {
-        varPart[lastKeyPart] = recordEntry.value.map((value: string) => maybeEscapeString(value));
-      } else {
-        varPart[lastKeyPart] = maybeEscapeString(recordEntry.value);
-      }
     } else {
       varPart[lastKeyPart] = recordEntry.value;
     }

From 5657f80feb8401d81dad704b1ab2f25850344d61 Mon Sep 17 00:00:00 2001
From: ymao1 <ying.mao@elastic.co>
Date: Thu, 14 Oct 2021 15:52:23 -0400
Subject: [PATCH 101/117] [Alerting] Show execution duration on Rule Details
 view (#114719)

* Adding execution duration to get alert instance summary

* Showing execution duration on rule details view

* Fixing unit tests

* Updating to match new mockup

* Fixing types

* Fixing functional test

* Removing unneeded max and min and adding tests

* Removing unneeded max and min and adding tests

* Fixing functional test

* Adding left axis

* PR feedback

* Reducing chart height

* PR feedback

* PR feedback

* PR feedback
---
 .../alerting/common/alert_instance_summary.ts |   4 +
 ...rt_instance_summary_from_event_log.test.ts |  70 +++++++--
 .../alert_instance_summary_from_event_log.ts  |  19 +++
 .../routes/get_rule_alert_summary.test.ts     |   4 +
 .../server/routes/get_rule_alert_summary.ts   |   2 +
 .../legacy/get_alert_instance_summary.test.ts |   4 +
 .../tests/get_alert_instance_summary.test.ts  |  11 +-
 .../lib/alert_api/alert_summary.test.ts       |   8 ++
 .../lib/alert_api/alert_summary.ts            |   2 +
 .../lib/execution_duration_utils.test.ts      |  68 +++++++++
 .../lib/execution_duration_utils.ts           |  38 +++++
 .../components/alert_instances.scss           |   5 +
 .../components/alert_instances.test.tsx       | 120 ++++++++++++++++
 .../components/alert_instances.tsx            | 112 ++++++++++++++-
 .../components/alert_instances_route.test.tsx |   4 +
 .../alerts_list/components/alerts_list.tsx    |  28 ++--
 .../execution_duration_chart.test.tsx         |  72 ++++++++++
 .../components/execution_duration_chart.tsx   | 133 ++++++++++++++++++
 .../alerting/get_alert_instance_summary.ts    |   1 +
 .../alerting/get_alert_instance_summary.ts    |  14 +-
 20 files changed, 685 insertions(+), 34 deletions(-)
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.test.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/execution_duration_chart.test.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/execution_duration_chart.tsx

diff --git a/x-pack/plugins/alerting/common/alert_instance_summary.ts b/x-pack/plugins/alerting/common/alert_instance_summary.ts
index 7ae37d6ddf53a..462d20b8fb2ea 100644
--- a/x-pack/plugins/alerting/common/alert_instance_summary.ts
+++ b/x-pack/plugins/alerting/common/alert_instance_summary.ts
@@ -23,6 +23,10 @@ export interface AlertInstanceSummary {
   lastRun?: string;
   errorMessages: Array<{ date: string; message: string }>;
   instances: Record<string, AlertInstanceStatus>;
+  executionDuration: {
+    average: number;
+    values: number[];
+  };
 }
 
 export interface AlertInstanceStatus {
diff --git a/x-pack/plugins/alerting/server/lib/alert_instance_summary_from_event_log.test.ts b/x-pack/plugins/alerting/server/lib/alert_instance_summary_from_event_log.test.ts
index 22122b22fd3bb..a6529f4c30a7b 100644
--- a/x-pack/plugins/alerting/server/lib/alert_instance_summary_from_event_log.test.ts
+++ b/x-pack/plugins/alerting/server/lib/alert_instance_summary_from_event_log.test.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { random, mean } from 'lodash';
 import { SanitizedAlert, AlertInstanceSummary } from '../types';
 import { IValidatedEvent } from '../../../event_log/server';
 import { EVENT_LOG_ACTIONS, EVENT_LOG_PROVIDER, LEGACY_EVENT_LOG_ACTIONS } from '../plugin';
@@ -31,6 +32,10 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "consumer": "alert-consumer",
         "enabled": false,
         "errorMessages": Array [],
+        "executionDuration": Object {
+          "average": 0,
+          "values": Array [],
+        },
         "id": "alert-123",
         "instances": Object {},
         "lastRun": undefined,
@@ -71,6 +76,10 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "consumer": "alert-consumer-2",
         "enabled": true,
         "errorMessages": Array [],
+        "executionDuration": Object {
+          "average": 0,
+          "values": Array [],
+        },
         "id": "alert-456",
         "instances": Object {},
         "lastRun": undefined,
@@ -137,7 +146,7 @@ describe('alertInstanceSummaryFromEventLog', () => {
       dateEnd,
     });
 
-    const { lastRun, status, instances } = summary;
+    const { lastRun, status, instances, executionDuration } = summary;
     expect({ lastRun, status, instances }).toMatchInlineSnapshot(`
       Object {
         "instances": Object {},
@@ -145,6 +154,8 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "status": "OK",
       }
     `);
+
+    testExecutionDurations(eventsFactory.getExecutionDurations(), executionDuration);
   });
 
   test('active alert with no instances but has errors', async () => {
@@ -163,7 +174,7 @@ describe('alertInstanceSummaryFromEventLog', () => {
       dateEnd,
     });
 
-    const { lastRun, status, errorMessages, instances } = summary;
+    const { lastRun, status, errorMessages, instances, executionDuration } = summary;
     expect({ lastRun, status, errorMessages, instances }).toMatchInlineSnapshot(`
       Object {
         "errorMessages": Array [
@@ -181,6 +192,8 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "status": "Error",
       }
     `);
+
+    testExecutionDurations(eventsFactory.getExecutionDurations(), executionDuration);
   });
 
   test('alert with currently inactive instance', async () => {
@@ -202,7 +215,7 @@ describe('alertInstanceSummaryFromEventLog', () => {
       dateEnd,
     });
 
-    const { lastRun, status, instances } = summary;
+    const { lastRun, status, instances, executionDuration } = summary;
     expect({ lastRun, status, instances }).toMatchInlineSnapshot(`
       Object {
         "instances": Object {
@@ -218,6 +231,8 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "status": "OK",
       }
     `);
+
+    testExecutionDurations(eventsFactory.getExecutionDurations(), executionDuration);
   });
 
   test('legacy alert with currently inactive instance', async () => {
@@ -239,7 +254,7 @@ describe('alertInstanceSummaryFromEventLog', () => {
       dateEnd,
     });
 
-    const { lastRun, status, instances } = summary;
+    const { lastRun, status, instances, executionDuration } = summary;
     expect({ lastRun, status, instances }).toMatchInlineSnapshot(`
       Object {
         "instances": Object {
@@ -255,6 +270,8 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "status": "OK",
       }
     `);
+
+    testExecutionDurations(eventsFactory.getExecutionDurations(), executionDuration);
   });
 
   test('alert with currently inactive instance, no new-instance', async () => {
@@ -275,7 +292,7 @@ describe('alertInstanceSummaryFromEventLog', () => {
       dateEnd,
     });
 
-    const { lastRun, status, instances } = summary;
+    const { lastRun, status, instances, executionDuration } = summary;
     expect({ lastRun, status, instances }).toMatchInlineSnapshot(`
       Object {
         "instances": Object {
@@ -291,6 +308,8 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "status": "OK",
       }
     `);
+
+    testExecutionDurations(eventsFactory.getExecutionDurations(), executionDuration);
   });
 
   test('alert with currently active instance', async () => {
@@ -312,7 +331,7 @@ describe('alertInstanceSummaryFromEventLog', () => {
       dateEnd,
     });
 
-    const { lastRun, status, instances } = summary;
+    const { lastRun, status, instances, executionDuration } = summary;
     expect({ lastRun, status, instances }).toMatchInlineSnapshot(`
       Object {
         "instances": Object {
@@ -328,6 +347,8 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "status": "Active",
       }
     `);
+
+    testExecutionDurations(eventsFactory.getExecutionDurations(), executionDuration);
   });
 
   test('alert with currently active instance with no action group in event log', async () => {
@@ -349,7 +370,7 @@ describe('alertInstanceSummaryFromEventLog', () => {
       dateEnd,
     });
 
-    const { lastRun, status, instances } = summary;
+    const { lastRun, status, instances, executionDuration } = summary;
     expect({ lastRun, status, instances }).toMatchInlineSnapshot(`
       Object {
         "instances": Object {
@@ -365,6 +386,8 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "status": "Active",
       }
     `);
+
+    testExecutionDurations(eventsFactory.getExecutionDurations(), executionDuration);
   });
 
   test('alert with currently active instance that switched action groups', async () => {
@@ -386,7 +409,7 @@ describe('alertInstanceSummaryFromEventLog', () => {
       dateEnd,
     });
 
-    const { lastRun, status, instances } = summary;
+    const { lastRun, status, instances, executionDuration } = summary;
     expect({ lastRun, status, instances }).toMatchInlineSnapshot(`
       Object {
         "instances": Object {
@@ -402,6 +425,8 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "status": "Active",
       }
     `);
+
+    testExecutionDurations(eventsFactory.getExecutionDurations(), executionDuration);
   });
 
   test('alert with currently active instance, no new-instance', async () => {
@@ -422,7 +447,7 @@ describe('alertInstanceSummaryFromEventLog', () => {
       dateEnd,
     });
 
-    const { lastRun, status, instances } = summary;
+    const { lastRun, status, instances, executionDuration } = summary;
     expect({ lastRun, status, instances }).toMatchInlineSnapshot(`
       Object {
         "instances": Object {
@@ -438,6 +463,8 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "status": "Active",
       }
     `);
+
+    testExecutionDurations(eventsFactory.getExecutionDurations(), executionDuration);
   });
 
   test('alert with active and inactive muted alerts', async () => {
@@ -462,7 +489,7 @@ describe('alertInstanceSummaryFromEventLog', () => {
       dateEnd,
     });
 
-    const { lastRun, status, instances } = summary;
+    const { lastRun, status, instances, executionDuration } = summary;
     expect({ lastRun, status, instances }).toMatchInlineSnapshot(`
       Object {
         "instances": Object {
@@ -485,6 +512,8 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "status": "Active",
       }
     `);
+
+    testExecutionDurations(eventsFactory.getExecutionDurations(), executionDuration);
   });
 
   test('alert with active and inactive alerts over many executes', async () => {
@@ -515,7 +544,7 @@ describe('alertInstanceSummaryFromEventLog', () => {
       dateEnd,
     });
 
-    const { lastRun, status, instances } = summary;
+    const { lastRun, status, instances, executionDuration } = summary;
     expect({ lastRun, status, instances }).toMatchInlineSnapshot(`
       Object {
         "instances": Object {
@@ -538,7 +567,19 @@ describe('alertInstanceSummaryFromEventLog', () => {
         "status": "Active",
       }
     `);
+
+    testExecutionDurations(eventsFactory.getExecutionDurations(), executionDuration);
   });
+
+  const testExecutionDurations = (
+    actualDurations: number[],
+    executionDuration?: { average?: number; values?: number[] }
+  ) => {
+    expect(executionDuration).toEqual({
+      average: Math.round(mean(actualDurations)),
+      values: actualDurations,
+    });
+  };
 });
 
 function dateString(isoBaseDate: string, offsetMillis = 0): string {
@@ -573,6 +614,7 @@ export class EventsFactory {
       event: {
         provider: EVENT_LOG_PROVIDER,
         action: EVENT_LOG_ACTIONS.execute,
+        duration: random(2000, 180000) * 1000 * 1000,
       },
     };
 
@@ -634,6 +676,12 @@ export class EventsFactory {
     });
     return this;
   }
+
+  getExecutionDurations(): number[] {
+    return this.events
+      .filter((ev) => ev?.event?.action === 'execute' && ev?.event?.duration !== undefined)
+      .map((ev) => ev?.event?.duration! / (1000 * 1000));
+  }
 }
 
 function createAlert(overrides: Partial<SanitizedAlert>): SanitizedAlert<{ bar: boolean }> {
diff --git a/x-pack/plugins/alerting/server/lib/alert_instance_summary_from_event_log.ts b/x-pack/plugins/alerting/server/lib/alert_instance_summary_from_event_log.ts
index 8a6c55dfac619..40fae121df51d 100644
--- a/x-pack/plugins/alerting/server/lib/alert_instance_summary_from_event_log.ts
+++ b/x-pack/plugins/alerting/server/lib/alert_instance_summary_from_event_log.ts
@@ -5,10 +5,13 @@
  * 2.0.
  */
 
+import { mean } from 'lodash';
 import { SanitizedAlert, AlertInstanceSummary, AlertInstanceStatus } from '../types';
 import { IEvent } from '../../../event_log/server';
 import { EVENT_LOG_ACTIONS, EVENT_LOG_PROVIDER, LEGACY_EVENT_LOG_ACTIONS } from '../plugin';
 
+const Millis2Nanos = 1000 * 1000;
+
 export interface AlertInstanceSummaryFromEventLogParams {
   alert: SanitizedAlert<{ bar: boolean }>;
   events: IEvent[];
@@ -36,9 +39,14 @@ export function alertInstanceSummaryFromEventLog(
     lastRun: undefined,
     errorMessages: [],
     instances: {},
+    executionDuration: {
+      average: 0,
+      values: [],
+    },
   };
 
   const instances = new Map<string, AlertInstanceStatus>();
+  const eventDurations: number[] = [];
 
   // loop through the events
   // should be sorted newest to oldest, we want oldest to newest, so reverse
@@ -66,6 +74,10 @@ export function alertInstanceSummaryFromEventLog(
         alertInstanceSummary.status = 'OK';
       }
 
+      if (event?.event?.duration) {
+        eventDurations.push(event?.event?.duration / Millis2Nanos);
+      }
+
       continue;
     }
 
@@ -111,6 +123,13 @@ export function alertInstanceSummaryFromEventLog(
 
   alertInstanceSummary.errorMessages.sort((a, b) => a.date.localeCompare(b.date));
 
+  if (eventDurations.length > 0) {
+    alertInstanceSummary.executionDuration = {
+      average: Math.round(mean(eventDurations)),
+      values: eventDurations,
+    };
+  }
+
   return alertInstanceSummary;
 }
 
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts b/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts
index f0f34ae5756b4..5044c5c8617a0 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts
@@ -38,6 +38,10 @@ describe('getRuleAlertSummaryRoute', () => {
     status: 'OK',
     errorMessages: [],
     instances: {},
+    executionDuration: {
+      average: 1,
+      values: [3, 5, 5],
+    },
   };
 
   it('gets rule alert summary', async () => {
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.ts b/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.ts
index 5bb8c5efd0d79..131bddcce049d 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.ts
@@ -39,6 +39,7 @@ const rewriteBodyRes: RewriteResponseCase<AlertInstanceSummary> = ({
   errorMessages,
   lastRun,
   instances: alerts,
+  executionDuration,
   ...rest
 }) => ({
   ...rest,
@@ -49,6 +50,7 @@ const rewriteBodyRes: RewriteResponseCase<AlertInstanceSummary> = ({
   status_end_date: statusEndDate,
   error_messages: errorMessages,
   last_run: lastRun,
+  execution_duration: executionDuration,
 });
 
 export const getRuleAlertSummaryRoute = (
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.test.ts b/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.test.ts
index d529aec4162d6..ed2b3056da45e 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.test.ts
@@ -43,6 +43,10 @@ describe('getAlertInstanceSummaryRoute', () => {
     status: 'OK',
     errorMessages: [],
     instances: {},
+    executionDuration: {
+      average: 0,
+      values: [],
+    },
   };
 
   it('gets alert instance summary', async () => {
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_instance_summary.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_instance_summary.test.ts
index e116f18d779ea..bd88b0f53ab07 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_instance_summary.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_instance_summary.test.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { omit, mean } from 'lodash';
 import { RulesClient, ConstructorOptions } from '../rules_client';
 import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
 import { taskManagerMock } from '../../../../task_manager/server/mocks';
@@ -138,8 +139,11 @@ describe('getAlertInstanceSummary()', () => {
 
     const dateStart = new Date(Date.now() - 60 * 1000).toISOString();
 
+    const durations: number[] = eventsFactory.getExecutionDurations();
+
     const result = await rulesClient.getAlertInstanceSummary({ id: '1', dateStart });
-    expect(result).toMatchInlineSnapshot(`
+    const resultWithoutExecutionDuration = omit(result, 'executionDuration');
+    expect(resultWithoutExecutionDuration).toMatchInlineSnapshot(`
       Object {
         "alertTypeId": "123",
         "consumer": "alert-consumer",
@@ -182,6 +186,11 @@ describe('getAlertInstanceSummary()', () => {
         "throttle": null,
       }
     `);
+
+    expect(result.executionDuration).toEqual({
+      average: Math.round(mean(durations)),
+      values: durations,
+    });
   });
 
   // Further tests don't check the result of `getAlertInstanceSummary()`, as the result
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/alert_summary.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/alert_summary.test.ts
index c7b987f2b04bd..9f62e0ed0d50e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/alert_summary.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/alert_summary.test.ts
@@ -28,6 +28,10 @@ describe('loadAlertInstanceSummary', () => {
       statusStartDate: '2021-04-01T21:19:25.174Z',
       tags: [],
       throttle: null,
+      executionDuration: {
+        average: 0,
+        values: [],
+      },
     };
 
     http.get.mockResolvedValueOnce({
@@ -45,6 +49,10 @@ describe('loadAlertInstanceSummary', () => {
       status_start_date: '2021-04-01T21:19:25.174Z',
       tags: [],
       throttle: null,
+      execution_duration: {
+        average: 0,
+        values: [],
+      },
     });
 
     const result = await loadAlertInstanceSummary({ http, alertId: 'te/st' });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/alert_summary.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/alert_summary.ts
index cb924db74cea5..701c8f3a7beec 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/alert_summary.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/alert_summary.ts
@@ -17,6 +17,7 @@ const rewriteBodyRes: RewriteRequestCase<AlertInstanceSummary> = ({
   status_end_date: statusEndDate,
   error_messages: errorMessages,
   last_run: lastRun,
+  execution_duration: executionDuration,
   ...rest
 }: any) => ({
   ...rest,
@@ -27,6 +28,7 @@ const rewriteBodyRes: RewriteRequestCase<AlertInstanceSummary> = ({
   errorMessages,
   lastRun,
   instances: alerts,
+  executionDuration,
 });
 
 export async function loadAlertInstanceSummary({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.test.ts
new file mode 100644
index 0000000000000..da102405c179d
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.test.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 { formatMillisForDisplay, shouldShowDurationWarning } from './execution_duration_utils';
+import { AlertType as RuleType } from '../../types';
+
+describe('formatMillisForDisplay', () => {
+  it('should return 0 for undefined', () => {
+    expect(formatMillisForDisplay(undefined)).toEqual('00:00:00.000');
+  });
+
+  it('should correctly format millisecond duration in milliseconds', () => {
+    expect(formatMillisForDisplay(845)).toEqual('00:00:00.845');
+  });
+
+  it('should correctly format second duration in milliseconds', () => {
+    expect(formatMillisForDisplay(45200)).toEqual('00:00:45.200');
+  });
+
+  it('should correctly format minute duration in milliseconds', () => {
+    expect(formatMillisForDisplay(122450)).toEqual('00:02:02.450');
+  });
+
+  it('should correctly format hour duration in milliseconds', () => {
+    expect(formatMillisForDisplay(3634601)).toEqual('01:00:34.601');
+  });
+});
+
+describe('shouldShowDurationWarning', () => {
+  it('should return false if rule type or ruleTaskTimeout is undefined', () => {
+    expect(shouldShowDurationWarning(undefined, 1000)).toEqual(false);
+    expect(shouldShowDurationWarning(mockRuleType(), 1000)).toEqual(false);
+  });
+
+  it('should return false if average duration is less than rule task timeout', () => {
+    expect(shouldShowDurationWarning(mockRuleType({ ruleTaskTimeout: '1m' }), 1000)).toEqual(false);
+  });
+
+  it('should return true if average duration is greater than rule task timeout', () => {
+    expect(shouldShowDurationWarning(mockRuleType({ ruleTaskTimeout: '1m' }), 120000)).toEqual(
+      true
+    );
+  });
+});
+
+function mockRuleType(overwrites: Partial<RuleType> = {}): RuleType {
+  return {
+    id: 'test.testRuleType',
+    name: 'My Test Rule Type',
+    actionGroups: [{ id: 'default', name: 'Default Action Group' }],
+    actionVariables: {
+      context: [],
+      state: [],
+      params: [],
+    },
+    defaultActionGroupId: 'default',
+    recoveryActionGroup: { id: 'recovered', name: 'Recovered' },
+    authorizedConsumers: {},
+    producer: 'alerts',
+    minimumLicenseRequired: 'basic',
+    enabledInLicense: true,
+    ...overwrites,
+  };
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.ts
new file mode 100644
index 0000000000000..ecad5475274ce
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import moment from 'moment';
+import { padStart } from 'lodash';
+import { AlertType as RuleType } from '../../types';
+import { parseDuration } from '../../../../alerting/common';
+
+export function formatMillisForDisplay(value: number | undefined) {
+  if (!value) {
+    return '00:00:00.000';
+  }
+
+  const duration = moment.duration(value);
+  const durationString = [duration.hours(), duration.minutes(), duration.seconds()]
+    .map((v: number) => padStart(`${v}`, 2, '0'))
+    .join(':');
+
+  // add millis
+  const millisString = padStart(`${duration.milliseconds()}`, 3, '0');
+  return `${durationString}.${millisString}`;
+}
+
+export function shouldShowDurationWarning(
+  ruleType: RuleType | undefined,
+  avgDurationMillis: number
+) {
+  if (!ruleType || !ruleType.ruleTaskTimeout) {
+    return false;
+  }
+  const ruleTypeTimeout: string = ruleType.ruleTaskTimeout;
+  const ruleTypeTimeoutMillis: number = parseDuration(ruleTypeTimeout);
+  return avgDurationMillis > ruleTypeTimeoutMillis;
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.scss b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.scss
index 76fd94fd4044b..454d6e20d9323 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.scss
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.scss
@@ -9,3 +9,8 @@
     width: 85%;
   }
 }
+
+.ruleDurationWarningIcon {
+  bottom: $euiSizeXS;
+  position: relative;
+}
\ No newline at end of file
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.test.tsx
index cada7748062f1..a790427e36483 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.test.tsx
@@ -8,9 +8,13 @@
 import * as React from 'react';
 import uuid from 'uuid';
 import { shallow } from 'enzyme';
+import { mountWithIntl, nextTick } from '@kbn/test/jest';
+import { act } from 'react-dom/test-utils';
 import { AlertInstances, AlertInstanceListItem, alertInstanceToListItem } from './alert_instances';
 import { Alert, AlertInstanceSummary, AlertInstanceStatus, AlertType } from '../../../../types';
 import { EuiBasicTable } from '@elastic/eui';
+import { ExecutionDurationChart } from '../../common/components/execution_duration_chart';
+
 jest.mock('../../../../common/lib/kibana');
 
 const fakeNow = new Date('2020-02-09T23:15:41.941Z');
@@ -271,6 +275,118 @@ describe('alertInstanceToListItem', () => {
   });
 });
 
+describe('execution duration overview', () => {
+  it('render last execution status', async () => {
+    const rule = mockAlert({
+      executionStatus: { status: 'ok', lastExecutionDate: new Date('2020-08-20T19:23:38Z') },
+    });
+    const ruleType = mockAlertType();
+    const alertSummary = mockAlertInstanceSummary();
+
+    const wrapper = mountWithIntl(
+      <AlertInstances
+        {...mockAPIs}
+        alert={rule}
+        alertType={ruleType}
+        readOnly={false}
+        alertInstanceSummary={alertSummary}
+      />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    const ruleExecutionStatusStat = wrapper.find('[data-test-subj="ruleStatus-ok"]');
+    expect(ruleExecutionStatusStat.exists()).toBeTruthy();
+    expect(ruleExecutionStatusStat.first().prop('description')).toEqual('Last response');
+    expect(wrapper.find('EuiHealth[data-test-subj="ruleStatus-ok"]').text()).toEqual('Ok');
+  });
+
+  it('renders average execution duration', async () => {
+    const rule = mockAlert();
+    const ruleType = mockAlertType({ ruleTaskTimeout: '10m' });
+    const alertSummary = mockAlertInstanceSummary({
+      executionDuration: { average: 60284, values: [] },
+    });
+
+    const wrapper = mountWithIntl(
+      <AlertInstances
+        {...mockAPIs}
+        alert={rule}
+        alertType={ruleType}
+        readOnly={false}
+        alertInstanceSummary={alertSummary}
+      />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    const avgExecutionDurationPanel = wrapper.find('[data-test-subj="avgExecutionDurationPanel"]');
+    expect(avgExecutionDurationPanel.exists()).toBeTruthy();
+    expect(avgExecutionDurationPanel.first().prop('color')).toEqual('subdued');
+    expect(wrapper.find('EuiStat[data-test-subj="avgExecutionDurationStat"]').text()).toEqual(
+      'Average duration00:01:00.284'
+    );
+    expect(wrapper.find('[data-test-subj="ruleDurationWarning"]').exists()).toBeFalsy();
+  });
+
+  it('renders warning when average execution duration exceeds rule timeout', async () => {
+    const rule = mockAlert();
+    const ruleType = mockAlertType({ ruleTaskTimeout: '10m' });
+    const alertSummary = mockAlertInstanceSummary({
+      executionDuration: { average: 60284345, values: [] },
+    });
+
+    const wrapper = mountWithIntl(
+      <AlertInstances
+        {...mockAPIs}
+        alert={rule}
+        alertType={ruleType}
+        readOnly={false}
+        alertInstanceSummary={alertSummary}
+      />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    const avgExecutionDurationPanel = wrapper.find('[data-test-subj="avgExecutionDurationPanel"]');
+    expect(avgExecutionDurationPanel.exists()).toBeTruthy();
+    expect(avgExecutionDurationPanel.first().prop('color')).toEqual('warning');
+    expect(wrapper.find('EuiStat[data-test-subj="avgExecutionDurationStat"]').text()).toEqual(
+      'Average duration16:44:44.345'
+    );
+    expect(wrapper.find('[data-test-subj="ruleDurationWarning"]').exists()).toBeTruthy();
+  });
+
+  it('renders execution duration chart', () => {
+    const rule = mockAlert();
+    const ruleType = mockAlertType();
+    const alertSummary = mockAlertInstanceSummary();
+
+    expect(
+      shallow(
+        <AlertInstances
+          {...mockAPIs}
+          alert={rule}
+          alertType={ruleType}
+          alertInstanceSummary={alertSummary}
+          readOnly={false}
+        />
+      )
+        .find(ExecutionDurationChart)
+        .exists()
+    ).toBeTruthy();
+  });
+});
+
 function mockAlert(overloads: Partial<Alert> = {}): Alert {
   return {
     id: uuid.v4(),
@@ -342,6 +458,10 @@ function mockAlertInstanceSummary(
         actionGroupId: 'testActionGroup',
       },
     },
+    executionDuration: {
+      average: 0,
+      values: [],
+    },
   };
   return { ...summary, ...overloads };
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.tsx
index 1583cb188f1c1..9de70699edbdb 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.tsx
@@ -8,11 +8,26 @@
 import React, { useState } from 'react';
 import moment, { Duration } from 'moment';
 import { i18n } from '@kbn/i18n';
-import { EuiBasicTable, EuiHealth, EuiSpacer, EuiToolTip } from '@elastic/eui';
+import {
+  EuiBasicTable,
+  EuiHealth,
+  EuiSpacer,
+  EuiToolTip,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHorizontalRule,
+  EuiPanel,
+  EuiStat,
+  EuiIconTip,
+} from '@elastic/eui';
 // @ts-ignore
 import { RIGHT_ALIGNMENT, CENTER_ALIGNMENT } from '@elastic/eui/lib/services';
 import { padStart, chunk } from 'lodash';
-import { ActionGroup, AlertInstanceStatusValues } from '../../../../../../alerting/common';
+import {
+  ActionGroup,
+  AlertExecutionStatusErrorReasons,
+  AlertInstanceStatusValues,
+} from '../../../../../../alerting/common';
 import {
   Alert,
   AlertInstanceSummary,
@@ -27,6 +42,16 @@ import {
 import { DEFAULT_SEARCH_PAGE_SIZE } from '../../../constants';
 import './alert_instances.scss';
 import { RuleMutedSwitch } from './rule_muted_switch';
+import { getHealthColor } from '../../alerts_list/components/alert_status_filter';
+import {
+  alertsStatusesTranslationsMapping,
+  ALERT_STATUS_LICENSE_ERROR,
+} from '../../alerts_list/translations';
+import {
+  formatMillisForDisplay,
+  shouldShowDurationWarning,
+} from '../../../lib/execution_duration_utils';
+import { ExecutionDurationChart } from '../../common/components/execution_duration_chart';
 
 type AlertInstancesProps = {
   alert: Alert;
@@ -161,8 +186,91 @@ export function AlertInstances({
     requestRefresh();
   };
 
+  const showDurationWarning = shouldShowDurationWarning(
+    alertType,
+    alertInstanceSummary.executionDuration.average
+  );
+
+  const healthColor = getHealthColor(alert.executionStatus.status);
+  const isLicenseError =
+    alert.executionStatus.error?.reason === AlertExecutionStatusErrorReasons.License;
+  const statusMessage = isLicenseError
+    ? ALERT_STATUS_LICENSE_ERROR
+    : alertsStatusesTranslationsMapping[alert.executionStatus.status];
+
   return (
     <>
+      <EuiHorizontalRule />
+      <EuiFlexGroup>
+        <EuiFlexItem grow={1}>
+          <EuiPanel color="subdued" hasBorder={false}>
+            <EuiStat
+              data-test-subj={`ruleStatus-${alert.executionStatus.status}`}
+              titleSize="xs"
+              title={
+                <EuiHealth
+                  data-test-subj={`ruleStatus-${alert.executionStatus.status}`}
+                  textSize="inherit"
+                  color={healthColor}
+                >
+                  {statusMessage}
+                </EuiHealth>
+              }
+              description={i18n.translate(
+                'xpack.triggersActionsUI.sections.alertDetails.alertInstancesList.ruleLastExecutionDescription',
+                {
+                  defaultMessage: `Last response`,
+                }
+              )}
+            />
+          </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem grow={1}>
+          <EuiPanel
+            data-test-subj="avgExecutionDurationPanel"
+            color={showDurationWarning ? 'warning' : 'subdued'}
+            hasBorder={false}
+          >
+            <EuiStat
+              data-test-subj="avgExecutionDurationStat"
+              titleSize="xs"
+              title={
+                <EuiFlexGroup gutterSize="xs">
+                  {showDurationWarning && (
+                    <EuiFlexItem grow={false}>
+                      <EuiIconTip
+                        data-test-subj="ruleDurationWarning"
+                        anchorClassName="ruleDurationWarningIcon"
+                        type="alert"
+                        color="warning"
+                        content={i18n.translate(
+                          'xpack.triggersActionsUI.sections.alertDetails.alertInstancesList.ruleTypeExcessDurationMessage',
+                          {
+                            defaultMessage: `Duration exceeds the rule's expected run time.`,
+                          }
+                        )}
+                        position="top"
+                      />
+                    </EuiFlexItem>
+                  )}
+                  <EuiFlexItem grow={false}>
+                    {formatMillisForDisplay(alertInstanceSummary.executionDuration.average)}
+                  </EuiFlexItem>
+                </EuiFlexGroup>
+              }
+              description={i18n.translate(
+                'xpack.triggersActionsUI.sections.alertDetails.alertInstancesList.avgDurationDescription',
+                {
+                  defaultMessage: `Average duration`,
+                }
+              )}
+            />
+          </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem grow={4}>
+          <ExecutionDurationChart executionDuration={alertInstanceSummary.executionDuration} />
+        </EuiFlexItem>
+      </EuiFlexGroup>
       <EuiSpacer size="xl" />
       <input
         type="hidden"
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances_route.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances_route.test.tsx
index d673c30b997cb..a0eb3212f7742 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances_route.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances_route.test.tsx
@@ -179,6 +179,10 @@ function mockAlertInstanceSummary(overloads: Partial<any> = {}): any {
         muted: false,
       },
     },
+    executionDuration: {
+      average: 0,
+      values: [],
+    },
   };
   return summary;
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
index 91b1b14083ed2..a7d54a896d7ef 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
@@ -8,7 +8,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 
 import { i18n } from '@kbn/i18n';
-import { capitalize, padStart, sortBy } from 'lodash';
+import { capitalize, sortBy } from 'lodash';
 import moment from 'moment';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { useEffect, useState } from 'react';
@@ -72,7 +72,6 @@ import {
   ALERTS_FEATURE_ID,
   AlertExecutionStatusErrorReasons,
   formatDuration,
-  parseDuration,
 } from '../../../../../../alerting/common';
 import { alertsStatusesTranslationsMapping, ALERT_STATUS_LICENSE_ERROR } from '../translations';
 import { useKibana } from '../../../../common/lib/kibana';
@@ -82,6 +81,10 @@ import { CenterJustifiedSpinner } from '../../../components/center_justified_spi
 import { ManageLicenseModal } from './manage_license_modal';
 import { checkAlertTypeEnabled } from '../../../lib/check_alert_type_enabled';
 import { RuleEnabledSwitch } from './rule_enabled_switch';
+import {
+  formatMillisForDisplay,
+  shouldShowDurationWarning,
+} from '../../../lib/execution_duration_utils';
 
 const ENTER_KEY = 13;
 
@@ -523,25 +526,14 @@ export const AlertsList: React.FunctionComponent = () => {
       truncateText: false,
       'data-test-subj': 'alertsTableCell-duration',
       render: (value: number, item: AlertTableItem) => {
-        const ruleTypeTimeout: string | undefined = alertTypesState.data.get(
-          item.alertTypeId
-        )?.ruleTaskTimeout;
-        const ruleTypeTimeoutMillis: number | undefined = ruleTypeTimeout
-          ? parseDuration(ruleTypeTimeout)
-          : undefined;
-        const showDurationWarning: boolean = ruleTypeTimeoutMillis
-          ? value > ruleTypeTimeoutMillis
-          : false;
-        const duration = moment.duration(value);
-        const durationString = [duration.hours(), duration.minutes(), duration.seconds()]
-          .map((v: number) => padStart(`${v}`, 2, '0'))
-          .join(':');
+        const showDurationWarning = shouldShowDurationWarning(
+          alertTypesState.data.get(item.alertTypeId),
+          value
+        );
 
-        // add millis
-        const millisString = padStart(`${duration.milliseconds()}`, 3, '0');
         return (
           <>
-            {`${durationString}.${millisString}`}
+            {`${formatMillisForDisplay(value)}`}
             {showDurationWarning && (
               <EuiIconTip
                 data-test-subj="ruleDurationWarning"
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/execution_duration_chart.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/execution_duration_chart.test.tsx
new file mode 100644
index 0000000000000..672cd75f0cd13
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/execution_duration_chart.test.tsx
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import * as React from 'react';
+import { mountWithIntl, nextTick } from '@kbn/test/jest';
+import { act } from 'react-dom/test-utils';
+import { ExecutionDurationChart, padOrTruncateDurations } from './execution_duration_chart';
+
+describe('execution duration chart', () => {
+  it('renders empty state when no execution duration values are available', async () => {
+    const executionDuration = mockExecutionDuration();
+
+    const wrapper = mountWithIntl(<ExecutionDurationChart executionDuration={executionDuration} />);
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find('[data-test-subj="executionDurationChartPanel"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="executionDurationChartEmpty"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="executionDurationChart"]').exists()).toBeFalsy();
+  });
+
+  it('renders chart when execution duration values are available', async () => {
+    const executionDuration = mockExecutionDuration({ average: 10, values: [1, 2] });
+
+    const wrapper = mountWithIntl(<ExecutionDurationChart executionDuration={executionDuration} />);
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find('[data-test-subj="executionDurationChartPanel"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="executionDurationChartEmpty"]').exists()).toBeFalsy();
+    expect(wrapper.find('[data-test-subj="executionDurationChart"]').exists()).toBeTruthy();
+  });
+});
+
+describe('padOrTruncateDurations', () => {
+  it('does nothing when array is the correct length', () => {
+    expect(padOrTruncateDurations([1, 2, 3], 3)).toEqual([1, 2, 3]);
+  });
+
+  it('pads execution duration values when there are fewer than display desires', () => {
+    expect(padOrTruncateDurations([1, 2, 3], 10)).toEqual([1, 2, 3, 0, 0, 0, 0, 0, 0, 0]);
+  });
+
+  it('truncates execution duration values when there are more than display desires', () => {
+    expect(padOrTruncateDurations([1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13], 10)).toEqual([
+      3, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+    ]);
+  });
+});
+
+function mockExecutionDuration(
+  overwrites: {
+    average?: number;
+    values?: number[];
+  } = {}
+) {
+  return {
+    average: 0,
+    values: [],
+    ...overwrites,
+  };
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/execution_duration_chart.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/execution_duration_chart.tsx
new file mode 100644
index 0000000000000..ca20af9cea0fd
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/execution_duration_chart.tsx
@@ -0,0 +1,133 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiPanel,
+  EuiEmptyPrompt,
+  EuiIconTip,
+  EuiTitle,
+} from '@elastic/eui';
+import lightEuiTheme from '@elastic/eui/dist/eui_theme_light.json';
+import { Axis, BarSeries, Chart, CurveType, LineSeries, Settings } from '@elastic/charts';
+import { assign, fill } from 'lodash';
+import { formatMillisForDisplay } from '../../../lib/execution_duration_utils';
+
+export interface ComponentOpts {
+  executionDuration: {
+    average: number;
+    values: number[];
+  };
+}
+
+const DESIRED_NUM_EXECUTION_DURATIONS = 30;
+
+export const ExecutionDurationChart: React.FunctionComponent<ComponentOpts> = ({
+  executionDuration,
+}: ComponentOpts) => {
+  const paddedExecutionDurations = padOrTruncateDurations(
+    executionDuration.values,
+    DESIRED_NUM_EXECUTION_DURATIONS
+  );
+
+  return (
+    <EuiPanel data-test-subj="executionDurationChartPanel" hasBorder={true}>
+      <EuiFlexGroup alignItems="center" gutterSize="xs">
+        <EuiFlexItem grow={false}>
+          <EuiTitle size="xxs">
+            <h4>
+              <FormattedMessage
+                id="xpack.triggersActionsUI.sections.executionDurationChart.recentDurationsTitle"
+                defaultMessage="Recent execution durations"
+              />
+            </h4>
+          </EuiTitle>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiIconTip
+            color="subdued"
+            type="questionInCircle"
+            content={i18n.translate(
+              'xpack.triggersActionsUI.sections.executionDurationChart.recentDurationsTooltip',
+              {
+                defaultMessage: `Recent rule executions include up to the last {numExecutions} executions.`,
+                values: {
+                  numExecutions: DESIRED_NUM_EXECUTION_DURATIONS,
+                },
+              }
+            )}
+            position="top"
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+
+      {executionDuration.values && executionDuration.values.length > 0 ? (
+        <>
+          <Chart data-test-subj="executionDurationChart" size={{ height: 80 }}>
+            <Settings
+              theme={{
+                lineSeriesStyle: {
+                  point: { visible: false },
+                  line: { stroke: lightEuiTheme.euiColorAccent },
+                },
+              }}
+            />
+            <BarSeries
+              id="executionDuration"
+              xScaleType="linear"
+              yScaleType="linear"
+              xAccessor={0}
+              yAccessors={[1]}
+              data={paddedExecutionDurations.map((val, ndx) => [ndx, val])}
+            />
+            <LineSeries
+              id="rule_duration_avg"
+              xScaleType="linear"
+              yScaleType="linear"
+              xAccessor={0}
+              yAccessors={[1]}
+              data={paddedExecutionDurations.map((val, ndx) => [ndx, executionDuration.average])}
+              curve={CurveType.CURVE_NATURAL}
+            />
+            <Axis id="left-axis" position="left" tickFormat={(d) => formatMillisForDisplay(d)} />
+          </Chart>
+        </>
+      ) : (
+        <>
+          <EuiEmptyPrompt
+            data-test-subj="executionDurationChartEmpty"
+            body={
+              <>
+                <p>
+                  <FormattedMessage
+                    id="xpack.triggersActionsUI.sections.executionDurationChart.executionDurationNoData"
+                    defaultMessage="There are no available executions for this rule."
+                  />
+                </p>
+              </>
+            }
+          />
+        </>
+      )}
+    </EuiPanel>
+  );
+};
+
+export function padOrTruncateDurations(values: number[], desiredSize: number) {
+  if (values.length === desiredSize) {
+    return values;
+  } else if (values.length < desiredSize) {
+    return assign(fill(new Array(desiredSize), 0), values);
+  } else {
+    // oldest durations are at the start of the array, so take the last {desiredSize} values
+    return values.slice(-desiredSize);
+  }
+}
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/get_alert_instance_summary.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/get_alert_instance_summary.ts
index d4ca6c2aa9cd8..181e6cc940c38 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/get_alert_instance_summary.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/get_alert_instance_summary.ts
@@ -73,6 +73,7 @@ export default function createGetAlertInstanceSummaryTests({ getService }: FtrPr
                 'status_start_date',
                 'status_end_date',
                 'last_run',
+                'execution_duration',
               ]);
               expect(stableBody).to.eql({
                 name: 'abc',
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get_alert_instance_summary.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get_alert_instance_summary.ts
index 099502e375faa..ff55c376c04b2 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get_alert_instance_summary.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get_alert_instance_summary.ts
@@ -58,7 +58,12 @@ export default function createGetAlertInstanceSummaryTests({ getService }: FtrPr
       const { status_start_date: statusStartDate, status_end_date: statusEndDate } = response.body;
       expect(Date.parse(statusStartDate)).to.be.lessThan(Date.parse(statusEndDate));
 
-      const stableBody = omit(response.body, ['status_start_date', 'status_end_date', 'last_run']);
+      const stableBody = omit(response.body, [
+        'status_start_date',
+        'status_end_date',
+        'last_run',
+        'execution_duration',
+      ]);
       expect(stableBody).to.eql({
         id: createdAlert.id,
         name: 'abc',
@@ -91,7 +96,12 @@ export default function createGetAlertInstanceSummaryTests({ getService }: FtrPr
       const { status_start_date: statusStartDate, status_end_date: statusEndDate } = response.body;
       expect(Date.parse(statusStartDate)).to.be.lessThan(Date.parse(statusEndDate));
 
-      const stableBody = omit(response.body, ['status_start_date', 'status_end_date', 'last_run']);
+      const stableBody = omit(response.body, [
+        'status_start_date',
+        'status_end_date',
+        'last_run',
+        'execution_duration',
+      ]);
       expect(stableBody).to.eql({
         id: createdAlert.id,
         name: 'abc',

From 91d48ff475075691c833ed401cfaf4013c0786d1 Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Thu, 14 Oct 2021 15:01:42 -0500
Subject: [PATCH 102/117] [Workplace Search] Fix loading state bug and update
 button (#115068)

* Change source deletion to set entire page loading

Do this instead of having the button loading

* Replace text button with icon button for blocked windows
---
 .../synchronization/blocked_window_item.test.tsx    |  4 ++--
 .../synchronization/blocked_window_item.tsx         | 13 +++++++++----
 .../views/content_sources/source_logic.ts           |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.test.tsx
index f3c01b8d94d37..183d336ea62da 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.test.tsx
@@ -16,7 +16,7 @@ import { shallow } from 'enzyme';
 import moment from 'moment';
 
 import {
-  EuiButton,
+  EuiButtonIcon,
   EuiDatePicker,
   EuiDatePickerRange,
   EuiSelect,
@@ -53,7 +53,7 @@ describe('BlockedWindowItem', () => {
 
   it('handles remove button click', () => {
     const wrapper = shallow(<BlockedWindowItem {...props} />);
-    wrapper.find(EuiButton).simulate('click');
+    wrapper.find(EuiButtonIcon).simulate('click');
 
     expect(removeBlockedWindow).toHaveBeenCalledWith(0);
   });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.tsx
index 272efc6fc3c50..3399f41254004 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.tsx
@@ -11,7 +11,7 @@ import { useActions, useValues } from 'kea';
 import moment from 'moment';
 
 import {
-  EuiButton,
+  EuiButtonIcon,
   EuiDatePicker,
   EuiDatePickerRange,
   EuiFlexGroup,
@@ -179,9 +179,14 @@ export const BlockedWindowItem: React.FC<Props> = ({ blockedWindow, index }) =>
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <EuiButton fill color="danger" onClick={() => removeBlockedWindow(index)}>
-            {REMOVE_BUTTON}
-          </EuiButton>
+          <EuiButtonIcon
+            display="base"
+            iconType="trash"
+            color="danger"
+            onClick={() => removeBlockedWindow(index)}
+            aria-label={REMOVE_BUTTON}
+            title={REMOVE_BUTTON}
+          />
         </EuiFlexItem>
       </EuiFlexGroup>
       <EuiSpacer size="s" />
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
index 9dcd0824cad11..0b67e3f2da79b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
@@ -112,6 +112,7 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
       {
         setContentSource: () => false,
         resetSourceState: () => true,
+        removeContentSource: () => true,
       },
     ],
     buttonLoading: [
@@ -119,7 +120,6 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
       {
         setButtonNotLoading: () => false,
         resetSourceState: () => false,
-        removeContentSource: () => true,
       },
     ],
     sectionLoading: [

From e49ec25fae79ed83245d23cf33edcdaaaf912fcd Mon Sep 17 00:00:00 2001
From: Kevin Lacabane <kevin.lacabane@elastic.co>
Date: Thu, 14 Oct 2021 22:47:57 +0200
Subject: [PATCH 103/117] [Stack Monitoring] Fix monitoring func test (#115013)

* add noDataContainer test-subj

* remove unnecessary test step

* Fix test subjects for overview page

* remove unused service

* update NoData component snapshots

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../no_data/__snapshots__/no_data.test.js.snap   |  2 ++
 .../public/components/no_data/no_data.js         | 16 ++++++++++------
 .../apps/monitoring/enable_monitoring/index.js   |  3 ---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap b/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap
index 34a4c049dddcc..8852d104fe00a 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap
@@ -3,6 +3,7 @@
 exports[`NoData should show a default message if reason is unknown 1`] = `
 <div
   class="euiPage euiPage--paddingMedium euiPage--grow"
+  data-test-subj="noDataContainer"
 >
   <h1
     class="euiScreenReaderOnly"
@@ -94,6 +95,7 @@ exports[`NoData should show a default message if reason is unknown 1`] = `
 exports[`NoData should show text next to the spinner while checking a setting 1`] = `
 <div
   class="euiPage euiPage--paddingMedium euiPage--grow"
+  data-test-subj="noDataContainer"
 >
   <h1
     class="euiScreenReaderOnly"
diff --git a/x-pack/plugins/monitoring/public/components/no_data/no_data.js b/x-pack/plugins/monitoring/public/components/no_data/no_data.js
index 97bf7cacf53e7..2effc4187233d 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/no_data.js
+++ b/x-pack/plugins/monitoring/public/components/no_data/no_data.js
@@ -56,9 +56,13 @@ export function NoData(props) {
     window.location.hash = getSafeForExternalLink('#/elasticsearch/nodes');
   }
 
+  const NoDataContainer = ({ children }) => {
+    return <EuiPage data-test-subj="noDataContainer">{children}</EuiPage>;
+  };
+
   if (isCloudEnabled) {
     return (
-      <EuiPage>
+      <NoDataContainer>
         <EuiScreenReaderOnly>
           <h1>
             <FormattedMessage
@@ -97,13 +101,13 @@ export function NoData(props) {
             <CloudDeployment />
           </EuiPageContent>
         </EuiPageBody>
-      </EuiPage>
+      </NoDataContainer>
     );
   }
 
   if (useInternalCollection) {
     return (
-      <EuiPage>
+      <NoDataContainer>
         <EuiScreenReaderOnly>
           <h1>
             <FormattedMessage
@@ -140,12 +144,12 @@ export function NoData(props) {
             ) : null}
           </EuiPageContent>
         </EuiPageBody>
-      </EuiPage>
+      </NoDataContainer>
     );
   }
 
   return (
-    <EuiPage>
+    <NoDataContainer>
       <EuiScreenReaderOnly>
         <h1>
           <FormattedMessage
@@ -211,7 +215,7 @@ export function NoData(props) {
           </EuiButtonEmpty>
         </EuiPageContent>
       </EuiPageBody>
-    </EuiPage>
+    </NoDataContainer>
   );
 }
 
diff --git a/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js b/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
index 79bd479c45a17..cce6401453d21 100644
--- a/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
+++ b/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
@@ -11,7 +11,6 @@ export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['monitoring', 'common', 'header']);
   const esSupertest = getService('esSupertest');
   const noData = getService('monitoringNoData');
-  const testSubjects = getService('testSubjects');
   const clusterOverview = getService('monitoringClusterOverview');
   const retry = getService('retry');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
@@ -53,8 +52,6 @@ export default function ({ getService, getPageObjects }) {
       // Here we are checking that once Monitoring is enabled,
       // it moves on to the cluster overview page.
       await retry.tryForTime(20000, async () => {
-        // Click the refresh button
-        await testSubjects.click('querySubmitButton');
         await clusterOverview.closeAlertsModal();
         expect(await clusterOverview.isOnClusterOverview()).to.be(true);
       });

From 8db36d9f4a93b89e1c3fba166e90f646290958ce Mon Sep 17 00:00:00 2001
From: Vadim Yakhin <yakhin.v@gmail.com>
Date: Thu, 14 Oct 2021 15:36:56 -0700
Subject: [PATCH 104/117] [Fleet, Workplace Search] Add Workplace Search
 connectors as non-Fleet integrations (#114919)

* Add icons

* Add new categories

* Add Workplace Search connectors to the unified integrations view

* Add a new enterprise_search shipper

* Update number of custom integrations in test

* Change customIntegrations type to optional

* Revert "Update number of custom integrations in test"

This reverts commit 30214b2c7c2ba290176b44a80a72a5392918d9dc.

The reason is that while this test passes with 2 separate commands for
functional test runner, it fails when it is run with a single command.

Reverting to make the CI pass. We will look into this test separately.
I will link the investigation issue in the PR.
---
 .../custom_integrations/common/index.ts       |  10 +-
 x-pack/plugins/enterprise_search/kibana.json  |   2 +-
 .../public/assets/source_icons/box.svg        |   1 +
 .../assets/source_icons/confluence_cloud.svg  |   1 +
 .../assets/source_icons/confluence_server.svg |   1 +
 .../assets/source_icons/custom_api_source.svg |   1 +
 .../public/assets/source_icons/dropbox.svg    |   1 +
 .../public/assets/source_icons/github.svg     |   1 +
 .../source_icons/github_enterprise_server.svg |   1 +
 .../public/assets/source_icons/gmail.svg      |   1 +
 .../assets/source_icons/google_drive.svg      |   1 +
 .../public/assets/source_icons/jira_cloud.svg |   1 +
 .../assets/source_icons/jira_server.svg       |   1 +
 .../public/assets/source_icons/onedrive.svg   |   1 +
 .../public/assets/source_icons/salesforce.svg |   1 +
 .../source_icons/salesforce_sandbox.svg       |   1 +
 .../public/assets/source_icons/servicenow.svg |   1 +
 .../assets/source_icons/sharepoint_online.svg |   1 +
 .../public/assets/source_icons/slack.svg      |   1 +
 .../public/assets/source_icons/zendesk.svg    |   1 +
 .../enterprise_search/server/integrations.ts  | 304 ++++++++++++++++++
 .../enterprise_search/server/plugin.ts        |   9 +-
 22 files changed, 340 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/box.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/confluence_cloud.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/confluence_server.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/custom_api_source.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/dropbox.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/github.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/github_enterprise_server.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/gmail.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/google_drive.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/jira_cloud.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/jira_server.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/onedrive.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/salesforce.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/salesforce_sandbox.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/servicenow.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/sharepoint_online.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/slack.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/assets/source_icons/zendesk.svg
 create mode 100644 x-pack/plugins/enterprise_search/server/integrations.ts

diff --git a/src/plugins/custom_integrations/common/index.ts b/src/plugins/custom_integrations/common/index.ts
index de2a6592465a2..944ac6ba3e6ee 100755
--- a/src/plugins/custom_integrations/common/index.ts
+++ b/src/plugins/custom_integrations/common/index.ts
@@ -40,8 +40,15 @@ export const INTEGRATION_CATEGORY_DISPLAY = {
   web: 'Web',
 
   // Kibana added
-  upload_file: 'Upload a file',
+  communication: 'Communication',
+  customer_support: 'Customer Support',
+  document_storage: 'Document Storage',
+  enterprise_management: 'Enterprise Management',
+  knowledge_platform: 'Knowledge Platform',
   language_client: 'Language client',
+  project_management: 'Project Management',
+  software_development: 'Software Development',
+  upload_file: 'Upload a file',
 };
 
 /**
@@ -70,6 +77,7 @@ export interface IntegrationCategoryCount {
 // TODO: consider i18n
 export const SHIPPER_DISPLAY = {
   beats: 'Beats',
+  enterprise_search: 'Enterprise Search',
   language_clients: 'Language clients',
   other: 'Other',
   sample_data: 'Sample data',
diff --git a/x-pack/plugins/enterprise_search/kibana.json b/x-pack/plugins/enterprise_search/kibana.json
index 9df01988fbd89..76b53766b1f0e 100644
--- a/x-pack/plugins/enterprise_search/kibana.json
+++ b/x-pack/plugins/enterprise_search/kibana.json
@@ -4,7 +4,7 @@
   "kibanaVersion": "kibana",
   "requiredPlugins": ["features", "spaces", "security", "licensing", "data", "charts", "infra"],
   "configPath": ["enterpriseSearch"],
-  "optionalPlugins": ["usageCollection", "home", "cloud"],
+  "optionalPlugins": ["usageCollection", "home", "cloud", "customIntegrations"],
   "server": true,
   "ui": true,
   "requiredBundles": ["home", "kibanaReact"],
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/box.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/box.svg
new file mode 100644
index 0000000000000..b1b542eadd59c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/box.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="72" height="71.986" viewBox="0 0 19.05 19.046" version="1.1"><g fill="#29ace3" fill-rule="evenodd"><path d="M9.834 13.13A2.128 2.128 0 017.7 11.005c0-1.171.955-2.122 2.132-2.122 1.178 0 2.132.95 2.132 2.122a2.127 2.127 0 01-2.131 2.123zm-6.28 0a2.128 2.128 0 01-2.133-2.123c0-1.172.955-2.123 2.133-2.123 1.177 0 2.13.95 2.13 2.122a2.127 2.127 0 01-2.13 2.123zm6.28-5.662c-1.36 0-2.544.762-3.14 1.88a3.554 3.554 0 00-3.14-1.88c-.8 0-1.538.263-2.133.708V5.194A.708.708 0 00.71 4.5c-.389 0-.701.308-.71.694v5.871a3.546 3.546 0 003.553 3.481 3.556 3.556 0 003.14-1.88 3.556 3.556 0 003.14 1.88 3.547 3.547 0 003.554-3.54 3.546 3.546 0 00-3.554-3.538z"/><path d="M18.902 13.36l-1.932-2.358 1.934-2.365a.669.669 0 00-.163-.979.822.822 0 00-1.073.13l-1.665 2.03-1.662-2.03a.82.82 0 00-1.073-.13.668.668 0 00-.162.98l1.93 2.364-1.93 2.36c-.245.312-.175.746.162.979a.822.822 0 001.073-.13l1.663-2.029 1.661 2.029a.823.823 0 001.074.13c.338-.233.408-.667.163-.98z"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/confluence_cloud.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/confluence_cloud.svg
new file mode 100644
index 0000000000000..7aac36a6fe3c5
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/confluence_cloud.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset=".18" stop-color="#0052cc"/><stop offset="1" stop-color="#2684ff"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="95.0371" x2="71.8734" xlink:href="#a" y1="104.185" y2="51.0439"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="6770.46" x2="6500.78" xlink:href="#a" y1="-77645.6" y2="-78879.7"/><clipPath id="d"><path d="m0 0h100v100h-100z"/></clipPath><g clip-path="url(#d)"><path d="m3.62631 75.3532c-1.03424 1.6866-2.19577 3.6437-3.182274 5.203-.882999 1.4921-.4089699 3.4166 1.066064 4.3279l20.6848 12.7291c.7261.4483 1.6018.5862 2.4305.3827.8287-.2034 1.541-.7311 1.9769-1.4647.8274-1.3843 1.8935-3.1823 3.055-5.1076 8.1944-13.5246 16.4365-11.8698 31.2977-4.7734l20.5097 9.7537c.7768.3697 1.6702.4092 2.4766.1094.8063-.2997 1.457-.9132 1.8036-1.7005l9.8491-22.276c.6959-1.5909-.0122-3.446-1.5911-4.1687-4.3279-2.0367-12.936-6.0941-20.6848-9.8333-27.8767-13.5405-51.5687-12.6654-69.69179 16.8184z" fill="url(#b)"/><path d="m96.3737 24.8029c1.0343-1.6866 2.1958-3.6437 3.1823-5.203.883-1.4922.409-3.4166-1.066-4.3279l-20.6848-12.72913c-.732-.49303-1.6359-.65992-2.4957-.46081s-1.5983.74635-2.0391 1.51096c-.8274 1.38429-1.8934 3.18227-3.0549 5.10755-8.1944 13.52463-16.4365 11.86993-31.2977 4.77343l-20.4461-9.70595c-.7768-.36973-1.6702-.40921-2.4765-.10944-.8064.29976-1.457.91322-1.8037 1.70057l-9.84912 22.27592c-.69586 1.591.01219 3.4461 1.59114 4.1688 4.32788 2.0366 12.93598 6.094 20.68478 9.8332 27.9404 13.5247 51.6324 12.6177 69.7554-16.8342z" fill="url(#c)"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/confluence_server.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/confluence_server.svg
new file mode 100644
index 0000000000000..7aac36a6fe3c5
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/confluence_server.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset=".18" stop-color="#0052cc"/><stop offset="1" stop-color="#2684ff"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="95.0371" x2="71.8734" xlink:href="#a" y1="104.185" y2="51.0439"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="6770.46" x2="6500.78" xlink:href="#a" y1="-77645.6" y2="-78879.7"/><clipPath id="d"><path d="m0 0h100v100h-100z"/></clipPath><g clip-path="url(#d)"><path d="m3.62631 75.3532c-1.03424 1.6866-2.19577 3.6437-3.182274 5.203-.882999 1.4921-.4089699 3.4166 1.066064 4.3279l20.6848 12.7291c.7261.4483 1.6018.5862 2.4305.3827.8287-.2034 1.541-.7311 1.9769-1.4647.8274-1.3843 1.8935-3.1823 3.055-5.1076 8.1944-13.5246 16.4365-11.8698 31.2977-4.7734l20.5097 9.7537c.7768.3697 1.6702.4092 2.4766.1094.8063-.2997 1.457-.9132 1.8036-1.7005l9.8491-22.276c.6959-1.5909-.0122-3.446-1.5911-4.1687-4.3279-2.0367-12.936-6.0941-20.6848-9.8333-27.8767-13.5405-51.5687-12.6654-69.69179 16.8184z" fill="url(#b)"/><path d="m96.3737 24.8029c1.0343-1.6866 2.1958-3.6437 3.1823-5.203.883-1.4922.409-3.4166-1.066-4.3279l-20.6848-12.72913c-.732-.49303-1.6359-.65992-2.4957-.46081s-1.5983.74635-2.0391 1.51096c-.8274 1.38429-1.8934 3.18227-3.0549 5.10755-8.1944 13.52463-16.4365 11.86993-31.2977 4.77343l-20.4461-9.70595c-.7768-.36973-1.6702-.40921-2.4765-.10944-.8064.29976-1.457.91322-1.8037 1.70057l-9.84912 22.27592c-.69586 1.591.01219 3.4461 1.59114 4.1688 4.32788 2.0366 12.93598 6.094 20.68478 9.8332 27.9404 13.5247 51.6324 12.6177 69.7554-16.8342z" fill="url(#c)"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/custom_api_source.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/custom_api_source.svg
new file mode 100644
index 0000000000000..cc07fbbc50877
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/custom_api_source.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="a"><path d="m0 0h100v100h-100z"/></clipPath><g clip-path="url(#a)"><path d="m50.8142 23.5717h-4.2c4.143 8.1938 6.3015 17.2469 6.3015 26.4286 0 9.1816-2.1585 18.2347-6.3015 26.4285h4.5714c7.0093 0 13.7316-2.7844 18.6879-7.7407s7.7407-11.6785 7.7407-18.6878-2.7844-13.7315-7.7407-18.6879c-4.9563-4.9563-11.6786-7.7407-18.6879-7.7407zm-.8142-23.5857279c-6.6174-.0042253-13.1691 1.3119779-19.2715 3.8714579 5.3516 4.32083 9.9142 9.53597 13.4857 15.41427h8.0714l.0715.0857c7.7784.5043 15.0733 3.9498 20.4037 9.637s8.2968 13.1897 8.2968 20.9844-2.9664 15.2973-8.2968 20.9845-12.6253 9.1327-20.4037 9.6369l-.0715.1001h-8.0714c-3.5715 5.8782-8.1341 11.0935-13.4857 15.4143 6.8282 2.8556 14.2051 4.1594 21.5985 3.8181 7.3933-.3415 14.6186-2.3201 21.1544-5.7929 6.5358-3.4729 12.2191-8.3534 16.6398-14.2894 4.4206-5.936 7.4683-12.7794 8.9231-20.0362 1.4547-7.2568 1.2807-14.7461-.5104-21.9274-1.791-7.1813-5.1539-13.8753-9.846-19.5991s-10.5964-10.33458-17.2868-13.49953c-6.6903-3.16494-13.9999-4.8051405-21.4011-4.8021979zm-10.8714 19.2857279c-3.4579-5.1394-7.7617-9.65573-12.7287-13.35712-7.308 3.93332-13.5268 9.61712-18.09986 16.54282 4.21966-2.0886 8.86316-3.1785 13.57146-3.1857zm0 61.4286h-17.2571c-4.7102-.005-9.3553-1.1002-13.57146-3.2 4.57606 6.9408 10.80566 12.6353 18.12846 16.5714 4.9508-3.7106 9.2437-8.2257 12.7001-13.3571zm2.6428-4.2858c4.4971-8.0826 6.8574-17.1791 6.8574-26.4285 0-9.2495-2.3603-18.346-6.8574-26.4286h-19.8999c-6.6584-.0024-13.07027 2.5194-17.94297 7.0571-.04357.1274-.09606.2515-.15712.3715 1.44454-1.374 3.03486-2.586 4.74278-3.6143-1.70792 1.0283-3.29824 2.2403-4.74278 3.6143-5.02806 12.1627-5.02806 25.823 0 37.9857.06106.12.11355.244.15712.3714 4.87578 4.5328 11.28557 7.0539 17.94297 7.0571z" fill="#0060d5"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/dropbox.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/dropbox.svg
new file mode 100644
index 0000000000000..01e5a7735de12
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/dropbox.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m20.3395 39.4907-20.3395-16.2859 29.4168-19.2045 20.5829 17.1784-29.6601 18.3121 29.6601 18.3118-20.5828 17.1794-29.41680072-19.2045zm29.6605 18.3119 20.5839 17.1794 29.4158-19.2045-20.3396-16.287zm50-34.5981-29.4158-19.2045-20.5839 17.1784 29.6601 18.3121zm-49.9398 38.2941-20.6434 17.1278-8.833-5.7665v6.4653l29.4764 17.6748 29.4774-17.6748v-6.4653l-8.832 5.7665z" fill="#007ee5" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/github.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/github.svg
new file mode 100644
index 0000000000000..aa9c3e5b45146
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/github.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m49.9954 1c-27.6067 0-49.9954 22.3856-49.9954 50.0015 0 22.0909 14.3252 40.83 34.1938 47.4416 2.5016.4605 3.4132-1.0835 3.4132-2.4095 0-1.1879-.0429-4.331-.0675-8.5024-13.9077 3.0203-16.8421-6.7037-16.8421-6.7037-2.2745-5.7767-5.5527-7.3145-5.5527-7.3145-4.5397-3.1002.3438-3.0388.3438-3.0388 5.0186.353 7.6583 5.1536 7.6583 5.1536 4.4599 7.6399 11.7039 5.433 14.5523 4.153.4543-3.2291 1.7466-5.4329 3.1739-6.6822-11.1023-1.2616-22.7755-5.5527-22.7755-24.7122 0-5.4576 1.9492-9.9236 5.1475-13.4167-.5156-1.2646-2.2315-6.3507.4911-13.2324 0 0 4.196-1.3444 13.7482 5.126 3.9872-1.1112 8.266-1.6637 12.5172-1.6851 4.2482.0214 8.5239.5739 12.5173 1.6851 9.546-6.4704 13.7358-5.126 13.7358-5.126 2.7288 6.8817 1.013 11.9678.5004 13.2324 3.2045 3.4931 5.1382 7.9591 5.1382 13.4167 0 19.2086-11.6915 23.4353-22.8275 24.6723 1.7925 1.5439 3.3917 4.595 3.3917 9.2575 0 6.6853-.0614 12.0783-.0614 13.7174 0 1.3383.9024 2.8945 3.4378 2.4065 19.8533-6.627 34.1662-25.3538 34.1662-47.4386 0-27.6159-22.3887-50.0015-50.0046-50.0015z" fill="#1a1919" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/github_enterprise_server.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/github_enterprise_server.svg
new file mode 100644
index 0000000000000..aa9c3e5b45146
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/github_enterprise_server.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m49.9954 1c-27.6067 0-49.9954 22.3856-49.9954 50.0015 0 22.0909 14.3252 40.83 34.1938 47.4416 2.5016.4605 3.4132-1.0835 3.4132-2.4095 0-1.1879-.0429-4.331-.0675-8.5024-13.9077 3.0203-16.8421-6.7037-16.8421-6.7037-2.2745-5.7767-5.5527-7.3145-5.5527-7.3145-4.5397-3.1002.3438-3.0388.3438-3.0388 5.0186.353 7.6583 5.1536 7.6583 5.1536 4.4599 7.6399 11.7039 5.433 14.5523 4.153.4543-3.2291 1.7466-5.4329 3.1739-6.6822-11.1023-1.2616-22.7755-5.5527-22.7755-24.7122 0-5.4576 1.9492-9.9236 5.1475-13.4167-.5156-1.2646-2.2315-6.3507.4911-13.2324 0 0 4.196-1.3444 13.7482 5.126 3.9872-1.1112 8.266-1.6637 12.5172-1.6851 4.2482.0214 8.5239.5739 12.5173 1.6851 9.546-6.4704 13.7358-5.126 13.7358-5.126 2.7288 6.8817 1.013 11.9678.5004 13.2324 3.2045 3.4931 5.1382 7.9591 5.1382 13.4167 0 19.2086-11.6915 23.4353-22.8275 24.6723 1.7925 1.5439 3.3917 4.595 3.3917 9.2575 0 6.6853-.0614 12.0783-.0614 13.7174 0 1.3383.9024 2.8945 3.4378 2.4065 19.8533-6.627 34.1662-25.3538 34.1662-47.4386 0-27.6159-22.3887-50.0015-50.0046-50.0015z" fill="#1a1919" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/gmail.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/gmail.svg
new file mode 100644
index 0000000000000..31fe60c6a63f9
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/gmail.svg
@@ -0,0 +1 @@
+<svg width="100" height="100" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0)"><path d="M6.818 87.517h15.91V48.881L0 31.835V80.7a6.816 6.816 0 006.818 6.818z" fill="#4285F4"/><path d="M77.273 87.517h15.909A6.816 6.816 0 00100 80.7V31.835L77.273 48.881v38.636z" fill="#34A853"/><path d="M77.273 19.335v29.546L100 31.835v-9.09c0-8.427-9.62-13.24-16.364-8.183l-6.363 4.773z" fill="#FBBC04"/><path d="M22.727 48.88V19.336L50 39.79l27.273-20.455v29.546L50 69.335 22.727 48.881z" fill="#EA4335"/><path d="M0 22.744v9.091l22.727 17.046V19.335l-6.363-4.773C9.619 9.506 0 14.319 0 22.745z" fill="#C5221F"/></g><defs><clipPath id="clip0"><path fill="#fff" transform="translate(0 12.499)" d="M0 0h100v75.018H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/google_drive.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/google_drive.svg
new file mode 100644
index 0000000000000..f3fe82cd3cd98
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/google_drive.svg
@@ -0,0 +1 @@
+<svg width="100" height="100" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0)"><g clip-path="url(#clip1)"><path d="M6.913 82.125l4.441 7.67c.923 1.615 2.25 2.884 3.807 3.807L31.02 66.15H-.7c0 1.788.461 3.576 1.384 5.19l6.23 10.786z" fill="#0066DA"/><path d="M49.65 33.851L33.79 6.398c-1.558.923-2.884 2.192-3.807 3.806L.684 60.959A10.45 10.45 0 00-.7 66.148h31.721L49.65 33.852z" fill="#00AC47"/><path d="M84.14 93.602c1.557-.923 2.883-2.192 3.806-3.806l1.846-3.173 8.824-15.283A10.45 10.45 0 00100 66.149H68.277l6.75 13.265 9.112 14.188z" fill="#EA4335"/><path d="M49.65 33.851L65.51 6.398c-1.557-.923-3.345-1.384-5.19-1.384H38.98c-1.845 0-3.633.519-5.19 1.384L49.65 33.85z" fill="#00832D"/><path d="M68.279 66.149H31.02l-15.86 27.453c1.557.923 3.345 1.384 5.19 1.384H78.95c1.845 0 3.633-.519 5.19-1.384L68.28 66.15z" fill="#2684FC"/><path d="M83.966 35.581L69.317 10.204c-.923-1.614-2.25-2.883-3.806-3.806L49.65 33.85 68.279 66.15h31.663a10.45 10.45 0 00-1.384-5.19L83.966 35.58z" fill="#FFBA00"/></g></g><defs><clipPath id="clip0"><path fill="#fff" d="M0 0h100v100H0z"/></clipPath><clipPath id="clip1"><path fill="#fff" transform="translate(-.7 5.014)" d="M0 0h100.7v89.972H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/jira_cloud.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/jira_cloud.svg
new file mode 100644
index 0000000000000..c12e55798d889
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/jira_cloud.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset=".18" stop-color="#0052cc"/><stop offset="1" stop-color="#2684ff"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="75.1425" x2="54.7827" xlink:href="#a" y1="24.0781" y2="45.3227"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="1956.92" x2="1082.22" xlink:href="#a" y1="1849.11" y2="2714.75"/><clipPath id="d"><path d="m0 0h100v100h-100z"/></clipPath><g clip-path="url(#d)"><path d="m95.8224 0h-48.1546c0 5.76522 2.2902 11.2943 6.3669 15.3709 4.0766 4.0767 9.6057 6.3669 15.3709 6.3669h8.8706v8.5642c.0077 11.9946 9.7293 21.7162 21.7238 21.7238v-47.84814c0-2.30726-1.8704-4.17766-4.1776-4.17766z" fill="#2684ff"/><path d="m71.9952 23.9944h-48.1545c.0077 11.9946 9.7293 21.7162 21.7239 21.7238h8.8705v8.5921c.0154 11.9946 9.7432 21.7099 21.7378 21.7099v-47.8482c0-2.3072-1.8704-4.1776-4.1777-4.1776z" fill="url(#b)"/><path d="m48.1545 47.9724h-48.1545c0 12.0055 9.73233 21.7378 21.7378 21.7378h8.8984v8.5642c.0077 11.9837 9.7123 21.7008 21.696 21.7238v-47.8481c0-2.3073-1.8704-4.1777-4.1777-4.1777z" fill="url(#c)"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/jira_server.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/jira_server.svg
new file mode 100644
index 0000000000000..4dfd0fd910079
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/jira_server.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset=".18" stop-color="#0052cc"/><stop offset="1" stop-color="#2684ff"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="47.7365" x2="27.0869" xlink:href="#a" y1="20.2349" y2="40.8846"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="1416.82" x2="2098.99" xlink:href="#a" y1="3129.77" y2="2687.25"/><path d="m97.5915 47.1319-43.0961-42.98539-4.1465-4.14651-32.3705 32.3704-14.81682 14.7615c-.36821.3672-.6604.8034-.85971 1.2837s-.30187.9952-.30187 1.5153c0 .52.10256 1.0348.30187 1.5151s.4915.9166.85971 1.2837l29.60612 29.6613 17.5812 17.6089 32.4395-32.3979.4976-.4976 14.3055-14.3194c.3765-.3681.6757-.8078.8799-1.2932s.3096-1.0066.3096-1.5334c0-.5266-.1054-1.0478-.3096-1.5332s-.5034-.9251-.8799-1.2933zm-47.2426 17.6504-14.7892-14.7893 14.7892-14.7891 14.7892 14.7891z" fill="#2684ff"/><path d="m50.3488 35.2038c-4.6294-4.6608-7.2278-10.9635-7.2278-17.5328s2.5984-12.872 7.2278-17.532816l-32.4257 32.301316 17.6089 17.6089z" fill="url(#b)"/><path d="m65.207 49.8962-14.8583 14.886c2.3153 2.3109 4.1522 5.0556 5.4054 8.0771 1.2532 3.0216 1.8983 6.2607 1.8983 9.5318 0 3.2712-.6451 6.5101-1.8983 9.5317s-3.0901 5.7663-5.4054 8.0771l32.481-32.4395z" fill="url(#c)"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/onedrive.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/onedrive.svg
new file mode 100644
index 0000000000000..c390dff1e418f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/onedrive.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><path d="m60.4144 61.235 20.6412-19.7397c-4.2876-16.7185-21.3163-26.7957-38.0349-22.5081-7.5288 1.9308-14.0679 6.598-18.341 13.0904.3194-.008 35.7347 29.1574 35.7347 29.1574z" fill="#0364b8"/><path d="m38.1321 35.7933-.001.0034c-3.9441-2.4428-8.4928-3.734-13.1321-3.7277-.1072 0-.2125.0068-.3194.008-13.8001.171-24.848511 11.4967-24.67764455 25.2964.06194815 5.0058 1.62603455 9.8776 4.48952455 13.9839l30.92382-3.873 23.7087-19.1172z" fill="#0078d4"/><path d="m81.0554 41.4944c-.4537-.0303-.9096-.0513-1.3711-.0513-2.7691-.0027-5.5093.5629-8.0511 1.6618l-.0006-.0021-12.5086 5.2638 13.7898 17.0339 24.6528 5.9928c5.3204-9.8765 1.6264-22.1957-8.2501-27.5158-2.5521-1.3747-5.3688-2.1872-8.2609-2.383z" fill="#1490df"/><path d="m4.49161 71.3574c4.66932 6.7133 12.33019 10.7142 20.50749 10.7098h54.6853c7.4702.0021 14.3384-4.0971 17.8823-10.6731l-38.4426-23.0269z" fill="#28a8ea"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/salesforce.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/salesforce.svg
new file mode 100644
index 0000000000000..ef6d552949424
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/salesforce.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g clip-rule="evenodd" fill-rule="evenodd"><path d="m41.6133 22.6339c3.2263-3.3605 7.716-5.4446 12.6822-5.4446 6.6008 0 12.3598 3.6808 15.427 9.1455 2.7433-1.2252 5.7146-1.8566 8.7191-1.8529 11.9064 0 21.5584 9.7361 21.5584 21.7466 0 12.0115-9.652 21.7476-21.5584 21.7476-1.4261.0007-2.8486-.1412-4.2464-.4234-2.7008 4.818-7.8482 8.0734-13.7543 8.0734-2.4726 0-4.812-.5716-6.8952-1.5877-2.7379 6.4407-9.1165 10.9564-16.5512 10.9564-7.7421 0-14.3409-4.8991-16.8736-11.7692-1.1275.2386-2.277.3584-3.4295.3573-9.21863 0-16.6914-7.5498-16.6914-16.8645 0-6.2425 3.35749-11.6922 8.34668-14.6082-1.05742-2.4341-1.60164-5.0601-1.59866-7.714-.001-10.7122 8.69608-19.3962 19.42318-19.3962 6.2976 0 11.8944 2.9941 15.4431 7.6339" fill="#00a1e0"/><g fill="#fff"><path d="m14.4841 51.2978c-.0631.1631.023.1982.043.2262.1882.1371.3784.2352.5706.3444 1.0211.5415 1.9831.6997 2.9901.6997 2.0521 0 3.3255-1.0911 3.3255-2.848v-.034c0-1.6237-1.4375-2.2133-2.7869-2.6398l-.1752-.057c-1.0171-.3304-1.894-.6147-1.894-1.2843v-.0361c0-.5726.5126-.994 1.3074-.994.8829 0 1.932.2933 2.6067.6667 0 0 .1982.1281.2703-.0641.04-.1021.3824-1.0231.4174-1.1222.039-.1091-.03-.1882-.1001-.2302-.7708-.4705-1.8359-.7908-2.9381-.7908l-.2052.002c-1.8769 0-3.1883 1.1342-3.1883 2.7598v.0341c0 1.7138 1.4465 2.2693 2.8009 2.6567l.2183.0671c.987.3033 1.8369.5636 1.8369 1.2593v.0341c0 .6346-.5526 1.1081-1.4435 1.1081-.9359.0067-1.8537-.2576-2.6428-.7608-.1441-.0841-.2282-.1451-.3393-.2122-.0581-.037-.2052-.1011-.2693.0921zm30.0302 0c-.0631.1631.023.1982.043.2262.1872.1371.3784.2352.5706.3444 1.0211.5415 1.9831.6997 2.9901.6997 2.0522 0 3.3245-1.0911 3.3245-2.848v-.034c0-1.6237-1.4365-2.2133-2.7859-2.6398l-.1752-.057c-1.017-.3304-1.8949-.6147-1.8949-1.2843v-.0361c0-.5726.5135-.994 1.3083-.994.8829 0 1.932.2933 2.6067.6667 0 0 .1982.1281.2703-.0641.04-.1021.3824-1.0231.4174-1.1222.0391-.1091-.03-.1882-.1001-.2302-.7708-.4705-1.8359-.7908-2.938-.7908l-.2052.002c-1.878 0-3.1883 1.1342-3.1883 2.7598v.0341c0 1.7138 1.4465 2.2693 2.8009 2.6567l.2182.0671c.987.3033 1.8389.5636 1.8389 1.2593v.0341c0 .6346-.5546 1.1081-1.4465 1.1081-.9359.0067-1.8537-.2576-2.6427-.7608-.1432-.0841-.2283-.1421-.3374-.2122-.037-.024-.2102-.0911-.2703.0921zm20.5003-3.4406c0 .993-.1852 1.7748-.5505 2.3274-.3604.5466-.905.8139-1.6658.8139-.7618 0-1.3053-.2653-1.6597-.8139-.3584-.5506-.5406-1.3344-.5406-2.3274 0-.991.1822-1.7719.5406-2.3194.3544-.5406.8979-.8049 1.6597-.8049.7608 0 1.3064.2633 1.6678.8049.3633.5475.5485 1.3274.5485 2.3194zm1.7118-1.8409c-.1549-.5437-.42-1.0497-.7788-1.4866-.3587-.4268-.8076-.7687-1.3144-1.001-.5225-.2433-1.1412-.3664-1.8349-.3664-.6947 0-1.3133.1231-1.8359.3674-.5245.2442-.966.5806-1.3164 1-.3473.4185-.6106.92-.7798 1.4866-.171.5985-.2553 1.2184-.2502 1.8409 0 .6567.0841 1.2763.2502 1.8399.1702.5676.4305 1.0691.7808 1.4876.3494.4184.7919.7537 1.3154.991.5236.2382 1.1412.3594 1.8359.3594.6937 0 1.3114-.1202 1.8349-.3594.5075-.2267.9568-.5656 1.3144-.991.3494-.4175.6106-.919.7798-1.4876.1722-.598.2572-1.2177.2523-1.8399 0-.6557-.0841-1.2753-.2523-1.8409zm14.0616 4.7169c-.057-.1672-.2182-.1041-.2182-.1041-.2565.1039-.5233.1804-.7958.2282-.2863.0441-.6006.0661-.939.0661-.8289 0-1.4876-.2463-1.959-.7328-.4725-.4875-.7378-1.2753-.7348-2.3404.003-.971.2362-1.6998.6567-2.2554.4174-.5525 1.0531-.8358 1.9-.8358.7067 0 1.2452.0801 1.8098.2592 0 0 .1352.0581.1992-.1191.1502-.4154.2603-.7127.4205-1.1712.045-.1291-.0661-.1842-.1061-.2002-.3712-.1292-.7531-.2253-1.1412-.2873-.426-.0613-.856-.0904-1.2864-.0871-.7187 0-1.3594.1221-1.9079.3674-.527.2288-.9977.5698-1.3795.999-.3674.4185-.6466.92-.8328 1.4866-.1903.5959-.2849 1.2183-.2803 1.8439 0 1.4195.3844 2.5677 1.1412 3.4085.7567.8429 1.8949 1.2713 3.3795 1.2713.8779 0 1.7778-.1771 2.4245-.4324 0 0 .1241-.0601.0701-.2032zm2.9961-3.827c.0801-.5516.2333-1.0111.4685-1.3674.3544-.5436.896-.8409 1.6568-.8409.7607 0 1.2633.2993 1.6236.8409.2403.3574.3434.8358.3844 1.3674h-4.1343zm5.765-1.2123c-.1464-.5006-.3998-.9634-.7427-1.3564-.3734-.4014-.7378-.6827-1.0992-.8388-.5256-.2229-1.0908-.3373-1.6617-.3364-.7228 0-1.3794.1201-1.912.3714-.5345.2503-.984.5926-1.3354 1.0191-.3523.4244-.6166.9309-.7848 1.5045-.1736.6012-.2596 1.2242-.2553 1.8499 0 .6677.0881 1.2914.2633 1.851.1772.5636.4595 1.0611.8409 1.4725.3804.4144.8709.7398 1.4575.966.5826.2252 1.2903.3414 2.1042.3404 1.6737-.006 2.5546-.3794 2.918-.5806.0641-.0351.1262-.0971.0491-.2773l-.3794-1.0611c-.0571-.1582-.2182-.1001-.2182-.1001-.4145.1541-1.0041.4304-2.3785.4274-.899-.001-1.5656-.2663-1.9821-.6807-.4304-.4244-.6386-1.0481-.6757-1.929l5.796.006s.1522-.003.1682-.1502c.006-.063.2002-1.1912-.1722-2.4976zm-52.1852 1.2123c.082-.5516.2332-1.0111.4684-1.3674.3544-.5436.896-.8409 1.6568-.8409s1.2633.2993 1.6257.8409c.2372.3574.3413.8358.3824 1.3674h-4.1343zm5.763-1.2123c-.1458-.5004-.3986-.9632-.7408-1.3564-.3724-.4014-.7378-.6827-1.0992-.8388-.5256-.2229-1.0908-.3373-1.6617-.3364-.7207 0-1.3794.1201-1.912.3714-.5345.2503-.983.5926-1.3354 1.0191-.3513.4244-.6166.9309-.7848 1.5045-.1729.6013-.2589 1.2243-.2552 1.8499 0 .6677.089 1.2914.2642 1.851.1762.5636.4585 1.0611.8409 1.4725.3804.4144.8699.7398 1.4565.966.5826.2252 1.2914.3414 2.1042.3404 1.6737-.006 2.5557-.3794 2.918-.5806.0651-.0351.1262-.0971.0491-.2773l-.3774-1.0611c-.0591-.1582-.2202-.1001-.2202-.1001-.4135.1541-1.0021.4304-2.3795.4274-.8979-.001-1.5646-.2663-1.9821-.6807-.4284-.4244-.6376-1.0481-.6747-1.929l5.7961.006s.1521-.003.1681-.1502c.006-.063.2002-1.1912-.1741-2.4976zm-18.2911 5.0072c-.2272-.1801-.2582-.2262-.3353-.3433-.1141-.1782-.1722-.4315-.1722-.7538 0-.5105.1672-.8759.5165-1.1222-.004.001.4986-.4344 1.6818-.4184.8299.011 1.5716.1331 1.5716.1331v2.6358h.002s-.7367.1581-1.5656.2082c-1.1792.0701-1.7038-.3404-1.6998-.3394zm2.3054-4.0722c-.2352-.017-.5405-.027-.9049-.027-.4965 0-.977.062-1.4265.1832-.4535.1211-.8609.3103-1.2113.5606-.3502.25-.6379.5775-.8408.957-.2052.3813-.3084.8308-.3084 1.3353 0 .5136.0881.959.2643 1.3234.1772.3664.4315.6707.7568.906.3223.2352.7198.4074 1.1812.5115.4545.1041.97.1572 1.5336.1572.5947 0 1.1873-.0491 1.7619-.1472.4883-.0839.9749-.1777 1.4595-.2813.1922-.046.4054-.1041.4054-.1041.1442-.036.1331-.1902.1331-.1902l-.003-5.3005c0-1.1612-.3103-2.0241-.9219-2.5577-.6087-.5335-1.5046-.8028-2.6628-.8028-.4344 0-1.1332.0601-1.5516.1441 0 0-1.2673.2453-1.7889.6527 0 0-.1131.0711-.05.2303l.4094 1.1031c.0511.1422.1902.0941.1902.0941s.0431-.017.0951-.047c1.1152-.6067 2.5256-.5887 2.5256-.5887.6267 0 1.1082.1252 1.4325.3744.3164.2423.4775.6087.4775 1.3815v.2442c-.4985-.071-.956-.1121-.956-.1121zm46.7497-2.9871c.017-.0391.0173-.0834.0009-.1227-.0165-.0393-.0483-.0702-.088-.0855-.0981-.038-.5906-.1422-.971-.1662-.7278-.044-1.1322.0781-1.4946.2403-.3584.1631-.7578.4244-.98.7227v-.7057c0-.0981-.0701-.1762-.1662-.1762h-1.4865c-.0961 0-.1662.0781-.1662.1762v8.646c0 .0961.0801.1762.1762.1762h1.5236c.0961 0 .1751-.0801.1751-.1762v-4.3195c0-.5806.0641-1.1582.1922-1.5216.1252-.3584.2963-.6467.5066-.8529.2122-.2052.4534-.3493.7167-.4304.2528-.0732.5147-.1103.7778-.1101.3033 0 .6367.079.6367.079.1111.013.1742-.056.2102-.1571.1001-.2643.3824-1.0581.4365-1.2163z"/><path d="m59.597 39.6356c-.188-.057-.3792-.1028-.5726-.1371-.2604-.0429-.524-.063-.7878-.0601-1.0481 0-1.874.2963-2.4546.8809-.5766.5806-.968 1.4655-1.1652 2.6287l-.0701.3924h-1.3173s-.1592-.006-.1932.1682l-.2153 1.2063c-.016.1141.0341.1862.1882.1862h1.2814l-1.3004 7.2535c-.0765.4852-.1926.9633-.3473 1.4295-.1272.3584-.2503.6277-.4045.8249-.1481.1872-.2883.3273-.5305.4084-.1992.0671-.4305.0981-.6817.0981-.1402 0-.3264-.023-.4645-.0511-.1081-.021-.2133-.0549-.3133-.1011 0 0-.1502-.057-.2103.0921l-.4294 1.1783c-.04.1161.017.2052.0901.2322.1702.0601.2973.1001.5295.1552.3224.076.5937.08.8489.08.5326 0 1.0211-.075 1.4235-.2202.4044-.1471.7578-.4024 1.0711-.7468.3374-.3734.5506-.7638.7518-1.2983.2002-.5266.3734-1.1812.5105-1.945l1.3064-7.3897h1.908s.1611.006.1942-.1692l.2162-1.2053c.015-.1151-.034-.1862-.1892-.1862h-1.8529c.01-.042.0941-.6937.3063-1.3083.0901-.2603.2613-.4725.4054-.6177.1422-.1431.3063-.2442.4855-.3023.1842-.06.3934-.0881.6227-.0881.1742 0 .3463.0201.4765.0471.1792.038.2492.058.2963.0721.1892.057.2142.002.2512-.0901l.4435-1.2163c.046-.1301-.0671-.1862-.1071-.2022zm-25.8939 12.535c0 .0971-.0701.1752-.1662.1752h-1.5376c-.0961 0-.1652-.0781-.1652-.1752v-12.3698c0-.0971.0691-.1752.1652-.1752h1.5376c.0971 0 .1662.0781.1662.1752z"/></g></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/salesforce_sandbox.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/salesforce_sandbox.svg
new file mode 100644
index 0000000000000..ef6d552949424
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/salesforce_sandbox.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g clip-rule="evenodd" fill-rule="evenodd"><path d="m41.6133 22.6339c3.2263-3.3605 7.716-5.4446 12.6822-5.4446 6.6008 0 12.3598 3.6808 15.427 9.1455 2.7433-1.2252 5.7146-1.8566 8.7191-1.8529 11.9064 0 21.5584 9.7361 21.5584 21.7466 0 12.0115-9.652 21.7476-21.5584 21.7476-1.4261.0007-2.8486-.1412-4.2464-.4234-2.7008 4.818-7.8482 8.0734-13.7543 8.0734-2.4726 0-4.812-.5716-6.8952-1.5877-2.7379 6.4407-9.1165 10.9564-16.5512 10.9564-7.7421 0-14.3409-4.8991-16.8736-11.7692-1.1275.2386-2.277.3584-3.4295.3573-9.21863 0-16.6914-7.5498-16.6914-16.8645 0-6.2425 3.35749-11.6922 8.34668-14.6082-1.05742-2.4341-1.60164-5.0601-1.59866-7.714-.001-10.7122 8.69608-19.3962 19.42318-19.3962 6.2976 0 11.8944 2.9941 15.4431 7.6339" fill="#00a1e0"/><g fill="#fff"><path d="m14.4841 51.2978c-.0631.1631.023.1982.043.2262.1882.1371.3784.2352.5706.3444 1.0211.5415 1.9831.6997 2.9901.6997 2.0521 0 3.3255-1.0911 3.3255-2.848v-.034c0-1.6237-1.4375-2.2133-2.7869-2.6398l-.1752-.057c-1.0171-.3304-1.894-.6147-1.894-1.2843v-.0361c0-.5726.5126-.994 1.3074-.994.8829 0 1.932.2933 2.6067.6667 0 0 .1982.1281.2703-.0641.04-.1021.3824-1.0231.4174-1.1222.039-.1091-.03-.1882-.1001-.2302-.7708-.4705-1.8359-.7908-2.9381-.7908l-.2052.002c-1.8769 0-3.1883 1.1342-3.1883 2.7598v.0341c0 1.7138 1.4465 2.2693 2.8009 2.6567l.2183.0671c.987.3033 1.8369.5636 1.8369 1.2593v.0341c0 .6346-.5526 1.1081-1.4435 1.1081-.9359.0067-1.8537-.2576-2.6428-.7608-.1441-.0841-.2282-.1451-.3393-.2122-.0581-.037-.2052-.1011-.2693.0921zm30.0302 0c-.0631.1631.023.1982.043.2262.1872.1371.3784.2352.5706.3444 1.0211.5415 1.9831.6997 2.9901.6997 2.0522 0 3.3245-1.0911 3.3245-2.848v-.034c0-1.6237-1.4365-2.2133-2.7859-2.6398l-.1752-.057c-1.017-.3304-1.8949-.6147-1.8949-1.2843v-.0361c0-.5726.5135-.994 1.3083-.994.8829 0 1.932.2933 2.6067.6667 0 0 .1982.1281.2703-.0641.04-.1021.3824-1.0231.4174-1.1222.0391-.1091-.03-.1882-.1001-.2302-.7708-.4705-1.8359-.7908-2.938-.7908l-.2052.002c-1.878 0-3.1883 1.1342-3.1883 2.7598v.0341c0 1.7138 1.4465 2.2693 2.8009 2.6567l.2182.0671c.987.3033 1.8389.5636 1.8389 1.2593v.0341c0 .6346-.5546 1.1081-1.4465 1.1081-.9359.0067-1.8537-.2576-2.6427-.7608-.1432-.0841-.2283-.1421-.3374-.2122-.037-.024-.2102-.0911-.2703.0921zm20.5003-3.4406c0 .993-.1852 1.7748-.5505 2.3274-.3604.5466-.905.8139-1.6658.8139-.7618 0-1.3053-.2653-1.6597-.8139-.3584-.5506-.5406-1.3344-.5406-2.3274 0-.991.1822-1.7719.5406-2.3194.3544-.5406.8979-.8049 1.6597-.8049.7608 0 1.3064.2633 1.6678.8049.3633.5475.5485 1.3274.5485 2.3194zm1.7118-1.8409c-.1549-.5437-.42-1.0497-.7788-1.4866-.3587-.4268-.8076-.7687-1.3144-1.001-.5225-.2433-1.1412-.3664-1.8349-.3664-.6947 0-1.3133.1231-1.8359.3674-.5245.2442-.966.5806-1.3164 1-.3473.4185-.6106.92-.7798 1.4866-.171.5985-.2553 1.2184-.2502 1.8409 0 .6567.0841 1.2763.2502 1.8399.1702.5676.4305 1.0691.7808 1.4876.3494.4184.7919.7537 1.3154.991.5236.2382 1.1412.3594 1.8359.3594.6937 0 1.3114-.1202 1.8349-.3594.5075-.2267.9568-.5656 1.3144-.991.3494-.4175.6106-.919.7798-1.4876.1722-.598.2572-1.2177.2523-1.8399 0-.6557-.0841-1.2753-.2523-1.8409zm14.0616 4.7169c-.057-.1672-.2182-.1041-.2182-.1041-.2565.1039-.5233.1804-.7958.2282-.2863.0441-.6006.0661-.939.0661-.8289 0-1.4876-.2463-1.959-.7328-.4725-.4875-.7378-1.2753-.7348-2.3404.003-.971.2362-1.6998.6567-2.2554.4174-.5525 1.0531-.8358 1.9-.8358.7067 0 1.2452.0801 1.8098.2592 0 0 .1352.0581.1992-.1191.1502-.4154.2603-.7127.4205-1.1712.045-.1291-.0661-.1842-.1061-.2002-.3712-.1292-.7531-.2253-1.1412-.2873-.426-.0613-.856-.0904-1.2864-.0871-.7187 0-1.3594.1221-1.9079.3674-.527.2288-.9977.5698-1.3795.999-.3674.4185-.6466.92-.8328 1.4866-.1903.5959-.2849 1.2183-.2803 1.8439 0 1.4195.3844 2.5677 1.1412 3.4085.7567.8429 1.8949 1.2713 3.3795 1.2713.8779 0 1.7778-.1771 2.4245-.4324 0 0 .1241-.0601.0701-.2032zm2.9961-3.827c.0801-.5516.2333-1.0111.4685-1.3674.3544-.5436.896-.8409 1.6568-.8409.7607 0 1.2633.2993 1.6236.8409.2403.3574.3434.8358.3844 1.3674h-4.1343zm5.765-1.2123c-.1464-.5006-.3998-.9634-.7427-1.3564-.3734-.4014-.7378-.6827-1.0992-.8388-.5256-.2229-1.0908-.3373-1.6617-.3364-.7228 0-1.3794.1201-1.912.3714-.5345.2503-.984.5926-1.3354 1.0191-.3523.4244-.6166.9309-.7848 1.5045-.1736.6012-.2596 1.2242-.2553 1.8499 0 .6677.0881 1.2914.2633 1.851.1772.5636.4595 1.0611.8409 1.4725.3804.4144.8709.7398 1.4575.966.5826.2252 1.2903.3414 2.1042.3404 1.6737-.006 2.5546-.3794 2.918-.5806.0641-.0351.1262-.0971.0491-.2773l-.3794-1.0611c-.0571-.1582-.2182-.1001-.2182-.1001-.4145.1541-1.0041.4304-2.3785.4274-.899-.001-1.5656-.2663-1.9821-.6807-.4304-.4244-.6386-1.0481-.6757-1.929l5.796.006s.1522-.003.1682-.1502c.006-.063.2002-1.1912-.1722-2.4976zm-52.1852 1.2123c.082-.5516.2332-1.0111.4684-1.3674.3544-.5436.896-.8409 1.6568-.8409s1.2633.2993 1.6257.8409c.2372.3574.3413.8358.3824 1.3674h-4.1343zm5.763-1.2123c-.1458-.5004-.3986-.9632-.7408-1.3564-.3724-.4014-.7378-.6827-1.0992-.8388-.5256-.2229-1.0908-.3373-1.6617-.3364-.7207 0-1.3794.1201-1.912.3714-.5345.2503-.983.5926-1.3354 1.0191-.3513.4244-.6166.9309-.7848 1.5045-.1729.6013-.2589 1.2243-.2552 1.8499 0 .6677.089 1.2914.2642 1.851.1762.5636.4585 1.0611.8409 1.4725.3804.4144.8699.7398 1.4565.966.5826.2252 1.2914.3414 2.1042.3404 1.6737-.006 2.5557-.3794 2.918-.5806.0651-.0351.1262-.0971.0491-.2773l-.3774-1.0611c-.0591-.1582-.2202-.1001-.2202-.1001-.4135.1541-1.0021.4304-2.3795.4274-.8979-.001-1.5646-.2663-1.9821-.6807-.4284-.4244-.6376-1.0481-.6747-1.929l5.7961.006s.1521-.003.1681-.1502c.006-.063.2002-1.1912-.1741-2.4976zm-18.2911 5.0072c-.2272-.1801-.2582-.2262-.3353-.3433-.1141-.1782-.1722-.4315-.1722-.7538 0-.5105.1672-.8759.5165-1.1222-.004.001.4986-.4344 1.6818-.4184.8299.011 1.5716.1331 1.5716.1331v2.6358h.002s-.7367.1581-1.5656.2082c-1.1792.0701-1.7038-.3404-1.6998-.3394zm2.3054-4.0722c-.2352-.017-.5405-.027-.9049-.027-.4965 0-.977.062-1.4265.1832-.4535.1211-.8609.3103-1.2113.5606-.3502.25-.6379.5775-.8408.957-.2052.3813-.3084.8308-.3084 1.3353 0 .5136.0881.959.2643 1.3234.1772.3664.4315.6707.7568.906.3223.2352.7198.4074 1.1812.5115.4545.1041.97.1572 1.5336.1572.5947 0 1.1873-.0491 1.7619-.1472.4883-.0839.9749-.1777 1.4595-.2813.1922-.046.4054-.1041.4054-.1041.1442-.036.1331-.1902.1331-.1902l-.003-5.3005c0-1.1612-.3103-2.0241-.9219-2.5577-.6087-.5335-1.5046-.8028-2.6628-.8028-.4344 0-1.1332.0601-1.5516.1441 0 0-1.2673.2453-1.7889.6527 0 0-.1131.0711-.05.2303l.4094 1.1031c.0511.1422.1902.0941.1902.0941s.0431-.017.0951-.047c1.1152-.6067 2.5256-.5887 2.5256-.5887.6267 0 1.1082.1252 1.4325.3744.3164.2423.4775.6087.4775 1.3815v.2442c-.4985-.071-.956-.1121-.956-.1121zm46.7497-2.9871c.017-.0391.0173-.0834.0009-.1227-.0165-.0393-.0483-.0702-.088-.0855-.0981-.038-.5906-.1422-.971-.1662-.7278-.044-1.1322.0781-1.4946.2403-.3584.1631-.7578.4244-.98.7227v-.7057c0-.0981-.0701-.1762-.1662-.1762h-1.4865c-.0961 0-.1662.0781-.1662.1762v8.646c0 .0961.0801.1762.1762.1762h1.5236c.0961 0 .1751-.0801.1751-.1762v-4.3195c0-.5806.0641-1.1582.1922-1.5216.1252-.3584.2963-.6467.5066-.8529.2122-.2052.4534-.3493.7167-.4304.2528-.0732.5147-.1103.7778-.1101.3033 0 .6367.079.6367.079.1111.013.1742-.056.2102-.1571.1001-.2643.3824-1.0581.4365-1.2163z"/><path d="m59.597 39.6356c-.188-.057-.3792-.1028-.5726-.1371-.2604-.0429-.524-.063-.7878-.0601-1.0481 0-1.874.2963-2.4546.8809-.5766.5806-.968 1.4655-1.1652 2.6287l-.0701.3924h-1.3173s-.1592-.006-.1932.1682l-.2153 1.2063c-.016.1141.0341.1862.1882.1862h1.2814l-1.3004 7.2535c-.0765.4852-.1926.9633-.3473 1.4295-.1272.3584-.2503.6277-.4045.8249-.1481.1872-.2883.3273-.5305.4084-.1992.0671-.4305.0981-.6817.0981-.1402 0-.3264-.023-.4645-.0511-.1081-.021-.2133-.0549-.3133-.1011 0 0-.1502-.057-.2103.0921l-.4294 1.1783c-.04.1161.017.2052.0901.2322.1702.0601.2973.1001.5295.1552.3224.076.5937.08.8489.08.5326 0 1.0211-.075 1.4235-.2202.4044-.1471.7578-.4024 1.0711-.7468.3374-.3734.5506-.7638.7518-1.2983.2002-.5266.3734-1.1812.5105-1.945l1.3064-7.3897h1.908s.1611.006.1942-.1692l.2162-1.2053c.015-.1151-.034-.1862-.1892-.1862h-1.8529c.01-.042.0941-.6937.3063-1.3083.0901-.2603.2613-.4725.4054-.6177.1422-.1431.3063-.2442.4855-.3023.1842-.06.3934-.0881.6227-.0881.1742 0 .3463.0201.4765.0471.1792.038.2492.058.2963.0721.1892.057.2142.002.2512-.0901l.4435-1.2163c.046-.1301-.0671-.1862-.1071-.2022zm-25.8939 12.535c0 .0971-.0701.1752-.1662.1752h-1.5376c-.0961 0-.1652-.0781-.1652-.1752v-12.3698c0-.0971.0691-.1752.1652-.1752h1.5376c.0971 0 .1662.0781.1662.1752z"/></g></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/servicenow.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/servicenow.svg
new file mode 100644
index 0000000000000..6388ec44d21d7
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/servicenow.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m50 6c-27 0-50 21.9528-50 49.3939 0 14.4689 6 27.4411 15.5 36.9208 3.5 3.4925 9 3.4925 13 .4989 5.5-4.4904 13-6.985 21.5-6.985s15.5 2.4946 21.5 6.985c4 2.9936 9.5 2.4946 13-.9979 9.5-8.9807 15.5-21.9529 15.5-36.4218-.5-26.9421-22.5-49.3939-50-49.3939zm-.5 74.8393c-14.5 0-25-10.9765-25-24.9465s10-24.9464 25-24.9464 25 11.4753 25 24.9464c0 13.471-10 24.9465-25 24.9465z" fill="#82b6a1" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/sharepoint_online.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/sharepoint_online.svg
new file mode 100644
index 0000000000000..aebfd7a8e49c0
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/sharepoint_online.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 102 100" width="102" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="9.88794" x2="43.4615" y1="20.9988" y2="78.9304"><stop offset="0" stop-color="#058f92"/><stop offset=".5" stop-color="#038489"/><stop offset="1" stop-color="#026d71"/></linearGradient><path d="m52.1629 57.022c15.4125 0 27.9068-12.5409 27.9068-28.011 0-15.47-12.4943-28.011-27.9068-28.011s-27.9068 12.541-27.9068 28.011c0 15.4701 12.4943 28.011 27.9068 28.011z" fill="#036c70"/><path d="m75.4188 80.3617c14.1281 0 25.5812-11.4959 25.5812-25.6768 0-14.1808-11.4531-25.6767-25.5812-25.6767s-25.5812 11.4959-25.5812 25.6767c0 14.1809 11.4531 25.6768 25.5812 25.6768z" fill="#1a9ba1"/><path d="m55.6508 99.0371c10.9172 0 19.7673-8.8832 19.7673-19.8411 0-10.958-8.8501-19.8411-19.7673-19.8411-10.9171 0-19.7673 8.8831-19.7673 19.8411 0 10.9579 8.8502 19.8411 19.7673 19.8411z" fill="#37c6d0"/><g fill="#000"><path d="m56.8143 26.2805v49.8128c-.0116 1.7309-1.0566 3.2859-2.6512 3.9449-.5077.2156-1.0534.3267-1.6046.3268h-16.6511c-.0232-.3968-.0232-.7703-.0232-1.1671-.0078-.3896.0077-.7794.0465-1.1672.4256-7.4615 5.0052-14.0449 11.8372-17.0166v-4.3417c-15.2049-2.4185-25.5776-16.751-23.1681-32.0125.0167-.1057.034-.2114.0519-.3169.1158-.7872.2789-1.5667.4884-2.3342h27.4184c2.3467.009 4.2468 1.9162 4.2558 4.2717z" opacity=".1"/><path d="m50.2321 24.342h-25.5812c-2.5842 15.2341 7.6245 29.6865 22.8019 32.2803.4596.0785.921.1455 1.3839.2008-7.2092 3.4314-12.4627 13.1769-12.9092 21.2067-.0387.3877-.0542.7775-.0465 1.1671 0 .3968 0 .7703.0232 1.1671.042.7847.1431 1.565.3023 2.3343h14.0232c1.7245-.0116 3.2737-1.0605 3.9302-2.6611.2148-.5096.3255-1.0573.3256-1.6106v-49.8129c-.0088-2.3545-1.9076-4.2614-4.2534-4.2717z" opacity=".2"/><path d="m50.2332 24.342h-25.5812c-2.5837 15.2355 7.6266 29.6885 22.8054 32.2819.3105.053.6219.1008.9339.1432-6.9766 3.6788-12.0231 13.401-12.4603 21.2627h14.3022c2.343-.0178 4.2381-1.9199 4.2558-4.2717v-45.1444c-.009-2.3554-1.9091-4.2627-4.2558-4.2717z" opacity=".2"/><path d="m47.9068 24.342h-23.2556c-2.4396 14.3825 6.539 28.2329 20.6278 31.8205-5.3347 6.1179-8.6068 13.7714-9.3488 21.8673h11.9767c2.3467-.009 4.2468-1.9162 4.2558-4.2717v-45.1444c-.0013-2.3586-1.906-4.2703-4.2559-4.2717z" opacity=".2"/></g><path d="m5.26276 24.342h42.63684c2.3543 0 4.2628 1.9157 4.2628 4.2787v42.7961c0 2.3631-1.9085 4.2787-4.2628 4.2787h-42.63684c-2.35426 0-4.26276-1.9156-4.26276-4.2787v-42.7961c0-2.363 1.9085-4.2787 4.26276-4.2787z" fill="url(#a)"/><path d="m20.0404 49.4935c-.999-.6651-1.8334-1.5506-2.4395-2.5887-.5873-1.0853-.8801-2.3065-.8489-3.5411-.0523-1.6716.5097-3.3042 1.579-4.5868 1.1237-1.2842 2.5762-2.2351 4.2-2.7498 1.8507-.6114 3.789-.9126 5.7372-.8916 2.5619-.094 5.1203.2656 7.5581 1.0621v5.3688c-1.0592-.6441-2.2129-1.1168-3.4186-1.4006-1.3083-.322-2.6507-.4835-3.9977-.4809-1.4204-.0523-2.8318.2476-4.1093.8731-.9862.4269-1.6258 1.4009-1.6278 2.4789-.004.654.2463 1.2838.6976 1.7554.5332.556 1.1638 1.0087 1.8605 1.3352.7752.3875 1.938.9026 3.4884 1.5453.1707.0542.3371.1213.4976.2008 1.5259.5985 2.9979 1.3272 4.4 2.1778 1.0618.6571 1.9529 1.558 2.6 2.6284.6635 1.2134.985 2.5852.9302 3.9682.0758 1.7162-.4473 3.4052-1.479 4.7759-1.0284 1.2601-2.4032 2.1888-3.9535 2.6704-1.8235.5736-3.7265.851-5.6372.8216-1.7143.0078-3.426-.1328-5.1162-.4202-1.4272-.2344-2.8199-.6452-4.1465-1.2231v-5.6606c1.268.909 2.6847 1.5884 4.186 2.0075 1.4962.468 3.0516.718 4.6186.7423 1.4503.0922 2.898-.2162 4.186-.8917.9023-.511 1.451-1.479 1.4279-2.5186.0061-.7234-.279-1.4186-.7906-1.9281-.6363-.6269-1.3729-1.1422-2.1791-1.5243-.9302-.4669-2.3-1.0823-4.1093-1.8464-1.4393-.5808-2.8174-1.3041-4.1139-2.1592z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/slack.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/slack.svg
new file mode 100644
index 0000000000000..8f6fc0c987eaa
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/slack.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><path d="m21.0097 63.1921c0 5.7819-4.723 10.505-10.5048 10.505-5.78176 0-10.5049-4.7231-10.5049-10.505 0-5.7817 4.72314-10.5048 10.5049-10.5048h10.5048z" fill="#e01e5a"/><path d="m26.3029 63.1921c0-5.7817 4.7231-10.5048 10.505-10.5048 5.7817 0 10.5048 4.7231 10.5048 10.5048v26.303c0 5.7817-4.7231 10.5049-10.5048 10.5049-5.7819 0-10.505-4.7232-10.505-10.5049z" fill="#e01e5a"/><path d="m36.8079 21.0097c-5.7819 0-10.505-4.723-10.505-10.5048 0-5.78176 4.7231-10.5049 10.505-10.5049 5.7817 0 10.5048 4.72314 10.5048 10.5049v10.5048z" fill="#36c5f0"/><path d="m36.8079 26.303c5.7817 0 10.5048 4.723 10.5048 10.5048 0 5.7817-4.7231 10.5049-10.5048 10.5049h-26.303c-5.78176 0-10.5049-4.7232-10.5049-10.5049 0-5.7818 4.72314-10.5048 10.5049-10.5048z" fill="#36c5f0"/><path d="m78.9903 36.8078c0-5.7818 4.7231-10.5048 10.5049-10.5048 5.7817 0 10.5048 4.723 10.5048 10.5048 0 5.7817-4.7231 10.5049-10.5048 10.5049h-10.5049z" fill="#2eb67d"/><path d="m73.6971 36.8079c0 5.7817-4.7231 10.5048-10.5048 10.5048-5.7819 0-10.505-4.7231-10.505-10.5048v-26.303c0-5.78176 4.7231-10.5049 10.505-10.5049 5.7817 0 10.5048 4.72314 10.5048 10.5049z" fill="#2eb67d"/><g fill="#ecb22e"><path d="m63.1923 78.9902c5.7817 0 10.5048 4.7232 10.5048 10.5049s-4.7231 10.5048-10.5048 10.5048c-5.7819 0-10.505-4.7231-10.505-10.5048v-10.5049z"/><path d="m63.1923 73.6971c-5.7819 0-10.505-4.7231-10.505-10.505 0-5.7817 4.7231-10.5048 10.505-10.5048h26.3028c5.7817 0 10.5049 4.7231 10.5049 10.5048 0 5.7819-4.7232 10.505-10.5049 10.505z"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/assets/source_icons/zendesk.svg b/x-pack/plugins/enterprise_search/public/assets/source_icons/zendesk.svg
new file mode 100644
index 0000000000000..8afd143dd9a7c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/assets/source_icons/zendesk.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="#03363d"><path d="m46.1924 32.8712v52.5618h-46.1924z"/><path d="m46.1924 14c0 5.7732-2.4333 11.31-6.7647 15.3924-4.3314 4.0822-10.206 6.3757-16.3315 6.3757-6.1256 0-12.0001-2.2935-16.33147-6.3757-4.33139-4.0824-6.76473-9.6192-6.76473-15.3924z"/><path d="m53.8026 85.425c0-5.7732 2.4334-11.31 6.7648-15.3923 4.3313-4.0823 10.2059-6.3757 16.3314-6.3757 6.1256 0 12.0001 2.2934 16.3315 6.3757 4.3315 4.0823 6.7647 9.6191 6.7647 15.3923z"/><path d="m53.8026 66.5618v-52.5618h46.1974z"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/server/integrations.ts b/x-pack/plugins/enterprise_search/server/integrations.ts
new file mode 100644
index 0000000000000..48909261243e8
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/integrations.ts
@@ -0,0 +1,304 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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 { HttpServiceSetup } from 'src/core/server';
+
+import type { IntegrationCategory } from '../../../../src/plugins/custom_integrations/common';
+import type { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
+
+interface WorkplaceSearchIntegration {
+  id: string;
+  title: string;
+  description: string;
+  categories: IntegrationCategory[];
+  uiInternalPath?: string;
+}
+
+const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
+  {
+    id: 'box',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.boxName', {
+      defaultMessage: 'Box',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.boxDescription',
+      {
+        defaultMessage: 'Search over your files and folders stored on Box with Workplace Search.',
+      }
+    ),
+    categories: ['document_storage'],
+  },
+  {
+    id: 'confluence_cloud',
+    title: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.confluenceCloudName',
+      {
+        defaultMessage: 'Confluence Cloud',
+      }
+    ),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.confluenceCloudDescription',
+      {
+        defaultMessage:
+          'Search over your organizational content on Confluence Cloud with Workplace Search.',
+      }
+    ),
+    categories: ['knowledge_platform'],
+  },
+  {
+    id: 'confluence_server',
+    title: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.confluenceServerName',
+      {
+        defaultMessage: 'Confluence Server',
+      }
+    ),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.confluenceServerDescription',
+      {
+        defaultMessage:
+          'Search over your organizational content on Confluence Server with Workplace Search.',
+      }
+    ),
+    categories: ['knowledge_platform'],
+  },
+  {
+    id: 'dropbox',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.dropboxName', {
+      defaultMessage: 'Dropbox',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.dropboxDescription',
+      {
+        defaultMessage:
+          'Search over your files and folders stored on Dropbox with Workplace Search.',
+      }
+    ),
+    categories: ['document_storage'],
+  },
+  {
+    id: 'github',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.githubName', {
+      defaultMessage: 'GitHub',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.githubDescription',
+      {
+        defaultMessage: 'Search over your projects and repos on GitHub with Workplace Search.',
+      }
+    ),
+    categories: ['software_development'],
+  },
+  {
+    id: 'github_enterprise_server',
+    title: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.githubEnterpriseServerName',
+      {
+        defaultMessage: 'GitHub Enterprise Server',
+      }
+    ),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.githubEnterpriseServerDescription',
+      {
+        defaultMessage:
+          'Search over your projects and repos on GitHub Enterprise Server with Workplace Search.',
+      }
+    ),
+    categories: ['software_development'],
+  },
+  {
+    id: 'gmail',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.gmailName', {
+      defaultMessage: 'Gmail',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.gmailDescription',
+      {
+        defaultMessage: 'Search over your emails managed by Gmail with Workplace Search.',
+      }
+    ),
+    categories: ['communication'],
+  },
+  {
+    id: 'google_drive',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveName', {
+      defaultMessage: 'Google Drive',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.googleDriveDescription',
+      {
+        defaultMessage: 'Search over your documents on Google Drive with Workplace Search.',
+      }
+    ),
+    categories: ['document_storage'],
+  },
+  {
+    id: 'jira_cloud',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.jiraCloudName', {
+      defaultMessage: 'Jira Cloud',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.jiraCloudDescription',
+      {
+        defaultMessage: 'Search over your project workflow on Jira Cloud with Workplace Search.',
+      }
+    ),
+    categories: ['project_management'],
+  },
+  {
+    id: 'jira_server',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.jiraServerName', {
+      defaultMessage: 'Jira Server',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.jiraServerDescription',
+      {
+        defaultMessage: 'Search over your project workflow on Jira Server with Workplace Search.',
+      }
+    ),
+    categories: ['project_management'],
+  },
+  {
+    id: 'onedrive',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.onedriveName', {
+      defaultMessage: 'OneDrive',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.onedriveDescription',
+      {
+        defaultMessage: 'Search over your files stored on OneDrive with Workplace Search.',
+      }
+    ),
+    categories: ['document_storage'],
+    uiInternalPath: '/app/enterprise_search/workplace_search/sources/add/one_drive',
+  },
+  {
+    id: 'salesforce',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.salesforceName', {
+      defaultMessage: 'Salesforce',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.salesforceDescription',
+      {
+        defaultMessage: 'Search over your content on Salesforce with Workplace Search.',
+      }
+    ),
+    categories: ['crm'],
+  },
+  {
+    id: 'salesforce_sandbox',
+    title: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.salesforceSandboxName',
+      {
+        defaultMessage: 'Salesforce Sandbox',
+      }
+    ),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.salesforceSandboxDescription',
+      {
+        defaultMessage: 'Search over your content on Salesforce Sandbox with Workplace Search.',
+      }
+    ),
+    categories: ['crm'],
+  },
+  {
+    id: 'servicenow',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.servicenowName', {
+      defaultMessage: 'ServiceNow',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.servicenowDescription',
+      {
+        defaultMessage: 'Search over your content on ServiceNow with Workplace Search.',
+      }
+    ),
+    categories: ['enterprise_management'],
+  },
+  {
+    id: 'sharepoint_online',
+    title: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.sharepointOnlineName',
+      {
+        defaultMessage: 'SharePoint Online',
+      }
+    ),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.sharepointOnlineDescription',
+      {
+        defaultMessage: 'Search over your files stored on SharePoint Online with Workplace Search.',
+      }
+    ),
+    categories: ['document_storage'],
+    uiInternalPath: '/app/enterprise_search/workplace_search/sources/add/share_point',
+  },
+  {
+    id: 'slack',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.slackName', {
+      defaultMessage: 'Slack',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.slackDescription',
+      {
+        defaultMessage: 'Search over your messages on Slack with Workplace Search.',
+      }
+    ),
+    categories: ['communication'],
+  },
+  {
+    id: 'zendesk',
+    title: i18n.translate('xpack.enterpriseSearch.workplaceSearch.integrations.zendeskName', {
+      defaultMessage: 'Zendesk',
+    }),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.zendeskDescription',
+      {
+        defaultMessage: 'Search over your tickets on Zendesk with Workplace Search.',
+      }
+    ),
+    categories: ['customer_support'],
+  },
+  {
+    id: 'custom_api_source',
+    title: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.customApiSourceName',
+      {
+        defaultMessage: 'Custom API Source',
+      }
+    ),
+    description: i18n.translate(
+      'xpack.enterpriseSearch.workplaceSearch.integrations.customApiSourceDescription',
+      {
+        defaultMessage:
+          'Search over anything by building your own integration with Workplace Search.',
+      }
+    ),
+    categories: ['custom'],
+    uiInternalPath: '/app/enterprise_search/workplace_search/sources/add/custom',
+  },
+];
+
+export const registerEnterpriseSearchIntegrations = (
+  http: HttpServiceSetup,
+  customIntegrations: CustomIntegrationsPluginSetup
+) => {
+  workplaceSearchIntegrations.forEach((integration) => {
+    customIntegrations.registerCustomIntegration({
+      uiInternalPath: `/app/enterprise_search/workplace_search/sources/add/${integration.id}`,
+      icons: [
+        {
+          type: 'svg',
+          src: http.basePath.prepend(
+            `/plugins/enterpriseSearch/assets/source_icons/${integration.id}.svg`
+          ),
+        },
+      ],
+      isBeta: false,
+      shipper: 'enterprise_search',
+      ...integration,
+    });
+  });
+};
diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts
index 63ac8ed02afbe..f40046c22b419 100644
--- a/x-pack/plugins/enterprise_search/server/plugin.ts
+++ b/x-pack/plugins/enterprise_search/server/plugin.ts
@@ -15,6 +15,7 @@ import {
   KibanaRequest,
   DEFAULT_APP_CATEGORIES,
 } from '../../../../src/core/server';
+import { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
 import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
 import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
 import { InfraPluginSetup } from '../../infra/server';
@@ -31,6 +32,7 @@ import {
 import { registerTelemetryUsageCollector as registerASTelemetryUsageCollector } from './collectors/app_search/telemetry';
 import { registerTelemetryUsageCollector as registerESTelemetryUsageCollector } from './collectors/enterprise_search/telemetry';
 import { registerTelemetryUsageCollector as registerWSTelemetryUsageCollector } from './collectors/workplace_search/telemetry';
+import { registerEnterpriseSearchIntegrations } from './integrations';
 
 import { checkAccess } from './lib/check_access';
 import { entSearchHttpAgent } from './lib/enterprise_search_http_agent';
@@ -55,6 +57,7 @@ interface PluginsSetup {
   security: SecurityPluginSetup;
   features: FeaturesPluginSetup;
   infra: InfraPluginSetup;
+  customIntegrations?: CustomIntegrationsPluginSetup;
 }
 
 interface PluginsStart {
@@ -80,11 +83,15 @@ export class EnterpriseSearchPlugin implements Plugin {
 
   public setup(
     { capabilities, http, savedObjects, getStartServices }: CoreSetup<PluginsStart>,
-    { usageCollection, security, features, infra }: PluginsSetup
+    { usageCollection, security, features, infra, customIntegrations }: PluginsSetup
   ) {
     const config = this.config;
     const log = this.logger;
 
+    if (customIntegrations) {
+      registerEnterpriseSearchIntegrations(http, customIntegrations);
+    }
+
     /*
      * Initialize config.ssl.certificateAuthorities file(s) - required for all API calls (+ access checks)
      */

From 0a3ede8fd105c66081f8ef186c11f3ba64e7eb32 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Thu, 14 Oct 2021 15:59:02 -0700
Subject: [PATCH 105/117] [ci] Explicitly define tasks for ES snapshot build
 (#115074)

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 .buildkite/scripts/steps/es_snapshots/build.sh | 9 ++++++++-
 packages/kbn-es/src/utils/build_snapshot.js    | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.buildkite/scripts/steps/es_snapshots/build.sh b/.buildkite/scripts/steps/es_snapshots/build.sh
index 91b5004594a6d..975d5944da883 100755
--- a/.buildkite/scripts/steps/es_snapshots/build.sh
+++ b/.buildkite/scripts/steps/es_snapshots/build.sh
@@ -61,7 +61,14 @@ export DOCKER_TLS_CERTDIR="$CERTS_DIR"
 export DOCKER_HOST=localhost:2377
 
 echo "--- Build Elasticsearch"
-./gradlew -Dbuild.docker=true assemble --parallel
+./gradlew \
+  :distribution:archives:darwin-aarch64-tar:assemble \
+  :distribution:archives:darwin-tar:assemble \
+  :distribution:docker:docker-export:assemble \
+  :distribution:archives:linux-aarch64-tar:assemble \
+  :distribution:archives:linux-tar:assemble \
+  :distribution:archives:windows-zip:assemble \
+  --parallel
 
 echo "--- Create distribution archives"
 find distribution -type f \( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \) -not -path '*no-jdk*' -not -path '*build-context*' -exec cp {} "$destination" \;
diff --git a/packages/kbn-es/src/utils/build_snapshot.js b/packages/kbn-es/src/utils/build_snapshot.js
index c60ef61e98538..ec26ba69e658b 100644
--- a/packages/kbn-es/src/utils/build_snapshot.js
+++ b/packages/kbn-es/src/utils/build_snapshot.js
@@ -26,6 +26,7 @@ const onceEvent = (emitter, event) => new Promise((resolve) => emitter.once(even
  * @returns {Object} containing archive and optional plugins
  *
  * Gradle tasks:
+ *   $ ./gradlew tasks --all | grep 'distribution.*assemble\s'
  *   :distribution:archives:darwin-tar:assemble
  *   :distribution:archives:linux-tar:assemble
  *   :distribution:archives:windows-zip:assemble

From 45f02d3c9bfe7708ebd609b8f321c93dbe1a6e1f Mon Sep 17 00:00:00 2001
From: Mat Schaffer <mat@elastic.co>
Date: Fri, 15 Oct 2021 08:46:06 +0900
Subject: [PATCH 106/117] [Stack Monitoring] Enable react stack monitoring by
 default (#114436)

* Enable react stack monitoring by default

* Also update test snapshot

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 x-pack/plugins/monitoring/server/config.test.ts | 2 +-
 x-pack/plugins/monitoring/server/config.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/monitoring/server/config.test.ts b/x-pack/plugins/monitoring/server/config.test.ts
index 76880d8f83d34..f4604903e0068 100644
--- a/x-pack/plugins/monitoring/server/config.test.ts
+++ b/x-pack/plugins/monitoring/server/config.test.ts
@@ -107,7 +107,7 @@ describe('config schema', () => {
             "index": "metricbeat-*",
           },
           "min_interval_seconds": 10,
-          "render_react_app": false,
+          "render_react_app": true,
           "show_license_expiration": true,
         },
       }
diff --git a/x-pack/plugins/monitoring/server/config.ts b/x-pack/plugins/monitoring/server/config.ts
index 5c2bdc1424f93..ddbfd480a9f4e 100644
--- a/x-pack/plugins/monitoring/server/config.ts
+++ b/x-pack/plugins/monitoring/server/config.ts
@@ -51,7 +51,7 @@ export const configSchema = schema.object({
     }),
     min_interval_seconds: schema.number({ defaultValue: 10 }),
     show_license_expiration: schema.boolean({ defaultValue: true }),
-    render_react_app: schema.boolean({ defaultValue: false }),
+    render_react_app: schema.boolean({ defaultValue: true }),
   }),
   kibana: schema.object({
     collection: schema.object({

From ed9859ac147bfeb597f03b30514afc10190f05bf Mon Sep 17 00:00:00 2001
From: Frank Hassanabad <frank.hassanabad@elastic.co>
Date: Thu, 14 Oct 2021 20:24:01 -0600
Subject: [PATCH 107/117] [Security solutions] Adds linter rule to forbid usage
 of no-non-null-assertion (TypeScript ! bang operator)  (#114375)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

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

**What this linter rule does:**
* Sets the [@typescript-eslint/no-non-null-assertion](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-non-null-assertion.md) linter rule to become an error if seen.

If you try to use the `!` operator you get an error and nice helper message that tries to encourage better practices such as this one:

<img width="1635" alt="Screen Shot 2021-10-07 at 11 26 14 AM" src="https://user-images.githubusercontent.com/1151048/136474207-f38d3461-0af9-4cdc-885b-632cb49d8a24.png">

**Why are we deciding to set this linter rule?**
* Recommended from Kibana [styleguide](https://github.com/elastic/kibana/blob/master/STYLEGUIDE.mdx#avoid-non-null-assertions) for ~2 years now and still recommended.
* A lot of TypeScript has evolved and has operators such as `?` which can replace the `!` in most cases. Other cases can use a throw explicitly or other ways to manage this.
* Some types can change instead of using this operator and we should just change the types.
* TypeScript flows have improved and when we upgrade the linter will cause errors where we can remove the `!` operator which is 👍 better than leaving them when they're not needed anymore.
* Newer programmers and team members sometimes mistake it for the `?` when it is not the same thing.
* We have had past bugs and bugs recently because of these.
* It's easier to use the linter to find bugs than to rely on manual tests.

**How did Frank fix all the 403 areas in which the linter goes off?**
* Anywhere I could remove the `!` operator without side effects or type script errors I just removed the `!` operator.
* Anywhere in test code where I could replace the code with a `?` or a `throw` I went through that route.
* Within the code areas (non test code) where I saw what looks like a simple bug that I could fix using a `?? []` or `?` operator or `String(value)` or fixing a simple type I would choose that route first. These areas I marked in the code review with the words `NOTE:` for anyone to look at.
* Within all other areas of the code and tests where anything looked more involved I just disabled the linter for that particular line. When in doubt I chose this route.

### Checklist

- [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
---
 .eslintrc.js                                  | 38 +++++++++++++++++--
 .../common/detection_engine/utils.ts          |  3 +-
 .../data_loaders/index_endpoint_hosts.ts      |  2 +-
 .../data_loaders/index_fleet_agent.ts         |  2 +-
 .../integration/cases/connectors.spec.ts      |  4 +-
 .../detection_rules/custom_query_rule.spec.ts | 10 ++---
 .../detection_rules/export_rule.spec.ts       |  2 +-
 .../timeline_templates/creation.spec.ts       |  2 +-
 .../timeline_templates/export.spec.ts         |  4 +-
 .../integration/timelines/export.spec.ts      |  4 +-
 .../timelines/search_or_filter.spec.ts        |  8 ++--
 .../cypress/integration/urls/state.spec.ts    |  4 +-
 .../value_lists/value_lists.spec.ts           | 14 +++----
 .../cypress/screens/timelines.ts              |  5 ++-
 .../cypress/tasks/create_new_rule.ts          | 11 ++++--
 .../security_solution/cypress/tasks/login.ts  |  4 +-
 .../cypress/tasks/rule_details.ts             |  2 +-
 .../common/components/charts/barchart.tsx     |  2 +-
 .../components/event_details/helpers.test.tsx |  2 +-
 .../components/event_details/helpers.tsx      |  2 +-
 .../events_viewer/events_viewer.tsx           |  4 +-
 .../common/components/events_viewer/index.tsx | 10 ++---
 .../navigation/breadcrumbs/index.ts           |  1 +
 .../public/common/components/utils.ts         |  1 +
 .../mock/endpoint/app_context_render.tsx      |  2 +-
 .../components/alerts_table/actions.test.tsx  |  8 ++--
 .../components/alerts_table/actions.tsx       |  2 +
 .../components/alerts_table/index.tsx         |  6 +--
 .../components/rules/ml_job_select/index.tsx  |  2 +
 .../components/rules/rule_switch/index.tsx    |  4 +-
 .../detection_engine/detection_engine.tsx     |  4 +-
 .../detection_engine/rules/details/index.tsx  |  7 ++--
 .../pages/detection_engine/rules/helpers.tsx  |  1 +
 .../authentications_table/index.tsx           |  8 ++--
 .../artifact_card_grid/artifact_card_grid.tsx |  1 +
 .../back_to_external_app_button.tsx           |  4 +-
 .../context_menu_with_router_support.tsx      |  1 +
 .../paginated_content/paginated_content.tsx   |  1 +
 .../pages/endpoint_hosts/store/reducer.ts     |  9 +++--
 .../event_filter_delete_modal.test.tsx        |  4 +-
 .../view/components/flyout/index.test.tsx     |  8 ++--
 .../view/components/form/index.test.tsx       |  4 +-
 .../view/components/modal/index.test.tsx      | 12 +++---
 .../use_event_filters_notification.test.tsx   | 20 +++++-----
 .../view/components/delete_modal.test.tsx     | 10 ++---
 .../view/components/form_flyout.tsx           |  2 +-
 .../pages/mocks/trusted_apps_http_mocks.ts    |  1 +
 .../policy/store/policy_details/index.test.ts |  6 +--
 .../exception_items_summary.test.tsx          |  2 +-
 .../components/policy_form_layout.tsx         |  1 +
 .../pages/policy/view/policy_hooks.ts         |  2 +-
 .../flyout/policy_trusted_apps_flyout.tsx     |  1 +
 .../list/policy_trusted_apps_list.tsx         |  1 +
 .../pages/trusted_apps/store/middleware.ts    |  2 +
 .../components/create_trusted_app_form.tsx    |  2 +
 .../effected_policy_select.tsx                |  2 +-
 .../network/components/details/index.tsx      |  2 +-
 .../network_dns_table/index.test.tsx          |  4 +-
 .../network_http_table/index.test.tsx         |  4 +-
 .../components/tls_table/index.test.tsx       |  4 +-
 .../components/users_table/index.test.tsx     |  4 +-
 .../security_solution/public/plugin.tsx       |  9 ++++-
 .../public/resolver/mocks/resolver_tree.ts    |  1 +
 .../models/indexed_process_tree/index.ts      |  1 +
 .../public/resolver/store/selectors.test.ts   |  6 +--
 .../resolver/test_utilities/extend_jest.ts    |  4 +-
 .../resolver/view/graph_controls.test.tsx     | 30 +++++++--------
 .../public/resolver/view/panel.test.tsx       | 10 ++---
 .../view/side_effect_simulator_factory.ts     |  1 +
 .../field_renderers/field_renderers.test.tsx  |  6 +--
 .../flyout/header/active_timelines.tsx        |  1 +
 .../components/flyout/header/index.tsx        |  3 ++
 .../components/open_timeline/helpers.ts       |  2 +
 .../components/open_timeline/index.test.tsx   |  2 +-
 .../note_previews/index.test.tsx              |  4 +-
 .../timelines_table/actions_columns.tsx       |  2 +
 .../event_details/expandable_event.tsx        |  2 +-
 .../header_tooltip_content/index.tsx          |  2 +-
 .../timeline/body/events/stateful_event.tsx   |  1 +
 .../components/timeline/body/index.tsx        |  6 +--
 .../suricata/suricata_row_renderer.test.tsx   |  2 +-
 .../body/renderers/zeek/zeek_signature.tsx    |  6 +--
 .../add_data_provider_popover.tsx             |  6 +--
 .../timeline/notes_tab_content/index.tsx      |  7 +++-
 .../timeline/query_tab_content/index.tsx      |  2 +-
 .../timeline/search_or_filter/index.tsx       |  8 +++-
 .../selectable_timeline/index.test.tsx        |  4 +-
 .../timeline/selectable_timeline/index.tsx    |  4 +-
 .../timelines/components/timeline/styles.tsx  |  4 +-
 .../public/timelines/containers/api.ts        |  3 +-
 .../public/timelines/store/timeline/epic.ts   |  2 +-
 .../timelines/store/timeline/reducer.test.ts  |  8 ++--
 .../server/endpoint/lib/artifacts/task.ts     |  1 +
 .../endpoint/lib/policy/license_watch.test.ts |  2 +-
 .../endpoint/routes/actions/isolation.ts      |  1 +
 .../routes/metadata/enrichment.test.ts        | 12 +++---
 .../endpoint/routes/metadata/handlers.ts      |  8 ++++
 .../endpoint/routes/metadata/metadata.test.ts |  6 +--
 .../routes/metadata/query_builders.ts         |  4 +-
 .../server/endpoint/routes/policy/service.ts  |  2 +
 .../endpoint/routes/trusted_apps/service.ts   |  2 +
 .../server/endpoint/services/actions.ts       |  2 +
 .../services/artifacts/artifact_client.ts     |  3 +-
 .../manifest_manager/manifest_manager.mock.ts |  8 ++--
 .../metadata/endpoint_metadata_service.ts     |  4 +-
 .../migrations/create_migration.ts            |  2 +-
 .../routes/index/create_index_route.ts        |  2 +-
 .../rules/add_prepackaged_rules_route.test.ts |  2 +-
 .../rules/create_rules_bulk_route.test.ts     |  2 +-
 .../routes/rules/create_rules_route.test.ts   |  2 +-
 .../rules/delete_rules_bulk_route.test.ts     |  2 +-
 .../routes/rules/delete_rules_route.test.ts   |  2 +-
 .../routes/rules/find_rules_route.test.ts     |  2 +-
 .../rules/find_rules_status_route.test.ts     |  2 +-
 ...get_prepackaged_rules_status_route.test.ts |  2 +-
 .../routes/rules/import_rules_route.test.ts   |  2 +-
 .../rules/patch_rules_bulk_route.test.ts      |  2 +-
 .../routes/rules/patch_rules_route.test.ts    |  2 +-
 .../rules/perform_bulk_action_route.test.ts   |  2 +-
 .../routes/rules/read_rules_route.test.ts     |  2 +-
 .../rules/update_rules_bulk_route.test.ts     |  2 +-
 .../routes/rules/update_rules_route.test.ts   |  2 +-
 .../routes/signals/query_signals_route.ts     |  2 +-
 .../signals/build_event_type_signal.ts        |  4 +-
 .../signals/build_rule.test.ts                |  4 +-
 .../enrich_signal_threat_matches.ts           |  2 +-
 .../bulk_create_threshold_signals.ts          |  2 +
 .../threshold/get_threshold_bucket_filters.ts |  1 +
 .../detection_engine/signals/utils.test.ts    |  2 +-
 .../lib/detection_engine/signals/utils.ts     |  1 +
 .../timeline/utils/check_timelines_status.ts  |  1 +
 .../lib/timeline/utils/failure_cases.ts       |  2 +-
 .../security_solution/server/plugin.ts        | 10 ++++-
 .../cti/event_enrichment/response.test.ts     |  2 +-
 .../factory/hosts/details/helpers.ts          |  1 +
 .../public/components/hover_actions/index.tsx |  1 +
 .../timelines/public/components/index.tsx     |  1 +
 .../header_tooltip_content/index.tsx          |  2 +-
 .../t_grid/body/events/stateful_event.tsx     |  1 +
 .../public/components/t_grid/helpers.tsx      |  1 +
 .../components/t_grid/integrated/index.tsx    |  2 +-
 .../components/t_grid/standalone/index.tsx    |  2 +-
 .../public/components/t_grid/styles.tsx       |  4 +-
 .../fields_browser/field_browser.test.tsx     |  4 +-
 .../t_grid/toolbar/fields_browser/helpers.tsx |  1 +
 .../t_grid/toolbar/fields_browser/index.tsx   |  2 +
 .../public/components/utils/helpers.ts        |  2 +-
 .../public/container/use_update_alerts.ts     |  4 +-
 x-pack/plugins/timelines/public/plugin.ts     |  7 +++-
 149 files changed, 367 insertions(+), 238 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index c12cc7c1eb496..0c2c78cd1dd7f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -899,7 +899,12 @@ module.exports = {
     },
 
     /**
-     * Security Solution overrides
+     * Security Solution overrides. These rules below are maintained and owned by
+     * the people within the security-solution-platform team. Please see ping them
+     * or check with them if you are encountering issues, have suggestions, or would
+     * like to add, change, or remove any particular rule. Linters, Typescript, and rules
+     * evolve and change over time just like coding styles, so please do not hesitate to
+     * reach out.
      */
     {
       // front end and common typescript and javascript files only
@@ -922,6 +927,22 @@ module.exports = {
         ],
       },
     },
+    {
+      // typescript only for front and back end, but excludes the test files.
+      // We use this section to add rules in which we do not want to apply to test files.
+      // This should be a very small set as most linter rules are useful for tests as well.
+      files: [
+        'x-pack/plugins/security_solution/**/*.{ts,tsx}',
+        'x-pack/plugins/timelines/**/*.{ts,tsx}',
+      ],
+      excludedFiles: [
+        'x-pack/plugins/security_solution/**/*.{test,mock,test_helper}.{ts,tsx}',
+        'x-pack/plugins/timelines/**/*.{test,mock,test_helper}.{ts,tsx}',
+      ],
+      rules: {
+        '@typescript-eslint/no-non-null-assertion': 'error',
+      },
+    },
     {
       // typescript only for front and back end
       files: [
@@ -1040,7 +1061,12 @@ module.exports = {
     },
 
     /**
-     * Lists overrides
+     * Lists overrides. These rules below are maintained and owned by
+     * the people within the security-solution-platform team. Please see ping them
+     * or check with them if you are encountering issues, have suggestions, or would
+     * like to add, change, or remove any particular rule. Linters, Typescript, and rules
+     * evolve and change over time just like coding styles, so please do not hesitate to
+     * reach out.
      */
     {
       // front end and common typescript and javascript files only
@@ -1215,8 +1241,14 @@ module.exports = {
         ],
       },
     },
+
     /**
-     * Metrics entities overrides
+     * Metrics entities overrides. These rules below are maintained and owned by
+     * the people within the security-solution-platform team. Please see ping them
+     * or check with them if you are encountering issues, have suggestions, or would
+     * like to add, change, or remove any particular rule. Linters, Typescript, and rules
+     * evolve and change over time just like coding styles, so please do not hesitate to
+     * reach out.
      */
     {
       // front end and common typescript and javascript files only
diff --git a/x-pack/plugins/security_solution/common/detection_engine/utils.ts b/x-pack/plugins/security_solution/common/detection_engine/utils.ts
index 28749e0400bbb..7d4badcd3507c 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/utils.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/utils.ts
@@ -51,7 +51,8 @@ export const normalizeThresholdField = (
     ? thresholdField
     : isEmpty(thresholdField)
     ? []
-    : [thresholdField!];
+    : // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      [thresholdField!];
 };
 
 export const normalizeThresholdObject = (threshold: Threshold): ThresholdNormalized => {
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts
index d7ab014c3b445..fdb8416de2ed8 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts
@@ -161,7 +161,7 @@ export async function indexEndpointHostDocs({
         const indexedAgentResponse = await indexFleetAgentForHost(
           client,
           kbnClient,
-          hostMetadata!,
+          hostMetadata,
           realPolicies[appliedPolicyId].policy_id,
           kibanaVersion
         );
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts
index b792b34dd510f..67a261d088f86 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts
@@ -73,7 +73,7 @@ export const indexFleetAgentForHost = async (
     .index<FleetServerAgent>({
       index: agentDoc._index,
       id: agentDoc._id,
-      body: agentDoc._source!,
+      body: agentDoc._source,
       op_type: 'create',
     })
     .catch(wrapErrorAndRejectPromise);
diff --git a/x-pack/plugins/security_solution/cypress/integration/cases/connectors.spec.ts b/x-pack/plugins/security_solution/cypress/integration/cases/connectors.spec.ts
index a53e37f363d05..287d86c6fba9e 100644
--- a/x-pack/plugins/security_solution/cypress/integration/cases/connectors.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/cases/connectors.spec.ts
@@ -89,11 +89,11 @@ describe('Cases connectors', () => {
     addServiceNowConnector(snConnector);
 
     cy.wait('@createConnector').then(({ response }) => {
-      cy.wrap(response!.statusCode).should('eql', 200);
+      cy.wrap(response?.statusCode).should('eql', 200);
       cy.get(TOASTER).should('have.text', "Created 'New connector'");
       cy.get(TOASTER).should('not.exist');
 
-      selectLastConnectorCreated(response!.body.id);
+      selectLastConnectorCreated(response?.body.id);
 
       cy.wait('@saveConnector', { timeout: 10000 }).its('response.statusCode').should('eql', 200);
       cy.get(SERVICE_NOW_MAPPING).first().should('have.text', 'short_description');
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_rules/custom_query_rule.spec.ts b/x-pack/plugins/security_solution/cypress/integration/detection_rules/custom_query_rule.spec.ts
index 028ef36138bbd..3af966b4ba2b2 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detection_rules/custom_query_rule.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/detection_rules/custom_query_rule.spec.ts
@@ -351,10 +351,10 @@ describe('Custom detection rules deletion and edition', () => {
       goToRuleDetails();
 
       cy.wait('@fetchRuleDetails').then(({ response }) => {
-        cy.wrap(response!.statusCode).should('eql', 200);
+        cy.wrap(response?.statusCode).should('eql', 200);
 
-        cy.wrap(response!.body.max_signals).should('eql', getExistingRule().maxSignals);
-        cy.wrap(response!.body.enabled).should('eql', false);
+        cy.wrap(response?.body.max_signals).should('eql', getExistingRule().maxSignals);
+        cy.wrap(response?.body.enabled).should('eql', false);
       });
     });
 
@@ -414,9 +414,9 @@ describe('Custom detection rules deletion and edition', () => {
       saveEditedRule();
 
       cy.wait('@getRule').then(({ response }) => {
-        cy.wrap(response!.statusCode).should('eql', 200);
+        cy.wrap(response?.statusCode).should('eql', 200);
         // ensure that editing rule does not modify max_signals
-        cy.wrap(response!.body.max_signals).should('eql', getExistingRule().maxSignals);
+        cy.wrap(response?.body.max_signals).should('eql', getExistingRule().maxSignals);
       });
 
       cy.get(RULE_NAME_HEADER).should('contain', `${getEditedRule().name}`);
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_rules/export_rule.spec.ts b/x-pack/plugins/security_solution/cypress/integration/detection_rules/export_rule.spec.ts
index 03086810a8435..18b7b122f0967 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detection_rules/export_rule.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/detection_rules/export_rule.spec.ts
@@ -35,7 +35,7 @@ describe('Export rules', () => {
     goToManageAlertsDetectionRules();
     exportFirstRule();
     cy.wait('@export').then(({ response }) => {
-      cy.wrap(response!.body).should('eql', expectedExportedRule(this.ruleResponse));
+      cy.wrap(response?.body).should('eql', expectedExportedRule(this.ruleResponse));
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/cypress/integration/timeline_templates/creation.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timeline_templates/creation.spec.ts
index 48269677466b6..71bbea673e5c8 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timeline_templates/creation.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timeline_templates/creation.spec.ts
@@ -70,7 +70,7 @@ describe('Timeline Templates', () => {
     addNameToTimeline(getTimeline().title);
 
     cy.wait('@timeline').then(({ response }) => {
-      const timelineId = response!.body.data.persistTimeline.timeline.savedObjectId;
+      const timelineId = response?.body.data.persistTimeline.timeline.savedObjectId;
 
       addDescriptionToTimeline(getTimeline().description);
       addNotesToTimeline(getTimeline().notes);
diff --git a/x-pack/plugins/security_solution/cypress/integration/timeline_templates/export.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timeline_templates/export.spec.ts
index a20baffeadc7e..638a70df35850 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timeline_templates/export.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timeline_templates/export.spec.ts
@@ -35,9 +35,9 @@ describe('Export timelines', () => {
     exportTimeline(this.templateId);
 
     cy.wait('@export').then(({ response }) => {
-      cy.wrap(response!.statusCode).should('eql', 200);
+      cy.wrap(response?.statusCode).should('eql', 200);
 
-      cy.wrap(response!.body).should(
+      cy.wrap(response?.body).should(
         'eql',
         expectedExportedTimelineTemplate(this.templateResponse)
       );
diff --git a/x-pack/plugins/security_solution/cypress/integration/timelines/export.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timelines/export.spec.ts
index 029216f701ae0..29d1cb588f1a2 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timelines/export.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timelines/export.spec.ts
@@ -33,9 +33,9 @@ describe('Export timelines', () => {
     exportTimeline(this.timelineId);
 
     cy.wait('@export').then(({ response }) => {
-      cy.wrap(response!.statusCode).should('eql', 200);
+      cy.wrap(response?.statusCode).should('eql', 200);
 
-      cy.wrap(response!.body).should('eql', expectedExportedTimeline(this.timelineResponse));
+      cy.wrap(response?.body).should('eql', expectedExportedTimeline(this.timelineResponse));
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/cypress/integration/timelines/search_or_filter.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timelines/search_or_filter.spec.ts
index 9d019cf23ebb1..b42bdcdd6fb8d 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timelines/search_or_filter.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timelines/search_or_filter.spec.ts
@@ -54,8 +54,8 @@ describe('Update kqlMode for timeline', () => {
   it('should be able to update timeline kqlMode with filter', () => {
     cy.get(TIMELINE_KQLMODE_FILTER).click();
     cy.wait('@update').then(({ response }) => {
-      cy.wrap(response!.statusCode).should('eql', 200);
-      cy.wrap(response!.body.data.persistTimeline.timeline.kqlMode).should('eql', 'filter');
+      cy.wrap(response?.statusCode).should('eql', 200);
+      cy.wrap(response?.body.data.persistTimeline.timeline.kqlMode).should('eql', 'filter');
       cy.get(ADD_FILTER).should('exist');
     });
   });
@@ -63,8 +63,8 @@ describe('Update kqlMode for timeline', () => {
   it('should be able to update timeline kqlMode with search', () => {
     cy.get(TIMELINE_KQLMODE_SEARCH).click();
     cy.wait('@update').then(({ response }) => {
-      cy.wrap(response!.statusCode).should('eql', 200);
-      cy.wrap(response!.body.data.persistTimeline.timeline.kqlMode).should('eql', 'search');
+      cy.wrap(response?.statusCode).should('eql', 200);
+      cy.wrap(response?.body.data.persistTimeline.timeline.kqlMode).should('eql', 'search');
       cy.get(ADD_FILTER).should('not.exist');
     });
   });
diff --git a/x-pack/plugins/security_solution/cypress/integration/urls/state.spec.ts b/x-pack/plugins/security_solution/cypress/integration/urls/state.spec.ts
index 47e6b0d34e3c5..73eb141f1ce3d 100644
--- a/x-pack/plugins/security_solution/cypress/integration/urls/state.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/urls/state.spec.ts
@@ -250,8 +250,8 @@ describe('url state', () => {
 
     cy.wait('@timeline').then(({ response }) => {
       closeTimeline();
-      cy.wrap(response!.statusCode).should('eql', 200);
-      const timelineId = response!.body.data.persistTimeline.timeline.savedObjectId;
+      cy.wrap(response?.statusCode).should('eql', 200);
+      const timelineId = response?.body.data.persistTimeline.timeline.savedObjectId;
       cy.visit('/app/home');
       cy.visit(`/app/security/timelines?timeline=(id:'${timelineId}',isOpen:!t)`);
       cy.get(DATE_PICKER_APPLY_BUTTON_TIMELINE).should('exist');
diff --git a/x-pack/plugins/security_solution/cypress/integration/value_lists/value_lists.spec.ts b/x-pack/plugins/security_solution/cypress/integration/value_lists/value_lists.spec.ts
index a7cc412a920c0..f2b87e42685e7 100644
--- a/x-pack/plugins/security_solution/cypress/integration/value_lists/value_lists.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/value_lists/value_lists.spec.ts
@@ -174,8 +174,8 @@ describe('value lists', () => {
         cy.wait('@exportList').then(({ response }) => {
           cy.fixture(listName).then((list: string) => {
             const [lineOne, lineTwo] = list.split('\n');
-            expect(response!.body).to.contain(lineOne);
-            expect(response!.body).to.contain(lineTwo);
+            expect(response?.body).to.contain(lineOne);
+            expect(response?.body).to.contain(lineTwo);
           });
         });
       });
@@ -189,8 +189,8 @@ describe('value lists', () => {
         cy.wait('@exportList').then(({ response }) => {
           cy.fixture(listName).then((list: string) => {
             const [lineOne, lineTwo] = list.split('\n');
-            expect(response!.body).to.contain(lineOne);
-            expect(response!.body).to.contain(lineTwo);
+            expect(response?.body).to.contain(lineOne);
+            expect(response?.body).to.contain(lineTwo);
           });
         });
       });
@@ -204,8 +204,8 @@ describe('value lists', () => {
         cy.wait('@exportList').then(({ response }) => {
           cy.fixture(listName).then((list: string) => {
             const [lineOne, lineTwo] = list.split('\n');
-            expect(response!.body).to.contain(lineOne);
-            expect(response!.body).to.contain(lineTwo);
+            expect(response?.body).to.contain(lineOne);
+            expect(response?.body).to.contain(lineTwo);
           });
         });
       });
@@ -219,7 +219,7 @@ describe('value lists', () => {
         cy.wait('@exportList').then(({ response }) => {
           cy.fixture(listName).then((list: string) => {
             const [lineOne] = list.split('\n');
-            expect(response!.body).to.contain(lineOne);
+            expect(response?.body).to.contain(lineOne);
           });
         });
       });
diff --git a/x-pack/plugins/security_solution/cypress/screens/timelines.ts b/x-pack/plugins/security_solution/cypress/screens/timelines.ts
index ca60250330f83..92522c44dd8e4 100644
--- a/x-pack/plugins/security_solution/cypress/screens/timelines.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/timelines.ts
@@ -9,7 +9,10 @@ export const BULK_ACTIONS = '[data-test-subj="utility-bar-action-button"]';
 
 export const EXPORT_TIMELINE_ACTION = '[data-test-subj="export-timeline-action"]';
 
-export const TIMELINE = (id: string) => {
+export const TIMELINE = (id: string | undefined) => {
+  if (id == null) {
+    throw new TypeError('id should never be null or undefined');
+  }
   return `[data-test-subj="title-${id}"]`;
 };
 
diff --git a/x-pack/plugins/security_solution/cypress/tasks/create_new_rule.ts b/x-pack/plugins/security_solution/cypress/tasks/create_new_rule.ts
index 591be21b5682b..b9323fee44d5c 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/create_new_rule.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/create_new_rule.ts
@@ -254,7 +254,7 @@ export const fillDefineCustomRuleWithImportedQueryAndContinue = (
   rule: CustomRule | OverrideRule
 ) => {
   cy.get(IMPORT_QUERY_FROM_SAVED_TIMELINE_LINK).click();
-  cy.get(TIMELINE(rule.timeline.id!)).click();
+  cy.get(TIMELINE(rule.timeline.id)).click();
   cy.get(CUSTOM_QUERY_INPUT).should('have.value', rule.customQuery);
   cy.get(DEFINE_CONTINUE_BUTTON).should('exist').click({ force: true });
 
@@ -273,7 +273,7 @@ export const fillDefineThresholdRule = (rule: ThresholdRule) => {
   const threshold = 1;
 
   cy.get(IMPORT_QUERY_FROM_SAVED_TIMELINE_LINK).click();
-  cy.get(TIMELINE(rule.timeline.id!)).click();
+  cy.get(TIMELINE(rule.timeline.id)).click();
   cy.get(COMBO_BOX_CLEAR_BTN).first().click();
 
   rule.index.forEach((index) => {
@@ -298,7 +298,7 @@ export const fillDefineThresholdRuleAndContinue = (rule: ThresholdRule) => {
     cy.wrap($el).type(rule.thresholdField, { delay: 35 });
 
   cy.get(IMPORT_QUERY_FROM_SAVED_TIMELINE_LINK).click();
-  cy.get(TIMELINE(rule.timeline.id!)).click();
+  cy.get(TIMELINE(rule.timeline.id)).click();
   cy.get(CUSTOM_QUERY_INPUT).should('have.value', rule.customQuery);
   cy.get(THRESHOLD_INPUT_AREA)
     .find(INPUT)
@@ -314,9 +314,12 @@ export const fillDefineThresholdRuleAndContinue = (rule: ThresholdRule) => {
 };
 
 export const fillDefineEqlRuleAndContinue = (rule: CustomRule) => {
+  if (rule.customQuery == null) {
+    throw new TypeError('The rule custom query should never be undefined or null ');
+  }
   cy.get(RULES_CREATION_FORM).find(EQL_QUERY_INPUT).should('exist');
   cy.get(RULES_CREATION_FORM).find(EQL_QUERY_INPUT).should('be.visible');
-  cy.get(RULES_CREATION_FORM).find(EQL_QUERY_INPUT).type(rule.customQuery!);
+  cy.get(RULES_CREATION_FORM).find(EQL_QUERY_INPUT).type(rule.customQuery);
   cy.get(RULES_CREATION_FORM).find(EQL_QUERY_VALIDATION_SPINNER).should('not.exist');
   cy.get(RULES_CREATION_PREVIEW)
     .find(QUERY_PREVIEW_BUTTON)
diff --git a/x-pack/plugins/security_solution/cypress/tasks/login.ts b/x-pack/plugins/security_solution/cypress/tasks/login.ts
index 5a935702131d6..96d37d2d9214a 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/login.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/login.ts
@@ -57,7 +57,7 @@ const LOGIN_API_ENDPOINT = '/internal/security/login';
  */
 export const getUrlWithRoute = (role: ROLES, route: string) => {
   const url = Cypress.config().baseUrl;
-  const kibana = new URL(url!);
+  const kibana = new URL(String(url));
   const theUrl = `${Url.format({
     auth: `${role}:changeme`,
     username: role,
@@ -83,7 +83,7 @@ interface User {
  */
 export const constructUrlWithUser = (user: User, route: string) => {
   const url = Cypress.config().baseUrl;
-  const kibana = new URL(url!);
+  const kibana = new URL(String(url));
   const hostname = kibana.hostname;
   const username = user.username;
   const password = user.password;
diff --git a/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts b/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts
index 37968e700fb39..f001af9df62d2 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts
@@ -32,7 +32,7 @@ export const activatesRule = () => {
   cy.get(RULE_SWITCH).should('be.visible');
   cy.get(RULE_SWITCH).click();
   cy.wait('@bulk_update').then(({ response }) => {
-    cy.wrap(response!.statusCode).should('eql', 200);
+    cy.wrap(response?.statusCode).should('eql', 200);
   });
 };
 
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx b/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx
index 527ef2721ab86..20ab5cca89a76 100644
--- a/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx
@@ -94,7 +94,7 @@ export const BarChartBaseComponent = ({
             yAccessors={yAccessors}
             timeZone={timeZone}
             splitSeriesAccessors={splitSeriesAccessors}
-            data={series.value!}
+            data={series.value ?? []}
             stackAccessors={get('configs.series.stackAccessors', chartConfigs)}
             color={series.color ? series.color : undefined}
           />
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/helpers.test.tsx
index d164d1f8f0ba0..bcdec78fe0614 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/helpers.test.tsx
@@ -12,7 +12,7 @@ import { mockBrowserFields } from '../../containers/source/mock';
 
 const aField = {
   ...mockDetailItemData[4],
-  ...mockBrowserFields.base.fields!['@timestamp'],
+  ...mockBrowserFields.base.fields?.['@timestamp'],
 };
 
 describe('helpers', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/helpers.tsx
index a1c74a603fbc3..47d0ccf5ba3b2 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/helpers.tsx
@@ -127,7 +127,7 @@ export const getColumnsWithTimestamp = ({
 export const getExampleText = (example: string | number | null | undefined): string =>
   !isEmpty(example) ? `Example: ${example}` : '';
 
-export const getIconFromType = (type: string | null) => {
+export const getIconFromType = (type: string | null | undefined) => {
   switch (type) {
     case 'string': // fall through
     case 'keyword':
diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx
index 632197aa6b219..fd644d1380ddb 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx
@@ -236,7 +236,7 @@ const EventsViewerComponent: React.FC<Props> = ({
     useTimelineEvents({
       docValueFields,
       fields,
-      filterQuery: combinedQueries!.filterQuery,
+      filterQuery: combinedQueries?.filterQuery,
       id,
       indexNames,
       limit: itemsPerPage,
@@ -300,7 +300,7 @@ const EventsViewerComponent: React.FC<Props> = ({
               height={headerFilterGroup ? COMPACT_HEADER_HEIGHT : EVENTS_VIEWER_HEADER_HEIGHT}
               subtitle={utilityBar ? undefined : subtitle}
               title={globalFullScreen ? titleWithExitFullScreen : justTitle}
-              isInspectDisabled={combinedQueries!.filterQuery === undefined}
+              isInspectDisabled={combinedQueries?.filterQuery === undefined}
             >
               {HeaderSectionContent}
             </HeaderSection>
diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
index d60db8a4bc461..1e61e69180f91 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
@@ -181,7 +181,7 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
               browserFields,
               bulkActions,
               columns,
-              dataProviders: dataProviders!,
+              dataProviders,
               defaultCellActions,
               deletedEventIds,
               docValueFields,
@@ -199,7 +199,7 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
               isLive,
               isLoadingIndexPattern,
               itemsPerPage,
-              itemsPerPageOptions: itemsPerPageOptions!,
+              itemsPerPageOptions,
               kqlMode,
               leadingControlColumns,
               onRuleChange,
@@ -220,7 +220,7 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
               columns={columns}
               docValueFields={docValueFields}
               id={id}
-              dataProviders={dataProviders!}
+              dataProviders={dataProviders}
               deletedEventIds={deletedEventIds}
               end={end}
               isLoadingIndexPattern={isLoadingIndexPattern}
@@ -228,8 +228,8 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
               indexNames={selectedPatterns}
               indexPattern={indexPattern}
               isLive={isLive}
-              itemsPerPage={itemsPerPage!}
-              itemsPerPageOptions={itemsPerPageOptions!}
+              itemsPerPage={itemsPerPage}
+              itemsPerPageOptions={itemsPerPageOptions}
               kqlMode={kqlMode}
               query={query}
               onRuleChange={onRuleChange}
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts b/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts
index f4e3814738f92..7262264d72103 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts
@@ -54,6 +54,7 @@ export const useSetBreadcrumbs = () => {
 
                   dispatch(timelineActions.showTimeline({ id: TimelineId.active, show: false }));
 
+                  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                   navigateToUrl(breadcrumb.href!);
                 },
               }
diff --git a/x-pack/plugins/security_solution/public/common/components/utils.ts b/x-pack/plugins/security_solution/public/common/components/utils.ts
index fc27578487ca7..da92c94d3c1cd 100644
--- a/x-pack/plugins/security_solution/public/common/components/utils.ts
+++ b/x-pack/plugins/security_solution/public/common/components/utils.ts
@@ -22,6 +22,7 @@ export const getDaysDiff = (minDate: moment.Moment, maxDate: moment.Moment) => {
 };
 
 export const histogramDateTimeFormatter = (domain: [string, string] | null, fixedDiff?: number) => {
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const diff = fixedDiff ?? getDaysDiff(moment(domain![0]), moment(domain![1]));
   const format = niceTimeFormatByDay(diff);
   return timeFormatter(format);
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
index 20d411a0437c2..ed2a2252bd0d2 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
@@ -78,7 +78,7 @@ const experimentalFeaturesReducer: Reducer<State['app'], UpdateExperimentalFeatu
     return {
       ...state,
       enableExperimental: {
-        ...state.enableExperimental!,
+        ...state.enableExperimental,
         ...action.payload,
       },
     };
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
index 261ac8cfee1a6..835784031e065 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
@@ -290,7 +290,7 @@ describe('alert actions', () => {
           ...mockEcsDataWithAlert,
           signal: {
             rule: {
-              ...mockEcsDataWithAlert.signal?.rule!,
+              ...mockEcsDataWithAlert.signal?.rule,
               // @ts-expect-error
               timeline_id: null,
             },
@@ -317,7 +317,7 @@ describe('alert actions', () => {
           ...mockEcsDataWithAlert,
           signal: {
             rule: {
-              ...mockEcsDataWithAlert.signal?.rule!,
+              ...mockEcsDataWithAlert.signal?.rule,
               timeline_id: [''],
             },
           },
@@ -343,7 +343,7 @@ describe('alert actions', () => {
           ...mockEcsDataWithAlert,
           signal: {
             rule: {
-              ...mockEcsDataWithAlert.signal?.rule!,
+              ...mockEcsDataWithAlert.signal?.rule,
               type: ['eql'],
               timeline_id: [''],
             },
@@ -387,7 +387,7 @@ describe('alert actions', () => {
           ...mockEcsDataWithAlert,
           signal: {
             rule: {
-              ...mockEcsDataWithAlert.signal?.rule!,
+              ...mockEcsDataWithAlert.signal?.rule,
               type: ['eql'],
               timeline_id: [''],
             },
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
index d48bc95f5d480..fb958c775e68c 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
@@ -192,8 +192,10 @@ export const getThresholdAggregationData = (
         };
       }
 
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const originalTime = moment(thresholdData.signal?.original_time![0]);
       const now = moment();
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const ruleFrom = dateMath.parse(thresholdData.signal?.rule?.from![0]!);
       const ruleInterval = moment.duration(now.diff(ruleFrom));
       const fromOriginalTime = originalTime.clone().subtract(ruleInterval); // This is the default... can overshoot
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 d7c48c4f18bc8..4bd516d0b1338 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
@@ -142,14 +142,14 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
 
   const setEventsLoadingCallback = useCallback(
     ({ eventIds, isLoading }: SetEventsLoadingProps) => {
-      setEventsLoading!({ id: timelineId, eventIds, isLoading });
+      setEventsLoading({ id: timelineId, eventIds, isLoading });
     },
     [setEventsLoading, timelineId]
   );
 
   const setEventsDeletedCallback = useCallback(
     ({ eventIds, isDeleted }: SetEventsDeletedProps) => {
-      setEventsDeleted!({ id: timelineId, eventIds, isDeleted });
+      setEventsDeleted({ id: timelineId, eventIds, isDeleted });
     },
     [setEventsDeleted, timelineId]
   );
@@ -216,7 +216,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
 
   // Callback for clearing entire selection from utility bar
   const clearSelectionCallback = useCallback(() => {
-    clearSelected!({ id: timelineId });
+    clearSelected({ id: timelineId });
     dispatch(
       timelineActions.setTGridSelectAll({
         id: timelineId,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.tsx
index 6d7b5d4acc5b8..f785ec43a8b31 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.tsx
@@ -59,6 +59,7 @@ interface MlJobSelectProps {
 }
 
 const renderJobOption = (option: MlJobOption) => (
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   <JobDisplay id={option.value!.id} description={option.value!.description} />
 );
 
@@ -69,6 +70,7 @@ export const MlJobSelect: React.FC<MlJobSelectProps> = ({ describedByIds = [], f
   const mlUrl = useKibana().services.application.getUrlForApp('ml');
   const handleJobSelect = useCallback(
     (selectedJobOptions: MlJobOption[]): void => {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const selectedJobIds = selectedJobOptions.map((option) => option.value!.id);
       field.setValue(selectedJobIds);
     },
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.tsx
index dc20dd1aa9ca4..dd836a04f8263 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.tsx
@@ -61,9 +61,9 @@ export const RuleSwitchComponent = ({
     async (event: EuiSwitchEvent) => {
       setMyIsLoading(true);
       if (dispatch != null) {
-        await enableRulesAction([id], event.target.checked!, dispatch, dispatchToaster);
+        await enableRulesAction([id], event.target.checked, dispatch, dispatchToaster);
       } else {
-        const enabling = event.target.checked!;
+        const enabling = event.target.checked;
         const title = enabling
           ? i18n.BATCH_ACTION_ACTIVATE_SELECTED_ERROR(1)
           : i18n.BATCH_ACTION_DEACTIVATE_SELECTED_ERROR(1);
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 848bdd7f8ef71..ebda4f2b4232f 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
@@ -176,8 +176,8 @@ const DetectionEnginePageComponent: React.FC<DetectionEngineComponentProps> = ({
   const onFilterGroupChangedCallback = useCallback(
     (newFilterGroup: Status) => {
       const timelineId = TimelineId.detectionsPage;
-      clearEventsLoading!({ id: timelineId });
-      clearEventsDeleted!({ id: timelineId });
+      clearEventsLoading({ id: timelineId });
+      clearEventsDeleted({ id: timelineId });
       setFilterGroup(newFilterGroup);
     },
     [clearEventsLoading, clearEventsDeleted, setFilterGroup]
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
index 492b8e461fb60..7167b07c7da5d 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
@@ -302,6 +302,7 @@ const RuleDetailsPageComponent: React.FC<DetectionEngineComponentProps> = ({
   const getLegacyUrlConflictCallout = useMemo(() => {
     const outcome = rule?.outcome;
     if (rule != null && spacesApi && outcome === 'conflict') {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const aliasTargetId = rule?.alias_target_id!; // This is always defined if outcome === 'conflict'
       // We have resolved to one rule, but there is another one with a legacy URL associated with this page. Display a
       // callout with a warning for the user, and provide a way for them to navigate to the other rule.
@@ -401,9 +402,9 @@ const RuleDetailsPageComponent: React.FC<DetectionEngineComponentProps> = ({
   const onFilterGroupChangedCallback = useCallback(
     (newFilterGroup: Status) => {
       const timelineId = TimelineId.detectionsRulesDetailsPage;
-      clearEventsLoading!({ id: timelineId });
-      clearEventsDeleted!({ id: timelineId });
-      clearSelected!({ id: timelineId });
+      clearEventsLoading({ id: timelineId });
+      clearEventsDeleted({ id: timelineId });
+      clearSelected({ id: timelineId });
       setFilterGroup(newFilterGroup);
     },
     [clearEventsLoading, clearEventsDeleted, clearSelected, setFilterGroup]
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
index 0f109214c6bf3..18b5d74516199 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
@@ -174,6 +174,7 @@ export const getAboutStepsData = (rule: Rule, detailsView: boolean): AboutStepRu
     timestampOverride: timestampOverride ?? '',
     name,
     description,
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     note: note!,
     references,
     severity: {
diff --git a/x-pack/plugins/security_solution/public/hosts/components/authentications_table/index.tsx b/x-pack/plugins/security_solution/public/hosts/components/authentications_table/index.tsx
index b83853eec69a1..23e5da28a3559 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/authentications_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/authentications_table/index.tsx
@@ -229,8 +229,8 @@ const getAuthenticationColumns = (): AuthTableColumns => [
     truncateText: false,
     hideForMobile: false,
     render: ({ node }) =>
-      has('lastSuccess.timestamp', node) && node.lastSuccess!.timestamp != null ? (
-        <FormattedRelativePreferenceDate value={node.lastSuccess!.timestamp} />
+      has('lastSuccess.timestamp', node) && node.lastSuccess?.timestamp != null ? (
+        <FormattedRelativePreferenceDate value={node.lastSuccess?.timestamp} />
       ) : (
         getEmptyTagValue()
       ),
@@ -264,8 +264,8 @@ const getAuthenticationColumns = (): AuthTableColumns => [
     truncateText: false,
     hideForMobile: false,
     render: ({ node }) =>
-      has('lastFailure.timestamp', node) && node.lastFailure!.timestamp != null ? (
-        <FormattedRelativePreferenceDate value={node.lastFailure!.timestamp} />
+      has('lastFailure.timestamp', node) && node.lastFailure?.timestamp != null ? (
+        <FormattedRelativePreferenceDate value={node.lastFailure?.timestamp} />
       ) : (
         getEmptyTagValue()
       ),
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_card_grid/artifact_card_grid.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_card_grid/artifact_card_grid.tsx
index 9e9082ccc54e7..0218b83288d84 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_card_grid/artifact_card_grid.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_card_grid/artifact_card_grid.tsx
@@ -119,6 +119,7 @@ export const ArtifactCardGrid = memo<ArtifactCardGridProps>(
 
     const handleItemComponentProps = useCallback(
       (item: AnyArtifact): ArtifactEntryCollapsibleCardProps => {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return fullCardProps.get(item)!;
       },
       [fullCardProps]
diff --git a/x-pack/plugins/security_solution/public/management/components/back_to_external_app_button/back_to_external_app_button.tsx b/x-pack/plugins/security_solution/public/management/components/back_to_external_app_button/back_to_external_app_button.tsx
index c71eea2aaf9db..47242ed7d1edc 100644
--- a/x-pack/plugins/security_solution/public/management/components/back_to_external_app_button/back_to_external_app_button.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/back_to_external_app_button/back_to_external_app_button.tsx
@@ -31,7 +31,7 @@ const EuiButtonEmptyStyled = styled(EuiButtonEmpty)`
 export type BackToExternalAppButtonProps = CommonProps & ListPageRouteState;
 export const BackToExternalAppButton = memo<BackToExternalAppButtonProps>(
   ({ backButtonLabel, backButtonUrl, onBackButtonNavigateTo, ...commonProps }) => {
-    const handleBackOnClick = useNavigateToAppEventHandler(...onBackButtonNavigateTo!);
+    const handleBackOnClick = useNavigateToAppEventHandler(...onBackButtonNavigateTo);
 
     return (
       <EuiButtonEmptyStyled
@@ -40,7 +40,7 @@ export const BackToExternalAppButton = memo<BackToExternalAppButtonProps>(
         flush="left"
         size="xs"
         iconType="arrowLeft"
-        href={backButtonUrl!}
+        href={backButtonUrl}
         onClick={handleBackOnClick}
         textProps={{ className: 'text' }}
       >
diff --git a/x-pack/plugins/security_solution/public/management/components/context_menu_with_router_support/context_menu_with_router_support.tsx b/x-pack/plugins/security_solution/public/management/components/context_menu_with_router_support/context_menu_with_router_support.tsx
index 41abb0309a7d1..6e33ad9218bb6 100644
--- a/x-pack/plugins/security_solution/public/management/components/context_menu_with_router_support/context_menu_with_router_support.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/context_menu_with_router_support/context_menu_with_router_support.tsx
@@ -75,6 +75,7 @@ export const ContextMenuWithRouterSupport = memo<ContextMenuWithRouterSupportPro
       };
 
       if (maxWidth) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         newAdditionalProps.style!.maxWidth = maxWidth;
       }
 
diff --git a/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx b/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx
index fa123e023bd9f..0a6b66afebc32 100644
--- a/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/paginated_content/paginated_content.tsx
@@ -203,6 +203,7 @@ export const PaginatedContent = memo(
             key = item[itemId] as unknown as Key;
           } else {
             if (itemKeys.has(item)) {
+              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
               key = itemKeys.get(item)!;
             } else {
               key = generateUUI();
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
index b16caf00b4e28..d9407e310639e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
@@ -50,9 +50,9 @@ const handleEndpointDetailsActivityLogChanged: CaseReducer<EndpointDetailsActivi
         }
       : { ...state.endpointDetails.activityLog };
   return {
-    ...state!,
+    ...state,
     endpointDetails: {
-      ...state.endpointDetails!,
+      ...state.endpointDetails,
       activityLog: {
         ...updatedActivityLog,
         logData: action.payload,
@@ -181,7 +181,7 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
     return {
       ...state,
       endpointDetails: {
-        ...state.endpointDetails!,
+        ...state.endpointDetails,
         activityLog: {
           ...state.endpointDetails.activityLog,
           paging: {
@@ -195,7 +195,7 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
     return {
       ...state,
       endpointDetails: {
-        ...state.endpointDetails!,
+        ...state.endpointDetails,
         activityLog: {
           ...state.endpointDetails.activityLog,
           paging: {
@@ -458,6 +458,7 @@ const handleEndpointIsolationRequestStateChanged: ImmutableReducer<
   AppAction & { type: 'endpointIsolationRequestStateChange' }
 > = (state, action) => {
   return {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     ...state!,
     isolationRequestState: action.payload,
   };
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.test.tsx
index ed18c084c2a05..108e3d06affa6 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.test.tsx
@@ -30,12 +30,12 @@ describe('When event filters delete modal is shown', () => {
   const getConfirmButton = () =>
     renderResult.baseElement.querySelector(
       '[data-test-subj="eventFilterDeleteModalConfirmButton"]'
-    )! as HTMLButtonElement;
+    ) as HTMLButtonElement;
 
   const getCancelButton = () =>
     renderResult.baseElement.querySelector(
       '[data-test-subj="eventFilterDeleteModalCancelButton"]'
-    )! as HTMLButtonElement;
+    ) as HTMLButtonElement;
 
   const getCurrentState = () => store.getState().management.eventFilters;
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.test.tsx
index d5a1c6624923b..83b4f005135ba 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.test.tsx
@@ -80,7 +80,7 @@ describe('Event filter flyout', () => {
     });
 
     expect(getFormEntryState(getState())).not.toBeUndefined();
-    expect(getFormEntryState(getState())!.entries[0].field).toBe('');
+    expect(getFormEntryState(getState())?.entries[0].field).toBe('');
   });
 
   it('should confirm form when button is disabled', () => {
@@ -98,7 +98,7 @@ describe('Event filter flyout', () => {
       type: 'eventFiltersChangeForm',
       payload: {
         entry: {
-          ...(getState().form!.entry as CreateExceptionListItemSchema),
+          ...(getState().form?.entry as CreateExceptionListItemSchema),
           name: 'test',
           os_types: ['windows'],
         },
@@ -125,7 +125,7 @@ describe('Event filter flyout', () => {
         type: 'eventFiltersFormStateChanged',
         payload: {
           type: 'LoadedResourceState',
-          data: getState().form!.entry as ExceptionListItemSchema,
+          data: getState().form?.entry as ExceptionListItemSchema,
         },
       });
     });
@@ -193,6 +193,6 @@ describe('Event filter flyout', () => {
     });
 
     expect(getFormEntryState(getState())).not.toBeUndefined();
-    expect(getFormEntryState(getState())!.item_id).toBe(createdEventFilterEntryMock().item_id);
+    expect(getFormEntryState(getState())?.item_id).toBe(createdEventFilterEntryMock().item_id);
   });
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx
index 3934e3a389c36..f8dd9ac632cd0 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx
@@ -99,7 +99,7 @@ describe('Event filter form', () => {
       });
     });
 
-    expect(getState().form.entry!.name).toBe('Exception name');
+    expect(getState().form.entry?.name).toBe('Exception name');
     expect(getState().form.hasNameError).toBeFalsy();
   });
 
@@ -116,7 +116,7 @@ describe('Event filter form', () => {
       });
     });
 
-    expect(getState().form.entry!.name).toBe('');
+    expect(getState().form.entry?.name).toBe('');
     expect(getState().form.hasNameError).toBeTruthy();
   });
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/modal/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/modal/index.test.tsx
index c77188694f507..8ea50ecd460e4 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/modal/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/modal/index.test.tsx
@@ -81,7 +81,7 @@ describe('Event filter modal', () => {
       await waitForAction('eventFiltersInitForm');
     });
 
-    expect(getState().form!.entry).not.toBeUndefined();
+    expect(getState().form?.entry).not.toBeUndefined();
   });
 
   it('should set OS with the enriched data', async () => {
@@ -90,7 +90,7 @@ describe('Event filter modal', () => {
       await waitForAction('eventFiltersInitForm');
     });
 
-    expect(getState().form!.entry?.os_types).toContain('linux');
+    expect(getState().form?.entry?.os_types).toContain('linux');
   });
 
   it('should confirm form when button is disabled', async () => {
@@ -103,7 +103,7 @@ describe('Event filter modal', () => {
     act(() => {
       fireEvent.click(confirmButton);
     });
-    expect(getState().form!.submissionResourceState.type).toBe('UninitialisedResourceState');
+    expect(getState().form?.submissionResourceState.type).toBe('UninitialisedResourceState');
   });
 
   it('should confirm form when button is enabled', async () => {
@@ -116,7 +116,7 @@ describe('Event filter modal', () => {
       type: 'eventFiltersChangeForm',
       payload: {
         entry: {
-          ...(getState().form!.entry as CreateExceptionListItemSchema),
+          ...(getState().form?.entry as CreateExceptionListItemSchema),
           name: 'test',
         },
         hasNameError: false,
@@ -126,7 +126,7 @@ describe('Event filter modal', () => {
     act(() => {
       fireEvent.click(confirmButton);
     });
-    expect(getState().form!.submissionResourceState.type).toBe('LoadingResourceState');
+    expect(getState().form?.submissionResourceState.type).toBe('LoadingResourceState');
     expect(confirmButton.hasAttribute('disabled')).toBeTruthy();
   });
 
@@ -143,7 +143,7 @@ describe('Event filter modal', () => {
         type: 'eventFiltersFormStateChanged',
         payload: {
           type: 'LoadedResourceState',
-          data: getState().form!.entry as ExceptionListItemSchema,
+          data: getState().form?.entry as ExceptionListItemSchema,
         },
       });
     });
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/use_event_filters_notification.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/use_event_filters_notification.test.tsx
index 039aeb9f8e596..82fe231505ad5 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/use_event_filters_notification.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/use_event_filters_notification.test.tsx
@@ -79,14 +79,14 @@ describe('EventFiltersNotification', () => {
         type: 'eventFiltersFormStateChanged',
         payload: {
           type: 'LoadedResourceState',
-          data: store.getState()!.management!.eventFilters!.form!.entry as ExceptionListItemSchema,
+          data: store.getState().management.eventFilters.form.entry as ExceptionListItemSchema,
         },
       });
     });
 
     expect(notifications.toasts.addSuccess).toBeCalledWith(
       getCreationSuccessMessage(
-        store.getState()!.management!.eventFilters!.form!.entry as CreateExceptionListItemSchema
+        store.getState().management.eventFilters.form.entry as CreateExceptionListItemSchema
       )
     );
     expect(notifications.toasts.addDanger).not.toBeCalled();
@@ -110,14 +110,14 @@ describe('EventFiltersNotification', () => {
         type: 'eventFiltersFormStateChanged',
         payload: {
           type: 'LoadedResourceState',
-          data: store.getState()!.management!.eventFilters!.form!.entry as ExceptionListItemSchema,
+          data: store.getState().management.eventFilters.form.entry as ExceptionListItemSchema,
         },
       });
     });
 
     expect(notifications.toasts.addSuccess).toBeCalledWith(
       getUpdateSuccessMessage(
-        store.getState()!.management!.eventFilters!.form!.entry as CreateExceptionListItemSchema
+        store.getState().management.eventFilters.form.entry as CreateExceptionListItemSchema
       )
     );
     expect(notifications.toasts.addDanger).not.toBeCalled();
@@ -144,7 +144,7 @@ describe('EventFiltersNotification', () => {
           type: 'FailedResourceState',
           error: { message: 'error message', statusCode: 500, error: 'error' },
           lastLoadedState: getLastLoadedResourceState(
-            store.getState()!.management!.eventFilters!.form!.submissionResourceState
+            store.getState().management.eventFilters.form.submissionResourceState
           ),
         },
       });
@@ -154,7 +154,7 @@ describe('EventFiltersNotification', () => {
     expect(notifications.toasts.addDanger).toBeCalledWith(
       getCreationErrorMessage(
         (
-          store.getState()!.management!.eventFilters!.form!
+          store.getState().management.eventFilters.form
             .submissionResourceState as FailedResourceState
         ).error
       )
@@ -181,7 +181,7 @@ describe('EventFiltersNotification', () => {
           type: 'FailedResourceState',
           error: { message: 'error message', statusCode: 500, error: 'error' },
           lastLoadedState: getLastLoadedResourceState(
-            store.getState()!.management!.eventFilters!.form!.submissionResourceState
+            store.getState().management.eventFilters.form.submissionResourceState
           ),
         },
       });
@@ -191,7 +191,7 @@ describe('EventFiltersNotification', () => {
     expect(notifications.toasts.addDanger).toBeCalledWith(
       getUpdateErrorMessage(
         (
-          store.getState()!.management!.eventFilters!.form!
+          store.getState().management.eventFilters.form
             .submissionResourceState as FailedResourceState
         ).error
       )
@@ -211,7 +211,7 @@ describe('EventFiltersNotification', () => {
           type: 'FailedResourceState',
           error: { message: 'error message', statusCode: 500, error: 'error' },
           lastLoadedState: getLastLoadedResourceState(
-            store.getState()!.management!.eventFilters!.form!.submissionResourceState
+            store.getState().management.eventFilters.form.submissionResourceState
           ),
         },
       });
@@ -221,7 +221,7 @@ describe('EventFiltersNotification', () => {
     expect(notifications.toasts.addWarning).toBeCalledWith(
       getGetErrorMessage(
         (
-          store.getState()!.management!.eventFilters!.form!
+          store.getState().management.eventFilters.form
             .submissionResourceState as FailedResourceState
         ).error
       )
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx
index 2a75ab0622128..2118a8de9b9ed 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx
@@ -53,11 +53,11 @@ describe('When on the host isolation exceptions delete modal', () => {
 
     const submitButton = renderResult.baseElement.querySelector(
       '[data-test-subj="hostIsolationExceptionsDeleteModalConfirmButton"]'
-    )! as HTMLButtonElement;
+    ) as HTMLButtonElement;
 
     const cancelButton = renderResult.baseElement.querySelector(
       '[data-test-subj="hostIsolationExceptionsDeleteModalConfirmButton"]'
-    )! as HTMLButtonElement;
+    ) as HTMLButtonElement;
 
     act(() => {
       fireEvent.click(submitButton);
@@ -72,7 +72,7 @@ describe('When on the host isolation exceptions delete modal', () => {
     render();
     const cancelButton = renderResult.baseElement.querySelector(
       '[data-test-subj="hostIsolationExceptionsDeleteModalConfirmButton"]'
-    )! as HTMLButtonElement;
+    ) as HTMLButtonElement;
 
     const waiter = waitForAction('hostIsolationExceptionsMarkToDelete', {
       validate: ({ payload }) => {
@@ -96,7 +96,7 @@ describe('When on the host isolation exceptions delete modal', () => {
 
     const submitButton = renderResult.baseElement.querySelector(
       '[data-test-subj="hostIsolationExceptionsDeleteModalConfirmButton"]'
-    )! as HTMLButtonElement;
+    ) as HTMLButtonElement;
 
     await act(async () => {
       fireEvent.click(submitButton);
@@ -121,7 +121,7 @@ describe('When on the host isolation exceptions delete modal', () => {
 
     const submitButton = renderResult.baseElement.querySelector(
       '[data-test-subj="hostIsolationExceptionsDeleteModalConfirmButton"]'
-    )! as HTMLButtonElement;
+    ) as HTMLButtonElement;
 
     await act(async () => {
       fireEvent.click(submitButton);
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx
index de12616c67a3c..799e327a3fb4c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx
@@ -97,7 +97,7 @@ export const HostIsolationExceptionsFormFlyout: React.FC<{}> = memo(() => {
       if (!exceptionToEdit || location.id !== exceptionToEdit.id) {
         dispatch({
           type: 'hostIsolationExceptionsMarkToEdit',
-          payload: { id: location.id! },
+          payload: { id: location.id },
         });
       } else {
         setException(exceptionToEdit);
diff --git a/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts b/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts
index 6f90fcd629485..0a440afcb2c30 100644
--- a/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts
@@ -75,6 +75,7 @@ export const trustedAppPutHttpMocks = httpHandlerMockFactory<TrustedAppPutHttpMo
       const response: PutTrustedAppUpdateResponse = {
         data: {
           ...(body as unknown as PutTrustedAppUpdateRequest),
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           id: path.split('/').pop()!,
           created_at: '2021-10-12T16:02:55.856Z',
           created_by: 'elastic',
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
index 479da6b873480..e0c4ee2600588 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
@@ -106,7 +106,7 @@ describe('policy details: ', () => {
 
       it('windows process events is enabled', () => {
         const config = policyConfig(getState());
-        expect(config!.windows.events.process).toEqual(true);
+        expect(config.windows.events.process).toEqual(true);
       });
     });
 
@@ -128,7 +128,7 @@ describe('policy details: ', () => {
 
       it('mac file events is enabled', () => {
         const config = policyConfig(getState());
-        expect(config!.mac.events.file).toEqual(true);
+        expect(config.mac.events.file).toEqual(true);
       });
     });
 
@@ -150,7 +150,7 @@ describe('policy details: ', () => {
 
       it('linux file events is enabled', () => {
         const config = policyConfig(getState());
-        expect(config!.linux.events.file).toEqual(true);
+        expect(config.linux.events.file).toEqual(true);
       });
     });
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx
index 1d9edbe66fc78..b348a99d223b8 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx
@@ -20,7 +20,7 @@ const mockTheme = getMockTheme({
 });
 
 const getStatValue = (el: reactTestingLibrary.RenderResult, stat: string) => {
-  return el.getByText(stat)!.nextSibling?.lastChild?.textContent;
+  return el.getByText(stat).nextSibling?.lastChild?.textContent;
 };
 
 describe('Fleet event filters card', () => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx
index a4a2ee65c84e7..4573b15b8fabc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx
@@ -101,6 +101,7 @@ export const PolicyFormLayout = React.memo(() => {
           title: i18n.translate('xpack.securitySolution.endpoint.policy.details.updateErrorTitle', {
             defaultMessage: 'Failed!',
           }),
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           text: policyUpdateStatus.error!.message,
         });
       }
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_hooks.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_hooks.ts
index c6b89b4137cc4..9e53eb9cfc40f 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_hooks.ts
@@ -93,7 +93,7 @@ export const usePolicyTrustedAppsNotification = () => {
               'xpack.securitySolution.endpoint.policy.trustedApps.layout.flyout.toastSuccess.textSingle',
               {
                 defaultMessage: '"{name}" has been added to your trusted applications list.',
-                values: { name: updatedArtifacts[0]!.data.name },
+                values: { name: updatedArtifacts[0].data.name },
               }
             ),
     });
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx
index 8728104aee637..f5880022383f9 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx
@@ -91,6 +91,7 @@ export const PolicyTrustedAppsFlyout = React.memo(() => {
       payload: {
         action: 'assign',
         artifacts: selectedArtifactIds.map<MaybeImmutable<TrustedApp>>((selectedId) => {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           return assignableArtifactsList?.data?.find((trustedApp) => trustedApp.id === selectedId)!;
         }),
       },
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.tsx
index cb29d0ff868ac..5d6c9731c7070 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/policy_trusted_apps_list.tsx
@@ -181,6 +181,7 @@ export const PolicyTrustedAppsList = memo(() => {
 
   const provideCardProps = useCallback<Required<ArtifactCardGridProps>['cardComponentProps']>(
     (item) => {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       return cardProps.get(item as Immutable<TrustedApp>)!;
     },
     [cardProps]
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts
index 0ff6282f8a018..0de5761ccf074 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts
@@ -191,6 +191,7 @@ const submitCreationIfNeeded = async (
       if (editMode) {
         responseTrustedApp = (
           await trustedAppsService.updateTrustedApp(
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             { id: editItemId(currentState)! },
             // TODO: try to remove the cast
             entry as PostTrustedAppCreateRequest
@@ -414,6 +415,7 @@ const fetchEditTrustedAppIfNeeded = async (
           payload: {
             // @ts-expect-error-next-line will be fixed with when AsyncResourceState is refactored (#830)
             type: 'LoadingResourceState',
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             previousState: editItemState(currentState)!,
           },
         });
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx
index 50485ccde00ad..d4f456ab8e039 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx
@@ -86,7 +86,9 @@ const addResultToValidation = (
     };
   }
   const errorMarkup: React.ReactNode = type === 'warnings' ? <div>{resultValue}</div> : resultValue;
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   validation.result[field]![type].push(errorMarkup);
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   validation.result[field]!.isInvalid = true;
 };
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/effected_policy_select/effected_policy_select.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/effected_policy_select/effected_policy_select.tsx
index e247602060384..07de303c155aa 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/effected_policy_select/effected_policy_select.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/effected_policy_select/effected_policy_select.tsx
@@ -143,7 +143,7 @@ export const EffectedPolicySelect = memo<EffectedPolicySelectProps>(
         });
       },
       [isGlobal, onChange]
-    )!;
+    );
 
     const handleGlobalButtonChange = useCallback(
       (selectedId) => {
diff --git a/x-pack/plugins/security_solution/public/network/components/details/index.tsx b/x-pack/plugins/security_solution/public/network/components/details/index.tsx
index 7658a6a76230c..0b53a4bfb3fe2 100644
--- a/x-pack/plugins/security_solution/public/network/components/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/details/index.tsx
@@ -71,7 +71,7 @@ export const IpOverview = React.memo<IpOverviewProps>(
     const capabilities = useMlCapabilities();
     const userPermissions = hasMlUserPermissions(capabilities);
     const [darkMode] = useUiSetting$<boolean>(DEFAULT_DARK_MODE);
-    const typeData = data[flowTarget]!;
+    const typeData = data[flowTarget];
     const column: DescriptionList[] = [
       {
         title: i18n.LOCATION,
diff --git a/x-pack/plugins/security_solution/public/network/components/network_dns_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/network_dns_table/index.test.tsx
index a811f5c92c37a..fc28067866146 100644
--- a/x-pack/plugins/security_solution/public/network/components/network_dns_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/network_dns_table/index.test.tsx
@@ -78,7 +78,7 @@ describe('NetworkTopNFlow Table Component', () => {
         </TestProviders>
       );
 
-      expect(store.getState().network.page.queries!.dns.sort).toEqual({
+      expect(store.getState().network.page.queries?.dns.sort).toEqual({
         direction: 'desc',
         field: 'queryCount',
       });
@@ -87,7 +87,7 @@ describe('NetworkTopNFlow Table Component', () => {
 
       wrapper.update();
 
-      expect(store.getState().network.page.queries!.dns.sort).toEqual({
+      expect(store.getState().network.page.queries?.dns.sort).toEqual({
         direction: 'asc',
         field: 'dnsName',
       });
diff --git a/x-pack/plugins/security_solution/public/network/components/network_http_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/network_http_table/index.test.tsx
index f05372c76b36f..2a85b31791f5a 100644
--- a/x-pack/plugins/security_solution/public/network/components/network_http_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/network_http_table/index.test.tsx
@@ -80,7 +80,7 @@ describe('NetworkHttp Table Component', () => {
         </TestProviders>
       );
 
-      expect(store.getState().network.page.queries!.http.sort).toEqual({
+      expect(store.getState().network.page.queries?.http.sort).toEqual({
         direction: 'desc',
       });
 
@@ -88,7 +88,7 @@ describe('NetworkHttp Table Component', () => {
 
       wrapper.update();
 
-      expect(store.getState().network.page.queries!.http.sort).toEqual({
+      expect(store.getState().network.page.queries?.http.sort).toEqual({
         direction: 'asc',
       });
       expect(wrapper.find('.euiTable thead tr th button').first().find('svg')).toBeTruthy();
diff --git a/x-pack/plugins/security_solution/public/network/components/tls_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/tls_table/index.test.tsx
index 8f2c7a098a045..3a1a5efef6b89 100644
--- a/x-pack/plugins/security_solution/public/network/components/tls_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/tls_table/index.test.tsx
@@ -77,7 +77,7 @@ describe('Tls Table Component', () => {
           />
         </TestProviders>
       );
-      expect(store.getState().network.details.queries!.tls.sort).toEqual({
+      expect(store.getState().network.details.queries?.tls.sort).toEqual({
         direction: 'desc',
         field: '_id',
       });
@@ -86,7 +86,7 @@ describe('Tls Table Component', () => {
 
       wrapper.update();
 
-      expect(store.getState().network.details.queries!.tls.sort).toEqual({
+      expect(store.getState().network.details.queries?.tls.sort).toEqual({
         direction: 'asc',
         field: '_id',
       });
diff --git a/x-pack/plugins/security_solution/public/network/components/users_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/users_table/index.test.tsx
index 69027ad9bd9f8..3861433b4dcb0 100644
--- a/x-pack/plugins/security_solution/public/network/components/users_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/users_table/index.test.tsx
@@ -81,7 +81,7 @@ describe('Users Table Component', () => {
           />
         </TestProviders>
       );
-      expect(store.getState().network.details.queries!.users.sort).toEqual({
+      expect(store.getState().network.details.queries?.users.sort).toEqual({
         direction: 'asc',
         field: 'name',
       });
@@ -90,7 +90,7 @@ describe('Users Table Component', () => {
 
       wrapper.update();
 
-      expect(store.getState().network.details.queries!.users.sort).toEqual({
+      expect(store.getState().network.details.queries?.users.sort).toEqual({
         direction: 'desc',
         field: 'name',
       });
diff --git a/x-pack/plugins/security_solution/public/plugin.tsx b/x-pack/plugins/security_solution/public/plugin.tsx
index 718487ccf7fc6..371b68e9bec8e 100644
--- a/x-pack/plugins/security_solution/public/plugin.tsx
+++ b/x-pack/plugins/security_solution/public/plugin.tsx
@@ -371,16 +371,23 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
 
       const timelineInitialState = {
         timeline: {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           ...subPlugins.timelines.store.initialState.timeline!,
           timelineById: {
             ...subPlugins.timelines.store.initialState.timeline.timelineById,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             ...subPlugins.alerts.storageTimelines!.timelineById,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             ...subPlugins.rules.storageTimelines!.timelineById,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             ...subPlugins.exceptions.storageTimelines!.timelineById,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             ...subPlugins.hosts.storageTimelines!.timelineById,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             ...subPlugins.network.storageTimelines!.timelineById,
             ...(this.experimentalFeatures.uebaEnabled && subPlugins.ueba != null
-              ? subPlugins.ueba.storageTimelines!.timelineById
+              ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                subPlugins.ueba.storageTimelines!.timelineById
               : {}),
           },
         },
diff --git a/x-pack/plugins/security_solution/public/resolver/mocks/resolver_tree.ts b/x-pack/plugins/security_solution/public/resolver/mocks/resolver_tree.ts
index 0dc08f7adbfbc..0700e92157937 100644
--- a/x-pack/plugins/security_solution/public/resolver/mocks/resolver_tree.ts
+++ b/x-pack/plugins/security_solution/public/resolver/mocks/resolver_tree.ts
@@ -314,6 +314,7 @@ export function mockTreeWithNoAncestorsAndTwoChildrenAndRelatedEventsOnOrigin({
     secondChildID,
   });
   const parentEntityID = nodeModel.parentId(
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     resolverTree.nodes.find((node) => node.id === originID)!
   );
   const relatedEvents = [
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.ts b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.ts
index 3a8bf76e732a9..6dfeaa9723a33 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.ts
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.ts
@@ -162,6 +162,7 @@ export function root(tree: IndexedProcessTree) {
 
   // iteratively swap current w/ its parent
   while (parent(tree, current) !== undefined) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     current = parent(tree, current)!;
   }
   return current;
diff --git a/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts b/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts
index 110ea476f5fb2..26cf874edda00 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts
@@ -145,7 +145,7 @@ describe('resolver selectors', () => {
           });
         });
         it('the origin should be in view', () => {
-          const origin = selectors.graphNodeForID(state())(originID)!;
+          const origin = selectors.graphNodeForID(state())(originID);
           expect(
             selectors
               .visibleNodesAndEdgeLines(state())(0)
@@ -153,7 +153,7 @@ describe('resolver selectors', () => {
           ).toBe(true);
         });
         it('the first child should be in view', () => {
-          const firstChild = selectors.graphNodeForID(state())(firstChildID)!;
+          const firstChild = selectors.graphNodeForID(state())(firstChildID);
           expect(
             selectors
               .visibleNodesAndEdgeLines(state())(0)
@@ -161,7 +161,7 @@ describe('resolver selectors', () => {
           ).toBe(true);
         });
         it('the second child should not be in view', () => {
-          const secondChild = selectors.graphNodeForID(state())(secondChildID)!;
+          const secondChild = selectors.graphNodeForID(state())(secondChildID);
           expect(
             selectors
               .visibleNodesAndEdgeLines(state())(0)
diff --git a/x-pack/plugins/security_solution/public/resolver/test_utilities/extend_jest.ts b/x-pack/plugins/security_solution/public/resolver/test_utilities/extend_jest.ts
index 145e54dbbb7b2..7bb7180712c99 100644
--- a/x-pack/plugins/security_solution/public/resolver/test_utilities/extend_jest.ts
+++ b/x-pack/plugins/security_solution/public/resolver/test_utilities/extend_jest.ts
@@ -67,7 +67,7 @@ expect.extend({
       ? () =>
           `${this.utils.matcherHint(matcherName, undefined, undefined, options)}\n\n` +
           `Expected: not ${this.utils.printExpected(expected)}\n${
-            this.utils.stringify(expected) !== this.utils.stringify(received[received.length - 1]!)
+            this.utils.stringify(expected) !== this.utils.stringify(received[received.length - 1])
               ? `Received:     ${this.utils.printReceived(received[received.length - 1])}`
               : ''
           }`
@@ -131,7 +131,7 @@ expect.extend({
       ? () =>
           `${this.utils.matcherHint(matcherName, undefined, undefined, options)}\n\n` +
           `Expected: not ${this.utils.printExpected(expected)}\n${
-            this.utils.stringify(expected) !== this.utils.stringify(received[received.length - 1]!)
+            this.utils.stringify(expected) !== this.utils.stringify(received[received.length - 1])
               ? `Received:     ${this.utils.printReceived(received[received.length - 1])}`
               : ''
           }`
diff --git a/x-pack/plugins/security_solution/public/resolver/view/graph_controls.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/graph_controls.test.tsx
index 1a7477af3b3cf..6a146882fbab5 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/graph_controls.test.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/graph_controls.test.tsx
@@ -104,7 +104,7 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
 
   describe('when the user clicks the west panning button', () => {
     beforeEach(async () => {
-      (await simulator.resolve('resolver:graph-controls:west-button'))!.simulate('click');
+      (await simulator.resolve('resolver:graph-controls:west-button'))?.simulate('click');
       simulator.runAnimationFramesTimeFromNow(nudgeAnimationDuration);
     });
 
@@ -118,7 +118,7 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
 
   describe('when the user clicks the south panning button', () => {
     beforeEach(async () => {
-      (await simulator.resolve('resolver:graph-controls:south-button'))!.simulate('click');
+      (await simulator.resolve('resolver:graph-controls:south-button'))?.simulate('click');
       simulator.runAnimationFramesTimeFromNow(nudgeAnimationDuration);
     });
 
@@ -132,7 +132,7 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
 
   describe('when the user clicks the east panning button', () => {
     beforeEach(async () => {
-      (await simulator.resolve('resolver:graph-controls:east-button'))!.simulate('click');
+      (await simulator.resolve('resolver:graph-controls:east-button'))?.simulate('click');
       simulator.runAnimationFramesTimeFromNow(nudgeAnimationDuration);
     });
 
@@ -146,7 +146,7 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
 
   describe('when the user clicks the north panning button', () => {
     beforeEach(async () => {
-      (await simulator.resolve('resolver:graph-controls:north-button'))!.simulate('click');
+      (await simulator.resolve('resolver:graph-controls:north-button'))?.simulate('click');
       simulator.runAnimationFramesTimeFromNow(nudgeAnimationDuration);
     });
 
@@ -160,9 +160,9 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
 
   describe('when the user clicks the center panning button', () => {
     beforeEach(async () => {
-      (await simulator.resolve('resolver:graph-controls:north-button'))!.simulate('click');
+      (await simulator.resolve('resolver:graph-controls:north-button'))?.simulate('click');
       simulator.runAnimationFramesTimeFromNow(nudgeAnimationDuration);
-      (await simulator.resolve('resolver:graph-controls:center-button'))!.simulate('click');
+      (await simulator.resolve('resolver:graph-controls:center-button'))?.simulate('click');
       simulator.runAnimationFramesTimeFromNow(nudgeAnimationDuration);
     });
 
@@ -177,7 +177,7 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
 
   describe('when the zoom in button is clicked', () => {
     beforeEach(async () => {
-      (await simulator.resolve('resolver:graph-controls:zoom-in'))!.simulate('click');
+      (await simulator.resolve('resolver:graph-controls:zoom-in'))?.simulate('click');
       simulator.runAnimationFramesTimeFromNow(nudgeAnimationDuration);
     });
 
@@ -191,7 +191,7 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
 
   describe('when the zoom out button is clicked', () => {
     beforeEach(async () => {
-      (await simulator.resolve('resolver:graph-controls:zoom-out'))!.simulate('click');
+      (await simulator.resolve('resolver:graph-controls:zoom-out'))?.simulate('click');
       simulator.runAnimationFramesTimeFromNow(nudgeAnimationDuration);
     });
 
@@ -207,7 +207,7 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
     beforeEach(async () => {
       await expect(originNodeStyle()).toYieldObjectEqualTo(originalSizeStyle);
 
-      (await simulator.resolve('resolver:graph-controls:zoom-slider'))!.simulate('change', {
+      (await simulator.resolve('resolver:graph-controls:zoom-slider'))?.simulate('change', {
         target: { value: 0.8 },
       });
       simulator.runAnimationFramesTimeFromNow(nudgeAnimationDuration);
@@ -223,7 +223,7 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
 
   describe('when the slider is moved downwards', () => {
     beforeEach(async () => {
-      (await simulator.resolve('resolver:graph-controls:zoom-slider'))!.simulate('change', {
+      (await simulator.resolve('resolver:graph-controls:zoom-slider'))?.simulate('change', {
         target: { value: 0.2 },
       });
       simulator.runAnimationFramesTimeFromNow(nudgeAnimationDuration);
@@ -239,7 +239,7 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
 
   describe('when the schema information button is clicked', () => {
     beforeEach(async () => {
-      (await simulator.resolve('resolver:graph-controls:schema-info-button'))!.simulate('click', {
+      (await simulator.resolve('resolver:graph-controls:schema-info-button'))?.simulate('click', {
         button: 0,
       });
     });
@@ -257,7 +257,7 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
 
   describe('when the node legend button is clicked', () => {
     beforeEach(async () => {
-      (await simulator.resolve('resolver:graph-controls:node-legend-button'))!.simulate('click', {
+      (await simulator.resolve('resolver:graph-controls:node-legend-button'))?.simulate('click', {
         button: 0,
       });
     });
@@ -275,7 +275,7 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
 
   describe('when the node legend button is clicked while the schema info button is open', () => {
     beforeEach(async () => {
-      (await simulator.resolve('resolver:graph-controls:schema-info-button'))!.simulate('click', {
+      (await simulator.resolve('resolver:graph-controls:schema-info-button'))?.simulate('click', {
         button: 0,
       });
     });
@@ -284,8 +284,8 @@ describe('graph controls: when relsover is loaded with an origin node', () => {
       expect(simulator.testSubject('resolver:graph-controls:schema-info').length).toBe(1);
 
       await simulator
-        .testSubject('resolver:graph-controls:node-legend-button')!
-        .simulate('click', { button: 0 });
+        .testSubject('resolver:graph-controls:node-legend-button')
+        ?.simulate('click', { button: 0 });
 
       await expect(
         simulator.map(() => ({
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panel.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/panel.test.tsx
index 3b2d222ac3812..72db334e17c2c 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panel.test.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panel.test.tsx
@@ -150,13 +150,13 @@ describe(`Resolver: when analyzing a tree with no ancestors and two children and
             .filterWhere(Simulator.isDOM);
 
           expect(copyableFieldHoverArea).toHaveLength(1);
-          copyableFieldHoverArea!.simulate('mouseenter');
+          copyableFieldHoverArea?.simulate('mouseenter');
         });
         describe('and when they click the copy-to-clipboard button', () => {
           beforeEach(async () => {
             const copyButton = await simulator().resolve('resolver:panel:clipboard');
             expect(copyButton).toHaveLength(1);
-            copyButton!.simulate('click');
+            copyButton?.simulate('click');
             simulator().confirmTextWrittenToClipboard();
           });
           it(`should write ${value} to the clipboard`, async () => {
@@ -232,11 +232,11 @@ describe(`Resolver: when analyzing a tree with no ancestors and two children and
             .filterWhere(Simulator.isDOM)
         );
       });
-      cExtHoverArea!.simulate('mouseenter');
+      cExtHoverArea?.simulate('mouseenter');
     });
     describe('and when the user clicks the copy-to-clipboard button', () => {
       beforeEach(async () => {
-        (await simulator().resolve('resolver:panel:clipboard'))!.simulate('click');
+        (await simulator().resolve('resolver:panel:clipboard'))?.simulate('click');
         simulator().confirmTextWrittenToClipboard();
       });
       const expected = 'Sep 23, 2020 @ 08:25:32.316';
@@ -369,7 +369,7 @@ describe(`Resolver: when analyzing a tree with no ancestors and two children and
                 beforeEach(async () => {
                   const button = await simulator().resolve('resolver:panel:clipboard');
                   expect(button).toBeTruthy();
-                  button!.simulate('click');
+                  button?.simulate('click');
                   simulator().confirmTextWrittenToClipboard();
                 });
                 it(`should write ${expectedValue} to the clipboard`, async () => {
diff --git a/x-pack/plugins/security_solution/public/resolver/view/side_effect_simulator_factory.ts b/x-pack/plugins/security_solution/public/resolver/view/side_effect_simulator_factory.ts
index 8c3caf16eadd7..b3289a510deef 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/side_effect_simulator_factory.ts
+++ b/x-pack/plugins/security_solution/public/resolver/view/side_effect_simulator_factory.ts
@@ -41,6 +41,7 @@ export const sideEffectSimulatorFactory: () => SideEffectSimulator = () => {
    */
   const getBoundingClientRect: (target: Element) => DOMRect = (target) => {
     if (contentRects.has(target)) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       return contentRects.get(target)!;
     }
     const domRect: DOMRect = {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/field_renderers/field_renderers.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/field_renderers/field_renderers.test.tsx
index 9851f11d9adba..e76e2800908c2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/field_renderers/field_renderers.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/field_renderers/field_renderers.test.tsx
@@ -70,7 +70,7 @@ describe('Field Renderers', () => {
 
   describe('#dateRenderer', () => {
     test('it renders correctly against snapshot', () => {
-      const wrapper = shallow(dateRenderer(mockData.complete.source!.firstSeen));
+      const wrapper = shallow(dateRenderer(mockData.complete.source?.firstSeen));
 
       expect(wrapper).toMatchSnapshot();
     });
@@ -307,7 +307,7 @@ describe('Field Renderers', () => {
       );
 
       expect(
-        wrapper.find('[data-test-subj="more-container"]').first().props().style!.overflow
+        wrapper.find('[data-test-subj="more-container"]').first().props().style?.overflow
       ).toEqual('auto');
     });
 
@@ -322,7 +322,7 @@ describe('Field Renderers', () => {
       );
 
       expect(
-        wrapper.find('[data-test-subj="more-container"]').first().props().style!.maxHeight
+        wrapper.find('[data-test-subj="more-container"]').first().props().style?.maxHeight
       ).toEqual(DEFAULT_MORE_MAX_HEIGHT);
     });
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/active_timelines.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/active_timelines.tsx
index 4eb91ca8ee272..639bc1ac6b57f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/active_timelines.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/active_timelines.tsx
@@ -77,6 +77,7 @@ const ActiveTimelinesComponent: React.FC<ActiveTimelinesProps> = ({
         <FormattedRelative
           data-test-subj="timeline-status"
           key="timeline-status-autosaved"
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           value={new Date(updated!)}
         />
       </>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
index 9f1730c367a81..1fdfb744f3071 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
@@ -113,6 +113,7 @@ const FlyoutHeaderPanelComponent: React.FC<FlyoutHeaderPanelProps> = ({ timeline
     [dataProviders, kqlQuery]
   );
   const getKqlQueryTimeline = useMemo(() => timelineSelectors.getKqlFilterQuerySelector(), []);
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const kqlQueryTimeline = useSelector((state: State) => getKqlQueryTimeline(state, timelineId)!);
 
   const kqlQueryExpression =
@@ -333,6 +334,7 @@ const TimelineStatusInfoComponent: React.FC<FlyoutHeaderProps> = ({ timelineId }
         <FormattedRelative
           data-test-subj="timeline-status"
           key="timeline-status-autosaved"
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           value={new Date(updated!)}
         />
       </EuiTextColor>
@@ -372,6 +374,7 @@ const FlyoutHeaderComponent: React.FC<FlyoutHeaderProps> = ({ timelineId }) => {
   );
   const { dataProviders, filters, timelineType, kqlMode, activeTab } = timeline;
   const getKqlQueryTimeline = useMemo(() => timelineSelectors.getKqlFilterQuerySelector(), []);
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const kqlQueryTimeline = useSelector((state: State) => getKqlQueryTimeline(state, timelineId)!);
 
   const kqlQueryExpression =
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
index 2a3b49517b456..1fbddf61f8cd3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
@@ -205,9 +205,11 @@ const convertToDefaultField = ({ and, ...dataProvider }: DataProviderResult) =>
   if (dataProvider.type === DataProviderType.template) {
     return deepMerge(dataProvider, {
       type: DataProviderType.default,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       enabled: dataProvider.queryMatch!.operator !== IS_OPERATOR,
       queryMatch: {
         value:
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           dataProvider.queryMatch!.operator === IS_OPERATOR ? '' : dataProvider.queryMatch!.value,
       },
     });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.test.tsx
index d59b75fcfb506..f3ec55ea0ddef 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.test.tsx
@@ -318,7 +318,7 @@ describe('StatefulOpenTimeline', () => {
       await waitFor(() => {
         expect(
           wrapper.find(`.${OPEN_TIMELINE_CLASS_NAME} input`).first().getDOMNode().id ===
-            document.activeElement!.id
+            document.activeElement?.id
         ).toBe(true);
       });
     });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/note_previews/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/note_previews/index.test.tsx
index 1cca5a3999b81..607bccdbc039d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/note_previews/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/note_previews/index.test.tsx
@@ -44,7 +44,7 @@ describe('NotePreviews', () => {
 
     const wrapper = mountWithIntl(<NotePreviews notes={hasNotes[0].notes} />);
 
-    hasNotes[0].notes!.forEach(({ savedObjectId }) => {
+    hasNotes[0].notes?.forEach(({ savedObjectId }) => {
       expect(wrapper.find(`[data-test-subj="note-preview-${savedObjectId}"]`).exists()).toBe(true);
     });
   });
@@ -54,7 +54,7 @@ describe('NotePreviews', () => {
 
     const wrapper = mountWithIntl(<NotePreviews notes={hasNotes[0].notes} />);
 
-    hasNotes[0].notes!.forEach(({ savedObjectId }) => {
+    hasNotes[0].notes?.forEach(({ savedObjectId }) => {
       expect(wrapper.find(`[data-test-subj="note-preview-${savedObjectId}"]`).exists()).toBe(true);
     });
   });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/actions_columns.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/actions_columns.tsx
index b3cd5eedd19c3..a7953d60ba767 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/actions_columns.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/actions_columns.tsx
@@ -40,6 +40,7 @@ export const getActionsColumns = ({
       onOpenTimeline({
         duplicate: true,
         timelineType: TimelineType.default,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         timelineId: savedObjectId!,
       });
     },
@@ -58,6 +59,7 @@ export const getActionsColumns = ({
       onOpenTimeline({
         duplicate: true,
         timelineType: TimelineType.template,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         timelineId: savedObjectId!,
       });
     },
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/expandable_event.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/expandable_event.tsx
index 53382fe8fa21d..17d43d80a5a9a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/expandable_event.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/expandable_event.tsx
@@ -108,7 +108,7 @@ export const ExpandableEvent = React.memo<Props>(
           <EventDetails
             browserFields={browserFields}
             data={detailsData ?? []}
-            id={event.eventId!}
+            id={event.eventId}
             isAlert={isAlert}
             isDraggable={isDraggable}
             timelineId={timelineId}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header_tooltip_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header_tooltip_content/index.tsx
index 0ae8dbb537fb8..017ba82e8e33c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header_tooltip_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header_tooltip_content/index.tsx
@@ -61,7 +61,7 @@ export const HeaderToolTipContent = React.memo<{ header: ColumnHeaderOptions }>(
         {':'}
       </ToolTipTableMetadata>
       <ToolTipTableValue>
-        <IconType data-test-subj="type-icon" type={getIconFromType(header.type!)} />
+        <IconType data-test-subj="type-icon" type={getIconFromType(header.type)} />
         <span data-test-subj="type-value">{header.type}</span>
       </ToolTipTableValue>
     </P>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
index 8c71a3b38dcd3..82f9cedc57a9c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
@@ -185,6 +185,7 @@ const StatefulEventComponent: React.FC<Props> = ({
 
   const handleOnEventDetailPanelOpened = useCallback(() => {
     const eventId = event._id;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const indexName = event._index!;
 
     const updatedExpandedDetail: TimelineExpandedDetailType = {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
index fc8bf2086471c..3ee0ef8804e89 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
@@ -111,7 +111,7 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
 
     const onRowSelected: OnRowSelected = useCallback(
       ({ eventIds, isSelected }: { eventIds: string[]; isSelected: boolean }) => {
-        setSelected!({
+        setSelected({
           id,
           eventIds: getEventIdToDataMapping(data, eventIds, queryFields),
           isSelected,
@@ -125,7 +125,7 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
     const onSelectAll: OnSelectAll = useCallback(
       ({ isSelected }: { isSelected: boolean }) =>
         isSelected
-          ? setSelected!({
+          ? setSelected({
               id,
               eventIds: getEventIdToDataMapping(
                 data,
@@ -135,7 +135,7 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
               isSelected,
               isSelectAllChecked: isSelected,
             })
-          : clearSelected!({ id }),
+          : clearSelected({ id }),
       [setSelected, clearSelected, id, data, queryFields]
     );
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
index 3703d6fe441c0..61ea659964e4d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
@@ -78,7 +78,7 @@ describe('suricata_row_renderer', () => {
   });
 
   test('should render a suricata row even if it does not have a suricata signature', () => {
-    delete suricata!.suricata!.eve!.alert!.signature;
+    delete suricata?.suricata?.eve?.alert?.signature;
     const children = suricataRowRenderer.renderRow({
       browserFields: mockBrowserFields,
       data: suricata,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx
index 41f35e7c50e30..7c010795682ac 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx
@@ -76,12 +76,12 @@ export const DraggableZeekElement = React.memo<{
       and: [],
       enabled: true,
       id: escapeDataProviderId(`draggable-zeek-element-draggable-wrapper-${id}-${field}-${value}`),
-      name: value!,
+      name: String(value),
       excluded: false,
       kqlQuery: '',
       queryMatch: {
         field,
-        value: value!,
+        value: String(value),
         operator: IS_OPERATOR as QueryOperator,
       },
     }),
@@ -97,7 +97,7 @@ export const DraggableZeekElement = React.memo<{
       ) : (
         <EuiToolTip data-test-subj="badge-tooltip" content={field}>
           <Badge iconType="tag" color="hollow" title="">
-            {stringRenderer(value!)}
+            {stringRenderer(String(value))}
           </Badge>
         </EuiToolTip>
       ),
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/add_data_provider_popover.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/add_data_provider_popover.tsx
index 84f286b435a48..52443cf92a9cb 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/add_data_provider_popover.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/add_data_provider_popover.tsx
@@ -113,7 +113,7 @@ const AddDataProviderPopoverComponent: React.FC<AddDataProviderPopoverProps> = (
         width: 400,
         content: (
           <StatefulEditDataProvider
-            browserFields={browserFields!}
+            browserFields={browserFields}
             field=""
             isExcluded={false}
             onDataProviderEdited={handleDataProviderEdited}
@@ -131,7 +131,7 @@ const AddDataProviderPopoverComponent: React.FC<AddDataProviderPopoverProps> = (
         width: 400,
         content: (
           <StatefulEditDataProvider
-            browserFields={browserFields!}
+            browserFields={browserFields}
             field=""
             isExcluded={false}
             onDataProviderEdited={handleDataProviderEdited}
@@ -182,7 +182,7 @@ const AddDataProviderPopoverComponent: React.FC<AddDataProviderPopoverProps> = (
 
     return (
       <StatefulEditDataProvider
-        browserFields={browserFields!}
+        browserFields={browserFields}
         field=""
         isExcluded={false}
         onDataProviderEdited={handleDataProviderEdited}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/notes_tab_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/notes_tab_content/index.tsx
index e9b1e8046cec0..726071b2caf74 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/notes_tab_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/notes_tab_content/index.tsx
@@ -95,8 +95,11 @@ const ParticipantsComponent: React.FC<ParticipantsProps> = ({ users }) => {
   const List = useMemo(
     () =>
       users.map((user) => (
-        <Fragment key={user.updatedBy!}>
-          <UsernameWithAvatar key={user.updatedBy!} username={user.updatedBy!} />
+        <Fragment key={user.updatedBy === null ? undefined : user.updatedBy}>
+          <UsernameWithAvatar
+            key={user.updatedBy === null ? undefined : user.updatedBy}
+            username={String(user.updatedBy)}
+          />
           <EuiSpacer size="s" />
         </Fragment>
       )),
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
index d2cf158818f75..2082e7f5b69bb 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
@@ -463,7 +463,7 @@ const makeMapStateToProps = () => {
       status,
       timelineType,
     } = timeline;
-    const kqlQueryTimeline = getKqlQueryTimeline(state, timelineId)!;
+    const kqlQueryTimeline = getKqlQueryTimeline(state, timelineId);
     const timelineFilter = kqlMode === 'filter' ? filters || [] : [];
 
     // return events on empty search
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx
index 33ab2e0049828..96ca26a099d2f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx
@@ -74,7 +74,7 @@ const StatefulSearchOrFilterComponent = React.memo<Props>(
         from={from}
         fromStr={fromStr}
         isRefreshPaused={isRefreshPaused}
-        kqlMode={kqlMode!}
+        kqlMode={kqlMode}
         refreshInterval={refreshInterval}
         savedQueryId={savedQueryId}
         setFilters={setFiltersInTimeline}
@@ -82,7 +82,7 @@ const StatefulSearchOrFilterComponent = React.memo<Props>(
         timelineId={timelineId}
         to={to}
         toStr={toStr}
-        updateKqlMode={updateKqlMode!}
+        updateKqlMode={updateKqlMode}
         updateReduxTime={updateReduxTime}
       />
     );
@@ -119,15 +119,19 @@ const makeMapStateToProps = () => {
     const policy: inputsModel.Policy = getInputsPolicy(state);
     return {
       dataProviders: timeline.dataProviders,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       filterQuery: getKqlFilterQuery(state, timelineId)!,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       filters: timeline.filters!,
       from: input.timerange.from,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       fromStr: input.timerange.fromStr!,
       isRefreshPaused: policy.kind === 'manual',
       kqlMode: getOr('filter', 'kqlMode', timeline),
       refreshInterval: policy.duration,
       savedQueryId: getOr(null, 'savedQueryId', timeline),
       to: input.timerange.to,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       toStr: input.timerange.toStr!,
     };
   };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx
index 44174009d0198..7269c005e9af5 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx
@@ -47,7 +47,7 @@ describe('SelectableTimeline', () => {
         const searchProps: EuiSelectableProps['searchProps'] = wrapper
           .find('[data-test-subj="selectable-input"]')
           .prop('searchProps');
-        expect(searchProps!.placeholder).toEqual('e.g. Timeline name or description');
+        expect(searchProps?.placeholder).toEqual('e.g. Timeline name or description');
       });
     });
 
@@ -65,7 +65,7 @@ describe('SelectableTimeline', () => {
         const searchProps: EuiSelectableProps['searchProps'] = wrapper
           .find('[data-test-subj="selectable-input"]')
           .prop('searchProps');
-        expect(searchProps!.placeholder).toEqual('e.g. Timeline template name or description');
+        expect(searchProps?.placeholder).toEqual('e.g. Timeline template name or description');
       });
     });
   });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.tsx
index 9d10584130194..e4070a051af46 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.tsx
@@ -110,8 +110,8 @@ const SelectableTimelineComponent: React.FC<SelectableTimelineProps> = ({
         selectableListOuterRef.current &&
         selectableListInnerRef.current
       ) {
-        const clientHeight = selectableListOuterRef.current!.clientHeight;
-        const scrollHeight = selectableListInnerRef.current!.clientHeight;
+        const clientHeight = selectableListOuterRef.current.clientHeight;
+        const scrollHeight = selectableListInnerRef.current.clientHeight;
         const clientHeightTrigger = clientHeight * 1.2;
         if (
           scrollOffset > 10 &&
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/styles.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/styles.tsx
index 3514766b334a0..af05198ef9974 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/styles.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/styles.tsx
@@ -271,13 +271,13 @@ export const EventsTrData = styled.div.attrs(({ className = '' }) => ({
 const TIMELINE_EVENT_DETAILS_OFFSET = 40;
 
 interface WidthProp {
-  width?: number;
+  width: number;
 }
 
 export const EventsTrSupplementContainer = styled.div.attrs<WidthProp>(({ width }) => ({
   role: 'dialog',
   style: {
-    width: `${width! - TIMELINE_EVENT_DETAILS_OFFSET}px`,
+    width: `${width - TIMELINE_EVENT_DETAILS_OFFSET}px`,
   },
 }))<WidthProp>``;
 
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/api.ts b/x-pack/plugins/security_solution/public/timelines/containers/api.ts
index 789c942d0e29a..7f74912be09b4 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/api.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/api.ts
@@ -156,6 +156,7 @@ export const persistTimeline = async ({
   try {
     if (isEmpty(timelineId) && timeline.status === TimelineStatus.draft && timeline) {
       const temp: TimelineResponse | TimelineErrorResponse = await cleanDraftTimeline({
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         timelineType: timeline.timelineType!,
         templateTimelineId: timeline.templateTimelineId ?? undefined,
         templateTimelineVersion: timeline.templateTimelineVersion ?? undefined,
@@ -163,7 +164,7 @@ export const persistTimeline = async ({
 
       const draftTimeline = decodeTimelineResponse(temp);
       const templateTimelineInfo =
-        timeline.timelineType! === TimelineType.template
+        timeline.timelineType === TimelineType.template
           ? {
               templateTimelineId:
                 draftTimeline.data.persistTimeline.timeline.templateTimelineId ??
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/epic.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/epic.ts
index 9d95036cb6076..164f293edee65 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/epic.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/epic.ts
@@ -235,7 +235,7 @@ export const createTimelineEpic =
               mergeMap(([result, recentTimeline, allTimelineQuery, kibana]) => {
                 const error = result as TimelineErrorResponse;
                 if (error.status_code != null && error.status_code === 405) {
-                  kibana.notifications!.toasts.addDanger({
+                  kibana.notifications.toasts.addDanger({
                     title: i18n.UPDATE_TIMELINE_ERROR_TITLE,
                     text: error.message ?? i18n.UPDATE_TIMELINE_ERROR_TEXT,
                   });
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts
index eceafb9b56cdd..639d1b1e4f489 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts
@@ -1126,8 +1126,8 @@ describe('Timeline', () => {
       const newAndProvider = update.foo.dataProviders[indexProvider].and.find(
         (i) => i.id === '456'
       );
-      expect(oldAndProvider!.enabled).toEqual(false);
-      expect(newAndProvider!.enabled).toEqual(true);
+      expect(oldAndProvider?.enabled).toEqual(false);
+      expect(newAndProvider?.enabled).toEqual(true);
     });
   });
 
@@ -1386,8 +1386,8 @@ describe('Timeline', () => {
       const newAndProvider = update.foo.dataProviders[indexProvider].and.find(
         (i) => i.id === '456'
       );
-      expect(oldAndProvider!.excluded).toEqual(true);
-      expect(newAndProvider!.excluded).toEqual(false);
+      expect(oldAndProvider?.excluded).toEqual(true);
+      expect(newAndProvider?.excluded).toEqual(false);
     });
   });
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
index a116311becfe5..cf6665a5dde2b 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
@@ -135,6 +135,7 @@ export class ManifestTask {
         }
       }
 
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       if (oldManifest! == null) {
         this.logger.debug('Last computed manifest not available yet');
         return;
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts
index a1b93b5bd59f7..32d5806a4b47a 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts
@@ -130,7 +130,7 @@ describe('Policy-Changing license watcher', () => {
 
     expect(packagePolicySvcMock.update).toHaveBeenCalled();
     expect(
-      packagePolicySvcMock.update.mock.calls[0][3].inputs[0].config!.policy.value.windows.popup
+      packagePolicySvcMock.update.mock.calls[0][3].inputs[0].config?.policy.value.windows.popup
         .malware.message
     ).not.toEqual(CustomMessage);
   });
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
index 4652630649ffc..e12299bedbb34 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
@@ -189,6 +189,7 @@ export const isolationRequestHandler = function (
         },
       } as Omit<EndpointAction, 'agents' | 'user_id'>,
       user: {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         id: user!.username,
       },
     };
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/enrichment.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/enrichment.test.ts
index 39aa0bf2d8cf7..9b454a266834c 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/enrichment.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/enrichment.test.ts
@@ -114,8 +114,8 @@ describe('test document enrichment', () => {
 
       const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
       expect(enrichedHostList.policy_info).toBeDefined();
-      expect(enrichedHostList.policy_info!.agent.applied.id).toEqual(policyID);
-      expect(enrichedHostList.policy_info!.agent.applied.revision).toEqual(policyRev);
+      expect(enrichedHostList.policy_info?.agent.applied.id).toEqual(policyID);
+      expect(enrichedHostList.policy_info?.agent.applied.revision).toEqual(policyRev);
     });
 
     it('reflects current fleet agent info', async () => {
@@ -130,8 +130,8 @@ describe('test document enrichment', () => {
 
       const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
       expect(enrichedHostList.policy_info).toBeDefined();
-      expect(enrichedHostList.policy_info!.agent.configured.id).toEqual(policyID);
-      expect(enrichedHostList.policy_info!.agent.configured.revision).toEqual(policyRev);
+      expect(enrichedHostList.policy_info?.agent.configured.id).toEqual(policyID);
+      expect(enrichedHostList.policy_info?.agent.configured.revision).toEqual(policyRev);
     });
 
     it('reflects current endpoint policy info', async () => {
@@ -151,8 +151,8 @@ describe('test document enrichment', () => {
 
       const enrichedHostList = await enrichHostMetadata(docGen.generateHostMetadata(), metaReqCtx);
       expect(enrichedHostList.policy_info).toBeDefined();
-      expect(enrichedHostList.policy_info!.endpoint.id).toEqual(policyID);
-      expect(enrichedHostList.policy_info!.endpoint.revision).toEqual(policyRev);
+      expect(enrichedHostList.policy_info?.endpoint.id).toEqual(policyID);
+      expect(enrichedHostList.policy_info?.endpoint.revision).toEqual(policyRev);
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts
index 5c06dbd3db14c..027107bcf1a59 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts
@@ -114,6 +114,7 @@ export const getMetadataListRequestHandler = function (
     }
 
     const endpointPolicies = await getAllEndpointPackagePolicies(
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       endpointAppContext.service.getPackagePolicyService()!,
       context.core.savedObjects.client
     );
@@ -344,6 +345,7 @@ export async function enrichHostMetadata(
     const status = await metadataRequestContext.endpointAppContextService
       ?.getAgentService()
       ?.getAgentStatusById(esClient.asCurrentUser, elasticAgentId);
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     hostStatus = fleetAgentStatusToEndpointHostStatus(status!);
   } catch (e) {
     if (e instanceof AgentNotFoundError) {
@@ -361,6 +363,7 @@ export async function enrichHostMetadata(
       ?.getAgent(esClient.asCurrentUser, elasticAgentId);
     const agentPolicy = await metadataRequestContext.endpointAppContextService
       .getAgentPolicyService()
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       ?.get(esSavedObjectClient, agent?.policy_id!, true);
     const endpointPolicy = ((agentPolicy?.package_policies || []) as PackagePolicy[]).find(
       (policy: PackagePolicy) => policy.package?.name === 'endpoint'
@@ -404,6 +407,7 @@ async function legacyListMetadataQuery(
   logger: Logger,
   endpointPolicies: PackagePolicy[]
 ): Promise<HostResultList> {
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const agentService = endpointAppContext.service.getAgentService()!;
 
   const metadataRequestContext: MetadataRequestContext = {
@@ -512,11 +516,15 @@ async function queryUnitedIndex(
       return metadata && agent;
     })
     .map((doc) => {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const { endpoint: metadata, agent } = doc!._source!.united!;
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const agentPolicy = agentPoliciesMap[agent.policy_id!];
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const endpointPolicy = endpointPoliciesMap[agent.policy_id!];
       return {
         metadata,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         host_status: fleetAgentStatusToEndpointHostStatus(agent.last_checkin_status!),
         policy_info: {
           agent: {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts
index d9016e7a9c7cb..3e5050c05814a 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts
@@ -171,8 +171,8 @@ describe('test endpoint route', () => {
       const esSearchMock = mockScopedClient.asCurrentUser.search;
       // should be called twice, united index first, then legacy index
       expect(esSearchMock).toHaveBeenCalledTimes(2);
-      expect(esSearchMock.mock.calls[0][0]!.index).toEqual(METADATA_UNITED_INDEX);
-      expect(esSearchMock.mock.calls[1][0]!.index).toEqual(metadataCurrentIndexPattern);
+      expect(esSearchMock.mock.calls[0][0]?.index).toEqual(METADATA_UNITED_INDEX);
+      expect(esSearchMock.mock.calls[1][0]?.index).toEqual(metadataCurrentIndexPattern);
       expect(routeConfig.options).toEqual({
         authRequired: true,
         tags: ['access:securitySolution'],
@@ -224,7 +224,7 @@ describe('test endpoint route', () => {
       );
 
       expect(esSearchMock).toHaveBeenCalledTimes(1);
-      expect(esSearchMock.mock.calls[0][0]!.index).toEqual(METADATA_UNITED_INDEX);
+      expect(esSearchMock.mock.calls[0][0]?.index).toEqual(METADATA_UNITED_INDEX);
       expect(esSearchMock.mock.calls[0][0]?.body?.query).toEqual({
         bool: {
           must: [
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/query_builders.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/query_builders.ts
index 448496671b4f9..7b09013496c6d 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/query_builders.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/query_builders.ts
@@ -53,8 +53,8 @@ export async function kibanaRequestToMetadataListESQuery(
     body: {
       query: buildQueryBody(
         request,
-        queryBuilderOptions?.unenrolledAgentIds!,
-        queryBuilderOptions?.statusAgentIds!
+        queryBuilderOptions?.unenrolledAgentIds,
+        queryBuilderOptions?.statusAgentIds
       ),
       track_total_hits: true,
       sort: MetadataSortMethod,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
index 987bef15afe98..ce46395a1f09f 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
@@ -120,12 +120,14 @@ export async function agentVersionsMap(
   const result: Map<string, number> = new Map<string, number>();
   let hasMore = true;
   while (hasMore) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const queryResult = await endpointAppContext.service
       .getAgentService()!
       .listAgents(esClient, searchOptions(page++));
     queryResult.agents.forEach((agent: Agent) => {
       const agentVersion = agent.local_metadata?.elastic?.agent?.version;
       if (result.has(agentVersion)) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         result.set(agentVersion, result.get(agentVersion)! + 1);
       } else {
         result.set(agentVersion, 1);
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/service.ts b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/service.ts
index 9cefc55eddec4..856a615c1ffa2 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/service.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/service.ts
@@ -142,6 +142,7 @@ export const getTrustedAppsList = async (
     data: results?.data.map(exceptionListItemToTrustedApp) ?? [],
     total: results?.total ?? 0,
     page: results?.page ?? 1,
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     per_page: results?.per_page ?? perPage!,
   };
 };
@@ -262,6 +263,7 @@ export const getTrustedAppsSummary = async (
   let page = 1;
 
   while (paging) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const { data, total } = (await exceptionsListClient.findExceptionListItem({
       listId: ENDPOINT_TRUSTED_APPS_LIST_ID,
       page,
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions.ts
index a04a6eea5ab65..711d78ba51b59 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions.ts
@@ -200,6 +200,7 @@ export const getPendingActionCounts = async (
       },
       { ignore: [404] }
     )
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     .then((result) => result.body?.hits?.hits?.map((a) => a._source!) || [])
     .catch(catchAndWrapError);
 
@@ -272,6 +273,7 @@ const fetchActionResponseIds = async (
       },
       { ignore: [404] }
     )
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     .then((result) => result.body?.hits?.hits?.map((a) => a._source!) || [])
     .catch(catchAndWrapError);
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.ts
index ac19757e037b2..062702bb14a49 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.ts
@@ -37,6 +37,7 @@ export class EndpointArtifactClient implements EndpointArtifactClientInterface {
 
     return {
       type: idPieces[1],
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       decodedSha256: idPieces.pop()!,
       identifier: idPieces.join('-'),
     };
@@ -74,7 +75,7 @@ export class EndpointArtifactClient implements EndpointArtifactClientInterface {
 
   async deleteArtifact(id: string) {
     // Ignoring the `id` not being in the type until we can refactor the types in endpoint.
-    // @ts-ignore
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const artifactId = (await this.getArtifact(id))?.id!;
     return this.fleetArtifacts.deleteArtifact(artifactId);
   }
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
index 87a73e0130113..a7fb5dc23877c 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.mock.ts
@@ -42,14 +42,14 @@ export const mockFindExceptionListItemResponses = (
   responses: Record<string, Record<string, ExceptionListItemSchema[]>>
 ) => {
   return jest.fn().mockImplementation((options: FindExceptionListItemOptions) => {
-    const matches = options.filter!.match(FILTER_REGEXP) || [];
+    const matches = options.filter?.match(FILTER_REGEXP) || [];
 
-    if (matches[4] && responses[options.listId]?.[`${matches![1]}-${matches[4]}`]) {
+    if (matches[4] && responses[options.listId]?.[`${matches?.[1]}-${matches[4]}`]) {
       return createExceptionListResponse(
-        responses[options.listId]?.[`${matches![1]}-${matches[4]}`] || []
+        responses[options.listId]?.[`${matches?.[1]}-${matches[4]}`] || []
       );
     } else {
-      return createExceptionListResponse(responses[options.listId]?.[matches![1] || ''] || []);
+      return createExceptionListResponse(responses[options.listId]?.[matches?.[1] || ''] || []);
     }
   });
 };
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.ts b/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.ts
index 5e2f46aa4c285..23c21e431a344 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.ts
@@ -171,6 +171,7 @@ export class EndpointMetadataService {
       // Get Agent Policy and Endpoint Package Policy
       if (fleetAgent) {
         try {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           fleetAgentPolicy = await this.getFleetAgentPolicy(fleetAgent.policy_id!);
           endpointPackagePolicy = fleetAgentPolicy.package_policies.find(
             (policy) => policy.package?.name === 'endpoint'
@@ -183,7 +184,8 @@ export class EndpointMetadataService {
       return {
         metadata: endpointMetadata,
         host_status: fleetAgent
-          ? fleetAgentStatusToEndpointHostStatus(fleetAgent.status!)
+          ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            fleetAgentStatusToEndpointHostStatus(fleetAgent.status!)
           : DEFAULT_ENDPOINT_HOST_STATUS,
         policy_info: {
           agent: {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.ts
index f9693c87631b7..8914e8eec87d0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.ts
@@ -94,7 +94,7 @@ export const createMigration = async ({
   return {
     destinationIndex: migrationIndex,
     sourceIndex: index,
-    taskId: String(response.body.task!),
+    taskId: String(response.body.task),
     version,
   };
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts
index 61635fdcef9f0..6ec23c32e4976 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts
@@ -58,7 +58,7 @@ export const createIndexRoute = (
         if (!siemClient) {
           return siemResponse.error({ statusCode: 404 });
         }
-        await createDetectionIndex(context, siemClient!, ruleDataService, ruleRegistryEnabled);
+        await createDetectionIndex(context, siemClient, ruleDataService, ruleRegistryEnabled);
         return response.ok({ body: { acknowledged: true } });
       } catch (err) {
         const error = transformError(err);
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
index 48efcc4495aff..26e09d69d3a45 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
@@ -124,7 +124,7 @@ describe.each([
     });
 
     test('returns 404 if rulesClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const request = addPrepackagedRulesRequest();
       const response = await server.inject(request, context);
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
index 2c8696dbd4554..6f721bb2bb9c5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
@@ -55,7 +55,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(getReadBulkRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
index d1be96a44930a..59fe5c0ff68a1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
@@ -56,7 +56,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(getCreateRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
index 7db5651de2c34..49580fc09ca63 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
@@ -84,7 +84,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(getDeleteBulkRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_route.test.ts
index 7c447660acb45..466012a045eb3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_route.test.ts
@@ -65,7 +65,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(getDeleteRequest(), context);
 
       expect(response.status).toEqual(404);
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts
index 7ae3f56b6fea9..0b0650d48872f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts
@@ -48,7 +48,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(getFindRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_status_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_status_route.test.ts
index 053e0b7178de5..5d6b9810a2cda 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_status_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_status_route.test.ts
@@ -41,7 +41,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(ruleStatusRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts
index 78572863f7472..e97744a5fe5a8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts
@@ -100,7 +100,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(getPrepackagedRulesStatusRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
index bf29dbe870153..aa301bcc0335e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
@@ -77,7 +77,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(request, context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
index 2c3db023dccc4..d0d5937eab2d7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
@@ -89,7 +89,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(getPatchBulkRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
index 97773c45ce0d9..00d7180dfc9be 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
@@ -69,7 +69,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(getPatchRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts
index ebc86acc964e6..41b909bd718c0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts
@@ -65,7 +65,7 @@ describe.each([
     });
 
     it('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(getBulkActionRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.test.ts
index 37b8228ac1e9b..bc9fa43b56ae7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.test.ts
@@ -86,7 +86,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(getReadRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
index 746a40dfa8dc2..f7bef76944a97 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
@@ -65,7 +65,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(getUpdateBulkRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
index 5b3e2737418c2..7d611f3cccbf2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
@@ -66,7 +66,7 @@ describe.each([
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting!.getRulesClient = jest.fn();
+      context.alerting.getRulesClient = jest.fn();
       const response = await server.inject(getUpdateRequest(), context);
 
       expect(response.status).toEqual(404);
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts
index 279a824426cec..e2be04fc6e7df 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts
@@ -51,7 +51,7 @@ export const querySignalsRoute = (router: SecuritySolutionPluginRouter, config:
         });
       }
       const esClient = context.core.elasticsearch.client.asCurrentUser;
-      const siemClient = context.securitySolution!.getAppClient();
+      const siemClient = context.securitySolution.getAppClient();
 
       // TODO: Once we are past experimental phase this code should be removed
       const { ruleRegistryEnabled } = parseExperimentalConfigValue(config.enableExperimental);
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_event_type_signal.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_event_type_signal.ts
index d22ca0d1f5090..0dd2acfb88ffe 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_event_type_signal.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_event_type_signal.ts
@@ -8,8 +8,8 @@ import { BaseSignalHit, SimpleHit } from './types';
 import { getField } from './utils';
 
 export const buildEventTypeSignal = (doc: BaseSignalHit): object => {
-  if (doc._source?.event != null && doc._source?.event instanceof Object) {
-    return { ...doc._source!.event, kind: 'signal' };
+  if (doc._source != null && doc._source.event instanceof Object) {
+    return { ...doc._source.event, kind: 'signal' };
   } else {
     return { kind: 'signal' };
   }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_rule.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_rule.test.ts
index bd5444a325128..012977da2a00f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_rule.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_rule.test.ts
@@ -108,7 +108,7 @@ describe('buildRuleWithOverrides', () => {
   test('it applies rule name override in buildRule', () => {
     const ruleSO = sampleRuleSO(getQueryRuleParams());
     ruleSO.attributes.params.ruleNameOverride = 'someKey';
-    const rule = buildRuleWithOverrides(ruleSO, sampleDocNoSortId()._source!);
+    const rule = buildRuleWithOverrides(ruleSO, sampleDocNoSortId()._source);
     const expected = {
       ...expectedRule(),
       name: 'someValue',
@@ -135,7 +135,7 @@ describe('buildRuleWithOverrides', () => {
     ];
     const doc = sampleDocNoSortId();
     doc._source.new_risk_score = newRiskScore;
-    const rule = buildRuleWithOverrides(ruleSO, doc._source!);
+    const rule = buildRuleWithOverrides(ruleSO, doc._source);
     const expected = {
       ...expectedRule(),
       risk_score: newRiskScore,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/enrich_signal_threat_matches.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/enrich_signal_threat_matches.ts
index 9da5934489023..272c3f64fb105 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/enrich_signal_threat_matches.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/enrich_signal_threat_matches.ts
@@ -107,7 +107,7 @@ export const enrichSignalThreatMatches = async (
     return {
       ...signalHit,
       _source: {
-        ...signalHit._source!,
+        ...signalHit._source,
         threat: {
           ...threat,
           enrichments: [...existingEnrichments, ...enrichments[i]],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/bulk_create_threshold_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/bulk_create_threshold_signals.ts
index 31bf7674b4f92..c202065176ff1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/bulk_create_threshold_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/bulk_create_threshold_signals.ts
@@ -116,6 +116,7 @@ const getTransformedHits = (
             ? [
                 {
                   field: threshold.cardinality[0].field,
+                  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                   value: bucket.cardinality_count!.value,
                 },
               ]
@@ -131,6 +132,7 @@ const getTransformedHits = (
   };
 
   return getCombinations(
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     (results.aggregations![aggParts.name] as { buckets: TermAggregationBucket[] }).buckets,
     0,
     aggParts.field
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts
index 5cafff24c544b..610be59deaa5f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts
@@ -40,6 +40,7 @@ export const getThresholdBucketFilters = async ({
       // Terms to filter events older than `lastSignalTimestamp`.
       bucket.terms.forEach((term) => {
         if (term.field != null) {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           (filter.bool!.filter as ESFilter[]).push({
             term: {
               [term.field]: `${term.value}`,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
index 7d2eafa46d382..0e50db97d1256 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
@@ -1277,7 +1277,7 @@ describe('utils', () => {
     test('It returns timestampOverride date time if set', () => {
       const override = '2020-10-07T19:20:28.049Z';
       const searchResult = sampleDocSearchResultsNoSortId();
-      searchResult.hits.hits[0]._source!.different_timestamp = new Date(override).toISOString();
+      searchResult.hits.hits[0]._source.different_timestamp = new Date(override).toISOString();
       const date = lastValidDate({ searchResult, timestampOverride: 'different_timestamp' });
       expect(date?.toISOString()).toEqual(override);
     });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
index 2aefc7ea0bd64..79b36cf62573a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
@@ -874,6 +874,7 @@ export const mergeSearchResults = (searchResults: SignalSearchResponse[]) => {
       aggregations: newAggregations,
       hits: {
         total: calculateTotal(prev.hits.total, next.hits.total),
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         max_score: Math.max(newHits.max_score!, existingHits.max_score!),
         hits: [...existingHits.hits, ...newHits.hits],
       },
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/utils/check_timelines_status.ts b/x-pack/plugins/security_solution/server/lib/timeline/utils/check_timelines_status.ts
index 560df1112ac58..f524d0c7ca3a6 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/utils/check_timelines_status.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/utils/check_timelines_status.ts
@@ -40,6 +40,7 @@ export const getTimelinesToUpdate = (
     installedTimelines.some((installedTimeline) => {
       return (
         timeline.templateTimelineId === installedTimeline.templateTimelineId &&
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         timeline.templateTimelineVersion! > installedTimeline.templateTimelineVersion!
       );
     })
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/utils/failure_cases.ts b/x-pack/plugins/security_solution/server/lib/timeline/utils/failure_cases.ts
index 99365a55a1d61..44f16c57ad2b4 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/utils/failure_cases.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/utils/failure_cases.ts
@@ -227,7 +227,7 @@ export const checkIsUpdateViaImportFailureCases = (
       return { body: UPDAT_TIMELINE_VIA_IMPORT_NOT_ALLOWED_ERROR_MESSAGE, statusCode: 405 };
     } else {
       return {
-        body: getImportExistingTimelineError(existTimeline!.savedObjectId),
+        body: getImportExistingTimelineError(existTimeline.savedObjectId),
         statusCode: 405,
       };
     }
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index 4cecabe52b588..0f908d7db8e05 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -361,6 +361,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
       this.lists = plugins.lists;
       this.manifestTask = new ManifestTask({
         endpointAppContext: endpointContext,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         taskManager: plugins.taskManager!,
       });
     }
@@ -386,6 +387,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
     this.checkMetadataTransformsTask = new CheckMetadataTransformsTask({
       endpointAppContext: endpointContext,
       core,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       taskManager: plugins.taskManager!,
     });
 
@@ -437,7 +439,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
       // License related start
       licenseService.start(this.licensing$);
       this.policyWatcher = new PolicyWatcher(
-        plugins.fleet!.packagePolicyService,
+        plugins.fleet.packagePolicyService,
         core.savedObjects,
         core.elasticsearch,
         logger
@@ -445,6 +447,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
       this.policyWatcher.start(licenseService);
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const exceptionListClient = this.lists!.getExceptionListClient(savedObjectsClient, 'kibana');
 
     this.endpointAppContextService.start({
@@ -454,14 +457,16 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
       agentPolicyService: plugins.fleet?.agentPolicyService,
       endpointMetadataService: new EndpointMetadataService(
         core.savedObjects,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         plugins.fleet?.agentService!,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         plugins.fleet?.agentPolicyService!,
         logger
       ),
       appClientFactory: this.appClientFactory,
       security: plugins.security,
       alerting: plugins.alerting,
-      config: this.config!,
+      config: this.config,
       cases: plugins.cases,
       logger,
       manifestManager,
@@ -485,6 +490,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
     );
 
     this.checkMetadataTransformsTask?.start({
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       taskManager: plugins.taskManager!,
     });
 
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/response.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/response.test.ts
index 11c6f4aa60265..137dd3b2c3d14 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/response.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/event_enrichment/response.test.ts
@@ -60,7 +60,7 @@ describe('parseEventEnrichmentResponse', () => {
       ignoreUnavailable: true,
       index: ['filebeat-*'],
     });
-    const parsedInspect = JSON.parse(parsedResponse.inspect!.dsl[0]);
+    const parsedInspect = JSON.parse(parsedResponse.inspect.dsl[0]);
     expect(parsedInspect).toEqual(expectedInspect);
   });
 
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts
index c96e0040fd23d..ae68d81d6b922 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts
@@ -223,6 +223,7 @@ export const getHostEndpoint = async (
           endpointPolicy: endpointData.Endpoint.policy.applied.name,
           policyStatus: endpointData.Endpoint.policy.applied.status,
           sensorVersion: endpointData.agent.version,
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           elasticAgentStatus: fleetAgentStatusToEndpointHostStatus(fleetAgentStatus!),
           isolation: endpointData.Endpoint.state?.isolation ?? false,
           pendingActions,
diff --git a/x-pack/plugins/timelines/public/components/hover_actions/index.tsx b/x-pack/plugins/timelines/public/components/hover_actions/index.tsx
index 02ebcb8abe912..12aef1ad00a71 100644
--- a/x-pack/plugins/timelines/public/components/hover_actions/index.tsx
+++ b/x-pack/plugins/timelines/public/components/hover_actions/index.tsx
@@ -89,6 +89,7 @@ const getOverflowButtonLazy = (props: OverflowButtonProps) => {
 };
 
 export const getHoverActions = (store?: Store): HoverActionsConfig => ({
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   getAddToTimelineButton: getAddToTimelineButtonLazy.bind(null, store!),
   getColumnToggleButton: getColumnToggleButtonLazy,
   getCopyButton: getCopyButtonLazy,
diff --git a/x-pack/plugins/timelines/public/components/index.tsx b/x-pack/plugins/timelines/public/components/index.tsx
index 9959574464836..0ff8c9bf97e8b 100644
--- a/x-pack/plugins/timelines/public/components/index.tsx
+++ b/x-pack/plugins/timelines/public/components/index.tsx
@@ -41,6 +41,7 @@ export const TGrid = (props: TGridComponent) => {
     browserFields = (tGridProps as TGridIntegratedProps).browserFields;
   }
   return (
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     <Provider store={tGridStore!}>
       <I18nProvider>
         <DragDropContextWrapper browserFields={browserFields} defaultsHeader={props.columns}>
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/header_tooltip_content/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/header_tooltip_content/index.tsx
index b973d99584d61..91dd64d8fed3a 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/header_tooltip_content/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/column_headers/header_tooltip_content/index.tsx
@@ -61,7 +61,7 @@ export const HeaderToolTipContent = React.memo<{ header: ColumnHeaderOptions }>(
         {':'}
       </ToolTipTableMetadata>
       <ToolTipTableValue>
-        <IconType data-test-subj="type-icon" type={getIconFromType(header.type!)} />
+        <IconType data-test-subj="type-icon" type={getIconFromType(header.type)} />
         <span data-test-subj="type-value">{header.type}</span>
       </ToolTipTableValue>
     </P>
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_event.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_event.tsx
index f448ba3831b14..d746368e389c8 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_event.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_event.tsx
@@ -122,6 +122,7 @@ const StatefulEventComponent: React.FC<Props> = ({
 
   const handleOnEventDetailPanelOpened = useCallback(() => {
     const eventId = event._id;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const indexName = event._index!;
 
     const updatedExpandedDetail: TimelineExpandedDetailType = {
diff --git a/x-pack/plugins/timelines/public/components/t_grid/helpers.tsx b/x-pack/plugins/timelines/public/components/t_grid/helpers.tsx
index 02c3d10a76058..e2eb1d4d04547 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/helpers.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/helpers.tsx
@@ -192,6 +192,7 @@ export const buildCombinedQuery = (combineQueriesParams: CombineQueries) => {
   const combinedQuery = combineQueries(combineQueriesParams);
   return combinedQuery
     ? {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         filterQuery: replaceStatusField(combinedQuery!.filterQuery),
       }
     : null;
diff --git a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
index b649dc36abe0a..e363297d04be5 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
@@ -237,7 +237,7 @@ const TGridIntegratedComponent: React.FC<TGridIntegratedProps> = ({
       endDate: end,
       entityType,
       fields,
-      filterQuery: combinedQueries!.filterQuery,
+      filterQuery: combinedQueries?.filterQuery,
       id,
       indexNames,
       limit: itemsPerPage,
diff --git a/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
index 1a374d0c6b87a..ae092d8634bb7 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
@@ -217,7 +217,7 @@ const TGridStandaloneComponent: React.FC<TGridStandaloneProps> = ({
     entityType,
     excludeEcsData: true,
     fields,
-    filterQuery: combinedQueries!.filterQuery,
+    filterQuery: combinedQueries?.filterQuery,
     id: STANDALONE_ID,
     indexNames,
     limit: itemsPerPageStore,
diff --git a/x-pack/plugins/timelines/public/components/t_grid/styles.tsx b/x-pack/plugins/timelines/public/components/t_grid/styles.tsx
index 28e425f53824b..9f957e2c61910 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/styles.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/styles.tsx
@@ -270,13 +270,13 @@ export const EventsTrData = styled.div.attrs(({ className = '' }) => ({
 const TIMELINE_EVENT_DETAILS_OFFSET = 40;
 
 interface WidthProp {
-  width?: number;
+  width: number;
 }
 
 export const EventsTrSupplementContainer = styled.div.attrs<WidthProp>(({ width }) => ({
   role: 'dialog',
   style: {
-    width: `${width! - TIMELINE_EVENT_DETAILS_OFFSET}px`,
+    width: `${width - TIMELINE_EVENT_DETAILS_OFFSET}px`,
   },
 }))<WidthProp>``;
 
diff --git a/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/field_browser.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/field_browser.test.tsx
index e44ee1d45d19b..e19499628e8c1 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/field_browser.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/field_browser.test.tsx
@@ -235,7 +235,7 @@ describe('FieldsBrowser', () => {
 
     expect(
       wrapper.find('[data-test-subj="field-search"]').first().getDOMNode().id ===
-        document.activeElement!.id
+        document.activeElement?.id
     ).toBe(true);
   });
 
@@ -266,7 +266,7 @@ describe('FieldsBrowser', () => {
     const changeEvent: any = { target: { value: inputText } };
     const onChange = searchField.props().onChange;
 
-    onChange!(changeEvent);
+    onChange?.(changeEvent);
     searchField.simulate('change').update();
 
     expect(onSearchInputChange).toBeCalledWith(inputText);
diff --git a/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/helpers.tsx b/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/helpers.tsx
index f4b608b456fed..552c228363e49 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/helpers.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/helpers.tsx
@@ -97,6 +97,7 @@ export const filterBrowserFieldsByFieldName = ({
         fields: filter(
           (f) => f.name != null && f.name.includes(trimmedSubstring),
           browserFields[categoryId].fields
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         ).reduce((filtered, field) => ({ ...filtered, [field.name!]: field }), {}),
       },
     }),
diff --git a/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/index.tsx
index bdec76418dc8c..0b67f53cca76e 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/index.tsx
@@ -100,7 +100,9 @@ export const StatefulFieldsBrowserComponent: React.FC<FieldBrowserProps> = ({
                   (selected, category) =>
                     newFilteredBrowserFields[category].fields != null &&
                     newFilteredBrowserFields[selected].fields != null &&
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                     Object.keys(newFilteredBrowserFields[category].fields!).length >
+                      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                       Object.keys(newFilteredBrowserFields[selected].fields!).length
                       ? category
                       : selected,
diff --git a/x-pack/plugins/timelines/public/components/utils/helpers.ts b/x-pack/plugins/timelines/public/components/utils/helpers.ts
index f02c86aecc108..23f92c119d574 100644
--- a/x-pack/plugins/timelines/public/components/utils/helpers.ts
+++ b/x-pack/plugins/timelines/public/components/utils/helpers.ts
@@ -53,7 +53,7 @@ export const getColumnsWithTimestamp = ({
     : [];
 };
 
-export const getIconFromType = (type: string | null) => {
+export const getIconFromType = (type: string | null | undefined) => {
   switch (type) {
     case 'string': // fall through
     case 'keyword':
diff --git a/x-pack/plugins/timelines/public/container/use_update_alerts.ts b/x-pack/plugins/timelines/public/container/use_update_alerts.ts
index b38c3b9a71fef..1b9e6218eecca 100644
--- a/x-pack/plugins/timelines/public/container/use_update_alerts.ts
+++ b/x-pack/plugins/timelines/public/container/use_update_alerts.ts
@@ -17,7 +17,7 @@ import {
 
 /**
  * Update alert status by query
- * 
+ *
  * @param useDetectionEngine logic flag for using the regular Detection Engine URL or the RAC URL
  *
  * @param status to update to('open' / 'closed' / 'acknowledged')
@@ -40,7 +40,7 @@ export const useUpdateAlertsStatus = (
   return {
     updateAlertStatus: async ({ status, index, query }) => {
       if (useDetectionEngine) {
-        return http!.fetch(DETECTION_ENGINE_SIGNALS_STATUS_URL, {
+        return http.fetch(DETECTION_ENGINE_SIGNALS_STATUS_URL, {
           method: 'POST',
           body: JSON.stringify({ status, query }),
         });
diff --git a/x-pack/plugins/timelines/public/plugin.ts b/x-pack/plugins/timelines/public/plugin.ts
index 4b383ce392147..acb7b26d0cf84 100644
--- a/x-pack/plugins/timelines/public/plugin.ts
+++ b/x-pack/plugins/timelines/public/plugin.ts
@@ -45,7 +45,7 @@ export class TimelinesPlugin implements Plugin<void, TimelinesUIStart> {
     }
     return {
       getHoverActions: () => {
-        return getHoverActions(this._store!);
+        return getHoverActions(this._store);
       },
       getTGrid: (props: TGridProps) => {
         if (props.type === 'standalone' && this._store) {
@@ -73,6 +73,7 @@ export class TimelinesPlugin implements Plugin<void, TimelinesUIStart> {
       },
       getFieldBrowser: (props: FieldBrowserProps) => {
         return getFieldsBrowserLazy(props, {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           store: this._store!,
         });
       },
@@ -90,6 +91,7 @@ export class TimelinesPlugin implements Plugin<void, TimelinesUIStart> {
       },
       getAddToCaseAction: (props) => {
         return getAddToCaseLazy(props, {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           store: this._store!,
           storage: this._storage,
           setStore: this.setStore.bind(this),
@@ -97,6 +99,7 @@ export class TimelinesPlugin implements Plugin<void, TimelinesUIStart> {
       },
       getAddToCasePopover: (props) => {
         return getAddToCasePopoverLazy(props, {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           store: this._store!,
           storage: this._storage,
           setStore: this.setStore.bind(this),
@@ -104,6 +107,7 @@ export class TimelinesPlugin implements Plugin<void, TimelinesUIStart> {
       },
       getAddToExistingCaseButton: (props) => {
         return getAddToExistingCaseButtonLazy(props, {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           store: this._store!,
           storage: this._storage,
           setStore: this.setStore.bind(this),
@@ -111,6 +115,7 @@ export class TimelinesPlugin implements Plugin<void, TimelinesUIStart> {
       },
       getAddToNewCaseButton: (props) => {
         return getAddToNewCaseButtonLazy(props, {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           store: this._store!,
           storage: this._storage,
           setStore: this.setStore.bind(this),

From 97848ca62a35f7ed409ea31269ba124a24a21bc3 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@budzenski.me>
Date: Thu, 14 Oct 2021 22:06:43 -0500
Subject: [PATCH 108/117] skip flaky suite. #115100

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

diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx
index 0411751685a90..917ffe49c6090 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx
@@ -25,7 +25,8 @@ import {
 import { Immutable } from '../../../../../../../common/endpoint/types';
 import { HttpFetchOptionsWithPath } from 'kibana/public';
 
-describe('When using the RemoveTrustedAppFromPolicyModal component', () => {
+// FLAKY https://github.com/elastic/kibana/issues/115100
+describe.skip('When using the RemoveTrustedAppFromPolicyModal component', () => {
   let appTestContext: AppContextTestRender;
   let renderResult: ReturnType<AppContextTestRender['render']>;
   let render: (waitForLoadedState?: boolean) => Promise<ReturnType<AppContextTestRender['render']>>;

From 8aeaa5a2ffc871a7802a8d000501539e307a66ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20S=C3=A1nchez?= <davidsansol92@gmail.com>
Date: Fri, 15 Oct 2021 09:25:30 +0200
Subject: [PATCH 109/117] [Security Solution][Endpoint] Remove refresh button
 from policy trusted apps flyout (#114974)

* Hide refresh button by prop and refactor unit test

* Add test cases for policies selector when enable/disable license

* Remove unused code when adding mock
---
 .../search_exceptions.test.tsx                | 112 +++++++++++++-----
 .../search_exceptions/search_exceptions.tsx   |  18 +--
 .../flyout/policy_trusted_apps_flyout.tsx     |   1 +
 3 files changed, 97 insertions(+), 34 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/management/components/search_exceptions/search_exceptions.test.tsx b/x-pack/plugins/security_solution/public/management/components/search_exceptions/search_exceptions.test.tsx
index ddee8e13f069d..084978d35d03a 100644
--- a/x-pack/plugins/security_solution/public/management/components/search_exceptions/search_exceptions.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/search_exceptions/search_exceptions.test.tsx
@@ -5,50 +5,77 @@
  * 2.0.
  */
 
-import { mount } from 'enzyme';
 import React from 'react';
+import { act, fireEvent } from '@testing-library/react';
+import { AppContextTestRender, createAppRootMockRenderer } from '../../../common/mock/endpoint';
+import {
+  EndpointPrivileges,
+  useEndpointPrivileges,
+} from '../../../common/components/user_privileges/use_endpoint_privileges';
+import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 
-import { SearchExceptions } from '.';
+import { SearchExceptions, SearchExceptionsProps } from '.';
+jest.mock('../../../common/components/user_privileges/use_endpoint_privileges');
 
 let onSearchMock: jest.Mock;
-
-interface EuiFieldSearchPropsFake {
-  onSearch(value: string): void;
-}
+const mockUseEndpointPrivileges = useEndpointPrivileges as jest.Mock;
 
 describe('Search exceptions', () => {
+  let appTestContext: AppContextTestRender;
+  let renderResult: ReturnType<AppContextTestRender['render']>;
+  let render: (
+    props?: Partial<SearchExceptionsProps>
+  ) => ReturnType<AppContextTestRender['render']>;
+
+  const loadedUserEndpointPrivilegesState = (
+    endpointOverrides: Partial<EndpointPrivileges> = {}
+  ): EndpointPrivileges => ({
+    loading: false,
+    canAccessFleet: true,
+    canAccessEndpointManagement: true,
+    isPlatinumPlus: false,
+    ...endpointOverrides,
+  });
+
   beforeEach(() => {
     onSearchMock = jest.fn();
+    appTestContext = createAppRootMockRenderer();
+
+    render = (overrideProps = {}) => {
+      const props: SearchExceptionsProps = {
+        placeholder: 'search test',
+        onSearch: onSearchMock,
+        ...overrideProps,
+      };
+
+      renderResult = appTestContext.render(<SearchExceptions {...props} />);
+      return renderResult;
+    };
+
+    mockUseEndpointPrivileges.mockReturnValue(loadedUserEndpointPrivilegesState());
   });
 
-  const getElement = (defaultValue: string = '') => (
-    <SearchExceptions
-      defaultValue={defaultValue}
-      onSearch={onSearchMock}
-      placeholder={'placeholder'}
-    />
-  );
+  afterAll(() => {
+    mockUseEndpointPrivileges.mockReset();
+  });
 
   it('should have a default value', () => {
     const expectedDefaultValue = 'this is a default value';
-    const element = mount(getElement(expectedDefaultValue));
-    const defaultValue = element
-      .find('[data-test-subj="searchField"]')
-      .first()
-      .props().defaultValue;
-    expect(defaultValue).toBe(expectedDefaultValue);
+    const element = render({ defaultValue: expectedDefaultValue });
+
+    expect(element.getByDisplayValue(expectedDefaultValue)).not.toBeNull();
   });
 
   it('should dispatch search action when submit search field', () => {
     const expectedDefaultValue = 'this is a default value';
-    const element = mount(getElement());
+    const element = render();
     expect(onSearchMock).toHaveBeenCalledTimes(0);
-    const searchFieldProps = element
-      .find('[data-test-subj="searchField"]')
-      .first()
-      .props() as EuiFieldSearchPropsFake;
 
-    searchFieldProps.onSearch(expectedDefaultValue);
+    act(() => {
+      fireEvent.change(element.getByTestId('searchField'), {
+        target: { value: expectedDefaultValue },
+      });
+    });
 
     expect(onSearchMock).toHaveBeenCalledTimes(1);
     expect(onSearchMock).toHaveBeenCalledWith(expectedDefaultValue, '', '');
@@ -56,11 +83,42 @@ describe('Search exceptions', () => {
 
   it('should dispatch search action when click on button', () => {
     const expectedDefaultValue = 'this is a default value';
-    const element = mount(getElement(expectedDefaultValue));
+    const element = render({ defaultValue: expectedDefaultValue });
     expect(onSearchMock).toHaveBeenCalledTimes(0);
 
-    element.find('[data-test-subj="searchButton"]').first().simulate('click');
+    act(() => {
+      fireEvent.click(element.getByTestId('searchButton'));
+    });
+
     expect(onSearchMock).toHaveBeenCalledTimes(1);
     expect(onSearchMock).toHaveBeenCalledWith(expectedDefaultValue, '', '');
   });
+
+  it('should hide refresh button', () => {
+    const element = render({ hideRefreshButton: true });
+
+    expect(element.queryByTestId('searchButton')).toBeNull();
+  });
+
+  it('should hide policies selector when no license', () => {
+    const generator = new EndpointDocGenerator('policy-list');
+    const policy = generator.generatePolicyPackagePolicy();
+    mockUseEndpointPrivileges.mockReturnValue(
+      loadedUserEndpointPrivilegesState({ isPlatinumPlus: false })
+    );
+    const element = render({ policyList: [policy], hasPolicyFilter: true });
+
+    expect(element.queryByTestId('policiesSelectorButton')).toBeNull();
+  });
+
+  it('should display policies selector when right license', () => {
+    const generator = new EndpointDocGenerator('policy-list');
+    const policy = generator.generatePolicyPackagePolicy();
+    mockUseEndpointPrivileges.mockReturnValue(
+      loadedUserEndpointPrivilegesState({ isPlatinumPlus: true })
+    );
+    const element = render({ policyList: [policy], hasPolicyFilter: true });
+
+    expect(element.queryByTestId('policiesSelectorButton')).not.toBeNull();
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/management/components/search_exceptions/search_exceptions.tsx b/x-pack/plugins/security_solution/public/management/components/search_exceptions/search_exceptions.tsx
index 2b7b2e6b66884..1f3eab5db2947 100644
--- a/x-pack/plugins/security_solution/public/management/components/search_exceptions/search_exceptions.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/search_exceptions/search_exceptions.tsx
@@ -19,6 +19,7 @@ export interface SearchExceptionsProps {
   policyList?: ImmutableArray<PolicyData>;
   defaultExcludedPolicies?: string;
   defaultIncludedPolicies?: string;
+  hideRefreshButton?: boolean;
   onSearch(query: string, includedPolicies?: string, excludedPolicies?: string): void;
 }
 
@@ -31,6 +32,7 @@ export const SearchExceptions = memo<SearchExceptionsProps>(
     policyList,
     defaultIncludedPolicies,
     defaultExcludedPolicies,
+    hideRefreshButton = false,
   }) => {
     const { isPlatinumPlus } = useEndpointPrivileges();
     const [query, setQuery] = useState<string>(defaultValue);
@@ -101,13 +103,15 @@ export const SearchExceptions = memo<SearchExceptionsProps>(
           </EuiFlexItem>
         ) : null}
 
-        <EuiFlexItem grow={false} onClick={handleOnSearch} data-test-subj="searchButton">
-          <EuiButton iconType="refresh">
-            {i18n.translate('xpack.securitySolution.management.search.button', {
-              defaultMessage: 'Refresh',
-            })}
-          </EuiButton>
-        </EuiFlexItem>
+        {!hideRefreshButton ? (
+          <EuiFlexItem grow={false} onClick={handleOnSearch} data-test-subj="searchButton">
+            <EuiButton iconType="refresh">
+              {i18n.translate('xpack.securitySolution.management.search.button', {
+                defaultMessage: 'Refresh',
+              })}
+            </EuiButton>
+          </EuiFlexItem>
+        ) : null}
       </EuiFlexGroup>
     );
   }
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx
index f5880022383f9..bbf2f3b208754 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/flyout/policy_trusted_apps_flyout.tsx
@@ -183,6 +183,7 @@ export const PolicyTrustedAppsFlyout = React.memo(() => {
               defaultMessage: 'Search trusted applications',
             }
           )}
+          hideRefreshButton
         />
         <EuiSpacer size="m" />
 

From 008421f170214648336bd9d5afb5cc794efbd82c Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Fri, 15 Oct 2021 09:33:06 +0200
Subject: [PATCH 110/117] [APM] Revert multi-metric ML job. (#114961)

---
 .../plugins/apm/common/anomaly_detection.ts   |  2 -
 .../apm/common/utils/apm_ml_anomaly_query.ts  | 25 -----
 .../create_anomaly_detection_jobs.ts          | 20 ++--
 .../lib/service_map/get_service_anomalies.ts  |  9 +-
 .../transactions/get_anomaly_data/fetcher.ts  |  4 +-
 .../modules/apm_transaction/manifest.json     | 18 ++--
 .../apm_transaction/ml/apm_metrics.json       | 53 -----------
 .../ml/datafeed_apm_metrics.json              | 95 -------------------
 ...tafeed_high_mean_transaction_duration.json | 14 +++
 .../ml/high_mean_transaction_duration.json    | 35 +++++++
 .../apis/ml/modules/recognize_module.ts       |  2 +-
 .../apis/ml/modules/setup_module.ts           | 10 +-
 12 files changed, 76 insertions(+), 211 deletions(-)
 delete mode 100644 x-pack/plugins/apm/common/utils/apm_ml_anomaly_query.ts
 delete mode 100644 x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/apm_metrics.json
 delete mode 100644 x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_apm_metrics.json
 create mode 100644 x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_high_mean_transaction_duration.json
 create mode 100644 x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/high_mean_transaction_duration.json

diff --git a/x-pack/plugins/apm/common/anomaly_detection.ts b/x-pack/plugins/apm/common/anomaly_detection.ts
index eb7c74a4540be..43a779407d2a4 100644
--- a/x-pack/plugins/apm/common/anomaly_detection.ts
+++ b/x-pack/plugins/apm/common/anomaly_detection.ts
@@ -33,8 +33,6 @@ export function getSeverityColor(score: number) {
   return mlGetSeverityColor(score);
 }
 
-export const ML_TRANSACTION_LATENCY_DETECTOR_INDEX = 0;
-
 export const ML_ERRORS = {
   INVALID_LICENSE: i18n.translate(
     'xpack.apm.anomaly_detection.error.invalid_license',
diff --git a/x-pack/plugins/apm/common/utils/apm_ml_anomaly_query.ts b/x-pack/plugins/apm/common/utils/apm_ml_anomaly_query.ts
deleted file mode 100644
index 26b859d37cf7f..0000000000000
--- a/x-pack/plugins/apm/common/utils/apm_ml_anomaly_query.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export function apmMlAnomalyQuery(detectorIndex: 0 | 1 | 2) {
-  return [
-    {
-      bool: {
-        filter: [
-          {
-            terms: {
-              result_type: ['model_plot', 'record'],
-            },
-          },
-          {
-            term: { detector_index: detectorIndex },
-          },
-        ],
-      },
-    },
-  ];
-}
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
index 10758b6d90cdc..4d4bc8dc185ab 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
@@ -5,21 +5,21 @@
  * 2.0.
  */
 
-import Boom from '@hapi/boom';
 import { Logger } from 'kibana/server';
+import uuid from 'uuid/v4';
 import { snakeCase } from 'lodash';
+import Boom from '@hapi/boom';
 import moment from 'moment';
-import uuid from 'uuid/v4';
 import { ML_ERRORS } from '../../../common/anomaly_detection';
-import {
-  METRICSET_NAME,
-  PROCESSOR_EVENT,
-} from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { environmentQuery } from '../../../common/utils/environment_query';
-import { withApmSpan } from '../../utils/with_apm_span';
 import { Setup } from '../helpers/setup_request';
+import {
+  TRANSACTION_DURATION,
+  PROCESSOR_EVENT,
+} from '../../../common/elasticsearch_fieldnames';
 import { APM_ML_JOB_GROUP, ML_MODULE_ID_APM_TRANSACTION } from './constants';
+import { withApmSpan } from '../../utils/with_apm_span';
 import { getAnomalyDetectionJobs } from './get_anomaly_detection_jobs';
 
 export async function createAnomalyDetectionJobs(
@@ -92,8 +92,8 @@ async function createAnomalyDetectionJob({
       query: {
         bool: {
           filter: [
-            { term: { [PROCESSOR_EVENT]: ProcessorEvent.metric } },
-            { term: { [METRICSET_NAME]: 'transaction' } },
+            { term: { [PROCESSOR_EVENT]: ProcessorEvent.transaction } },
+            { exists: { field: TRANSACTION_DURATION } },
             ...environmentQuery(environment),
           ],
         },
@@ -105,7 +105,7 @@ async function createAnomalyDetectionJob({
             job_tags: {
               environment,
               // identifies this as an APM ML job & facilitates future migrations
-              apm_ml_version: 3,
+              apm_ml_version: 2,
             },
           },
         },
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
index 97c95e4e40045..9b2d79dc726ee 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
@@ -11,11 +11,7 @@ import { estypes } from '@elastic/elasticsearch';
 import { ESSearchResponse } from '../../../../../../src/core/types/elasticsearch';
 import { MlPluginSetup } from '../../../../ml/server';
 import { PromiseReturnType } from '../../../../observability/typings/common';
-import {
-  getSeverity,
-  ML_ERRORS,
-  ML_TRANSACTION_LATENCY_DETECTOR_INDEX,
-} from '../../../common/anomaly_detection';
+import { getSeverity, ML_ERRORS } from '../../../common/anomaly_detection';
 import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
 import { getServiceHealthStatus } from '../../../common/service_health_status';
 import {
@@ -26,7 +22,6 @@ import { rangeQuery } from '../../../../observability/server';
 import { withApmSpan } from '../../utils/with_apm_span';
 import { getMlJobsWithAPMGroup } from '../anomaly_detection/get_ml_jobs_with_apm_group';
 import { Setup } from '../helpers/setup_request';
-import { apmMlAnomalyQuery } from '../../../common/utils/apm_ml_anomaly_query';
 
 export const DEFAULT_ANOMALIES: ServiceAnomaliesResponse = {
   mlJobIds: [],
@@ -61,7 +56,7 @@ export async function getServiceAnomalies({
         query: {
           bool: {
             filter: [
-              ...apmMlAnomalyQuery(ML_TRANSACTION_LATENCY_DETECTOR_INDEX),
+              { terms: { result_type: ['model_plot', 'record'] } },
               ...rangeQuery(
                 Math.min(end - 30 * 60 * 1000, start),
                 end,
diff --git a/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts b/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts
index a7357bbc1dd34..a61e0614f5b1a 100644
--- a/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts
@@ -12,8 +12,6 @@ import { rangeQuery } from '../../../../../observability/server';
 import { asMutableArray } from '../../../../common/utils/as_mutable_array';
 import { withApmSpan } from '../../../utils/with_apm_span';
 import { Setup } from '../../helpers/setup_request';
-import { apmMlAnomalyQuery } from '../../../../common/utils/apm_ml_anomaly_query';
-import { ML_TRANSACTION_LATENCY_DETECTOR_INDEX } from '../../../../common/anomaly_detection';
 
 export type ESResponse = Exclude<
   PromiseReturnType<typeof anomalySeriesFetcher>,
@@ -42,7 +40,7 @@ export function anomalySeriesFetcher({
         query: {
           bool: {
             filter: [
-              ...apmMlAnomalyQuery(ML_TRANSACTION_LATENCY_DETECTOR_INDEX),
+              { terms: { result_type: ['model_plot', 'record'] } },
               { term: { partition_field_value: serviceName } },
               { term: { by_field_value: transactionType } },
               ...rangeQuery(start, end, 'timestamp'),
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/manifest.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/manifest.json
index 123232935df05..f8feaef3be5f8 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/manifest.json
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/manifest.json
@@ -1,29 +1,29 @@
 {
   "id": "apm_transaction",
   "title": "APM",
-  "description": "Detect anomalies in transactions from your APM services for metric data.",
+  "description": "Detect anomalies in transactions from your APM services.",
   "type": "Transaction data",
   "logoFile": "logo.json",
-  "defaultIndexPattern": "apm-*-metric,metrics-apm*",
+  "defaultIndexPattern": "apm-*-transaction",
   "query": {
     "bool": {
       "filter": [
-        { "term": { "processor.event": "metric" } },
-        { "term": { "metricset.name": "transaction" } }
+        { "term": { "processor.event": "transaction" } },
+        { "exists": { "field": "transaction.duration" } }
       ]
     }
   },
   "jobs": [
     {
-      "id": "apm_metrics",
-      "file": "apm_metrics.json"
+      "id": "high_mean_transaction_duration",
+      "file": "high_mean_transaction_duration.json"
     }
   ],
   "datafeeds": [
     {
-      "id": "datafeed-apm_metrics",
-      "file": "datafeed_apm_metrics.json",
-      "job_id": "apm_metrics"
+      "id": "datafeed-high_mean_transaction_duration",
+      "file": "datafeed_high_mean_transaction_duration.json",
+      "job_id": "high_mean_transaction_duration"
     }
   ]
 }
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/apm_metrics.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/apm_metrics.json
deleted file mode 100644
index d5092f3ffc553..0000000000000
--- a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/apm_metrics.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "job_type": "anomaly_detector",
-  "groups": [
-    "apm"
-  ],
-  "description": "Detects anomalies in transaction duration, throughput and error percentage for metric data.",
-  "analysis_config": {
-    "bucket_span": "15m",
-    "summary_count_field_name" : "doc_count",
-    "detectors" : [
-      {
-        "detector_description" : "high duration by transaction type for an APM service",
-        "function" : "high_mean",
-        "field_name" : "transaction_duration",
-        "by_field_name" : "transaction.type",
-        "partition_field_name" : "service.name"
-      },
-      {
-        "detector_description" : "transactions per minute for an APM service",
-        "function" : "mean",
-        "field_name" : "transactions_per_min",
-        "by_field_name" : "transaction.type",
-        "partition_field_name" : "service.name"
-      },
-      {
-        "detector_description" : "percent failed for an APM service",
-        "function" : "high_mean",
-        "field_name" : "transaction_failure_percentage",
-        "by_field_name" : "transaction.type",
-        "partition_field_name" : "service.name"
-      }
-    ],
-    "influencers" : [
-      "transaction.type",
-      "service.name"
-    ]
-  },
-  "analysis_limits": {
-    "model_memory_limit": "32mb"
-  },
-  "data_description": {
-    "time_field" : "@timestamp",
-    "time_format" : "epoch_ms"
-  },
-  "model_plot_config": {
-    "enabled" : true,
-    "annotations_enabled" : true
-  },
-  "results_index_name" : "custom-apm",
-  "custom_settings": {
-    "created_by": "ml-module-apm-transaction"
-  }
-}
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_apm_metrics.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_apm_metrics.json
deleted file mode 100644
index ba45582252cd7..0000000000000
--- a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_apm_metrics.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "job_id": "JOB_ID",
-  "indices": [
-    "INDEX_PATTERN_NAME"
-  ],
-  "chunking_config" : {
-    "mode" : "off"
-  },
-  "query": {
-    "bool": {
-      "filter": [
-        { "term": { "processor.event": "metric" } },
-        { "term": { "metricset.name": "transaction" } }
-      ]
-    }
-  },
-  "aggregations" : {
-    "buckets" : {
-      "composite" : {
-        "size" : 5000,
-        "sources" : [
-          {
-            "date" : {
-              "date_histogram" : {
-                "field" : "@timestamp",
-                "fixed_interval" : "90s"
-              }
-            }
-          },
-          {
-            "transaction.type" : {
-              "terms" : {
-                "field" : "transaction.type"
-              }
-            }
-          },
-          {
-            "service.name" : {
-              "terms" : {
-                "field" : "service.name"
-              }
-            }
-          }
-        ]
-      },
-      "aggs" : {
-        "@timestamp" : {
-          "max" : {
-            "field" : "@timestamp"
-          }
-        },
-        "transactions_per_min" : {
-          "rate" : {
-            "unit" : "minute"
-          }
-        },
-        "transaction_duration" : {
-          "avg" : {
-            "field" : "transaction.duration.histogram"
-          }
-        },
-        "error_count" : {
-          "filter" : {
-            "term" : {
-              "event.outcome" : "failure"
-            }
-          },
-          "aggs" : {
-            "actual_error_count" : {
-              "value_count" : {
-                "field" : "event.outcome"
-              }
-            }
-          }
-        },
-        "success_count" : {
-          "filter" : {
-            "term" : {
-              "event.outcome" : "success"
-            }
-          }
-        },
-        "transaction_failure_percentage" : {
-          "bucket_script" : {
-            "buckets_path" : {
-              "failure_count" : "error_count>_count",
-              "success_count" : "success_count>_count"
-            },
-            "script" : "if ((params.failure_count + params.success_count)==0){return 0;}else{return params.failure_count/(params.failure_count + params.success_count);}"
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_high_mean_transaction_duration.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_high_mean_transaction_duration.json
new file mode 100644
index 0000000000000..d312577902f51
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_high_mean_transaction_duration.json
@@ -0,0 +1,14 @@
+{
+  "job_id": "JOB_ID",
+  "indices": [
+    "INDEX_PATTERN_NAME"
+  ],
+  "query": {
+    "bool": {
+      "filter": [
+        { "term": { "processor.event": "transaction" } },
+        { "exists": { "field": "transaction.duration.us" } }
+      ]
+    }
+  }
+}
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/high_mean_transaction_duration.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/high_mean_transaction_duration.json
new file mode 100644
index 0000000000000..77284cb275cd8
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/high_mean_transaction_duration.json
@@ -0,0 +1,35 @@
+{
+  "job_type": "anomaly_detector",
+  "groups": [
+    "apm"
+  ],
+  "description": "Detect transaction duration anomalies across transaction types for your APM services.",
+  "analysis_config": {
+    "bucket_span": "15m",
+    "detectors": [
+      {
+        "detector_description": "high duration by transaction type for an APM service",
+        "function": "high_mean",
+        "field_name": "transaction.duration.us",
+        "by_field_name": "transaction.type",
+        "partition_field_name": "service.name"
+      }
+    ],
+    "influencers": [
+      "transaction.type",
+      "service.name"
+    ]
+  },
+  "analysis_limits": {
+    "model_memory_limit": "32mb"
+  },
+  "data_description": {
+    "time_field": "@timestamp"
+  },
+  "model_plot_config": {
+    "enabled": true
+  },
+  "custom_settings": {
+    "created_by": "ml-module-apm-transaction"
+  }
+}
diff --git a/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts b/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts
index 00b820a025c8b..2742fbff294c0 100644
--- a/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts
+++ b/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts
@@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => {
       user: USER.ML_POWERUSER,
       expected: {
         responseCode: 200,
-        moduleIds: ['apm_jsbase', 'apm_nodejs'],
+        moduleIds: ['apm_jsbase', 'apm_transaction', 'apm_nodejs'],
       },
     },
     {
diff --git a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
index 6ff6b8113cb1a..c4dd529ac14f5 100644
--- a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
+++ b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
@@ -187,11 +187,9 @@ export default ({ getService }: FtrProviderContext) => {
         dashboards: [] as string[],
       },
     },
-    // Set startDatafeed and estimateModelMemory to false for the APM transaction test
-    // until there is a new data set available with metric data.
     {
       testTitleSuffix:
-        'for apm_transaction with prefix, startDatafeed false and estimateModelMemory false',
+        'for apm_transaction with prefix, startDatafeed true and estimateModelMemory true',
       sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apm',
       indexPattern: { name: 'ft_module_apm', timeField: '@timestamp' },
       module: 'apm_transaction',
@@ -199,14 +197,14 @@ export default ({ getService }: FtrProviderContext) => {
       requestBody: {
         prefix: 'pf5_',
         indexPatternName: 'ft_module_apm',
-        startDatafeed: false,
-        estimateModelMemory: false,
+        startDatafeed: true,
+        end: Date.now(),
       },
       expected: {
         responseCode: 200,
         jobs: [
           {
-            jobId: 'pf5_apm_metrics',
+            jobId: 'pf5_high_mean_transaction_duration',
             jobState: JOB_STATE.CLOSED,
             datafeedState: DATAFEED_STATE.STOPPED,
           },

From 402550c1654f8d6e0383440bba8e3db150499171 Mon Sep 17 00:00:00 2001
From: Giorgos Bamparopoulos <georgios.bamparopoulos@elastic.co>
Date: Fri, 15 Oct 2021 09:16:56 +0100
Subject: [PATCH 111/117] Update APM Plugin Routing and Linking (#115008)

* Update client-side and server-side routing function names and files
---
 x-pack/plugins/apm/dev_docs/routing_and_linking.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/apm/dev_docs/routing_and_linking.md b/x-pack/plugins/apm/dev_docs/routing_and_linking.md
index 478de0081fca4..af22bcdbdfa11 100644
--- a/x-pack/plugins/apm/dev_docs/routing_and_linking.md
+++ b/x-pack/plugins/apm/dev_docs/routing_and_linking.md
@@ -6,15 +6,15 @@ This document describes routing in the APM plugin.
 
 ### Server-side
 
-Route definitions for APM's server-side API are in the [server/routes directory](../server/routes). Routes are created with [the `createRoute` function](../server/routes/create_route.ts). Routes are added to the API in [the `createApmApi` function](../server/routes/create_apm_api.ts), which is initialized in the plugin `start` lifecycle method.
+Route definitions for APM's server-side API are in the [server/routes directory](../server/routes). Routes are created with [the `createApmServerRoute` function](../server/routes/create_apm_server_route.ts). Routes are added to the API in [the `registerRoutes` function](../server/routes/register_routes.ts), which is initialized in the plugin `setup` lifecycle method.
 
-The path and query string parameters are defined in the calls to `createRoute` with io-ts types, so that each route has its parameters type checked.
+The path and query string parameters are defined in the calls to `createApmServerRoute` with io-ts types, so that each route has its parameters type checked.
 
 ### Client-side
 
 The client-side routing uses `@kbn/typed-react-router-config`, which is a wrapper around [React Router](https://reactrouter.com/) and [React Router Config](https://www.npmjs.com/package/react-router-config). Its goal is to provide a layer of high-fidelity types that allows us to parse and format URLs for routes while making sure the needed parameters are provided and/or available (typed and validated at runtime). The `history` object used by React Router is injected by the Kibana Platform.
 
-Routes (and their parameters) are defined in [public/components/routing/apm_config.tsx](../public/components/routing/apm_config.tsx).
+Routes (and their parameters) are defined in [public/components/routing/apm_route_config.tsx](../public/components/routing/apm_route_config.tsx).
 
 #### Parameter handling
 

From 00db6023e6af7c69f1462738289f824a8dd67a64 Mon Sep 17 00:00:00 2001
From: Marco Vettorello <vettorello.marco@gmail.com>
Date: Fri, 15 Oct 2021 10:20:30 +0200
Subject: [PATCH 112/117] [deps] Renovate-bot default to draftPR and datavis
 reviewers (#114060)

New renovate-bot PRs are created as draft PR for elastic-charts. The PR will now ping the whole datavis team.
---
 renovate.json5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/renovate.json5 b/renovate.json5
index 76923f01daba0..ab33ba7b844ee 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -37,9 +37,10 @@
       {
         groupName: '@elastic/charts',
         packageNames: ['@elastic/charts'],
-        reviewers: ['markov00', 'nickofthyme'],
+        reviewers: ['team:datavis'],
         matchBaseBranches: ['master'],
         labels: ['release_note:skip', 'v8.0.0', 'v7.16.0', 'auto-backport'],
+        draftPR: true,
         enabled: true,
       },
       {

From 0fa440abad2592be442d88e557044dbfcdfc168a Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Fri, 15 Oct 2021 12:01:42 +0300
Subject: [PATCH 113/117] [Vega] Replacing the 'interval' property should only
 happen for the date_histogram aggregation (#115001)

---
 .../public/data_model/es_query_parser.test.js    | 16 ++++++++++++++--
 .../vega/public/data_model/es_query_parser.ts    |  8 ++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js b/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js
index bb3c0276f4cf9..214a23d2ee935 100644
--- a/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js
+++ b/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js
@@ -178,11 +178,23 @@ describe(`EsQueryParser.injectQueryContextVars`, () => {
   );
   test(
     `%autointerval% = true`,
-    check({ interval: { '%autointerval%': true } }, { calendar_interval: `1h` }, ctxObj)
+    check(
+      { date_histogram: { interval: { '%autointerval%': true } } },
+      { date_histogram: { calendar_interval: `1h` } },
+      ctxObj
+    )
   );
   test(
     `%autointerval% = 10`,
-    check({ interval: { '%autointerval%': 10 } }, { fixed_interval: `3h` }, ctxObj)
+    check(
+      { date_histogram: { interval: { '%autointerval%': 10 } } },
+      { date_histogram: { fixed_interval: `3h` } },
+      ctxObj
+    )
+  );
+  test(
+    `histogram with interval`,
+    check({ histogram: { interval: 1 } }, { histogram: { interval: 1 } }, ctxObj)
   );
   test(`%timefilter% = min`, check({ a: { '%timefilter%': 'min' } }, { a: rangeStart }));
   test(`%timefilter% = max`, check({ a: { '%timefilter%': 'max' } }, { a: rangeEnd }));
diff --git a/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts b/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts
index 134e82d676763..7f6ca05df3d7a 100644
--- a/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts
+++ b/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts
@@ -235,7 +235,8 @@ export class EsQueryParser {
         interval?: { '%autointerval%': true | number } | string;
       }
     >,
-    isQuery: boolean
+    isQuery: boolean,
+    key?: string
   ) {
     if (obj && typeof obj === 'object') {
       if (Array.isArray(obj)) {
@@ -281,9 +282,8 @@ export class EsQueryParser {
           if (!subObj || typeof obj !== 'object') continue;
 
           // replace "interval" with ES acceptable fixed_interval / calendar_interval
-          if (prop === 'interval') {
+          if (prop === 'interval' && key === 'date_histogram') {
             let intervalString: string;
-
             if (typeof subObj === 'string') {
               intervalString = subObj;
             } else if (subObj[AUTOINTERVAL]) {
@@ -322,7 +322,7 @@ export class EsQueryParser {
               this._createRangeFilter(subObj);
               continue;
             case undefined:
-              this._injectContextVars(subObj, isQuery);
+              this._injectContextVars(subObj, isQuery, prop);
               continue;
             default:
               throw new Error(

From c11b38de7bba8a805a7979ea9095858d580b22cf Mon Sep 17 00:00:00 2001
From: mgiota <giota85@gmail.com>
Date: Fri, 15 Oct 2021 11:07:47 +0200
Subject: [PATCH 114/117] [RAC] create functional tests for add to case
 (#114075)

* [RAC] create functional tests for add to case

* use observability test helpers for user creation

* basic tests for add to case options

* add two more cases

* test case for clicking on add to new case button

* remove unused expect statement

* clicking on add to existing case should open a modal

* move add to case functionality in a separate file

* address comments in the PR review

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../cases/add_to_existing_case_button.tsx     |  2 +-
 .../timeline/cases/add_to_new_case_button.tsx |  2 +-
 .../observability/alerts/add_to_case.ts       | 75 +++++++++++++++
 .../services/observability/alerts/common.ts   |  1 +
 .../services/observability/alerts/index.ts    |  4 +-
 .../apps/observability/alerts/add_to_case.ts  | 92 +++++++++++++++++++
 .../apps/observability/index.ts               |  1 +
 7 files changed, 174 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/test/functional/services/observability/alerts/add_to_case.ts
 create mode 100644 x-pack/test/observability_functional/apps/observability/alerts/add_to_case.ts

diff --git a/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_existing_case_button.tsx b/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_existing_case_button.tsx
index af19a6b7cdb74..30181a96aa70b 100644
--- a/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_existing_case_button.tsx
+++ b/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_existing_case_button.tsx
@@ -32,7 +32,7 @@ const AddToCaseActionComponent: React.FC<AddToCaseActionProps> = ({
       {userCanCrud && (
         <EuiContextMenuItem
           aria-label={ariaLabel}
-          data-test-subj="attach-alert-to-case-button"
+          data-test-subj="add-existing-case-menu-item"
           onClick={addExistingCaseClick}
           // needs forced size="s" since it is lazy loaded and the EuiContextMenuPanel can not initialize the size
           size="s"
diff --git a/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_new_case_button.tsx b/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_new_case_button.tsx
index 7a8e53bd10f83..82ce3d1ff8dc8 100644
--- a/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_new_case_button.tsx
+++ b/x-pack/plugins/timelines/public/components/actions/timeline/cases/add_to_new_case_button.tsx
@@ -33,7 +33,7 @@ const AddToCaseActionComponent: React.FC<AddToCaseActionProps> = ({
       {userCanCrud && (
         <EuiContextMenuItem
           aria-label={ariaLabel}
-          data-test-subj="attach-alert-to-case-button"
+          data-test-subj="add-new-case-item"
           onClick={addNewCaseClick}
           // needs forced size="s" since it is lazy loaded and the EuiContextMenuPanel can not initialize the size
           size="s"
diff --git a/x-pack/test/functional/services/observability/alerts/add_to_case.ts b/x-pack/test/functional/services/observability/alerts/add_to_case.ts
new file mode 100644
index 0000000000000..1669fc69a683c
--- /dev/null
+++ b/x-pack/test/functional/services/observability/alerts/add_to_case.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+const ADD_TO_EXISTING_CASE_SELECTOR = 'add-existing-case-menu-item';
+const ADD_TO_NEW_CASE_SELECTOR = 'add-new-case-item';
+const CREATE_CASE_FLYOUT = 'create-case-flyout';
+const SELECT_CASE_MODAL = 'all-cases-modal';
+
+export function ObservabilityAlertsAddToCaseProvider({ getService }: FtrProviderContext) {
+  const testSubjects = getService('testSubjects');
+
+  const getAddToExistingCaseSelector = async () => {
+    return await testSubjects.find(ADD_TO_EXISTING_CASE_SELECTOR);
+  };
+
+  const getAddToExistingCaseSelectorOrFail = async () => {
+    return await testSubjects.existOrFail(ADD_TO_EXISTING_CASE_SELECTOR);
+  };
+
+  const missingAddToExistingCaseSelectorOrFail = async () => {
+    return await testSubjects.missingOrFail(ADD_TO_EXISTING_CASE_SELECTOR);
+  };
+
+  const getAddToNewCaseSelector = async () => {
+    return await testSubjects.find(ADD_TO_NEW_CASE_SELECTOR);
+  };
+
+  const getAddToNewCaseSelectorOrFail = async () => {
+    return await testSubjects.existOrFail(ADD_TO_NEW_CASE_SELECTOR);
+  };
+
+  const missingAddToNewCaseSelectorOrFail = async () => {
+    return await testSubjects.missingOrFail(ADD_TO_NEW_CASE_SELECTOR);
+  };
+
+  const addToNewCaseButtonClick = async () => {
+    return await (await getAddToNewCaseSelector()).click();
+  };
+
+  const addToExistingCaseButtonClick = async () => {
+    return await (await getAddToExistingCaseSelector()).click();
+  };
+
+  const getCreateCaseFlyoutOrFail = async () => {
+    return await testSubjects.existOrFail(CREATE_CASE_FLYOUT);
+  };
+
+  const closeFlyout = async () => {
+    return await (await testSubjects.find('euiFlyoutCloseButton')).click();
+  };
+
+  const getAddtoExistingCaseModalOrFail = async () => {
+    return await testSubjects.existOrFail(SELECT_CASE_MODAL);
+  };
+
+  return {
+    getAddToExistingCaseSelector,
+    getAddToExistingCaseSelectorOrFail,
+    missingAddToExistingCaseSelectorOrFail,
+    getAddToNewCaseSelector,
+    getAddToNewCaseSelectorOrFail,
+    missingAddToNewCaseSelectorOrFail,
+    getCreateCaseFlyoutOrFail,
+    closeFlyout,
+    addToNewCaseButtonClick,
+    addToExistingCaseButtonClick,
+    getAddtoExistingCaseModalOrFail,
+  };
+}
diff --git a/x-pack/test/functional/services/observability/alerts/common.ts b/x-pack/test/functional/services/observability/alerts/common.ts
index 7098fdec2a9d4..d5a2ce2a18c41 100644
--- a/x-pack/test/functional/services/observability/alerts/common.ts
+++ b/x-pack/test/functional/services/observability/alerts/common.ts
@@ -204,5 +204,6 @@ export function ObservabilityAlertsCommonProvider({
     setWorkflowStatusFilter,
     submitQuery,
     typeInQueryBar,
+    openActionsMenuForRow,
   };
 }
diff --git a/x-pack/test/functional/services/observability/alerts/index.ts b/x-pack/test/functional/services/observability/alerts/index.ts
index f373b0d75c543..f2b5173dfe5b0 100644
--- a/x-pack/test/functional/services/observability/alerts/index.ts
+++ b/x-pack/test/functional/services/observability/alerts/index.ts
@@ -7,15 +7,17 @@
 
 import { ObservabilityAlertsPaginationProvider } from './pagination';
 import { ObservabilityAlertsCommonProvider } from './common';
+import { ObservabilityAlertsAddToCaseProvider } from './add_to_case';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export function ObservabilityAlertsProvider(context: FtrProviderContext) {
   const common = ObservabilityAlertsCommonProvider(context);
   const pagination = ObservabilityAlertsPaginationProvider(context);
-
+  const addToCase = ObservabilityAlertsAddToCaseProvider(context);
   return {
     common,
     pagination,
+    addToCase,
   };
 }
diff --git a/x-pack/test/observability_functional/apps/observability/alerts/add_to_case.ts b/x-pack/test/observability_functional/apps/observability/alerts/add_to_case.ts
new file mode 100644
index 0000000000000..f29111f2cb66b
--- /dev/null
+++ b/x-pack/test/observability_functional/apps/observability/alerts/add_to_case.ts
@@ -0,0 +1,92 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default ({ getService, getPageObjects }: FtrProviderContext) => {
+  const esArchiver = getService('esArchiver');
+  const observability = getService('observability');
+  const retry = getService('retry');
+
+  describe('Observability alerts / Add to case', function () {
+    this.tags('includeFirefox');
+
+    before(async () => {
+      await esArchiver.load('x-pack/test/functional/es_archives/observability/alerts');
+    });
+
+    after(async () => {
+      await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
+    });
+
+    describe('When user has all priviledges for cases', () => {
+      before(async () => {
+        await observability.users.setTestUserRole(
+          observability.users.defineBasicObservabilityRole({
+            observabilityCases: ['all'],
+            logs: ['all'],
+          })
+        );
+        await observability.alerts.common.navigateToTimeWithData();
+      });
+
+      after(async () => {
+        await observability.users.restoreDefaultTestUserRole();
+      });
+
+      it('renders case options in the overflow menu', async () => {
+        await observability.alerts.common.openActionsMenuForRow(0);
+        await retry.try(async () => {
+          await observability.alerts.addToCase.getAddToExistingCaseSelectorOrFail();
+          await observability.alerts.addToCase.getAddToNewCaseSelectorOrFail();
+        });
+      });
+
+      it('opens a flyout when Add to new case is clicked', async () => {
+        await observability.alerts.addToCase.addToNewCaseButtonClick();
+
+        await retry.try(async () => {
+          await observability.alerts.addToCase.getCreateCaseFlyoutOrFail();
+          await observability.alerts.addToCase.closeFlyout();
+        });
+      });
+
+      it('opens a modal when Add to existing case is clicked', async () => {
+        await observability.alerts.common.openActionsMenuForRow(0);
+
+        await retry.try(async () => {
+          await observability.alerts.addToCase.addToExistingCaseButtonClick();
+          await observability.alerts.addToCase.getAddtoExistingCaseModalOrFail();
+        });
+      });
+    });
+
+    describe('When user has read permissions for cases', () => {
+      before(async () => {
+        await observability.users.setTestUserRole(
+          observability.users.defineBasicObservabilityRole({
+            observabilityCases: ['read'],
+            logs: ['all'],
+          })
+        );
+        await observability.alerts.common.navigateToTimeWithData();
+      });
+
+      after(async () => {
+        await observability.users.restoreDefaultTestUserRole();
+      });
+
+      it('does not render case options in the overflow menu', async () => {
+        await observability.alerts.common.openActionsMenuForRow(0);
+        await retry.try(async () => {
+          await observability.alerts.addToCase.missingAddToExistingCaseSelectorOrFail();
+          await observability.alerts.addToCase.missingAddToNewCaseSelectorOrFail();
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/observability_functional/apps/observability/index.ts b/x-pack/test/observability_functional/apps/observability/index.ts
index b163d4d6bb8d5..43e056bae65c0 100644
--- a/x-pack/test/observability_functional/apps/observability/index.ts
+++ b/x-pack/test/observability_functional/apps/observability/index.ts
@@ -15,5 +15,6 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./alerts'));
     loadTestFile(require.resolve('./alerts/workflow_status'));
     loadTestFile(require.resolve('./alerts/pagination'));
+    loadTestFile(require.resolve('./alerts/add_to_case'));
   });
 }

From d19510535a4774a58ac37384ad0b09b99f821399 Mon Sep 17 00:00:00 2001
From: Ahmad Bamieh <ahmadbamieh@gmail.com>
Date: Fri, 15 Oct 2021 12:09:19 +0300
Subject: [PATCH 115/117] [i18n] remove angular i18n and move the remains to
 monitoring plugin (#115003)

---
 .../external-plugin-localization.asciidoc     |  21 ---
 package.json                                  |   2 -
 packages/kbn-i18n/BUILD.bazel                 |   2 -
 packages/kbn-i18n/GUIDELINE.md                |  57 ++-----
 packages/kbn-i18n/README.md                   |  92 -----------
 packages/kbn-i18n/angular/package.json        |   5 -
 .../__snapshots__/directive.test.ts.snap      |  69 --------
 .../kbn-i18n/src/angular/directive.test.ts    | 150 ------------------
 packages/kbn-i18n/src/angular/filter.test.ts  |  46 ------
 .../kbn-i18n/src/angular/provider.test.ts     |  47 ------
 packages/kbn-ui-shared-deps-src/src/entry.js  |   1 -
 packages/kbn-ui-shared-deps-src/src/index.js  |   1 -
 src/dev/i18n/README.md                        |  28 ----
 x-pack/.i18nrc.json                           |   2 +-
 .../public/angular/angular_i18n}/directive.ts |   5 +-
 .../public/angular/angular_i18n}/filter.ts    |   5 +-
 .../public/angular/angular_i18n}/index.ts     |   5 +-
 .../public/angular/angular_i18n}/provider.ts  |   7 +-
 .../monitoring/public/angular/app_modules.ts  |   2 +-
 yarn.lock                                     |  14 +-
 20 files changed, 23 insertions(+), 538 deletions(-)
 delete mode 100644 packages/kbn-i18n/angular/package.json
 delete mode 100644 packages/kbn-i18n/src/angular/__snapshots__/directive.test.ts.snap
 delete mode 100644 packages/kbn-i18n/src/angular/directive.test.ts
 delete mode 100644 packages/kbn-i18n/src/angular/filter.test.ts
 delete mode 100644 packages/kbn-i18n/src/angular/provider.test.ts
 rename {packages/kbn-i18n/src/angular => x-pack/plugins/monitoring/public/angular/angular_i18n}/directive.ts (94%)
 rename {packages/kbn-i18n/src/angular => x-pack/plugins/monitoring/public/angular/angular_i18n}/filter.ts (71%)
 rename {packages/kbn-i18n/src/angular => x-pack/plugins/monitoring/public/angular/angular_i18n}/index.ts (71%)
 rename {packages/kbn-i18n/src/angular => x-pack/plugins/monitoring/public/angular/angular_i18n}/provider.ts (78%)

diff --git a/docs/developer/plugin/external-plugin-localization.asciidoc b/docs/developer/plugin/external-plugin-localization.asciidoc
index d30dec1a8f46b..656dff90fe0de 100644
--- a/docs/developer/plugin/external-plugin-localization.asciidoc
+++ b/docs/developer/plugin/external-plugin-localization.asciidoc
@@ -135,27 +135,6 @@ export const Component = () => {
 
 Full details are {kib-repo}tree/master/packages/kbn-i18n#react[here].
 
-
-
-[discrete]
-==== i18n for Angular
-
-You are encouraged to use `i18n.translate()` by statically importing `i18n` from `@kbn/i18n` wherever possible in your Angular code. Angular wrappers use the translation `service` with the i18n engine under the hood.
-
-The translation directive has the following syntax:
-["source","js"]
------------
-<ANY
-  i18n-id="{string}"
-  i18n-default-message="{string}"
-  [i18n-values="{object}"]
-  [i18n-description="{string}"]
-></ANY>
------------
-
-Full details are {kib-repo}tree/master/packages/kbn-i18n#angularjs[here].
-
-
 [discrete]
 === Resources
 
diff --git a/package.json b/package.json
index f526f357ff347..9341ecd0bae35 100644
--- a/package.json
+++ b/package.json
@@ -489,7 +489,6 @@
     "@testing-library/react-hooks": "^5.1.1",
     "@testing-library/user-event": "^13.1.1",
     "@types/angular": "^1.6.56",
-    "@types/angular-mocks": "^1.7.0",
     "@types/apidoc": "^0.22.3",
     "@types/archiver": "^5.1.0",
     "@types/babel__core": "^7.1.16",
@@ -644,7 +643,6 @@
     "@yarnpkg/lockfile": "^1.1.0",
     "abab": "^2.0.4",
     "aggregate-error": "^3.1.0",
-    "angular-mocks": "^1.7.9",
     "antlr4ts-cli": "^0.5.0-alpha.3",
     "apidoc": "^0.29.0",
     "apidoc-markdown": "^6.0.0",
diff --git a/packages/kbn-i18n/BUILD.bazel b/packages/kbn-i18n/BUILD.bazel
index 49d5603b2c516..256262bb8783b 100644
--- a/packages/kbn-i18n/BUILD.bazel
+++ b/packages/kbn-i18n/BUILD.bazel
@@ -27,7 +27,6 @@ filegroup(
 )
 
 NPM_MODULE_EXTRA_FILES = [
-  "angular/package.json",
   "react/package.json",
   "package.json",
   "GUIDELINE.md",
@@ -47,7 +46,6 @@ TYPES_DEPS = [
   "//packages/kbn-babel-preset",
   "@npm//intl-messageformat",
   "@npm//tslib",
-  "@npm//@types/angular",
   "@npm//@types/intl-relativeformat",
   "@npm//@types/jest",
   "@npm//@types/prop-types",
diff --git a/packages/kbn-i18n/GUIDELINE.md b/packages/kbn-i18n/GUIDELINE.md
index 806e799bd1106..7ffc4b078c79b 100644
--- a/packages/kbn-i18n/GUIDELINE.md
+++ b/packages/kbn-i18n/GUIDELINE.md
@@ -93,17 +93,6 @@ The long term plan is to rely on using `FormattedMessage` and `i18n.translate()`
 Currently, we support the following ReactJS `i18n` tools, but they will be removed in future releases:
 - Usage of `props.intl.formatmessage()` (where `intl` is  passed to `props` by `injectI18n` HOC).
 
-#### In AngularJS
-
-The long term plan is to rely on using `i18n.translate()` by statically importing `i18n` from the `@kbn/i18n` package. **Avoid using the `i18n` filter and the `i18n` service injected in controllers, directives, services.**
-
-- Call JS function `i18n.translate()` from the `@kbn/i18n` package.
-- Use `i18nId` directive in template.
-
-Currently, we support the following AngluarJS `i18n` tools, but they will be removed in future releases:
-- Usage of `i18n` service in controllers, directives, services by injecting it.
-- Usage of `i18n` filter in template for attribute translation. Note: Use one-time binding ("{{:: ... }}") in filters wherever it's possible to prevent unnecessary expression re-evaluation.
-
 #### In JavaScript
 
 - Use `i18n.translate()` in NodeJS or any other framework agnostic code, where `i18n` is the I18n engine from `@kbn/i18n` package.
@@ -223,7 +212,6 @@ For example:
 - for button:
 
   ```js
-
   <EuiButton data-test-subj="addScriptedFieldLink" href={addScriptedFieldUrl}>
        <FormattedMessage id="kbn.management.editIndexPattern.scripted.addFieldButtonLabel" defaultMessage="Add scripted field"/>
   </EuiButton>
@@ -232,11 +220,11 @@ For example:
 - for dropDown:
 
   ```js
-  <select ng-model="indexedFieldTypeFilter" ng-options="o for o in indexedFieldTypes">
-      <option value=""
-          i18n-id="kbn.management.editIndexPattern.fields.allTypesDropDown"
-          i18n-default-message="All field types"></option>
-  </select>
+    <option value={
+      i18n.translate('kbn.management.editIndexPattern.fields.allTypesDropDown', {
+        defaultMessage: 'All field types',
+      })
+    }
   ```
 
 - for placeholder:
@@ -309,12 +297,6 @@ For example:
 
 - Variables
 
-  ```html
-  <span i18n-id="kbn.management.editIndexPattern.timeFilterHeader"
-    i18n-default-message="Time Filter field name: {timeFieldName}"
-    i18n-values="{ timeFieldName: indexPattern.timeFieldName }"></span>
-  ```
-
   ```html
   <FormattedMessage
     id="kbn.management.createIndexPatternHeader"
@@ -327,25 +309,6 @@ For example:
 
 - Labels and variables in tag
 
-  ```html
-  <span i18n-id="kbn.management.editIndexPattern.timeFilterLabel.timeFilterDetail"
-    i18n-default-message="This page lists every field in the {indexPatternTitle} index"
-    i18n-values="{ indexPatternTitle: '<strong>' + indexPattern.title + '</strong>' }"></span>
-  ```
-
-  -----------------------------------------------------------
-  **BUT** we can not use tags that should be compiled:
-
-  ```html
-  <span i18n-id="kbn.management.editIndexPattern.timeFilterLabel.timeFilterDetail"
-    i18n-default-message="This page lists every field in the {indexPatternTitle} index"
-    i18n-values="{ indexPatternTitle: '<div my-directive>' + indexPattern.title + '</div>' }"></span>
-  ```
-
-  To void injections vulnerability, `i18nId` directive doesn't compile its values.
-
-  -----------------------------------------------------------
-
   ```html
   <FormattedMessage
     id="kbn.management.createIndexPattern.step.indexPattern.disallowLabel"
@@ -388,10 +351,12 @@ The numeric input is mapped to a plural category, some subset of "zero", "one",
 
 Here is an example of message translation depending on a plural category:
 
-```html
-<span i18n-id="kbn.management.editIndexPattern.mappingConflictLabel"
-      i18n-default-message="{conflictFieldsLength, plural, one {A field is} other {# fields are}} defined as several types (string, integer, etc) across the indices that match this pattern."
-      i18n-values="{ conflictFieldsLength: conflictFields.length }"></span>
+```jsx
+  <FormattedMessage
+    id="kbn.management.editIndexPattern.mappingConflictLabel"
+    defaultMessage="{conflictFieldsLength, plural, one {A field is} other {# fields are}} defined as several types (string, integer, etc) across the indices that match this pattern."
+    values={{ conflictFieldsLength: conflictFields.length }}
+  />
 ```
 
 When `conflictFieldsLength` equals 1, the result string will be `"A field is defined as several types (string, integer, etc) across the indices that match this pattern."`. In cases when `conflictFieldsLength` has value of 2 or more, the result string - `"2 fields are defined as several types (string, integer, etc) across the indices that match this pattern."`.
diff --git a/packages/kbn-i18n/README.md b/packages/kbn-i18n/README.md
index 2b810fcd9616e..0eaf232998a39 100644
--- a/packages/kbn-i18n/README.md
+++ b/packages/kbn-i18n/README.md
@@ -343,98 +343,6 @@ export const MyComponent = injectI18n(
 );
 ```
 
-## AngularJS
-
-The long term plan is to rely on using `i18n.translate()` by statically importing `i18n` from the `@kbn/i18n` package. **Avoid using the `i18n` filter and the `i18n` service injected in controllers, directives, services.**
-
-AngularJS wrapper has 4 entities: translation `provider`, `service`, `directive`
-and `filter`. Both the directive and the filter use the translation `service`
-with i18n engine under the hood.
-
-The translation `provider` is used for `service` configuration and
-has the following methods:
-- `addMessages(messages: Map<string, string>, [locale: string])` - provides a way to register
-translations with the library
-- `setLocale(locale: string)` - tells the library which language to use by given
-language key
-- `getLocale()` - returns the current locale
-- `setDefaultLocale(locale: string)` - tells the library which language to fallback
-when missing translations
-- `getDefaultLocale()` - returns the default locale
-- `setFormats(formats: object)` - supplies a set of options to the underlying formatter
-- `getFormats()` - returns current formats
-- `getRegisteredLocales()` - returns array of locales having translations
-- `init(messages: Map<string, string>)` - initializes the engine
-
-The translation `service` provides only one method:
-- `i18n(id: string, { values: object, defaultMessage: string, description: string })` –
-translate message by id
-
-The translation `filter` is used for attributes translation and has
-the following syntax:
-```
-{{ ::'translationId' | i18n: { values: object, defaultMessage: string, description: string } }}
-```
-
-Where:
-- `translationId` - translation id to be translated
-- `values` - values to pass into translation
-- `defaultMessage` - will be used unless translation was successful (the final
-  fallback in english, will be used for generating `en.json`)
-- `description` - optional context comment that will be extracted by i18n tools
-and added as a comment next to translation message at `defaultMessages.json`
-
-The translation `directive` has the following syntax:
-```html
-<ANY
-  i18n-id="{string}"
-  i18n-default-message="{string}"
-  [i18n-values="{object}"]
-  [i18n-description="{string}"]
-></ANY>
-```
-
-Where:
-- `i18n-id` - translation id to be translated
-- `i18n-default-message` - will be used unless translation was successful
-- `i18n-values` - values to pass into translation
-- `i18n-description` - optional context comment that will be extracted by i18n tools
-and added as a comment next to translation message at `defaultMessages.json`
-
-If HTML rendering in `i18n-values` is required then value key in `i18n-values` object
-should have `html_` prefix. Otherwise the value will be inserted to the message without
-HTML rendering.\
-Example:
-```html
-<p
-  i18n-id="namespace.id"
-  i18n-default-message="Text with an emphasized {text}."
-  i18n-values="{
-    html_text: '<em>text</em>',
-  }"
-></p>
-```
-
-Angular `I18n` module is placed into `autoload` module, so it will be
-loaded automatically. After that we can use i18n directive in Angular templates:
-```html
-<span
-  i18n-id="welcome"
-  i18n-default-message="Hello!"
-></span>
-```
-
-In order to translate attributes in AngularJS we should use `i18nFilter`:
-```html
-<input
-  type="text"
-  placeholder="{{ ::'kbn.management.objects.searchAriaLabel' | i18n: {
-    defaultMessage: 'Search { title } Object',
-    values: { title }
-  } }}"
->
-```
-
 ## I18n tools
 
 In order to simplify localization process, some additional tools were implemented:
diff --git a/packages/kbn-i18n/angular/package.json b/packages/kbn-i18n/angular/package.json
deleted file mode 100644
index 11c842a9fc49b..0000000000000
--- a/packages/kbn-i18n/angular/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "browser": "../target_web/angular",
-  "main": "../target_node/angular",
-  "types": "../target_types/angular/index.d.ts"
-}
\ No newline at end of file
diff --git a/packages/kbn-i18n/src/angular/__snapshots__/directive.test.ts.snap b/packages/kbn-i18n/src/angular/__snapshots__/directive.test.ts.snap
deleted file mode 100644
index 44bb963994328..0000000000000
--- a/packages/kbn-i18n/src/angular/__snapshots__/directive.test.ts.snap
+++ /dev/null
@@ -1,69 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`i18nDirective doesn't render html in result message with text-only values 1`] = `
-<div
-  class="ng-scope ng-isolate-scope"
-  i18n-default-message="Default {one} onclick=alert(1) {two} message"
-  i18n-id="id"
-  i18n-values="{ one: '<span', two: '>Press</span>' }"
->
-  Default &lt;span onclick=alert(1) &gt;Press&lt;/span&gt; message
-</div>
-`;
-
-exports[`i18nDirective doesn't render html in text-only value 1`] = `
-<div
-  class="ng-scope ng-isolate-scope"
-  i18n-default-message="Default {value}"
-  i18n-id="id"
-  i18n-values="{ value: '<strong>message</strong>' }"
->
-  Default &lt;strong&gt;message&lt;/strong&gt;
-</div>
-`;
-
-exports[`i18nDirective inserts correct translation html content with values 1`] = `"default-message word"`;
-
-exports[`i18nDirective inserts correct translation html content with values 2`] = `"default-message anotherWord"`;
-
-exports[`i18nDirective sanitizes message before inserting it to DOM 1`] = `
-<div
-  class="ng-scope ng-isolate-scope"
-  i18n-default-message="Default message, {value}"
-  i18n-id="id"
-  i18n-values="{ html_value: '<div ng-click=\\"dangerousAction()\\"></div>' }"
->
-  Default message, 
-  <div />
-</div>
-`;
-
-exports[`i18nDirective sanitizes onclick attribute 1`] = `
-<div
-  class="ng-scope ng-isolate-scope"
-  i18n-default-message="Default {value} message"
-  i18n-id="id"
-  i18n-values="{ html_value: '<span onclick=alert(1)>Press</span>' }"
->
-  Default 
-  <span>
-    Press
-  </span>
-   message
-</div>
-`;
-
-exports[`i18nDirective sanitizes onmouseover attribute 1`] = `
-<div
-  class="ng-scope ng-isolate-scope"
-  i18n-default-message="Default {value} message"
-  i18n-id="id"
-  i18n-values="{ html_value: '<span onmouseover=\\"alert(1)\\">Press</span>' }"
->
-  Default 
-  <span>
-    Press
-  </span>
-   message
-</div>
-`;
diff --git a/packages/kbn-i18n/src/angular/directive.test.ts b/packages/kbn-i18n/src/angular/directive.test.ts
deleted file mode 100644
index fdfd974f6835a..0000000000000
--- a/packages/kbn-i18n/src/angular/directive.test.ts
+++ /dev/null
@@ -1,150 +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 angular from 'angular';
-import 'angular-mocks';
-import 'angular-sanitize';
-
-import { i18nDirective } from './directive';
-import { I18nProvider } from './provider';
-
-angular
-  .module('app', ['ngSanitize'])
-  .provider('i18n', I18nProvider)
-  .directive('i18nId', i18nDirective);
-
-describe('i18nDirective', () => {
-  let compile: angular.ICompileService;
-  let scope: angular.IRootScopeService & { word?: string };
-
-  beforeEach(angular.mock.module('app'));
-  beforeEach(
-    angular.mock.inject(
-      ($compile: angular.ICompileService, $rootScope: angular.IRootScopeService) => {
-        compile = $compile;
-        scope = $rootScope.$new();
-        scope.word = 'word';
-      }
-    )
-  );
-
-  test('inserts correct translation html content', () => {
-    const id = 'id';
-    const defaultMessage = 'default-message';
-
-    const element = angular.element(
-      `<div
-        i18n-id="${id}"
-        i18n-default-message="${defaultMessage}"
-      />`
-    );
-
-    compile(element)(scope);
-    scope.$digest();
-
-    expect(element.html()).toEqual(defaultMessage);
-  });
-
-  test('inserts correct translation html content with values', () => {
-    const id = 'id';
-    const defaultMessage = 'default-message {word}';
-
-    const element = angular.element(
-      `<div
-        i18n-id="${id}"
-        i18n-default-message="${defaultMessage}"
-        i18n-values="{ word }"
-      />`
-    );
-
-    compile(element)(scope);
-    scope.$digest();
-
-    expect(element.html()).toMatchSnapshot();
-
-    scope.word = 'anotherWord';
-    scope.$digest();
-
-    expect(element.html()).toMatchSnapshot();
-  });
-
-  test('sanitizes message before inserting it to DOM', () => {
-    const element = angular.element(
-      `<div
-        i18n-id="id"
-        i18n-default-message="Default message, {value}"
-        i18n-values="{ html_value: '<div ng-click=&quot;dangerousAction()&quot;></div>' }"
-       />`
-    );
-
-    compile(element)(scope);
-    scope.$digest();
-
-    expect(element[0]).toMatchSnapshot();
-  });
-
-  test(`doesn't render html in result message with text-only values`, () => {
-    const element = angular.element(
-      `<div
-        i18n-id="id"
-        i18n-default-message="Default {one} onclick=alert(1) {two} message"
-        i18n-values="{ one: '<span', two: '>Press</span>' }"
-       />`
-    );
-
-    compile(element)(scope);
-    scope.$digest();
-
-    expect(element[0]).toMatchSnapshot();
-  });
-
-  test('sanitizes onclick attribute', () => {
-    const element = angular.element(
-      `<div
-        i18n-id="id"
-        i18n-default-message="Default {value} message"
-        i18n-values="{ html_value: '<span onclick=alert(1)>Press</span>' }"
-       />`
-    );
-
-    compile(element)(scope);
-    scope.$digest();
-
-    expect(element[0]).toMatchSnapshot();
-  });
-
-  test('sanitizes onmouseover attribute', () => {
-    const element = angular.element(
-      `<div
-        i18n-id="id"
-        i18n-default-message="Default {value} message"
-        i18n-values="{ html_value: '<span onmouseover=&quot;alert(1)&quot;>Press</span>' }"
-       />`
-    );
-
-    compile(element)(scope);
-    scope.$digest();
-
-    expect(element[0]).toMatchSnapshot();
-  });
-
-  test(`doesn't render html in text-only value`, () => {
-    const element = angular.element(
-      `<div
-        i18n-id="id"
-        i18n-default-message="Default {value}"
-        i18n-values="{ value: '<strong>message</strong>' }"
-       />`
-    );
-
-    compile(element)(scope);
-    scope.$digest();
-
-    expect(element[0]).toMatchSnapshot();
-  });
-});
diff --git a/packages/kbn-i18n/src/angular/filter.test.ts b/packages/kbn-i18n/src/angular/filter.test.ts
deleted file mode 100644
index ce9963c065879..0000000000000
--- a/packages/kbn-i18n/src/angular/filter.test.ts
+++ /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 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.
- */
-
-jest.mock('../core/i18n', () => ({
-  translate: jest.fn().mockImplementation(() => 'translation'),
-}));
-
-import angular from 'angular';
-import 'angular-mocks';
-
-import * as i18n from '../core/i18n';
-import { i18nFilter as angularI18nFilter } from './filter';
-import { I18nProvider, I18nServiceType } from './provider';
-
-angular.module('app', []).provider('i18n', I18nProvider).filter('i18n', angularI18nFilter);
-
-describe('i18nFilter', () => {
-  let filter: I18nServiceType;
-
-  beforeEach(angular.mock.module('app'));
-  beforeEach(
-    angular.mock.inject((i18nFilter) => {
-      filter = i18nFilter;
-    })
-  );
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  test('provides wrapper around i18n engine', () => {
-    const id = 'id';
-    const defaultMessage = 'default-message';
-    const values = {};
-
-    const result = filter(id, { defaultMessage, values });
-
-    expect(result).toEqual('translation');
-    expect(i18n.translate).toHaveBeenCalledTimes(1);
-    expect(i18n.translate).toHaveBeenCalledWith(id, { defaultMessage, values });
-  });
-});
diff --git a/packages/kbn-i18n/src/angular/provider.test.ts b/packages/kbn-i18n/src/angular/provider.test.ts
deleted file mode 100644
index f55ff194cc6a7..0000000000000
--- a/packages/kbn-i18n/src/angular/provider.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 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 angular from 'angular';
-import 'angular-mocks';
-
-import * as i18nCore from '../core/i18n';
-import { I18nProvider, I18nServiceType } from './provider';
-
-angular.module('app', []).provider('i18n', I18nProvider);
-
-describe('i18nProvider', () => {
-  let provider: I18nProvider;
-  let service: I18nServiceType;
-
-  beforeEach(
-    angular.mock.module('app', [
-      'i18nProvider',
-      (i18n: I18nProvider) => {
-        provider = i18n;
-      },
-    ])
-  );
-  beforeEach(
-    angular.mock.inject((i18n: I18nServiceType) => {
-      service = i18n;
-    })
-  );
-
-  test('provides wrapper around i18n engine', () => {
-    expect(service).toEqual(i18nCore.translate);
-  });
-
-  test('provides service wrapper around i18n engine', () => {
-    const serviceMethodNames = Object.keys(provider);
-    const pluginMethodNames = Object.keys(i18nCore);
-
-    expect([...serviceMethodNames, 'translate'].sort()).toEqual(
-      [...pluginMethodNames, '$get'].sort()
-    );
-  });
-});
diff --git a/packages/kbn-ui-shared-deps-src/src/entry.js b/packages/kbn-ui-shared-deps-src/src/entry.js
index 0edfeb0e18174..d19aed4440e7c 100644
--- a/packages/kbn-ui-shared-deps-src/src/entry.js
+++ b/packages/kbn-ui-shared-deps-src/src/entry.js
@@ -15,7 +15,6 @@ require('./flot_charts');
 
 // stateful deps
 export const KbnI18n = require('@kbn/i18n');
-export const KbnI18nAngular = require('@kbn/i18n/angular');
 export const KbnI18nReact = require('@kbn/i18n/react');
 export const Angular = require('angular');
 export const EmotionReact = require('@emotion/react');
diff --git a/packages/kbn-ui-shared-deps-src/src/index.js b/packages/kbn-ui-shared-deps-src/src/index.js
index 7433a99b12a99..fc5825c6d4777 100644
--- a/packages/kbn-ui-shared-deps-src/src/index.js
+++ b/packages/kbn-ui-shared-deps-src/src/index.js
@@ -32,7 +32,6 @@ exports.externals = {
    */
   angular: '__kbnSharedDeps__.Angular',
   '@kbn/i18n': '__kbnSharedDeps__.KbnI18n',
-  '@kbn/i18n/angular': '__kbnSharedDeps__.KbnI18nAngular',
   '@kbn/i18n/react': '__kbnSharedDeps__.KbnI18nReact',
   '@emotion/react': '__kbnSharedDeps__.EmotionReact',
   jquery: '__kbnSharedDeps__.Jquery',
diff --git a/src/dev/i18n/README.md b/src/dev/i18n/README.md
index 5c2e996c2a640..99776e407899c 100644
--- a/src/dev/i18n/README.md
+++ b/src/dev/i18n/README.md
@@ -18,34 +18,6 @@ The `defaultMessage` must contain ICU references to all keys in the `values` and
 
 The `description` is optional, `values` is optional too unless `defaultMessage` references to it.
 
-* **Angular (.html)**
-
-  * **Filter**
-
-    ```
-    {{ ::'pluginNamespace.messageId' | i18n: {
-      defaultMessage: 'Default message string literal, {key}',
-      values: { key: 'value' },
-      description: 'Message context or description'
-    } }}
-    ```
-
-    * Don't break `| i18n: {` with line breaks, and don't skip whitespaces around `i18n:`.
-    * `::` operator is optional. Omit it if you need data binding for the `values`.
-
-  * **Directive**
-
-    ```html
-    <p
-      i18n-id="pluginNamespace.messageId"
-      i18n-default-message="Default message string literal, {key}. {emphasizedText}"
-      i18n-values="{ key: value, html_emphasizedText: htmlString }"
-      i18n-description="Message context or description"
-    ></p>
-    ```
-
-    * `html_` prefixes will be removed from `i18n-values` keys before validation.
-
 * **React (.jsx, .tsx)**
 
   * **\<FormattedMessage\>**
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index b51363f1b7006..372812d4d0dc1 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -64,7 +64,7 @@
     "xpack.observability": "plugins/observability",
     "xpack.banners": "plugins/banners"
   },
-  "exclude": ["examples"],
+  "exclude": ["examples", "plugins/monitoring/public/angular/angular_i18n"],
   "translations": [
     "plugins/translations/translations/zh-CN.json",
     "plugins/translations/translations/ja-JP.json"
diff --git a/packages/kbn-i18n/src/angular/directive.ts b/x-pack/plugins/monitoring/public/angular/angular_i18n/directive.ts
similarity index 94%
rename from packages/kbn-i18n/src/angular/directive.ts
rename to x-pack/plugins/monitoring/public/angular/angular_i18n/directive.ts
index edfc66c28e9b1..1aaff99a6a5c1 100644
--- a/packages/kbn-i18n/src/angular/directive.ts
+++ b/x-pack/plugins/monitoring/public/angular/angular_i18n/directive.ts
@@ -1,9 +1,8 @@
 /*
  * Copyright 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.
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
  */
 
 import { IDirective, IRootElementService, IScope } from 'angular';
diff --git a/packages/kbn-i18n/src/angular/filter.ts b/x-pack/plugins/monitoring/public/angular/angular_i18n/filter.ts
similarity index 71%
rename from packages/kbn-i18n/src/angular/filter.ts
rename to x-pack/plugins/monitoring/public/angular/angular_i18n/filter.ts
index 2dde305565813..e4e553fa47b6f 100644
--- a/packages/kbn-i18n/src/angular/filter.ts
+++ b/x-pack/plugins/monitoring/public/angular/angular_i18n/filter.ts
@@ -1,9 +1,8 @@
 /*
  * Copyright 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.
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
  */
 
 import { I18nServiceType } from './provider';
diff --git a/packages/kbn-i18n/src/angular/index.ts b/x-pack/plugins/monitoring/public/angular/angular_i18n/index.ts
similarity index 71%
rename from packages/kbn-i18n/src/angular/index.ts
rename to x-pack/plugins/monitoring/public/angular/angular_i18n/index.ts
index 0951b68fe6f16..8915c96e59be0 100644
--- a/packages/kbn-i18n/src/angular/index.ts
+++ b/x-pack/plugins/monitoring/public/angular/angular_i18n/index.ts
@@ -1,9 +1,8 @@
 /*
  * Copyright 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.
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
  */
 
 export { I18nProvider } from './provider';
diff --git a/packages/kbn-i18n/src/angular/provider.ts b/x-pack/plugins/monitoring/public/angular/angular_i18n/provider.ts
similarity index 78%
rename from packages/kbn-i18n/src/angular/provider.ts
rename to x-pack/plugins/monitoring/public/angular/angular_i18n/provider.ts
index 68d83972df5fc..b1da1bad6e399 100644
--- a/packages/kbn-i18n/src/angular/provider.ts
+++ b/x-pack/plugins/monitoring/public/angular/angular_i18n/provider.ts
@@ -1,12 +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.
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
  */
 
-import * as i18n from '../core';
+import { i18n } from '@kbn/i18n';
 
 export type I18nServiceType = ReturnType<I18nProvider['$get']>;
 
diff --git a/x-pack/plugins/monitoring/public/angular/app_modules.ts b/x-pack/plugins/monitoring/public/angular/app_modules.ts
index 20989e080edbf..537c960460cb1 100644
--- a/x-pack/plugins/monitoring/public/angular/app_modules.ts
+++ b/x-pack/plugins/monitoring/public/angular/app_modules.ts
@@ -12,8 +12,8 @@ import 'angular-sanitize';
 import 'angular-route';
 import '../index.scss';
 import { upperFirst } from 'lodash';
-import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
 import { CoreStart } from 'kibana/public';
+import { i18nDirective, i18nFilter, I18nProvider } from './angular_i18n';
 import { Storage } from '../../../../../src/plugins/kibana_utils/public';
 import {
   createTopNavDirective,
diff --git a/yarn.lock b/yarn.lock
index 70e2a452e87dc..f0e1921b77441 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5782,14 +5782,7 @@
   dependencies:
     "@turf/helpers" "6.x"
 
-"@types/angular-mocks@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@types/angular-mocks/-/angular-mocks-1.7.0.tgz#310d999a3c47c10ecd8eef466b5861df84799429"
-  integrity sha512-MeT5vxWBx4Ny5/sNZJjpZdv4K2KGwqQYiRQQZctan1TTaNyiVlFRYbcmheolhM4KKbTWmoxTVeuvGzniTDg1kw==
-  dependencies:
-    "@types/angular" "*"
-
-"@types/angular@*", "@types/angular@^1.6.56":
+"@types/angular@^1.6.56":
   version "1.6.56"
   resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.56.tgz#20124077bd44061e018c7283c0bb83f4b00322dd"
   integrity sha512-HxtqilvklZ7i6XOaiP7uIJIrFXEVEhfbSY45nfv2DeBRngncI58Y4ZOUMiUkcT8sqgLL1ablmbfylChUg7A3GA==
@@ -7873,11 +7866,6 @@ angular-aria@^1.8.0:
   resolved "https://registry.yarnpkg.com/angular-aria/-/angular-aria-1.8.0.tgz#97aec9b1e8bafd07d5fab30f98d8ec832e18e25d"
   integrity sha512-eCQI6EwgY6bYHdzIUfDABHnZjoZ3bNYpCsnceQF4bLfbq1QtZ7raRPNca45sj6C9Pfjde6PNcEDvuLozFPYnrQ==
 
-angular-mocks@^1.7.9:
-  version "1.7.9"
-  resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.7.9.tgz#0a3b7e28b9a493b4e3010ed2b0f69a68e9b4f79b"
-  integrity sha512-LQRqqiV3sZ7NTHBnNmLT0bXtE5e81t97+hkJ56oU0k3dqKv1s6F+nBWRlOVzqHWPGFOiPS8ZJVdrS8DFzHyNIA==
-
 angular-recursion@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/angular-recursion/-/angular-recursion-1.0.5.tgz#cd405428a0bf55faf52eaa7988c1fe69cd930543"

From a935f6b7235e1b127713aa7ecd64a348aa9ccc43 Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Fri, 15 Oct 2021 05:06:47 -0500
Subject: [PATCH 116/117] [data views] DataViewBase now requires a title
 (#115082)

* dataViewBase now requires a title
---
 packages/kbn-es-query/src/es_query/build_es_query.test.ts | 5 +++--
 packages/kbn-es-query/src/es_query/from_filters.test.ts   | 5 +++--
 packages/kbn-es-query/src/es_query/from_kuery.test.ts     | 5 +++--
 .../src/es_query/handle_nested_filter.test.ts             | 5 +++--
 packages/kbn-es-query/src/es_query/types.ts               | 2 +-
 .../src/filters/build_filters/build_filter.test.ts        | 5 +++--
 .../src/filters/build_filters/exists_filter.test.ts       | 5 +++--
 .../src/filters/build_filters/get_filter_field.test.ts    | 5 +++--
 .../src/filters/build_filters/phrase_filter.test.ts       | 8 +++++---
 .../src/filters/build_filters/phrases_filter.test.ts      | 5 +++--
 packages/kbn-es-query/src/kuery/ast/ast.test.ts           | 5 +++--
 packages/kbn-es-query/src/kuery/functions/and.test.ts     | 5 +++--
 packages/kbn-es-query/src/kuery/functions/exists.test.ts  | 5 +++--
 .../src/kuery/functions/geo_bounding_box.test.ts          | 5 +++--
 .../kbn-es-query/src/kuery/functions/geo_polygon.test.ts  | 5 +++--
 packages/kbn-es-query/src/kuery/functions/is.test.ts      | 5 +++--
 packages/kbn-es-query/src/kuery/functions/nested.test.ts  | 5 +++--
 packages/kbn-es-query/src/kuery/functions/not.test.ts     | 5 +++--
 packages/kbn-es-query/src/kuery/functions/or.test.ts      | 5 +++--
 packages/kbn-es-query/src/kuery/functions/range.test.ts   | 5 +++--
 .../functions/utils/get_full_field_name_node.test.ts      | 5 +++--
 .../kbn-es-query/src/kuery/node_types/function.test.ts    | 5 +++--
 .../data/common/search/expressions/kibana_context.test.ts | 6 +++---
 .../infra/public/containers/with_kuery_autocompletion.tsx | 1 -
 24 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/packages/kbn-es-query/src/es_query/build_es_query.test.ts b/packages/kbn-es-query/src/es_query/build_es_query.test.ts
index aca40632960f8..8fd884f65fa0d 100644
--- a/packages/kbn-es-query/src/es_query/build_es_query.test.ts
+++ b/packages/kbn-es-query/src/es_query/build_es_query.test.ts
@@ -12,13 +12,14 @@ import { luceneStringToDsl } from './lucene_string_to_dsl';
 import { decorateQuery } from './decorate_query';
 import { MatchAllFilter, Query } from '../filters';
 import { fields } from '../filters/stubs';
-import { IndexPatternBase } from './types';
+import { DataViewBase } from './types';
 
 jest.mock('../kuery/grammar');
 
 describe('build query', () => {
-  const indexPattern: IndexPatternBase = {
+  const indexPattern: DataViewBase = {
     fields,
+    title: 'dataView',
   };
 
   describe('buildEsQuery', () => {
diff --git a/packages/kbn-es-query/src/es_query/from_filters.test.ts b/packages/kbn-es-query/src/es_query/from_filters.test.ts
index eacf775194bb8..67de9e4d88736 100644
--- a/packages/kbn-es-query/src/es_query/from_filters.test.ts
+++ b/packages/kbn-es-query/src/es_query/from_filters.test.ts
@@ -9,11 +9,12 @@
 import { buildQueryFromFilters } from './from_filters';
 import { ExistsFilter, Filter, MatchAllFilter } from '../filters';
 import { fields } from '../filters/stubs';
-import { IndexPatternBase } from './types';
+import { DataViewBase } from './types';
 
 describe('build query', () => {
-  const indexPattern: IndexPatternBase = {
+  const indexPattern: DataViewBase = {
     fields,
+    title: 'dataView',
   };
 
   describe('buildQueryFromFilters', () => {
diff --git a/packages/kbn-es-query/src/es_query/from_kuery.test.ts b/packages/kbn-es-query/src/es_query/from_kuery.test.ts
index 2458013854393..443b44dff5819 100644
--- a/packages/kbn-es-query/src/es_query/from_kuery.test.ts
+++ b/packages/kbn-es-query/src/es_query/from_kuery.test.ts
@@ -9,14 +9,15 @@
 import { buildQueryFromKuery } from './from_kuery';
 import { fromKueryExpression, toElasticsearchQuery } from '../kuery';
 import { fields } from '../filters/stubs';
-import { IndexPatternBase } from './types';
+import { DataViewBase } from './types';
 import { Query } from '..';
 
 jest.mock('../kuery/grammar');
 
 describe('build query', () => {
-  const indexPattern: IndexPatternBase = {
+  const indexPattern: DataViewBase = {
     fields,
+    title: 'dataView',
   };
 
   describe('buildQueryFromKuery', () => {
diff --git a/packages/kbn-es-query/src/es_query/handle_nested_filter.test.ts b/packages/kbn-es-query/src/es_query/handle_nested_filter.test.ts
index 333f4bad54a46..2b9fbbe5ece04 100644
--- a/packages/kbn-es-query/src/es_query/handle_nested_filter.test.ts
+++ b/packages/kbn-es-query/src/es_query/handle_nested_filter.test.ts
@@ -9,12 +9,13 @@
 import { handleNestedFilter } from './handle_nested_filter';
 import { fields } from '../filters/stubs';
 import { buildPhraseFilter, buildQueryFilter } from '../filters';
-import { IndexPatternBase } from './types';
+import { DataViewBase } from './types';
 
 describe('handleNestedFilter', function () {
-  const indexPattern: IndexPatternBase = {
+  const indexPattern: DataViewBase = {
     id: 'logstash-*',
     fields,
+    title: 'dataView',
   };
 
   it("should return the filter's query wrapped in nested query if the target field is nested", () => {
diff --git a/packages/kbn-es-query/src/es_query/types.ts b/packages/kbn-es-query/src/es_query/types.ts
index 3a5893d20ef25..75ea320b3431f 100644
--- a/packages/kbn-es-query/src/es_query/types.ts
+++ b/packages/kbn-es-query/src/es_query/types.ts
@@ -65,7 +65,7 @@ export type IndexPatternFieldBase = DataViewFieldBase;
 export interface DataViewBase {
   fields: DataViewFieldBase[];
   id?: string;
-  title?: string;
+  title: string;
 }
 
 /**
diff --git a/packages/kbn-es-query/src/filters/build_filters/build_filter.test.ts b/packages/kbn-es-query/src/filters/build_filters/build_filter.test.ts
index 762af90063070..761d0341f1eae 100644
--- a/packages/kbn-es-query/src/filters/build_filters/build_filter.test.ts
+++ b/packages/kbn-es-query/src/filters/build_filters/build_filter.test.ts
@@ -7,13 +7,14 @@
  */
 
 import { buildFilter, FilterStateStore, FILTERS } from '.';
-import { IndexPatternBase } from '../..';
+import { DataViewBase } from '../..';
 import { fields as stubFields } from '../stubs';
 
 describe('buildFilter', () => {
-  const stubIndexPattern: IndexPatternBase = {
+  const stubIndexPattern: DataViewBase = {
     id: 'logstash-*',
     fields: stubFields,
+    title: 'dataView',
   };
 
   it('should build phrase filters', () => {
diff --git a/packages/kbn-es-query/src/filters/build_filters/exists_filter.test.ts b/packages/kbn-es-query/src/filters/build_filters/exists_filter.test.ts
index 35a2a5c3d6057..81aab2c300243 100644
--- a/packages/kbn-es-query/src/filters/build_filters/exists_filter.test.ts
+++ b/packages/kbn-es-query/src/filters/build_filters/exists_filter.test.ts
@@ -6,13 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { IndexPatternBase } from '../../es_query';
+import { DataViewBase } from '../../es_query';
 import { buildExistsFilter, getExistsFilterField } from './exists_filter';
 import { fields } from '../stubs/fields.mocks';
 
 describe('exists filter', function () {
-  const indexPattern: IndexPatternBase = {
+  const indexPattern: DataViewBase = {
     fields,
+    title: 'dataView',
   };
 
   describe('getExistsFilterField', function () {
diff --git a/packages/kbn-es-query/src/filters/build_filters/get_filter_field.test.ts b/packages/kbn-es-query/src/filters/build_filters/get_filter_field.test.ts
index ca67a439757de..06803716aac2f 100644
--- a/packages/kbn-es-query/src/filters/build_filters/get_filter_field.test.ts
+++ b/packages/kbn-es-query/src/filters/build_filters/get_filter_field.test.ts
@@ -9,13 +9,14 @@
 import { buildPhraseFilter } from './phrase_filter';
 import { buildQueryFilter } from './query_string_filter';
 import { getFilterField } from './get_filter_field';
-import { IndexPatternBase } from '../../es_query';
+import { DataViewBase } from '../../es_query';
 import { fields } from '../stubs/fields.mocks';
 
 describe('getFilterField', function () {
-  const indexPattern: IndexPatternBase = {
+  const indexPattern: DataViewBase = {
     id: 'logstash-*',
     fields,
+    title: 'dataView',
   };
 
   it('should return the field name from known filter types that target a specific field', () => {
diff --git a/packages/kbn-es-query/src/filters/build_filters/phrase_filter.test.ts b/packages/kbn-es-query/src/filters/build_filters/phrase_filter.test.ts
index f23dfde12d977..13f18ad0cc7ea 100644
--- a/packages/kbn-es-query/src/filters/build_filters/phrase_filter.test.ts
+++ b/packages/kbn-es-query/src/filters/build_filters/phrase_filter.test.ts
@@ -13,16 +13,17 @@ import {
   PhraseFilter,
 } from './phrase_filter';
 import { fields, getField } from '../stubs';
-import { IndexPatternBase } from '../../es_query';
+import { DataViewBase } from '../../es_query';
 import { estypes } from '@elastic/elasticsearch';
 
 describe('Phrase filter builder', () => {
-  let indexPattern: IndexPatternBase;
+  let indexPattern: DataViewBase;
 
   beforeEach(() => {
     indexPattern = {
       id: 'id',
       fields,
+      title: 'dataView',
     };
   });
 
@@ -151,8 +152,9 @@ describe('buildInlineScriptForPhraseFilter', () => {
 });
 
 describe('getPhraseFilterField', function () {
-  const indexPattern: IndexPatternBase = {
+  const indexPattern: DataViewBase = {
     fields,
+    title: 'dataView',
   };
 
   it('should return the name of the field a phrase query is targeting', () => {
diff --git a/packages/kbn-es-query/src/filters/build_filters/phrases_filter.test.ts b/packages/kbn-es-query/src/filters/build_filters/phrases_filter.test.ts
index c3e7fd37e1ff6..1a125e98f9645 100644
--- a/packages/kbn-es-query/src/filters/build_filters/phrases_filter.test.ts
+++ b/packages/kbn-es-query/src/filters/build_filters/phrases_filter.test.ts
@@ -6,13 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { IndexPatternBase } from '../../es_query';
+import { DataViewBase } from '../../es_query';
 import { buildPhrasesFilter, getPhrasesFilterField } from './phrases_filter';
 import { fields } from '../stubs';
 
 describe('phrases filter', function () {
-  const indexPattern: IndexPatternBase = {
+  const indexPattern: DataViewBase = {
     fields,
+    title: 'dataView',
   };
 
   describe('getPhrasesFilterField', function () {
diff --git a/packages/kbn-es-query/src/kuery/ast/ast.test.ts b/packages/kbn-es-query/src/kuery/ast/ast.test.ts
index edb9150ea00d5..0e4366d6e21d1 100644
--- a/packages/kbn-es-query/src/kuery/ast/ast.test.ts
+++ b/packages/kbn-es-query/src/kuery/ast/ast.test.ts
@@ -8,18 +8,19 @@
 
 import { fromKueryExpression, fromLiteralExpression, toElasticsearchQuery } from './ast';
 import { nodeTypes } from '../node_types';
-import { IndexPatternBase } from '../..';
+import { DataViewBase } from '../..';
 import { KueryNode } from '../types';
 import { fields } from '../../filters/stubs';
 
 jest.mock('../grammar');
 
 describe('kuery AST API', () => {
-  let indexPattern: IndexPatternBase;
+  let indexPattern: DataViewBase;
 
   beforeEach(() => {
     indexPattern = {
       fields,
+      title: 'dataView',
     };
   });
 
diff --git a/packages/kbn-es-query/src/kuery/functions/and.test.ts b/packages/kbn-es-query/src/kuery/functions/and.test.ts
index 239342bdc0a1c..07e431791b37a 100644
--- a/packages/kbn-es-query/src/kuery/functions/and.test.ts
+++ b/packages/kbn-es-query/src/kuery/functions/and.test.ts
@@ -10,7 +10,7 @@ import { nodeTypes } from '../node_types';
 import { fields } from '../../filters/stubs';
 import * as ast from '../ast';
 import * as and from './and';
-import { IndexPatternBase } from '../../es_query';
+import { DataViewBase } from '../../es_query';
 
 jest.mock('../grammar');
 
@@ -19,11 +19,12 @@ const childNode2 = nodeTypes.function.buildNode('is', 'extension', 'jpg');
 
 describe('kuery functions', () => {
   describe('and', () => {
-    let indexPattern: IndexPatternBase;
+    let indexPattern: DataViewBase;
 
     beforeEach(() => {
       indexPattern = {
         fields,
+        title: 'dataView',
       };
     });
 
diff --git a/packages/kbn-es-query/src/kuery/functions/exists.test.ts b/packages/kbn-es-query/src/kuery/functions/exists.test.ts
index 0941e478e816b..ed368d6af2bfd 100644
--- a/packages/kbn-es-query/src/kuery/functions/exists.test.ts
+++ b/packages/kbn-es-query/src/kuery/functions/exists.test.ts
@@ -8,7 +8,7 @@
 
 import { nodeTypes } from '../node_types';
 import { fields } from '../../filters/stubs';
-import { IndexPatternBase } from '../..';
+import { DataViewBase } from '../..';
 
 jest.mock('../grammar');
 
@@ -17,11 +17,12 @@ import * as exists from './exists';
 
 describe('kuery functions', () => {
   describe('exists', () => {
-    let indexPattern: IndexPatternBase;
+    let indexPattern: DataViewBase;
 
     beforeEach(() => {
       indexPattern = {
         fields,
+        title: 'dataView',
       };
     });
 
diff --git a/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.test.ts b/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.test.ts
index 45e6474b22986..9c4a33f50020f 100644
--- a/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.test.ts
+++ b/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.test.ts
@@ -9,7 +9,7 @@
 import { get } from 'lodash';
 import { nodeTypes } from '../node_types';
 import { fields } from '../../filters/stubs';
-import { IndexPatternBase } from '../..';
+import { DataViewBase } from '../..';
 
 import * as geoBoundingBox from './geo_bounding_box';
 import { JsonObject } from '@kbn/utility-types';
@@ -29,11 +29,12 @@ const params = {
 
 describe('kuery functions', () => {
   describe('geoBoundingBox', () => {
-    let indexPattern: IndexPatternBase;
+    let indexPattern: DataViewBase;
 
     beforeEach(() => {
       indexPattern = {
         fields,
+        title: 'dataView',
       };
     });
 
diff --git a/packages/kbn-es-query/src/kuery/functions/geo_polygon.test.ts b/packages/kbn-es-query/src/kuery/functions/geo_polygon.test.ts
index 2d1d6ed6cd6de..5a96f6f3cb03d 100644
--- a/packages/kbn-es-query/src/kuery/functions/geo_polygon.test.ts
+++ b/packages/kbn-es-query/src/kuery/functions/geo_polygon.test.ts
@@ -8,7 +8,7 @@
 
 import { nodeTypes } from '../node_types';
 import { fields } from '../../filters/stubs';
-import { IndexPatternBase } from '../..';
+import { DataViewBase } from '../..';
 
 import * as geoPolygon from './geo_polygon';
 
@@ -31,11 +31,12 @@ const points = [
 
 describe('kuery functions', () => {
   describe('geoPolygon', () => {
-    let indexPattern: IndexPatternBase;
+    let indexPattern: DataViewBase;
 
     beforeEach(() => {
       indexPattern = {
         fields,
+        title: 'dataView',
       };
     });
 
diff --git a/packages/kbn-es-query/src/kuery/functions/is.test.ts b/packages/kbn-es-query/src/kuery/functions/is.test.ts
index bc1bbb2508438..fbc6011331dbb 100644
--- a/packages/kbn-es-query/src/kuery/functions/is.test.ts
+++ b/packages/kbn-es-query/src/kuery/functions/is.test.ts
@@ -10,18 +10,19 @@ import { nodeTypes } from '../node_types';
 import { fields } from '../../filters/stubs';
 
 import * as is from './is';
-import { IndexPatternBase } from '../..';
+import { DataViewBase } from '../..';
 import { estypes } from '@elastic/elasticsearch';
 
 jest.mock('../grammar');
 
 describe('kuery functions', () => {
   describe('is', () => {
-    let indexPattern: IndexPatternBase;
+    let indexPattern: DataViewBase;
 
     beforeEach(() => {
       indexPattern = {
         fields,
+        title: 'dataView',
       };
     });
 
diff --git a/packages/kbn-es-query/src/kuery/functions/nested.test.ts b/packages/kbn-es-query/src/kuery/functions/nested.test.ts
index 7b6b7b695db2d..da7bfd2dce2d8 100644
--- a/packages/kbn-es-query/src/kuery/functions/nested.test.ts
+++ b/packages/kbn-es-query/src/kuery/functions/nested.test.ts
@@ -8,7 +8,7 @@
 
 import { nodeTypes } from '../node_types';
 import { fields } from '../../filters/stubs';
-import { IndexPatternBase } from '../..';
+import { DataViewBase } from '../..';
 
 import * as ast from '../ast';
 
@@ -20,11 +20,12 @@ const childNode = nodeTypes.function.buildNode('is', 'child', 'foo');
 
 describe('kuery functions', () => {
   describe('nested', () => {
-    let indexPattern: IndexPatternBase;
+    let indexPattern: DataViewBase;
 
     beforeEach(() => {
       indexPattern = {
         fields,
+        title: 'dataView',
       };
     });
 
diff --git a/packages/kbn-es-query/src/kuery/functions/not.test.ts b/packages/kbn-es-query/src/kuery/functions/not.test.ts
index af1e8108b40f5..96af4bc693621 100644
--- a/packages/kbn-es-query/src/kuery/functions/not.test.ts
+++ b/packages/kbn-es-query/src/kuery/functions/not.test.ts
@@ -8,7 +8,7 @@
 
 import { nodeTypes } from '../node_types';
 import { fields } from '../../filters/stubs';
-import { IndexPatternBase } from '../..';
+import { DataViewBase } from '../..';
 
 import * as ast from '../ast';
 import * as not from './not';
@@ -19,11 +19,12 @@ const childNode = nodeTypes.function.buildNode('is', 'extension', 'jpg');
 
 describe('kuery functions', () => {
   describe('not', () => {
-    let indexPattern: IndexPatternBase;
+    let indexPattern: DataViewBase;
 
     beforeEach(() => {
       indexPattern = {
         fields,
+        title: 'dataView',
       };
     });
 
diff --git a/packages/kbn-es-query/src/kuery/functions/or.test.ts b/packages/kbn-es-query/src/kuery/functions/or.test.ts
index eb7db62b22162..63fde9e802401 100644
--- a/packages/kbn-es-query/src/kuery/functions/or.test.ts
+++ b/packages/kbn-es-query/src/kuery/functions/or.test.ts
@@ -8,7 +8,7 @@
 
 import { nodeTypes } from '../node_types';
 import { fields } from '../../filters/stubs';
-import { IndexPatternBase } from '../..';
+import { DataViewBase } from '../..';
 
 import * as ast from '../ast';
 
@@ -20,11 +20,12 @@ const childNode2 = nodeTypes.function.buildNode('is', 'extension', 'jpg');
 
 describe('kuery functions', () => {
   describe('or', () => {
-    let indexPattern: IndexPatternBase;
+    let indexPattern: DataViewBase;
 
     beforeEach(() => {
       indexPattern = {
         fields,
+        title: 'dataView',
       };
     });
 
diff --git a/packages/kbn-es-query/src/kuery/functions/range.test.ts b/packages/kbn-es-query/src/kuery/functions/range.test.ts
index 42005a3fe702d..c541b26ce176f 100644
--- a/packages/kbn-es-query/src/kuery/functions/range.test.ts
+++ b/packages/kbn-es-query/src/kuery/functions/range.test.ts
@@ -9,7 +9,7 @@
 import { get } from 'lodash';
 import { nodeTypes } from '../node_types';
 import { fields } from '../../filters/stubs';
-import { IndexPatternBase } from '../..';
+import { DataViewBase } from '../..';
 import { RangeFilterParams } from '../../filters';
 
 import * as range from './range';
@@ -18,11 +18,12 @@ jest.mock('../grammar');
 
 describe('kuery functions', () => {
   describe('range', () => {
-    let indexPattern: IndexPatternBase;
+    let indexPattern: DataViewBase;
 
     beforeEach(() => {
       indexPattern = {
         fields,
+        title: 'dataView',
       };
     });
 
diff --git a/packages/kbn-es-query/src/kuery/functions/utils/get_full_field_name_node.test.ts b/packages/kbn-es-query/src/kuery/functions/utils/get_full_field_name_node.test.ts
index dccfc5d1c463a..046ffdb152e42 100644
--- a/packages/kbn-es-query/src/kuery/functions/utils/get_full_field_name_node.test.ts
+++ b/packages/kbn-es-query/src/kuery/functions/utils/get_full_field_name_node.test.ts
@@ -8,17 +8,18 @@
 
 import { nodeTypes } from '../../node_types';
 import { fields } from '../../../filters/stubs';
-import { IndexPatternBase } from '../../..';
+import { DataViewBase } from '../../..';
 import { getFullFieldNameNode } from './get_full_field_name_node';
 
 jest.mock('../../grammar');
 
 describe('getFullFieldNameNode', function () {
-  let indexPattern: IndexPatternBase;
+  let indexPattern: DataViewBase;
 
   beforeEach(() => {
     indexPattern = {
       fields,
+      title: 'dataView',
     };
   });
 
diff --git a/packages/kbn-es-query/src/kuery/node_types/function.test.ts b/packages/kbn-es-query/src/kuery/node_types/function.test.ts
index 5df6ba1916046..754bf170c5062 100644
--- a/packages/kbn-es-query/src/kuery/node_types/function.test.ts
+++ b/packages/kbn-es-query/src/kuery/node_types/function.test.ts
@@ -10,18 +10,19 @@ import { nodeTypes } from './index';
 
 import { buildNode, buildNodeWithArgumentNodes, toElasticsearchQuery } from './function';
 import { toElasticsearchQuery as isFunctionToElasticsearchQuery } from '../functions/is';
-import { IndexPatternBase } from '../../es_query';
+import { DataViewBase } from '../../es_query';
 import { fields } from '../../filters/stubs/fields.mocks';
 
 jest.mock('../grammar');
 
 describe('kuery node types', () => {
   describe('function', () => {
-    let indexPattern: IndexPatternBase;
+    let indexPattern: DataViewBase;
 
     beforeEach(() => {
       indexPattern = {
         fields,
+        title: 'dataView',
       };
     });
 
diff --git a/src/plugins/data/common/search/expressions/kibana_context.test.ts b/src/plugins/data/common/search/expressions/kibana_context.test.ts
index 77d89792b63c3..c9fe4ee5b7367 100644
--- a/src/plugins/data/common/search/expressions/kibana_context.test.ts
+++ b/src/plugins/data/common/search/expressions/kibana_context.test.ts
@@ -205,7 +205,7 @@ describe('kibanaContextFn', () => {
   it('deduplicates duplicated filters and keeps the first enabled filter', async () => {
     const { fn } = kibanaContextFn;
     const filter1 = buildFilter(
-      { fields: [] },
+      { fields: [], title: 'dataView' },
       { name: 'test', type: 'test' },
       FILTERS.PHRASE,
       false,
@@ -217,7 +217,7 @@ describe('kibanaContextFn', () => {
       FilterStateStore.APP_STATE
     );
     const filter2 = buildFilter(
-      { fields: [] },
+      { fields: [], title: 'dataView' },
       { name: 'test', type: 'test' },
       FILTERS.PHRASE,
       false,
@@ -230,7 +230,7 @@ describe('kibanaContextFn', () => {
     );
 
     const filter3 = buildFilter(
-      { fields: [] },
+      { fields: [], title: 'dataView' },
       { name: 'test', type: 'test' },
       FILTERS.PHRASE,
       false,
diff --git a/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx b/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx
index 0e5ef1ca78033..2b0aaf5175b88 100644
--- a/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx
+++ b/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx
@@ -83,7 +83,6 @@ class WithKueryAutocompletionComponent extends React.Component<
         query: expression,
         selectionStart: cursorPosition,
         selectionEnd: cursorPosition,
-        // @ts-expect-error (until data service updates to new types)
         indexPatterns: [indexPattern],
         boolFilter: [],
       })) || [];

From 81ba068853630825cfab0b054bf11ef757365f02 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@gmail.com>
Date: Fri, 15 Oct 2021 12:11:21 +0200
Subject: [PATCH 117/117] Add `deprecation.skip_deprecated_settings` config
 setting (#114751)

* Add `deprecation.skip_deprecated_settings` config setting

* fix deprecation from service

* fix existing config deprecations

* fix kbn-config unit tests

* adapt deprecation types

* fix more deprecations

* add filtering and adapt unit tests

* add service unit tests

* update generated doc

* fix telemetry unit tests

* address review comments

* add missing deprecation titles
---
 ...kibana-plugin-core-public.doclinksstart.md |   3 +-
 ...sedeprecationdetails.correctiveactions.md} |   4 +-
 ...basedeprecationdetails.deprecationtype.md} |   4 +-
 ...asedeprecationdetails.documentationurl.md} |   4 +-
 ...re-server.basedeprecationdetails.level.md} |   4 +-
 ...ugin-core-server.basedeprecationdetails.md |  26 +++
 ...-server.basedeprecationdetails.message.md} |   4 +-
 ....basedeprecationdetails.requirerestart.md} |   4 +-
 ...re-server.basedeprecationdetails.title.md} |   4 +-
 ...ver.configdeprecationdetails.configpath.md |  11 +
 ...onfigdeprecationdetails.deprecationtype.md |  11 +
 ...in-core-server.configdeprecationdetails.md |  20 ++
 ...-plugin-core-server.deprecationsdetails.md |  17 +-
 ...aturedeprecationdetails.deprecationtype.md |  11 +
 ...n-core-server.featuredeprecationdetails.md |  19 ++
 .../core/server/kibana-plugin-core-server.md  |   5 +-
 .../kbn-config/src/config_service.test.ts     |   8 +
 packages/kbn-config/src/config_service.ts     |   1 +
 .../deprecation/deprecation_factory.test.ts   |  12 ++
 .../src/deprecation/deprecation_factory.ts    |   4 +
 packages/kbn-config/src/deprecation/types.ts  |   4 +-
 src/core/public/public.api.md                 |   5 +-
 .../config/deprecation/core_deprecations.ts   |   4 +
 .../server/deprecations/deprecation_config.ts |  22 ++
 .../deprecations/deprecations_factory.test.ts | 197 +++++++++++++++---
 .../deprecations/deprecations_factory.ts      |  37 +++-
 .../deprecations/deprecations_service.mock.ts |   2 +-
 .../deprecations_service.test.mocks.ts        |  18 ++
 .../deprecations/deprecations_service.test.ts |  60 ++++--
 .../deprecations/deprecations_service.ts      |  40 +++-
 src/core/server/deprecations/index.ts         |   4 +
 src/core/server/deprecations/types.ts         |  41 +++-
 .../elasticsearch/elasticsearch_config.ts     |   5 +
 src/core/server/index.ts                      |   3 +
 src/core/server/kibana_config.ts              |   1 +
 .../saved_objects/saved_objects_config.ts     |   1 +
 src/core/server/server.api.md                 |  58 ++++--
 src/core/server/server.ts                     |   5 +-
 .../server/config/deprecations.test.ts        |   2 +
 .../telemetry/server/config/deprecations.ts   |   1 +
 .../core_plugin_deprecations/server/config.ts |   1 +
 .../test_suites/core/deprecations.ts          |   3 +
 x-pack/plugins/actions/server/index.ts        |   3 +
 x-pack/plugins/fleet/server/index.ts          |   1 +
 x-pack/plugins/maps/server/index.ts           |   1 +
 .../plugins/monitoring/server/deprecations.ts |   5 +
 .../plugins/reporting/server/config/index.ts  |   1 +
 .../server/config_deprecations.test.ts        |  12 +-
 .../security/server/config_deprecations.ts    |  11 +-
 x-pack/plugins/spaces/server/config.ts        |   1 +
 x-pack/plugins/stack_alerts/server/index.ts   |   1 +
 x-pack/plugins/task_manager/server/index.ts   |   2 +
 .../server/lib/kibana_status.test.ts          |   2 +-
 53 files changed, 595 insertions(+), 135 deletions(-)
 rename docs/development/core/server/{kibana-plugin-core-server.deprecationsdetails.correctiveactions.md => kibana-plugin-core-server.basedeprecationdetails.correctiveactions.md} (66%)
 rename docs/development/core/server/{kibana-plugin-core-server.deprecationsdetails.deprecationtype.md => kibana-plugin-core-server.basedeprecationdetails.deprecationtype.md} (70%)
 rename docs/development/core/server/{kibana-plugin-core-server.deprecationsdetails.documentationurl.md => kibana-plugin-core-server.basedeprecationdetails.documentationurl.md} (53%)
 rename docs/development/core/server/{kibana-plugin-core-server.deprecationsdetails.level.md => kibana-plugin-core-server.basedeprecationdetails.level.md} (66%)
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.md
 rename docs/development/core/server/{kibana-plugin-core-server.deprecationsdetails.message.md => kibana-plugin-core-server.basedeprecationdetails.message.md} (60%)
 rename docs/development/core/server/{kibana-plugin-core-server.deprecationsdetails.requirerestart.md => kibana-plugin-core-server.basedeprecationdetails.requirerestart.md} (54%)
 rename docs/development/core/server/{kibana-plugin-core-server.deprecationsdetails.title.md => kibana-plugin-core-server.basedeprecationdetails.title.md} (59%)
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.configdeprecationdetails.configpath.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.configdeprecationdetails.deprecationtype.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.configdeprecationdetails.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.featuredeprecationdetails.deprecationtype.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.featuredeprecationdetails.md
 create mode 100644 src/core/server/deprecations/deprecation_config.ts
 create mode 100644 src/core/server/deprecations/deprecations_service.test.mocks.ts

diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
index 51101c8804680..d90972d327041 100644
--- a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
+++ b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
@@ -17,4 +17,5 @@ export interface DocLinksStart
 |  --- | --- | --- |
 |  [DOC\_LINK\_VERSION](./kibana-plugin-core-public.doclinksstart.doc_link_version.md) | <code>string</code> |  |
 |  [ELASTIC\_WEBSITE\_URL](./kibana-plugin-core-public.doclinksstart.elastic_website_url.md) | <code>string</code> |  |
-|  [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code>        readonly settings: string;</code><br/><code>        readonly apm: {</code><br/><code>            readonly kibanaSettings: string;</code><br/><code>            readonly supportedServiceMaps: string;</code><br/><code>            readonly customLinks: string;</code><br/><code>            readonly droppedTransactionSpans: string;</code><br/><code>            readonly upgrading: string;</code><br/><code>            readonly metaData: string;</code><br/><code>        };</code><br/><code>        readonly canvas: {</code><br/><code>            readonly guide: string;</code><br/><code>        };</code><br/><code>        readonly dashboard: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly drilldowns: string;</code><br/><code>            readonly drilldownsTriggerPicker: string;</code><br/><code>            readonly urlDrilldownTemplateSyntax: string;</code><br/><code>            readonly urlDrilldownVariables: string;</code><br/><code>        };</code><br/><code>        readonly discover: Record&lt;string, string&gt;;</code><br/><code>        readonly filebeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly installation: string;</code><br/><code>            readonly configuration: string;</code><br/><code>            readonly elasticsearchOutput: string;</code><br/><code>            readonly elasticsearchModule: string;</code><br/><code>            readonly startup: string;</code><br/><code>            readonly exportedFields: string;</code><br/><code>            readonly suricataModule: string;</code><br/><code>            readonly zeekModule: string;</code><br/><code>        };</code><br/><code>        readonly auditbeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly auditdModule: string;</code><br/><code>            readonly systemModule: string;</code><br/><code>        };</code><br/><code>        readonly metricbeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly configure: string;</code><br/><code>            readonly httpEndpoint: string;</code><br/><code>            readonly install: string;</code><br/><code>            readonly start: string;</code><br/><code>        };</code><br/><code>        readonly enterpriseSearch: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly appSearchBase: string;</code><br/><code>            readonly workplaceSearchBase: string;</code><br/><code>        };</code><br/><code>        readonly heartbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly libbeat: {</code><br/><code>            readonly getStarted: string;</code><br/><code>        };</code><br/><code>        readonly logstash: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly functionbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly winlogbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly aggs: {</code><br/><code>            readonly composite: string;</code><br/><code>            readonly composite_missing_bucket: string;</code><br/><code>            readonly date_histogram: string;</code><br/><code>            readonly date_range: string;</code><br/><code>            readonly date_format_pattern: string;</code><br/><code>            readonly filter: string;</code><br/><code>            readonly filters: string;</code><br/><code>            readonly geohash_grid: string;</code><br/><code>            readonly histogram: string;</code><br/><code>            readonly ip_range: string;</code><br/><code>            readonly range: string;</code><br/><code>            readonly significant_terms: string;</code><br/><code>            readonly terms: string;</code><br/><code>            readonly avg: string;</code><br/><code>            readonly avg_bucket: string;</code><br/><code>            readonly max_bucket: string;</code><br/><code>            readonly min_bucket: string;</code><br/><code>            readonly sum_bucket: string;</code><br/><code>            readonly cardinality: string;</code><br/><code>            readonly count: string;</code><br/><code>            readonly cumulative_sum: string;</code><br/><code>            readonly derivative: string;</code><br/><code>            readonly geo_bounds: string;</code><br/><code>            readonly geo_centroid: string;</code><br/><code>            readonly max: string;</code><br/><code>            readonly median: string;</code><br/><code>            readonly min: string;</code><br/><code>            readonly moving_avg: string;</code><br/><code>            readonly percentile_ranks: string;</code><br/><code>            readonly serial_diff: string;</code><br/><code>            readonly std_dev: string;</code><br/><code>            readonly sum: string;</code><br/><code>            readonly top_hits: string;</code><br/><code>        };</code><br/><code>        readonly runtimeFields: {</code><br/><code>            readonly overview: string;</code><br/><code>            readonly mapping: string;</code><br/><code>        };</code><br/><code>        readonly scriptedFields: {</code><br/><code>            readonly scriptFields: string;</code><br/><code>            readonly scriptAggs: string;</code><br/><code>            readonly painless: string;</code><br/><code>            readonly painlessApi: string;</code><br/><code>            readonly painlessLangSpec: string;</code><br/><code>            readonly painlessSyntax: string;</code><br/><code>            readonly painlessWalkthrough: string;</code><br/><code>            readonly luceneExpressions: string;</code><br/><code>        };</code><br/><code>        readonly search: {</code><br/><code>            readonly sessions: string;</code><br/><code>            readonly sessionLimits: string;</code><br/><code>        };</code><br/><code>        readonly indexPatterns: {</code><br/><code>            readonly introduction: string;</code><br/><code>            readonly fieldFormattersNumber: string;</code><br/><code>            readonly fieldFormattersString: string;</code><br/><code>            readonly runtimeFields: string;</code><br/><code>        };</code><br/><code>        readonly addData: string;</code><br/><code>        readonly kibana: string;</code><br/><code>        readonly upgradeAssistant: string;</code><br/><code>        readonly rollupJobs: string;</code><br/><code>        readonly elasticsearch: Record&lt;string, string&gt;;</code><br/><code>        readonly siem: {</code><br/><code>            readonly privileges: string;</code><br/><code>            readonly guide: string;</code><br/><code>            readonly gettingStarted: string;</code><br/><code>            readonly ml: string;</code><br/><code>            readonly ruleChangeLog: string;</code><br/><code>            readonly detectionsReq: string;</code><br/><code>            readonly networkMap: string;</code><br/><code>        };</code><br/><code>        readonly securitySolution: {</code><br/><code>            readonly trustedApps: string;</code><br/><code>        };</code><br/><code>        readonly query: {</code><br/><code>            readonly eql: string;</code><br/><code>            readonly kueryQuerySyntax: string;</code><br/><code>            readonly luceneQuerySyntax: string;</code><br/><code>            readonly percolate: string;</code><br/><code>            readonly queryDsl: string;</code><br/><code>            readonly autocompleteChanges: string;</code><br/><code>        };</code><br/><code>        readonly date: {</code><br/><code>            readonly dateMath: string;</code><br/><code>            readonly dateMathIndexNames: string;</code><br/><code>        };</code><br/><code>        readonly management: Record&lt;string, string&gt;;</code><br/><code>        readonly ml: Record&lt;string, string&gt;;</code><br/><code>        readonly transforms: Record&lt;string, string&gt;;</code><br/><code>        readonly visualize: Record&lt;string, string&gt;;</code><br/><code>        readonly apis: Readonly&lt;{</code><br/><code>            bulkIndexAlias: string;</code><br/><code>            byteSizeUnits: string;</code><br/><code>            createAutoFollowPattern: string;</code><br/><code>            createFollower: string;</code><br/><code>            createIndex: string;</code><br/><code>            createSnapshotLifecyclePolicy: string;</code><br/><code>            createRoleMapping: string;</code><br/><code>            createRoleMappingTemplates: string;</code><br/><code>            createRollupJobsRequest: string;</code><br/><code>            createApiKey: string;</code><br/><code>            createPipeline: string;</code><br/><code>            createTransformRequest: string;</code><br/><code>            cronExpressions: string;</code><br/><code>            executeWatchActionModes: string;</code><br/><code>            indexExists: string;</code><br/><code>            openIndex: string;</code><br/><code>            putComponentTemplate: string;</code><br/><code>            painlessExecute: string;</code><br/><code>            painlessExecuteAPIContexts: string;</code><br/><code>            putComponentTemplateMetadata: string;</code><br/><code>            putSnapshotLifecyclePolicy: string;</code><br/><code>            putIndexTemplateV1: string;</code><br/><code>            putWatch: string;</code><br/><code>            simulatePipeline: string;</code><br/><code>            timeUnits: string;</code><br/><code>            updateTransform: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly observability: Readonly&lt;{</code><br/><code>            guide: string;</code><br/><code>            infrastructureThreshold: string;</code><br/><code>            logsThreshold: string;</code><br/><code>            metricsThreshold: string;</code><br/><code>            monitorStatus: string;</code><br/><code>            monitorUptime: string;</code><br/><code>            tlsCertificate: string;</code><br/><code>            uptimeDurationAnomaly: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly alerting: Record&lt;string, string&gt;;</code><br/><code>        readonly maps: Record&lt;string, string&gt;;</code><br/><code>        readonly monitoring: Record&lt;string, string&gt;;</code><br/><code>        readonly security: Readonly&lt;{</code><br/><code>            apiKeyServiceSettings: string;</code><br/><code>            clusterPrivileges: string;</code><br/><code>            elasticsearchSettings: string;</code><br/><code>            elasticsearchEnableSecurity: string;</code><br/><code>            indicesPrivileges: string;</code><br/><code>            kibanaTLS: string;</code><br/><code>            kibanaPrivileges: string;</code><br/><code>            mappingRoles: string;</code><br/><code>            mappingRolesFieldRules: string;</code><br/><code>            runAsPrivilege: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly watcher: Record&lt;string, string&gt;;</code><br/><code>        readonly ccs: Record&lt;string, string&gt;;</code><br/><code>        readonly plugins: Record&lt;string, string&gt;;</code><br/><code>        readonly snapshotRestore: Record&lt;string, string&gt;;</code><br/><code>        readonly ingest: Record&lt;string, string&gt;;</code><br/><code>        readonly fleet: Readonly&lt;{</code><br/><code>            guide: string;</code><br/><code>            fleetServer: string;</code><br/><code>            fleetServerAddFleetServer: string;</code><br/><code>            settings: string;</code><br/><code>            settingsFleetServerHostSettings: string;</code><br/><code>            troubleshooting: string;</code><br/><code>            elasticAgent: string;</code><br/><code>            datastreams: string;</code><br/><code>            datastreamsNamingScheme: string;</code><br/><code>            upgradeElasticAgent: string;</code><br/><code>            upgradeElasticAgent712lower: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly ecs: {</code><br/><code>            readonly guide: string;</code><br/><code>        };</code><br/><code>        readonly clients: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly goOverview: string;</code><br/><code>            readonly javaIndex: string;</code><br/><code>            readonly jsIntro: string;</code><br/><code>            readonly netGuide: string;</code><br/><code>            readonly perlGuide: string;</code><br/><code>            readonly phpGuide: string;</code><br/><code>            readonly pythonGuide: string;</code><br/><code>            readonly rubyOverview: string;</code><br/><code>            readonly rustGuide: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
\ No newline at end of file
+|  [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code>        readonly settings: string;</code><br/><code>        readonly elasticStackGetStarted: string;</code><br/><code>        readonly apm: {</code><br/><code>            readonly kibanaSettings: string;</code><br/><code>            readonly supportedServiceMaps: string;</code><br/><code>            readonly customLinks: string;</code><br/><code>            readonly droppedTransactionSpans: string;</code><br/><code>            readonly upgrading: string;</code><br/><code>            readonly metaData: string;</code><br/><code>        };</code><br/><code>        readonly canvas: {</code><br/><code>            readonly guide: string;</code><br/><code>        };</code><br/><code>        readonly dashboard: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly drilldowns: string;</code><br/><code>            readonly drilldownsTriggerPicker: string;</code><br/><code>            readonly urlDrilldownTemplateSyntax: string;</code><br/><code>            readonly urlDrilldownVariables: string;</code><br/><code>        };</code><br/><code>        readonly discover: Record&lt;string, string&gt;;</code><br/><code>        readonly filebeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly installation: string;</code><br/><code>            readonly configuration: string;</code><br/><code>            readonly elasticsearchOutput: string;</code><br/><code>            readonly elasticsearchModule: string;</code><br/><code>            readonly startup: string;</code><br/><code>            readonly exportedFields: string;</code><br/><code>            readonly suricataModule: string;</code><br/><code>            readonly zeekModule: string;</code><br/><code>        };</code><br/><code>        readonly auditbeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly auditdModule: string;</code><br/><code>            readonly systemModule: string;</code><br/><code>        };</code><br/><code>        readonly metricbeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly configure: string;</code><br/><code>            readonly httpEndpoint: string;</code><br/><code>            readonly install: string;</code><br/><code>            readonly start: string;</code><br/><code>        };</code><br/><code>        readonly enterpriseSearch: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly appSearchBase: string;</code><br/><code>            readonly workplaceSearchBase: string;</code><br/><code>        };</code><br/><code>        readonly heartbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly libbeat: {</code><br/><code>            readonly getStarted: string;</code><br/><code>        };</code><br/><code>        readonly logstash: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly functionbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly winlogbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly aggs: {</code><br/><code>            readonly composite: string;</code><br/><code>            readonly composite_missing_bucket: string;</code><br/><code>            readonly date_histogram: string;</code><br/><code>            readonly date_range: string;</code><br/><code>            readonly date_format_pattern: string;</code><br/><code>            readonly filter: string;</code><br/><code>            readonly filters: string;</code><br/><code>            readonly geohash_grid: string;</code><br/><code>            readonly histogram: string;</code><br/><code>            readonly ip_range: string;</code><br/><code>            readonly range: string;</code><br/><code>            readonly significant_terms: string;</code><br/><code>            readonly terms: string;</code><br/><code>            readonly avg: string;</code><br/><code>            readonly avg_bucket: string;</code><br/><code>            readonly max_bucket: string;</code><br/><code>            readonly min_bucket: string;</code><br/><code>            readonly sum_bucket: string;</code><br/><code>            readonly cardinality: string;</code><br/><code>            readonly count: string;</code><br/><code>            readonly cumulative_sum: string;</code><br/><code>            readonly derivative: string;</code><br/><code>            readonly geo_bounds: string;</code><br/><code>            readonly geo_centroid: string;</code><br/><code>            readonly max: string;</code><br/><code>            readonly median: string;</code><br/><code>            readonly min: string;</code><br/><code>            readonly moving_avg: string;</code><br/><code>            readonly percentile_ranks: string;</code><br/><code>            readonly serial_diff: string;</code><br/><code>            readonly std_dev: string;</code><br/><code>            readonly sum: string;</code><br/><code>            readonly top_hits: string;</code><br/><code>        };</code><br/><code>        readonly runtimeFields: {</code><br/><code>            readonly overview: string;</code><br/><code>            readonly mapping: string;</code><br/><code>        };</code><br/><code>        readonly scriptedFields: {</code><br/><code>            readonly scriptFields: string;</code><br/><code>            readonly scriptAggs: string;</code><br/><code>            readonly painless: string;</code><br/><code>            readonly painlessApi: string;</code><br/><code>            readonly painlessLangSpec: string;</code><br/><code>            readonly painlessSyntax: string;</code><br/><code>            readonly painlessWalkthrough: string;</code><br/><code>            readonly luceneExpressions: string;</code><br/><code>        };</code><br/><code>        readonly search: {</code><br/><code>            readonly sessions: string;</code><br/><code>            readonly sessionLimits: string;</code><br/><code>        };</code><br/><code>        readonly indexPatterns: {</code><br/><code>            readonly introduction: string;</code><br/><code>            readonly fieldFormattersNumber: string;</code><br/><code>            readonly fieldFormattersString: string;</code><br/><code>            readonly runtimeFields: string;</code><br/><code>        };</code><br/><code>        readonly addData: string;</code><br/><code>        readonly kibana: string;</code><br/><code>        readonly upgradeAssistant: string;</code><br/><code>        readonly rollupJobs: string;</code><br/><code>        readonly elasticsearch: Record&lt;string, string&gt;;</code><br/><code>        readonly siem: {</code><br/><code>            readonly privileges: string;</code><br/><code>            readonly guide: string;</code><br/><code>            readonly gettingStarted: string;</code><br/><code>            readonly ml: string;</code><br/><code>            readonly ruleChangeLog: string;</code><br/><code>            readonly detectionsReq: string;</code><br/><code>            readonly networkMap: string;</code><br/><code>            readonly troubleshootGaps: string;</code><br/><code>        };</code><br/><code>        readonly securitySolution: {</code><br/><code>            readonly trustedApps: string;</code><br/><code>        };</code><br/><code>        readonly query: {</code><br/><code>            readonly eql: string;</code><br/><code>            readonly kueryQuerySyntax: string;</code><br/><code>            readonly luceneQuerySyntax: string;</code><br/><code>            readonly percolate: string;</code><br/><code>            readonly queryDsl: string;</code><br/><code>            readonly autocompleteChanges: string;</code><br/><code>        };</code><br/><code>        readonly date: {</code><br/><code>            readonly dateMath: string;</code><br/><code>            readonly dateMathIndexNames: string;</code><br/><code>        };</code><br/><code>        readonly management: Record&lt;string, string&gt;;</code><br/><code>        readonly ml: Record&lt;string, string&gt;;</code><br/><code>        readonly transforms: Record&lt;string, string&gt;;</code><br/><code>        readonly visualize: Record&lt;string, string&gt;;</code><br/><code>        readonly apis: Readonly&lt;{</code><br/><code>            bulkIndexAlias: string;</code><br/><code>            byteSizeUnits: string;</code><br/><code>            createAutoFollowPattern: string;</code><br/><code>            createFollower: string;</code><br/><code>            createIndex: string;</code><br/><code>            createSnapshotLifecyclePolicy: string;</code><br/><code>            createRoleMapping: string;</code><br/><code>            createRoleMappingTemplates: string;</code><br/><code>            createRollupJobsRequest: string;</code><br/><code>            createApiKey: string;</code><br/><code>            createPipeline: string;</code><br/><code>            createTransformRequest: string;</code><br/><code>            cronExpressions: string;</code><br/><code>            executeWatchActionModes: string;</code><br/><code>            indexExists: string;</code><br/><code>            openIndex: string;</code><br/><code>            putComponentTemplate: string;</code><br/><code>            painlessExecute: string;</code><br/><code>            painlessExecuteAPIContexts: string;</code><br/><code>            putComponentTemplateMetadata: string;</code><br/><code>            putSnapshotLifecyclePolicy: string;</code><br/><code>            putIndexTemplateV1: string;</code><br/><code>            putWatch: string;</code><br/><code>            simulatePipeline: string;</code><br/><code>            timeUnits: string;</code><br/><code>            updateTransform: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly observability: Readonly&lt;{</code><br/><code>            guide: string;</code><br/><code>            infrastructureThreshold: string;</code><br/><code>            logsThreshold: string;</code><br/><code>            metricsThreshold: string;</code><br/><code>            monitorStatus: string;</code><br/><code>            monitorUptime: string;</code><br/><code>            tlsCertificate: string;</code><br/><code>            uptimeDurationAnomaly: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly alerting: Record&lt;string, string&gt;;</code><br/><code>        readonly maps: Record&lt;string, string&gt;;</code><br/><code>        readonly monitoring: Record&lt;string, string&gt;;</code><br/><code>        readonly security: Readonly&lt;{</code><br/><code>            apiKeyServiceSettings: string;</code><br/><code>            clusterPrivileges: string;</code><br/><code>            elasticsearchSettings: string;</code><br/><code>            elasticsearchEnableSecurity: string;</code><br/><code>            indicesPrivileges: string;</code><br/><code>            kibanaTLS: string;</code><br/><code>            kibanaPrivileges: string;</code><br/><code>            mappingRoles: string;</code><br/><code>            mappingRolesFieldRules: string;</code><br/><code>            runAsPrivilege: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly spaces: Readonly&lt;{</code><br/><code>            kibanaLegacyUrlAliases: string;</code><br/><code>            kibanaDisableLegacyUrlAliasesApi: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly watcher: Record&lt;string, string&gt;;</code><br/><code>        readonly ccs: Record&lt;string, string&gt;;</code><br/><code>        readonly plugins: Record&lt;string, string&gt;;</code><br/><code>        readonly snapshotRestore: Record&lt;string, string&gt;;</code><br/><code>        readonly ingest: Record&lt;string, string&gt;;</code><br/><code>        readonly fleet: Readonly&lt;{</code><br/><code>            guide: string;</code><br/><code>            fleetServer: string;</code><br/><code>            fleetServerAddFleetServer: string;</code><br/><code>            settings: string;</code><br/><code>            settingsFleetServerHostSettings: string;</code><br/><code>            troubleshooting: string;</code><br/><code>            elasticAgent: string;</code><br/><code>            datastreams: string;</code><br/><code>            datastreamsNamingScheme: string;</code><br/><code>            upgradeElasticAgent: string;</code><br/><code>            upgradeElasticAgent712lower: string;</code><br/><code>            learnMoreBlog: string;</code><br/><code>            apiKeysLearnMore: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly ecs: {</code><br/><code>            readonly guide: string;</code><br/><code>        };</code><br/><code>        readonly clients: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly goOverview: string;</code><br/><code>            readonly javaIndex: string;</code><br/><code>            readonly jsIntro: string;</code><br/><code>            readonly netGuide: string;</code><br/><code>            readonly perlGuide: string;</code><br/><code>            readonly phpGuide: string;</code><br/><code>            readonly pythonGuide: string;</code><br/><code>            readonly rubyOverview: string;</code><br/><code>            readonly rustGuide: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.correctiveactions.md b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.correctiveactions.md
similarity index 66%
rename from docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.correctiveactions.md
rename to docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.correctiveactions.md
index d7d10651033bf..273945166735b 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.correctiveactions.md
+++ b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.correctiveactions.md
@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [DeprecationsDetails](./kibana-plugin-core-server.deprecationsdetails.md) &gt; [correctiveActions](./kibana-plugin-core-server.deprecationsdetails.correctiveactions.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [BaseDeprecationDetails](./kibana-plugin-core-server.basedeprecationdetails.md) &gt; [correctiveActions](./kibana-plugin-core-server.basedeprecationdetails.correctiveactions.md)
 
-## DeprecationsDetails.correctiveActions property
+## BaseDeprecationDetails.correctiveActions property
 
 corrective action needed to fix this deprecation.
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.deprecationtype.md b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.deprecationtype.md
similarity index 70%
rename from docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.deprecationtype.md
rename to docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.deprecationtype.md
index 3a76bc60ee630..072dfd17418f9 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.deprecationtype.md
+++ b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.deprecationtype.md
@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [DeprecationsDetails](./kibana-plugin-core-server.deprecationsdetails.md) &gt; [deprecationType](./kibana-plugin-core-server.deprecationsdetails.deprecationtype.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [BaseDeprecationDetails](./kibana-plugin-core-server.basedeprecationdetails.md) &gt; [deprecationType](./kibana-plugin-core-server.basedeprecationdetails.deprecationtype.md)
 
-## DeprecationsDetails.deprecationType property
+## BaseDeprecationDetails.deprecationType property
 
 (optional) Used to identify between different deprecation types. Example use case: in Upgrade Assistant, we may want to allow the user to sort by deprecation type or show each type in a separate tab.
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.documentationurl.md b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.documentationurl.md
similarity index 53%
rename from docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.documentationurl.md
rename to docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.documentationurl.md
index 457cf7b61dac8..c8f0762acdce6 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.documentationurl.md
+++ b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.documentationurl.md
@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [DeprecationsDetails](./kibana-plugin-core-server.deprecationsdetails.md) &gt; [documentationUrl](./kibana-plugin-core-server.deprecationsdetails.documentationurl.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [BaseDeprecationDetails](./kibana-plugin-core-server.basedeprecationdetails.md) &gt; [documentationUrl](./kibana-plugin-core-server.basedeprecationdetails.documentationurl.md)
 
-## DeprecationsDetails.documentationUrl property
+## BaseDeprecationDetails.documentationUrl property
 
 (optional) link to the documentation for more details on the deprecation.
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.level.md b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.level.md
similarity index 66%
rename from docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.level.md
rename to docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.level.md
index 64ad22e2c87fb..ad755805d00b9 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.level.md
+++ b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.level.md
@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [DeprecationsDetails](./kibana-plugin-core-server.deprecationsdetails.md) &gt; [level](./kibana-plugin-core-server.deprecationsdetails.level.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [BaseDeprecationDetails](./kibana-plugin-core-server.basedeprecationdetails.md) &gt; [level](./kibana-plugin-core-server.basedeprecationdetails.level.md)
 
-## DeprecationsDetails.level property
+## BaseDeprecationDetails.level property
 
 levels: - warning: will not break deployment upon upgrade - critical: needs to be addressed before upgrade. - fetch\_error: Deprecations service failed to grab the deprecation details for the domain.
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.md b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.md
new file mode 100644
index 0000000000000..3e47865062352
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.md
@@ -0,0 +1,26 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [BaseDeprecationDetails](./kibana-plugin-core-server.basedeprecationdetails.md)
+
+## BaseDeprecationDetails interface
+
+Base properties shared by all types of deprecations
+
+<b>Signature:</b>
+
+```typescript
+export interface BaseDeprecationDetails 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [correctiveActions](./kibana-plugin-core-server.basedeprecationdetails.correctiveactions.md) | <code>{</code><br/><code>        api?: {</code><br/><code>            path: string;</code><br/><code>            method: 'POST' &#124; 'PUT';</code><br/><code>            body?: {</code><br/><code>                [key: string]: any;</code><br/><code>            };</code><br/><code>            omitContextFromBody?: boolean;</code><br/><code>        };</code><br/><code>        manualSteps: string[];</code><br/><code>    }</code> | corrective action needed to fix this deprecation. |
+|  [deprecationType](./kibana-plugin-core-server.basedeprecationdetails.deprecationtype.md) | <code>'config' &#124; 'feature'</code> | (optional) Used to identify between different deprecation types. Example use case: in Upgrade Assistant, we may want to allow the user to sort by deprecation type or show each type in a separate tab.<!-- -->Feel free to add new types if necessary. Predefined types are necessary to reduce having similar definitions with different keywords across kibana deprecations. |
+|  [documentationUrl](./kibana-plugin-core-server.basedeprecationdetails.documentationurl.md) | <code>string</code> | (optional) link to the documentation for more details on the deprecation. |
+|  [level](./kibana-plugin-core-server.basedeprecationdetails.level.md) | <code>'warning' &#124; 'critical' &#124; 'fetch_error'</code> | levels: - warning: will not break deployment upon upgrade - critical: needs to be addressed before upgrade. - fetch\_error: Deprecations service failed to grab the deprecation details for the domain. |
+|  [message](./kibana-plugin-core-server.basedeprecationdetails.message.md) | <code>string</code> | The description message to be displayed for the deprecation. Check the README for writing deprecations in <code>src/core/server/deprecations/README.mdx</code> |
+|  [requireRestart](./kibana-plugin-core-server.basedeprecationdetails.requirerestart.md) | <code>boolean</code> | (optional) specify the fix for this deprecation requires a full kibana restart. |
+|  [title](./kibana-plugin-core-server.basedeprecationdetails.title.md) | <code>string</code> | The title of the deprecation. Check the README for writing deprecations in <code>src/core/server/deprecations/README.mdx</code> |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.message.md b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.message.md
similarity index 60%
rename from docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.message.md
rename to docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.message.md
index 906ce8118f95b..5802bc316cc08 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.message.md
+++ b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.message.md
@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [DeprecationsDetails](./kibana-plugin-core-server.deprecationsdetails.md) &gt; [message](./kibana-plugin-core-server.deprecationsdetails.message.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [BaseDeprecationDetails](./kibana-plugin-core-server.basedeprecationdetails.md) &gt; [message](./kibana-plugin-core-server.basedeprecationdetails.message.md)
 
-## DeprecationsDetails.message property
+## BaseDeprecationDetails.message property
 
 The description message to be displayed for the deprecation. Check the README for writing deprecations in `src/core/server/deprecations/README.mdx`
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.requirerestart.md b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.requirerestart.md
similarity index 54%
rename from docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.requirerestart.md
rename to docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.requirerestart.md
index 85bddd9436e73..3f589600d0458 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.requirerestart.md
+++ b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.requirerestart.md
@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [DeprecationsDetails](./kibana-plugin-core-server.deprecationsdetails.md) &gt; [requireRestart](./kibana-plugin-core-server.deprecationsdetails.requirerestart.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [BaseDeprecationDetails](./kibana-plugin-core-server.basedeprecationdetails.md) &gt; [requireRestart](./kibana-plugin-core-server.basedeprecationdetails.requirerestart.md)
 
-## DeprecationsDetails.requireRestart property
+## BaseDeprecationDetails.requireRestart property
 
 (optional) specify the fix for this deprecation requires a full kibana restart.
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.title.md b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.title.md
similarity index 59%
rename from docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.title.md
rename to docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.title.md
index e8907688f6e5e..b6788a4faa7c5 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.title.md
+++ b/docs/development/core/server/kibana-plugin-core-server.basedeprecationdetails.title.md
@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [DeprecationsDetails](./kibana-plugin-core-server.deprecationsdetails.md) &gt; [title](./kibana-plugin-core-server.deprecationsdetails.title.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [BaseDeprecationDetails](./kibana-plugin-core-server.basedeprecationdetails.md) &gt; [title](./kibana-plugin-core-server.basedeprecationdetails.title.md)
 
-## DeprecationsDetails.title property
+## BaseDeprecationDetails.title property
 
 The title of the deprecation. Check the README for writing deprecations in `src/core/server/deprecations/README.mdx`
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.configdeprecationdetails.configpath.md b/docs/development/core/server/kibana-plugin-core-server.configdeprecationdetails.configpath.md
new file mode 100644
index 0000000000000..7af6c16d86e4a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.configdeprecationdetails.configpath.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [ConfigDeprecationDetails](./kibana-plugin-core-server.configdeprecationdetails.md) &gt; [configPath](./kibana-plugin-core-server.configdeprecationdetails.configpath.md)
+
+## ConfigDeprecationDetails.configPath property
+
+<b>Signature:</b>
+
+```typescript
+configPath: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.configdeprecationdetails.deprecationtype.md b/docs/development/core/server/kibana-plugin-core-server.configdeprecationdetails.deprecationtype.md
new file mode 100644
index 0000000000000..fb3737062f986
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.configdeprecationdetails.deprecationtype.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [ConfigDeprecationDetails](./kibana-plugin-core-server.configdeprecationdetails.md) &gt; [deprecationType](./kibana-plugin-core-server.configdeprecationdetails.deprecationtype.md)
+
+## ConfigDeprecationDetails.deprecationType property
+
+<b>Signature:</b>
+
+```typescript
+deprecationType: 'config';
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.configdeprecationdetails.md b/docs/development/core/server/kibana-plugin-core-server.configdeprecationdetails.md
new file mode 100644
index 0000000000000..d1ccbb0b6164a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.configdeprecationdetails.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [ConfigDeprecationDetails](./kibana-plugin-core-server.configdeprecationdetails.md)
+
+## ConfigDeprecationDetails interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface ConfigDeprecationDetails extends BaseDeprecationDetails 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [configPath](./kibana-plugin-core-server.configdeprecationdetails.configpath.md) | <code>string</code> |  |
+|  [deprecationType](./kibana-plugin-core-server.configdeprecationdetails.deprecationtype.md) | <code>'config'</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.md b/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.md
index 2ff9f4b792f5d..d8ced1da62416 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.md
+++ b/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.md
@@ -2,24 +2,11 @@
 
 [Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [DeprecationsDetails](./kibana-plugin-core-server.deprecationsdetails.md)
 
-## DeprecationsDetails interface
+## DeprecationsDetails type
 
 
 <b>Signature:</b>
 
 ```typescript
-export interface DeprecationsDetails 
+export declare type DeprecationsDetails = ConfigDeprecationDetails | FeatureDeprecationDetails;
 ```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [correctiveActions](./kibana-plugin-core-server.deprecationsdetails.correctiveactions.md) | <code>{</code><br/><code>        api?: {</code><br/><code>            path: string;</code><br/><code>            method: 'POST' &#124; 'PUT';</code><br/><code>            body?: {</code><br/><code>                [key: string]: any;</code><br/><code>            };</code><br/><code>            omitContextFromBody?: boolean;</code><br/><code>        };</code><br/><code>        manualSteps: string[];</code><br/><code>    }</code> | corrective action needed to fix this deprecation. |
-|  [deprecationType](./kibana-plugin-core-server.deprecationsdetails.deprecationtype.md) | <code>'config' &#124; 'feature'</code> | (optional) Used to identify between different deprecation types. Example use case: in Upgrade Assistant, we may want to allow the user to sort by deprecation type or show each type in a separate tab.<!-- -->Feel free to add new types if necessary. Predefined types are necessary to reduce having similar definitions with different keywords across kibana deprecations. |
-|  [documentationUrl](./kibana-plugin-core-server.deprecationsdetails.documentationurl.md) | <code>string</code> | (optional) link to the documentation for more details on the deprecation. |
-|  [level](./kibana-plugin-core-server.deprecationsdetails.level.md) | <code>'warning' &#124; 'critical' &#124; 'fetch_error'</code> | levels: - warning: will not break deployment upon upgrade - critical: needs to be addressed before upgrade. - fetch\_error: Deprecations service failed to grab the deprecation details for the domain. |
-|  [message](./kibana-plugin-core-server.deprecationsdetails.message.md) | <code>string</code> | The description message to be displayed for the deprecation. Check the README for writing deprecations in <code>src/core/server/deprecations/README.mdx</code> |
-|  [requireRestart](./kibana-plugin-core-server.deprecationsdetails.requirerestart.md) | <code>boolean</code> | (optional) specify the fix for this deprecation requires a full kibana restart. |
-|  [title](./kibana-plugin-core-server.deprecationsdetails.title.md) | <code>string</code> | The title of the deprecation. Check the README for writing deprecations in <code>src/core/server/deprecations/README.mdx</code> |
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.featuredeprecationdetails.deprecationtype.md b/docs/development/core/server/kibana-plugin-core-server.featuredeprecationdetails.deprecationtype.md
new file mode 100644
index 0000000000000..b530874d3678b
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.featuredeprecationdetails.deprecationtype.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [FeatureDeprecationDetails](./kibana-plugin-core-server.featuredeprecationdetails.md) &gt; [deprecationType](./kibana-plugin-core-server.featuredeprecationdetails.deprecationtype.md)
+
+## FeatureDeprecationDetails.deprecationType property
+
+<b>Signature:</b>
+
+```typescript
+deprecationType?: 'feature' | undefined;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.featuredeprecationdetails.md b/docs/development/core/server/kibana-plugin-core-server.featuredeprecationdetails.md
new file mode 100644
index 0000000000000..bed3356e36129
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.featuredeprecationdetails.md
@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [FeatureDeprecationDetails](./kibana-plugin-core-server.featuredeprecationdetails.md)
+
+## FeatureDeprecationDetails interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface FeatureDeprecationDetails extends BaseDeprecationDetails 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [deprecationType](./kibana-plugin-core-server.featuredeprecationdetails.deprecationtype.md) | <code>'feature' &#124; undefined</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index 76b48358363e0..3970cf005abe4 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -53,9 +53,11 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [AuthRedirectedParams](./kibana-plugin-core-server.authredirectedparams.md) | Result of auth redirection. |
 |  [AuthResultParams](./kibana-plugin-core-server.authresultparams.md) | Result of successful authentication. |
 |  [AuthToolkit](./kibana-plugin-core-server.authtoolkit.md) | A tool set defining an outcome of Auth interceptor for incoming request. |
+|  [BaseDeprecationDetails](./kibana-plugin-core-server.basedeprecationdetails.md) | Base properties shared by all types of deprecations |
 |  [Capabilities](./kibana-plugin-core-server.capabilities.md) | The read-only set of capabilities available for the current UI session. Capabilities are simple key-value pairs of (string, boolean), where the string denotes the capability ID, and the boolean is a flag indicating if the capability is enabled or disabled. |
 |  [CapabilitiesSetup](./kibana-plugin-core-server.capabilitiessetup.md) | APIs to manage the [Capabilities](./kibana-plugin-core-server.capabilities.md) that will be used by the application.<!-- -->Plugins relying on capabilities to toggle some of their features should register them during the setup phase using the <code>registerProvider</code> method.<!-- -->Plugins having the responsibility to restrict capabilities depending on a given context should register their capabilities switcher using the <code>registerSwitcher</code> method.<!-- -->Refers to the methods documentation for complete description and examples. |
 |  [CapabilitiesStart](./kibana-plugin-core-server.capabilitiesstart.md) | APIs to access the application [Capabilities](./kibana-plugin-core-server.capabilities.md)<!-- -->. |
+|  [ConfigDeprecationDetails](./kibana-plugin-core-server.configdeprecationdetails.md) |  |
 |  [ContextSetup](./kibana-plugin-core-server.contextsetup.md) | An object that handles registration of context providers and configuring handlers with context. |
 |  [CorePreboot](./kibana-plugin-core-server.corepreboot.md) | Context passed to the <code>setup</code> method of <code>preboot</code> plugins. |
 |  [CoreSetup](./kibana-plugin-core-server.coresetup.md) | Context passed to the <code>setup</code> method of <code>standard</code> plugins. |
@@ -65,7 +67,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [CustomHttpResponseOptions](./kibana-plugin-core-server.customhttpresponseoptions.md) | HTTP response parameters for a response with adjustable status code. |
 |  [DeleteDocumentResponse](./kibana-plugin-core-server.deletedocumentresponse.md) |  |
 |  [DeprecationsClient](./kibana-plugin-core-server.deprecationsclient.md) | Server-side client that provides access to fetch all Kibana deprecations |
-|  [DeprecationsDetails](./kibana-plugin-core-server.deprecationsdetails.md) |  |
 |  [DeprecationSettings](./kibana-plugin-core-server.deprecationsettings.md) | UiSettings deprecation field options. |
 |  [DeprecationsServiceSetup](./kibana-plugin-core-server.deprecationsservicesetup.md) | The deprecations service provides a way for the Kibana platform to communicate deprecated features and configs with its users. These deprecations are only communicated if the deployment is using these features. Allowing for a user tailored experience for upgrading the stack version.<!-- -->The Deprecation service is consumed by the upgrade assistant to assist with the upgrade experience.<!-- -->If a deprecated feature can be resolved without manual user intervention. Using correctiveActions.api allows the Upgrade Assistant to use this api to correct the deprecation upon a user trigger. |
 |  [DiscoveredPlugin](./kibana-plugin-core-server.discoveredplugin.md) | Small container object used to expose information about discovered plugins that may or may not have been started. |
@@ -77,6 +78,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [ErrorHttpResponseOptions](./kibana-plugin-core-server.errorhttpresponseoptions.md) | HTTP response parameters |
 |  [ExecutionContextSetup](./kibana-plugin-core-server.executioncontextsetup.md) |  |
 |  [FakeRequest](./kibana-plugin-core-server.fakerequest.md) | Fake request object created manually by Kibana plugins. |
+|  [FeatureDeprecationDetails](./kibana-plugin-core-server.featuredeprecationdetails.md) |  |
 |  [GetDeprecationsContext](./kibana-plugin-core-server.getdeprecationscontext.md) |  |
 |  [GetResponse](./kibana-plugin-core-server.getresponse.md) |  |
 |  [HttpAuth](./kibana-plugin-core-server.httpauth.md) |  |
@@ -246,6 +248,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [AuthResult](./kibana-plugin-core-server.authresult.md) |  |
 |  [CapabilitiesProvider](./kibana-plugin-core-server.capabilitiesprovider.md) | See [CapabilitiesSetup](./kibana-plugin-core-server.capabilitiessetup.md) |
 |  [CapabilitiesSwitcher](./kibana-plugin-core-server.capabilitiesswitcher.md) | See [CapabilitiesSetup](./kibana-plugin-core-server.capabilitiessetup.md) |
+|  [DeprecationsDetails](./kibana-plugin-core-server.deprecationsdetails.md) |  |
 |  [DestructiveRouteMethod](./kibana-plugin-core-server.destructiveroutemethod.md) | Set of HTTP methods changing the state of the server. |
 |  [ElasticsearchClient](./kibana-plugin-core-server.elasticsearchclient.md) | Client used to query the elasticsearch cluster. |
 |  [ElasticsearchClientConfig](./kibana-plugin-core-server.elasticsearchclientconfig.md) | Configuration options to be used to create a [cluster client](./kibana-plugin-core-server.iclusterclient.md) using the [createClient API](./kibana-plugin-core-server.elasticsearchservicestart.createclient.md) |
diff --git a/packages/kbn-config/src/config_service.test.ts b/packages/kbn-config/src/config_service.test.ts
index e8fd7ab187596..4a8164b100626 100644
--- a/packages/kbn-config/src/config_service.test.ts
+++ b/packages/kbn-config/src/config_service.test.ts
@@ -382,6 +382,7 @@ test('logs deprecation if schema is not present and "enabled" is used', async ()
         "foo",
         Array [
           Object {
+            "configPath": "foo.enabled",
             "correctiveActions": Object {
               "manualSteps": Array [
                 "Remove \\"foo.enabled\\" from the Kibana config file, CLI flag, or environment variable (in Docker only) before upgrading to 8.0.0.",
@@ -452,10 +453,12 @@ test('logs deprecation warning during validation', async () => {
   mockApplyDeprecations.mockImplementationOnce((config, deprecations, createAddDeprecation) => {
     const addDeprecation = createAddDeprecation!('');
     addDeprecation({
+      configPath: 'test1',
       message: 'some deprecation message',
       correctiveActions: { manualSteps: ['do X'] },
     });
     addDeprecation({
+      configPath: 'test2',
       message: 'another deprecation message',
       correctiveActions: { manualSteps: ['do Y'] },
     });
@@ -521,11 +524,13 @@ test('does not log warnings for silent deprecations during validation', async ()
     .mockImplementationOnce((config, deprecations, createAddDeprecation) => {
       const addDeprecation = createAddDeprecation!('');
       addDeprecation({
+        configPath: 'test1',
         message: 'some deprecation message',
         correctiveActions: { manualSteps: ['do X'] },
         silent: true,
       });
       addDeprecation({
+        configPath: 'test2',
         message: 'another deprecation message',
         correctiveActions: { manualSteps: ['do Y'] },
       });
@@ -534,6 +539,7 @@ test('does not log warnings for silent deprecations during validation', async ()
     .mockImplementationOnce((config, deprecations, createAddDeprecation) => {
       const addDeprecation = createAddDeprecation!('');
       addDeprecation({
+        configPath: 'silent',
         message: 'I am silent',
         silent: true,
         correctiveActions: { manualSteps: ['do Z'] },
@@ -617,6 +623,7 @@ describe('getHandledDeprecatedConfigs', () => {
       deprecations.forEach((deprecation) => {
         const addDeprecation = createAddDeprecation!(deprecation.path);
         addDeprecation({
+          configPath: 'test1',
           message: `some deprecation message`,
           documentationUrl: 'some-url',
           correctiveActions: { manualSteps: ['do X'] },
@@ -633,6 +640,7 @@ describe('getHandledDeprecatedConfigs', () => {
           "base",
           Array [
             Object {
+              "configPath": "test1",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "do X",
diff --git a/packages/kbn-config/src/config_service.ts b/packages/kbn-config/src/config_service.ts
index 5103aa1a2d49d..458acac953497 100644
--- a/packages/kbn-config/src/config_service.ts
+++ b/packages/kbn-config/src/config_service.ts
@@ -184,6 +184,7 @@ export class ConfigService {
     if (validatedConfig?.enabled === undefined && isEnabled !== undefined) {
       const deprecationPath = pathToString(enabledPath);
       const deprecatedConfigDetails: DeprecatedConfigDetails = {
+        configPath: deprecationPath,
         title: `Setting "${deprecationPath}" is deprecated`,
         message: `Configuring "${deprecationPath}" is deprecated and will be removed in 8.0.0.`,
         correctiveActions: {
diff --git a/packages/kbn-config/src/deprecation/deprecation_factory.test.ts b/packages/kbn-config/src/deprecation/deprecation_factory.test.ts
index 415c8fb9f0610..d9fe90ff711ed 100644
--- a/packages/kbn-config/src/deprecation/deprecation_factory.test.ts
+++ b/packages/kbn-config/src/deprecation/deprecation_factory.test.ts
@@ -43,6 +43,7 @@ describe('DeprecationFactory', () => {
         Array [
           Array [
             Object {
+              "configPath": "myplugin.deprecated",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "Remove \\"myplugin.deprecated\\" from the Kibana config file, CLI flag, or environment variable (in Docker only) before upgrading to 8.0.0.",
@@ -79,6 +80,7 @@ describe('DeprecationFactory', () => {
         Array [
           Array [
             Object {
+              "configPath": "myplugin.section.deprecated",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "Remove \\"myplugin.section.deprecated\\" from the Kibana config file, CLI flag, or environment variable (in Docker only) before upgrading to 8.0.0.",
@@ -134,6 +136,7 @@ describe('DeprecationFactory', () => {
         Array [
           Array [
             Object {
+              "configPath": "myplugin.deprecated",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "Remove \\"myplugin.deprecated\\" from the Kibana config file, CLI flag, or environment variable (in Docker only) before upgrading to 8.0.0.",
@@ -197,6 +200,7 @@ describe('DeprecationFactory', () => {
         Array [
           Array [
             Object {
+              "configPath": "myplugin.deprecated",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "Replace \\"myplugin.deprecated\\" with \\"myplugin.renamed\\" in the Kibana config file, CLI flag, or environment variable (in Docker only).",
@@ -254,6 +258,7 @@ describe('DeprecationFactory', () => {
         Array [
           Array [
             Object {
+              "configPath": "myplugin.oldsection.deprecated",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "Replace \\"myplugin.oldsection.deprecated\\" with \\"myplugin.newsection.renamed\\" in the Kibana config file, CLI flag, or environment variable (in Docker only).",
@@ -286,6 +291,7 @@ describe('DeprecationFactory', () => {
         Array [
           Array [
             Object {
+              "configPath": "myplugin.deprecated",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "Make sure \\"myplugin.renamed\\" contains the correct value in the config file, CLI flag, or environment variable (in Docker only).",
@@ -331,6 +337,7 @@ describe('DeprecationFactory', () => {
         Array [
           Array [
             Object {
+              "configPath": "myplugin.deprecated",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "Replace \\"myplugin.deprecated\\" with \\"myplugin.renamed\\" in the Kibana config file, CLI flag, or environment variable (in Docker only).",
@@ -373,6 +380,7 @@ describe('DeprecationFactory', () => {
         Array [
           Array [
             Object {
+              "configPath": "oldplugin.deprecated",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "Replace \\"oldplugin.deprecated\\" with \\"newplugin.renamed\\" in the Kibana config file, CLI flag, or environment variable (in Docker only).",
@@ -427,6 +435,7 @@ describe('DeprecationFactory', () => {
         Array [
           Array [
             Object {
+              "configPath": "myplugin.deprecated",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "Make sure \\"myplugin.renamed\\" contains the correct value in the config file, CLI flag, or environment variable (in Docker only).",
@@ -461,6 +470,7 @@ describe('DeprecationFactory', () => {
         Array [
           Array [
             Object {
+              "configPath": "myplugin.deprecated",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "Remove \\"myplugin.deprecated\\" from the Kibana config file, CLI flag, or environment variable (in Docker only).",
@@ -494,6 +504,7 @@ describe('DeprecationFactory', () => {
         Array [
           Array [
             Object {
+              "configPath": "myplugin.section.deprecated",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "Remove \\"myplugin.section.deprecated\\" from the Kibana config file, CLI flag, or environment variable (in Docker only).",
@@ -546,6 +557,7 @@ describe('DeprecationFactory', () => {
         Array [
           Array [
             Object {
+              "configPath": "myplugin.deprecated",
               "correctiveActions": Object {
                 "manualSteps": Array [
                   "Remove \\"myplugin.deprecated\\" from the Kibana config file, CLI flag, or environment variable (in Docker only).",
diff --git a/packages/kbn-config/src/deprecation/deprecation_factory.ts b/packages/kbn-config/src/deprecation/deprecation_factory.ts
index 1d61733715bd9..ea4db280e915b 100644
--- a/packages/kbn-config/src/deprecation/deprecation_factory.ts
+++ b/packages/kbn-config/src/deprecation/deprecation_factory.ts
@@ -37,6 +37,7 @@ const _deprecate = (
     return;
   }
   addDeprecation({
+    configPath: fullPath,
     title: getDeprecationTitle(fullPath),
     message: i18n.translate('kbnConfig.deprecations.deprecatedSettingMessage', {
       defaultMessage: 'Configuring "{fullPath}" is deprecated and will be removed in {removeBy}.',
@@ -73,6 +74,7 @@ const _rename = (
   const newValue = get(config, fullNewPath);
   if (newValue === undefined) {
     addDeprecation({
+      configPath: fullOldPath,
       title: getDeprecationTitle(fullOldPath),
       message: i18n.translate('kbnConfig.deprecations.replacedSettingMessage', {
         defaultMessage: `Setting "{fullOldPath}" has been replaced by "{fullNewPath}"`,
@@ -95,6 +97,7 @@ const _rename = (
     };
   } else {
     addDeprecation({
+      configPath: fullOldPath,
       title: getDeprecationTitle(fullOldPath),
       message: i18n.translate('kbnConfig.deprecations.conflictSettingMessage', {
         defaultMessage:
@@ -135,6 +138,7 @@ const _unused = (
     return;
   }
   addDeprecation({
+    configPath: fullPath,
     title: getDeprecationTitle(fullPath),
     message: i18n.translate('kbnConfig.deprecations.unusedSettingMessage', {
       defaultMessage: 'You no longer need to configure "{fullPath}".',
diff --git a/packages/kbn-config/src/deprecation/types.ts b/packages/kbn-config/src/deprecation/types.ts
index 12b561aa2b1b9..f5bb240f5cc43 100644
--- a/packages/kbn-config/src/deprecation/types.ts
+++ b/packages/kbn-config/src/deprecation/types.ts
@@ -20,6 +20,8 @@ export type AddConfigDeprecation = (details: DeprecatedConfigDetails) => void;
  * @public
  */
 export interface DeprecatedConfigDetails {
+  /** The path of the deprecated config setting */
+  configPath: string;
   /** The title to be displayed for the deprecation. */
   title?: string;
   /** The message to be displayed for the deprecation. */
@@ -30,7 +32,7 @@ export interface DeprecatedConfigDetails {
    * - critical: needs to be addressed before upgrade.
    */
   level?: 'warning' | 'critical';
-  /** (optional) set false to prevent the config service from logging the deprecation message. */
+  /** (optional) set to `true` to prevent the config service from logging the deprecation message. */
   silent?: boolean;
   /** (optional) link to the documentation for more details on the deprecation. */
   documentationUrl?: string;
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 50c9bcf925969..4c7f8aab5b767 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -732,10 +732,9 @@ export interface DocLinksStart {
 // Warning: (ae-forgotten-export) The symbol "DeprecationsDetails" needs to be exported by the entry point index.d.ts
 //
 // @internal (undocumented)
-export interface DomainDeprecationDetails extends DeprecationsDetails {
-    // (undocumented)
+export type DomainDeprecationDetails = DeprecationsDetails & {
     domainId: string;
-}
+};
 
 export { EnvironmentMode }
 
diff --git a/src/core/server/config/deprecation/core_deprecations.ts b/src/core/server/config/deprecation/core_deprecations.ts
index 79fb2aac60da4..2c30ab490db65 100644
--- a/src/core/server/config/deprecation/core_deprecations.ts
+++ b/src/core/server/config/deprecation/core_deprecations.ts
@@ -11,6 +11,8 @@ import { ConfigDeprecationProvider, ConfigDeprecation } from '@kbn/config';
 const rewriteBasePathDeprecation: ConfigDeprecation = (settings, fromPath, addDeprecation) => {
   if (settings.server?.basePath && !settings.server?.rewriteBasePath) {
     addDeprecation({
+      configPath: 'server.basePath',
+      title: 'Setting "server.rewriteBasePath" should be set when using "server.basePath"',
       message:
         'You should set server.basePath along with server.rewriteBasePath. Starting in 7.0, Kibana ' +
         'will expect that all requests start with server.basePath rather than expecting you to rewrite ' +
@@ -31,6 +33,8 @@ const rewriteCorsSettings: ConfigDeprecation = (settings, fromPath, addDeprecati
   const corsSettings = settings.server?.cors;
   if (typeof corsSettings === 'boolean') {
     addDeprecation({
+      configPath: 'server.cors',
+      title: 'Setting "server.cors" is deprecated',
       message: '"server.cors" is deprecated and has been replaced by "server.cors.enabled"',
       level: 'warning',
       correctiveActions: {
diff --git a/src/core/server/deprecations/deprecation_config.ts b/src/core/server/deprecations/deprecation_config.ts
new file mode 100644
index 0000000000000..fb5ff7e5957f5
--- /dev/null
+++ b/src/core/server/deprecations/deprecation_config.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 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, TypeOf } from '@kbn/config-schema';
+import { ServiceConfigDescriptor } from '../internal_types';
+
+const configSchema = schema.object({
+  // `deprecation.skip_deprecated_settings` is consistent with the equivalent ES feature and config property
+  skip_deprecated_settings: schema.arrayOf(schema.string(), { defaultValue: [] }),
+});
+
+export type DeprecationConfigType = TypeOf<typeof configSchema>;
+
+export const config: ServiceConfigDescriptor<DeprecationConfigType> = {
+  path: 'deprecation',
+  schema: configSchema,
+};
diff --git a/src/core/server/deprecations/deprecations_factory.test.ts b/src/core/server/deprecations/deprecations_factory.test.ts
index 85ef521538b15..9a67c6dc36dd2 100644
--- a/src/core/server/deprecations/deprecations_factory.test.ts
+++ b/src/core/server/deprecations/deprecations_factory.test.ts
@@ -7,20 +7,26 @@
  */
 
 import type { GetDeprecationsContext } from './types';
-import { DeprecationsFactory } from './deprecations_factory';
+import { DeprecationsFactory, DeprecationsFactoryConfig } from './deprecations_factory';
 import { loggerMock } from '../logging/logger.mock';
+import { DeprecationsDetails } from './types';
 
 describe('DeprecationsFactory', () => {
-  const logger = loggerMock.create();
+  let logger: ReturnType<typeof loggerMock.create>;
+  let config: DeprecationsFactoryConfig;
+
   beforeEach(() => {
-    loggerMock.clear(logger);
+    logger = loggerMock.create();
+    config = {
+      ignoredConfigDeprecations: [],
+    };
   });
 
   describe('getRegistry', () => {
     const domainId = 'test-plugin';
 
     it('creates a registry for a domainId', async () => {
-      const deprecationsFactory = new DeprecationsFactory({ logger });
+      const deprecationsFactory = new DeprecationsFactory({ logger, config });
       const registry = deprecationsFactory.getRegistry(domainId);
 
       expect(registry).toHaveProperty('registerDeprecations');
@@ -28,7 +34,7 @@ describe('DeprecationsFactory', () => {
     });
 
     it('creates one registry for a domainId', async () => {
-      const deprecationsFactory = new DeprecationsFactory({ logger });
+      const deprecationsFactory = new DeprecationsFactory({ logger, config });
       const registry = deprecationsFactory.getRegistry(domainId);
       const sameRegistry = deprecationsFactory.getRegistry(domainId);
 
@@ -36,7 +42,7 @@ describe('DeprecationsFactory', () => {
     });
 
     it('returns a registered registry', () => {
-      const deprecationsFactory = new DeprecationsFactory({ logger });
+      const deprecationsFactory = new DeprecationsFactory({ logger, config });
       const mockRegistry = 'mock-reg';
       const mockRegistries = {
         set: jest.fn(),
@@ -61,7 +67,7 @@ describe('DeprecationsFactory', () => {
     } as unknown as GetDeprecationsContext;
 
     it('returns a flattened array of deprecations', async () => {
-      const deprecationsFactory = new DeprecationsFactory({ logger });
+      const deprecationsFactory = new DeprecationsFactory({ logger, config });
       const mockPluginDeprecationsInfo = [
         {
           message: 'mockPlugin message',
@@ -97,8 +103,8 @@ describe('DeprecationsFactory', () => {
         getDeprecations: jest.fn().mockResolvedValue(anotherMockPluginDeprecationsInfo),
       });
 
-      const derpecations = await deprecationsFactory.getAllDeprecations(mockDependencies);
-      expect(derpecations).toStrictEqual(
+      const deprecations = await deprecationsFactory.getAllDeprecations(mockDependencies);
+      expect(deprecations).toStrictEqual(
         [
           mockPluginDeprecationsInfo.map((info) => ({ ...info, domainId: 'mockPlugin' })),
           anotherMockPluginDeprecationsInfo.map((info) => ({
@@ -110,7 +116,7 @@ describe('DeprecationsFactory', () => {
     });
 
     it(`returns a failure message for failed getDeprecations functions`, async () => {
-      const deprecationsFactory = new DeprecationsFactory({ logger });
+      const deprecationsFactory = new DeprecationsFactory({ logger, config });
       const domainId = 'mockPlugin';
       const mockError = new Error();
 
@@ -142,7 +148,7 @@ describe('DeprecationsFactory', () => {
     });
 
     it(`returns successful results even when some getDeprecations fail`, async () => {
-      const deprecationsFactory = new DeprecationsFactory({ logger });
+      const deprecationsFactory = new DeprecationsFactory({ logger, config });
       const mockPluginRegistry = deprecationsFactory.getRegistry('mockPlugin');
       const anotherMockPluginRegistry = deprecationsFactory.getRegistry('anotherMockPlugin');
       const mockError = new Error();
@@ -161,14 +167,14 @@ describe('DeprecationsFactory', () => {
       anotherMockPluginRegistry.registerDeprecations({
         getDeprecations: jest.fn().mockRejectedValue(mockError),
       });
-      const derpecations = await deprecationsFactory.getAllDeprecations(mockDependencies);
+      const deprecations = await deprecationsFactory.getAllDeprecations(mockDependencies);
 
       expect(logger.warn).toBeCalledTimes(1);
       expect(logger.warn).toBeCalledWith(
         `Failed to get deprecations info for plugin "anotherMockPlugin".`,
         mockError
       );
-      expect(derpecations).toStrictEqual([
+      expect(deprecations).toStrictEqual([
         ...mockPluginDeprecationsInfo.map((info) => ({ ...info, domainId: 'mockPlugin' })),
         {
           domainId: 'anotherMockPlugin',
@@ -181,6 +187,123 @@ describe('DeprecationsFactory', () => {
         },
       ]);
     });
+
+    it('excludes config deprecations explicitly ignored via `ignoredConfigDeprecations`', async () => {
+      const deprecationsFactory = new DeprecationsFactory({
+        logger,
+        config: {
+          ignoredConfigDeprecations: ['mockPlugin.foo', 'anotherMockPlugin.bar'],
+        },
+      });
+      const mockPluginDeprecationsInfo: DeprecationsDetails[] = [
+        {
+          configPath: 'mockPlugin.foo',
+          title: 'mockPlugin.foo is deprecated',
+          message: 'mockPlugin.foo is deprecated and will be removed in a future Kibana version',
+          level: 'critical',
+          deprecationType: 'config',
+          correctiveActions: {
+            manualSteps: ['come on', 'do something'],
+          },
+        },
+        {
+          configPath: 'mockPlugin.bar',
+          title: 'mockPlugin.bar is deprecated',
+          message: 'mockPlugin.bar is deprecated and will be removed in a future Kibana version',
+          level: 'critical',
+          deprecationType: 'config',
+          correctiveActions: {
+            manualSteps: ['come on', 'do something'],
+          },
+        },
+      ];
+      const anotherMockPluginDeprecationsInfo: DeprecationsDetails[] = [
+        {
+          configPath: 'anotherMockPlugin.foo',
+          title: 'anotherMockPlugin.foo is deprecated',
+          message:
+            'anotherMockPlugin.foo is deprecated and will be removed in a future Kibana version',
+          level: 'critical',
+          deprecationType: 'config',
+          correctiveActions: {
+            manualSteps: ['come on', 'do something'],
+          },
+        },
+        {
+          configPath: 'anotherMockPlugin.bar',
+          title: 'anotherMockPlugin.bar is deprecated',
+          message:
+            'anotherMockPlugin.bar is deprecated and will be removed in a future Kibana version',
+          level: 'critical',
+          deprecationType: 'config',
+          correctiveActions: {
+            manualSteps: ['come on', 'do something'],
+          },
+        },
+      ];
+
+      const mockPluginRegistry = deprecationsFactory.getRegistry('mockPlugin');
+      mockPluginRegistry.registerDeprecations({
+        getDeprecations: jest.fn().mockResolvedValue(mockPluginDeprecationsInfo),
+      });
+
+      const anotherMockPluginRegistry = deprecationsFactory.getRegistry('anotherMockPlugin');
+      anotherMockPluginRegistry.registerDeprecations({
+        getDeprecations: jest.fn().mockResolvedValue(anotherMockPluginDeprecationsInfo),
+      });
+
+      const deprecations = await deprecationsFactory.getAllDeprecations(mockDependencies);
+
+      expect(deprecations).toHaveLength(2);
+      expect(deprecations).toEqual([
+        expect.objectContaining({
+          configPath: 'mockPlugin.bar',
+          title: 'mockPlugin.bar is deprecated',
+        }),
+        expect.objectContaining({
+          configPath: 'anotherMockPlugin.foo',
+          title: 'anotherMockPlugin.foo is deprecated',
+        }),
+      ]);
+    });
+
+    it('does not throw when configured with paths not matching any deprecation', async () => {
+      const deprecationsFactory = new DeprecationsFactory({
+        logger,
+        config: {
+          ignoredConfigDeprecations: ['unknown.bar'],
+        },
+      });
+      const mockPluginDeprecationsInfo: DeprecationsDetails[] = [
+        {
+          configPath: 'mockPlugin.foo',
+          title: 'mockPlugin.foo is deprecated',
+          message: 'mockPlugin.foo is deprecated and will be removed in a future Kibana version',
+          level: 'critical',
+          deprecationType: 'config',
+          correctiveActions: {
+            manualSteps: ['come on', 'do something'],
+          },
+        },
+        {
+          configPath: 'mockPlugin.bar',
+          title: 'mockPlugin.bar is deprecated',
+          message: 'mockPlugin.bar is deprecated and will be removed in a future Kibana version',
+          level: 'critical',
+          deprecationType: 'config',
+          correctiveActions: {
+            manualSteps: ['come on', 'do something'],
+          },
+        },
+      ];
+
+      const mockPluginRegistry = deprecationsFactory.getRegistry('mockPlugin');
+      mockPluginRegistry.registerDeprecations({
+        getDeprecations: jest.fn().mockResolvedValue(mockPluginDeprecationsInfo),
+      });
+
+      await expect(deprecationsFactory.getAllDeprecations(mockDependencies)).resolves.toBeDefined();
+    });
   });
 
   describe('getDeprecations', () => {
@@ -190,7 +313,7 @@ describe('DeprecationsFactory', () => {
     } as unknown as GetDeprecationsContext;
 
     it('returns a flattened array of DeprecationInfo', async () => {
-      const deprecationsFactory = new DeprecationsFactory({ logger });
+      const deprecationsFactory = new DeprecationsFactory({ logger, config });
       const deprecationsRegistry = deprecationsFactory.getRegistry('mockPlugin');
       const deprecationsBody = [
         {
@@ -215,40 +338,62 @@ describe('DeprecationsFactory', () => {
         getDeprecations: jest.fn().mockResolvedValue(deprecationsBody),
       });
 
-      const derpecations = await deprecationsFactory.getDeprecations(
+      const deprecations = await deprecationsFactory.getDeprecations(
         'mockPlugin',
         mockDependencies
       );
-      expect(derpecations).toStrictEqual(
+      expect(deprecations).toStrictEqual(
         deprecationsBody.flat().map((body) => ({ ...body, domainId: 'mockPlugin' }))
       );
     });
 
-    it('removes empty entries from the returned array', async () => {
-      const deprecationsFactory = new DeprecationsFactory({ logger });
+    it('excludes config deprecations explicitly ignored via `ignoredConfigDeprecations`', async () => {
+      const deprecationsFactory = new DeprecationsFactory({
+        logger,
+        config: {
+          ignoredConfigDeprecations: ['test.foo'],
+        },
+      });
       const deprecationsRegistry = deprecationsFactory.getRegistry('mockPlugin');
-      const deprecationsBody = [
+      const deprecationsBody: DeprecationsDetails[] = [
         {
-          message: 'mockPlugin message',
+          configPath: 'test.foo',
+          title: 'test.foo is deprecated',
+          message: 'test.foo is deprecated and will be removed in a future Kibana version',
           level: 'critical',
+          deprecationType: 'config',
           correctiveActions: {
-            manualSteps: ['mockPlugin step 1', 'mockPlugin step 2'],
+            manualSteps: ['come on', 'do something'],
+          },
+        },
+        {
+          configPath: 'test.bar',
+          title: 'test.bar is deprecated',
+          message: 'test.bar is deprecated and will be removed in a future Kibana version',
+          level: 'critical',
+          deprecationType: 'config',
+          correctiveActions: {
+            manualSteps: ['come on', 'do something'],
           },
         },
-        [undefined],
-        undefined,
       ];
 
       deprecationsRegistry.registerDeprecations({
         getDeprecations: jest.fn().mockResolvedValue(deprecationsBody),
       });
 
-      const derpecations = await deprecationsFactory.getDeprecations(
+      const deprecations = await deprecationsFactory.getDeprecations(
         'mockPlugin',
         mockDependencies
       );
-      expect(derpecations).toHaveLength(1);
-      expect(derpecations).toStrictEqual([{ ...deprecationsBody[0], domainId: 'mockPlugin' }]);
+      expect(deprecations).toHaveLength(1);
+      expect(deprecations[0]).toEqual(
+        expect.objectContaining({
+          deprecationType: 'config',
+          configPath: 'test.bar',
+          title: 'test.bar is deprecated',
+        })
+      );
     });
   });
 });
diff --git a/src/core/server/deprecations/deprecations_factory.ts b/src/core/server/deprecations/deprecations_factory.ts
index 9905f0b26b4f3..ad28af2db528e 100644
--- a/src/core/server/deprecations/deprecations_factory.ts
+++ b/src/core/server/deprecations/deprecations_factory.ts
@@ -17,13 +17,21 @@ import type {
 
 export interface DeprecationsFactoryDeps {
   logger: Logger;
+  config: DeprecationsFactoryConfig;
+}
+
+export interface DeprecationsFactoryConfig {
+  ignoredConfigDeprecations: string[];
 }
 
 export class DeprecationsFactory {
   private readonly registries: Map<string, DeprecationsRegistry> = new Map();
   private readonly logger: Logger;
-  constructor({ logger }: DeprecationsFactoryDeps) {
+  private readonly config: DeprecationsFactoryConfig;
+
+  constructor({ logger, config }: DeprecationsFactoryDeps) {
     this.logger = logger;
+    this.config = config;
   }
 
   public getRegistry = (domainId: string): DeprecationsRegistry => {
@@ -41,7 +49,7 @@ export class DeprecationsFactory {
     dependencies: GetDeprecationsContext
   ): Promise<DomainDeprecationDetails[]> => {
     const infoBody = await this.getDeprecationsBody(domainId, dependencies);
-    return this.createDeprecationInfo(domainId, infoBody).flat();
+    return this.createDeprecationInfo(domainId, infoBody);
   };
 
   public getAllDeprecations = async (
@@ -63,13 +71,10 @@ export class DeprecationsFactory {
     domainId: string,
     deprecationInfoBody: DeprecationsDetails[]
   ): DomainDeprecationDetails[] => {
-    return deprecationInfoBody
-      .flat()
-      .filter(Boolean)
-      .map((pluginDeprecation) => ({
-        ...pluginDeprecation,
-        domainId,
-      }));
+    return deprecationInfoBody.map((pluginDeprecation) => ({
+      ...pluginDeprecation,
+      domainId,
+    }));
   };
 
   private getDeprecationsBody = async (
@@ -113,7 +118,7 @@ export class DeprecationsFactory {
           ];
         }
 
-        return settledResult.value;
+        return filterIgnoredDeprecations(settledResult.value.flat(), this.config);
       });
     } catch (err) {
       this.logger.warn(`Failed to get deprecations info for plugin "${domainId}".`, err);
@@ -121,3 +126,15 @@ export class DeprecationsFactory {
     }
   };
 }
+
+const filterIgnoredDeprecations = (
+  deprecations: DeprecationsDetails[],
+  config: DeprecationsFactoryConfig
+): DeprecationsDetails[] => {
+  return deprecations.filter((deprecation) => {
+    if (deprecation.deprecationType === 'config') {
+      return !config.ignoredConfigDeprecations.includes(deprecation.configPath);
+    }
+    return true;
+  });
+};
diff --git a/src/core/server/deprecations/deprecations_service.mock.ts b/src/core/server/deprecations/deprecations_service.mock.ts
index 2f9c8bade6405..c274c4409cce2 100644
--- a/src/core/server/deprecations/deprecations_service.mock.ts
+++ b/src/core/server/deprecations/deprecations_service.mock.ts
@@ -50,7 +50,7 @@ const createDeprecationsServiceMock = () => {
     stop: jest.fn(),
   };
 
-  mocked.setup.mockReturnValue(createInternalSetupContractMock());
+  mocked.setup.mockResolvedValue(createInternalSetupContractMock());
   return mocked;
 };
 
diff --git a/src/core/server/deprecations/deprecations_service.test.mocks.ts b/src/core/server/deprecations/deprecations_service.test.mocks.ts
new file mode 100644
index 0000000000000..3174698725f96
--- /dev/null
+++ b/src/core/server/deprecations/deprecations_service.test.mocks.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 { mockDeprecationsFactory } from './deprecations_factory.mock';
+
+export const mockedDeprecationFactoryInstance = mockDeprecationsFactory.create();
+export const DeprecationsFactoryMock = jest
+  .fn()
+  .mockImplementation(() => mockedDeprecationFactoryInstance);
+
+jest.doMock('./deprecations_factory', () => ({
+  DeprecationsFactory: DeprecationsFactoryMock,
+}));
diff --git a/src/core/server/deprecations/deprecations_service.test.ts b/src/core/server/deprecations/deprecations_service.test.ts
index dfc1c852f773e..a058ac38d5b01 100644
--- a/src/core/server/deprecations/deprecations_service.test.ts
+++ b/src/core/server/deprecations/deprecations_service.test.ts
@@ -6,42 +6,69 @@
  * Side Public License, v 1.
  */
 
+import { DeprecationsFactoryMock } from './deprecations_service.test.mocks';
+
 /* eslint-disable dot-notation */
-import { DeprecationsService } from './deprecations_service';
+import { DeprecationsService, DeprecationsSetupDeps } from './deprecations_service';
 import { httpServiceMock } from '../http/http_service.mock';
-import { mockRouter } from '../http/router/router.mock';
-import { savedObjectsClientMock, elasticsearchServiceMock } from '../mocks';
+import { savedObjectsClientMock, elasticsearchServiceMock, configServiceMock } from '../mocks';
 import { mockCoreContext } from '../core_context.mock';
 import { mockDeprecationsFactory } from './deprecations_factory.mock';
 import { mockDeprecationsRegistry } from './deprecations_registry.mock';
 
 describe('DeprecationsService', () => {
-  const coreContext = mockCoreContext.create();
-  const http = httpServiceMock.createInternalSetupContract();
-  const router = mockRouter.create();
-  http.createRouter.mockReturnValue(router);
-  const deprecationsCoreSetupDeps = { http };
+  let coreContext: ReturnType<typeof mockCoreContext.create>;
+  let http: ReturnType<typeof httpServiceMock.createInternalSetupContract>;
+  let router: ReturnType<typeof httpServiceMock.createRouter>;
+  let deprecationsCoreSetupDeps: DeprecationsSetupDeps;
+
+  beforeEach(() => {
+    const configService = configServiceMock.create({
+      atPath: { skip_deprecated_settings: ['hello', 'world'] },
+    });
+    coreContext = mockCoreContext.create({ configService });
+    http = httpServiceMock.createInternalSetupContract();
+    router = httpServiceMock.createRouter();
+    http.createRouter.mockReturnValue(router);
+    deprecationsCoreSetupDeps = { http };
+  });
 
-  beforeEach(() => jest.clearAllMocks());
+  afterEach(() => {
+    jest.clearAllMocks();
+    DeprecationsFactoryMock.mockClear();
+  });
 
   describe('#setup', () => {
-    it('registers routes', () => {
+    it('registers routes', async () => {
       const deprecationsService = new DeprecationsService(coreContext);
-      deprecationsService.setup(deprecationsCoreSetupDeps);
-      // Registers correct base api path
+      await deprecationsService.setup(deprecationsCoreSetupDeps);
+      // registers correct base api path
       expect(http.createRouter).toBeCalledWith('/api/deprecations');
       // registers get route '/'
       expect(router.get).toHaveBeenCalledTimes(1);
       expect(router.get).toHaveBeenCalledWith({ path: '/', validate: false }, expect.any(Function));
     });
 
-    it('calls registerConfigDeprecationsInfo', () => {
+    it('calls registerConfigDeprecationsInfo', async () => {
       const deprecationsService = new DeprecationsService(coreContext);
       const mockRegisterConfigDeprecationsInfo = jest.fn();
       deprecationsService['registerConfigDeprecationsInfo'] = mockRegisterConfigDeprecationsInfo;
-      deprecationsService.setup(deprecationsCoreSetupDeps);
+      await deprecationsService.setup(deprecationsCoreSetupDeps);
       expect(mockRegisterConfigDeprecationsInfo).toBeCalledTimes(1);
     });
+
+    it('creates DeprecationsFactory with the correct parameters', async () => {
+      const deprecationsService = new DeprecationsService(coreContext);
+      await deprecationsService.setup(deprecationsCoreSetupDeps);
+
+      expect(DeprecationsFactoryMock).toHaveBeenCalledTimes(1);
+      expect(DeprecationsFactoryMock).toHaveBeenCalledWith({
+        logger: expect.any(Object),
+        config: {
+          ignoredConfigDeprecations: ['hello', 'world'],
+        },
+      });
+    });
   });
 
   describe('#start', () => {
@@ -51,7 +78,7 @@ describe('DeprecationsService', () => {
         const savedObjectsClient = savedObjectsClientMock.create();
         const deprecationsService = new DeprecationsService(coreContext);
 
-        deprecationsService.setup(deprecationsCoreSetupDeps);
+        await deprecationsService.setup(deprecationsCoreSetupDeps);
 
         const start = deprecationsService.start();
         const deprecationsClient = start.asScopedToClient(esClient, savedObjectsClient);
@@ -73,6 +100,7 @@ describe('DeprecationsService', () => {
           'testDomain',
           [
             {
+              configPath: 'test',
               message: 'testMessage',
               documentationUrl: 'testDocUrl',
               correctiveActions: {
@@ -100,6 +128,7 @@ describe('DeprecationsService', () => {
       expect(configDeprecations).toMatchInlineSnapshot(`
         Array [
           Object {
+            "configPath": "test",
             "correctiveActions": Object {
               "manualSteps": Array [
                 "Using Kibana user management, change all users using the kibana_user role to the kibana_admin role.",
@@ -124,6 +153,7 @@ describe('DeprecationsService', () => {
           'testDomain',
           [
             {
+              configPath: 'test',
               message: 'testMessage',
               level: 'warning',
               correctiveActions: {
diff --git a/src/core/server/deprecations/deprecations_service.ts b/src/core/server/deprecations/deprecations_service.ts
index cfc0aae443d1b..0c3fd75987aa6 100644
--- a/src/core/server/deprecations/deprecations_service.ts
+++ b/src/core/server/deprecations/deprecations_service.ts
@@ -6,11 +6,14 @@
  * Side Public License, v 1.
  */
 
+import { take } from 'rxjs/operators';
+
 import { DeprecationsFactory } from './deprecations_factory';
 import { DomainDeprecationDetails, RegisterDeprecationsConfig } from './types';
 import { registerRoutes } from './routes';
-
+import { config as deprecationConfig, DeprecationConfigType } from './deprecation_config';
 import { CoreContext } from '../core_context';
+import { IConfigService } from '../config';
 import { CoreService } from '../../types';
 import { InternalHttpServiceSetup } from '../http';
 import { Logger } from '../logging';
@@ -103,6 +106,7 @@ export interface DeprecationsServiceSetup {
 export interface DeprecationsClient {
   getAllDeprecations: () => Promise<DomainDeprecationDetails[]>;
 }
+
 export interface InternalDeprecationsServiceStart {
   /**
    * Creates a {@link DeprecationsClient} with provided SO client and ES client.
@@ -129,22 +133,33 @@ export class DeprecationsService
   implements CoreService<InternalDeprecationsServiceSetup, InternalDeprecationsServiceStart>
 {
   private readonly logger: Logger;
-  private readonly deprecationsFactory: DeprecationsFactory;
+  private readonly configService: IConfigService;
+  private deprecationsFactory?: DeprecationsFactory;
 
-  constructor(private readonly coreContext: Pick<CoreContext, 'logger' | 'configService'>) {
+  constructor(coreContext: Pick<CoreContext, 'logger' | 'configService'>) {
     this.logger = coreContext.logger.get('deprecations-service');
-    this.deprecationsFactory = new DeprecationsFactory({
-      logger: this.logger,
-    });
+    this.configService = coreContext.configService;
   }
 
-  public setup({ http }: DeprecationsSetupDeps): InternalDeprecationsServiceSetup {
+  public async setup({ http }: DeprecationsSetupDeps): Promise<InternalDeprecationsServiceSetup> {
     this.logger.debug('Setting up Deprecations service');
-    const deprecationsFactory = this.deprecationsFactory;
+
+    const config = await this.configService
+      .atPath<DeprecationConfigType>(deprecationConfig.path)
+      .pipe(take(1))
+      .toPromise();
+
+    this.deprecationsFactory = new DeprecationsFactory({
+      logger: this.logger,
+      config: {
+        ignoredConfigDeprecations: config.skip_deprecated_settings,
+      },
+    });
 
     registerRoutes({ http });
     this.registerConfigDeprecationsInfo(this.deprecationsFactory);
 
+    const deprecationsFactory = this.deprecationsFactory;
     return {
       getRegistry: (domainId: string): DeprecationsServiceSetup => {
         const registry = deprecationsFactory.getRegistry(domainId);
@@ -156,6 +171,9 @@ export class DeprecationsService
   }
 
   public start(): InternalDeprecationsServiceStart {
+    if (!this.deprecationsFactory) {
+      throw new Error('`setup` must be called before `start`');
+    }
     return {
       asScopedToClient: this.createScopedDeprecations(),
     };
@@ -169,7 +187,7 @@ export class DeprecationsService
   ) => DeprecationsClient {
     return (esClient: IScopedClusterClient, savedObjectsClient: SavedObjectsClientContract) => {
       return {
-        getAllDeprecations: this.deprecationsFactory.getAllDeprecations.bind(null, {
+        getAllDeprecations: this.deprecationsFactory!.getAllDeprecations.bind(null, {
           savedObjectsClient,
           esClient,
         }),
@@ -178,7 +196,7 @@ export class DeprecationsService
   }
 
   private registerConfigDeprecationsInfo(deprecationsFactory: DeprecationsFactory) {
-    const handledDeprecatedConfigs = this.coreContext.configService.getHandledDeprecatedConfigs();
+    const handledDeprecatedConfigs = this.configService.getHandledDeprecatedConfigs();
 
     for (const [domainId, deprecationsContexts] of handledDeprecatedConfigs) {
       const deprecationsRegistry = deprecationsFactory.getRegistry(domainId);
@@ -186,12 +204,14 @@ export class DeprecationsService
         getDeprecations: () => {
           return deprecationsContexts.map(
             ({
+              configPath,
               title = `${domainId} has a deprecated setting`,
               level = 'critical',
               message,
               correctiveActions,
               documentationUrl,
             }) => ({
+              configPath,
               title,
               level,
               message,
diff --git a/src/core/server/deprecations/index.ts b/src/core/server/deprecations/index.ts
index 5c2a0b87b42de..d9225750f04a1 100644
--- a/src/core/server/deprecations/index.ts
+++ b/src/core/server/deprecations/index.ts
@@ -7,7 +7,10 @@
  */
 
 export type {
+  BaseDeprecationDetails,
   DeprecationsDetails,
+  ConfigDeprecationDetails,
+  FeatureDeprecationDetails,
   GetDeprecationsContext,
   RegisterDeprecationsConfig,
   DeprecationsGetResponse,
@@ -21,3 +24,4 @@ export type {
 } from './deprecations_service';
 
 export { DeprecationsService } from './deprecations_service';
+export { config } from './deprecation_config';
diff --git a/src/core/server/deprecations/types.ts b/src/core/server/deprecations/types.ts
index e24c6a13fceea..3990a76f7578e 100644
--- a/src/core/server/deprecations/types.ts
+++ b/src/core/server/deprecations/types.ts
@@ -6,22 +6,16 @@
  * Side Public License, v 1.
  */
 
+import type { MaybePromise } from '@kbn/utility-types';
 import type { SavedObjectsClientContract } from '../saved_objects/types';
 import type { IScopedClusterClient } from '../elasticsearch';
 
-type MaybePromise<T> = T | Promise<T>;
-
-/**
- * @internal
- */
-export interface DomainDeprecationDetails extends DeprecationsDetails {
-  domainId: string;
-}
-
 /**
+ * Base properties shared by all types of deprecations
+ *
  * @public
  */
-export interface DeprecationsDetails {
+export interface BaseDeprecationDetails {
   /**
    * The title of the deprecation.
    * Check the README for writing deprecations in `src/core/server/deprecations/README.mdx`
@@ -82,6 +76,33 @@ export interface DeprecationsDetails {
   };
 }
 
+/**
+ * @public
+ */
+export interface ConfigDeprecationDetails extends BaseDeprecationDetails {
+  configPath: string;
+  deprecationType: 'config';
+}
+
+/**
+ * @public
+ */
+export interface FeatureDeprecationDetails extends BaseDeprecationDetails {
+  deprecationType?: 'feature' | undefined;
+}
+
+/**
+ * @public
+ */
+export type DeprecationsDetails = ConfigDeprecationDetails | FeatureDeprecationDetails;
+
+/**
+ * @internal
+ */
+export type DomainDeprecationDetails = DeprecationsDetails & {
+  domainId: string;
+};
+
 /**
  * @public
  */
diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts
index 7470ff7081717..f130504e3293a 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.ts
@@ -178,6 +178,7 @@ const deprecations: ConfigDeprecationProvider = () => [
     }
     if (es.username === 'elastic') {
       addDeprecation({
+        configPath: `${fromPath}.username`,
         message: `Setting [${fromPath}.username] to "elastic" is deprecated. You should use the "kibana_system" user instead.`,
         correctiveActions: {
           manualSteps: [`Replace [${fromPath}.username] from "elastic" to "kibana_system".`],
@@ -185,6 +186,7 @@ const deprecations: ConfigDeprecationProvider = () => [
       });
     } else if (es.username === 'kibana') {
       addDeprecation({
+        configPath: `${fromPath}.username`,
         message: `Setting [${fromPath}.username] to "kibana" is deprecated. You should use the "kibana_system" user instead.`,
         correctiveActions: {
           manualSteps: [`Replace [${fromPath}.username] from "kibana" to "kibana_system".`],
@@ -193,6 +195,7 @@ const deprecations: ConfigDeprecationProvider = () => [
     }
     if (es.ssl?.key !== undefined && es.ssl?.certificate === undefined) {
       addDeprecation({
+        configPath: `${fromPath}.ssl.key`,
         message: `Setting [${fromPath}.ssl.key] without [${fromPath}.ssl.certificate] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`,
         correctiveActions: {
           manualSteps: [
@@ -202,6 +205,7 @@ const deprecations: ConfigDeprecationProvider = () => [
       });
     } else if (es.ssl?.certificate !== undefined && es.ssl?.key === undefined) {
       addDeprecation({
+        configPath: `${fromPath}.ssl.certificate`,
         message: `Setting [${fromPath}.ssl.certificate] without [${fromPath}.ssl.key] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`,
         correctiveActions: {
           manualSteps: [
@@ -211,6 +215,7 @@ const deprecations: ConfigDeprecationProvider = () => [
       });
     } else if (es.logQueries === true) {
       addDeprecation({
+        configPath: `${fromPath}.logQueries`,
         message: `Setting [${fromPath}.logQueries] is deprecated and no longer used. You should set the log level to "debug" for the "elasticsearch.queries" context in "logging.loggers".`,
         correctiveActions: {
           manualSteps: [
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 2e46e8f68570c..c92a91c96da95 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -387,7 +387,10 @@ export { EventLoopDelaysMonitor } from './metrics';
 
 export type { I18nServiceSetup } from './i18n';
 export type {
+  BaseDeprecationDetails,
   DeprecationsDetails,
+  ConfigDeprecationDetails,
+  FeatureDeprecationDetails,
   RegisterDeprecationsConfig,
   GetDeprecationsContext,
   DeprecationsServiceSetup,
diff --git a/src/core/server/kibana_config.ts b/src/core/server/kibana_config.ts
index ead3f2cc2776a..859f25d7082f1 100644
--- a/src/core/server/kibana_config.ts
+++ b/src/core/server/kibana_config.ts
@@ -17,6 +17,7 @@ const deprecations: ConfigDeprecationProvider = () => [
     const kibana = settings[fromPath];
     if (kibana?.index) {
       addDeprecation({
+        configPath: 'kibana.index',
         title: i18n.translate('core.kibana.index.deprecationTitle', {
           defaultMessage: `Setting "kibana.index" is deprecated`,
         }),
diff --git a/src/core/server/saved_objects/saved_objects_config.ts b/src/core/server/saved_objects/saved_objects_config.ts
index 0c27f170f590b..c9b4b4499fa80 100644
--- a/src/core/server/saved_objects/saved_objects_config.ts
+++ b/src/core/server/saved_objects/saved_objects_config.ts
@@ -27,6 +27,7 @@ const migrationDeprecations: ConfigDeprecationProvider = () => [
     const migrationsConfig = settings[fromPath];
     if (migrationsConfig?.enableV2 !== undefined) {
       addDeprecation({
+        configPath: `${fromPath}.enableV2`,
         message:
           '"migrations.enableV2" is deprecated and will be removed in an upcoming release without any further notice.',
         documentationUrl: 'https://ela.st/kbn-so-migration-v2',
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index fb16e889a19c7..9e50a3008293b 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -33,6 +33,7 @@ import { LoggerFactory } from '@kbn/logging';
 import { LogLevel } from '@kbn/logging';
 import { LogMeta } from '@kbn/logging';
 import { LogRecord } from '@kbn/logging';
+import { MaybePromise } from '@kbn/utility-types';
 import { ObjectType } from '@kbn/config-schema';
 import { Observable } from 'rxjs';
 import { PackageInfo } from '@kbn/config';
@@ -155,6 +156,27 @@ export interface AuthToolkit {
     } & ResponseHeaders) => AuthResult;
 }
 
+// @public
+export interface BaseDeprecationDetails {
+    correctiveActions: {
+        api?: {
+            path: string;
+            method: 'POST' | 'PUT';
+            body?: {
+                [key: string]: any;
+            };
+            omitContextFromBody?: boolean;
+        };
+        manualSteps: string[];
+    };
+    deprecationType?: 'config' | 'feature';
+    documentationUrl?: string;
+    level: 'warning' | 'critical' | 'fetch_error';
+    message: string;
+    requireRestart?: boolean;
+    title: string;
+}
+
 // @public
 export class BasePath {
     // @internal
@@ -249,6 +271,14 @@ export { ConfigDeprecation }
 
 export { ConfigDeprecationContext }
 
+// @public (undocumented)
+export interface ConfigDeprecationDetails extends BaseDeprecationDetails {
+    // (undocumented)
+    configPath: string;
+    // (undocumented)
+    deprecationType: 'config';
+}
+
 export { ConfigDeprecationFactory }
 
 export { ConfigDeprecationProvider }
@@ -802,25 +832,7 @@ export interface DeprecationsClient {
 }
 
 // @public (undocumented)
-export interface DeprecationsDetails {
-    correctiveActions: {
-        api?: {
-            path: string;
-            method: 'POST' | 'PUT';
-            body?: {
-                [key: string]: any;
-            };
-            omitContextFromBody?: boolean;
-        };
-        manualSteps: string[];
-    };
-    deprecationType?: 'config' | 'feature';
-    documentationUrl?: string;
-    level: 'warning' | 'critical' | 'fetch_error';
-    message: string;
-    requireRestart?: boolean;
-    title: string;
-}
+export type DeprecationsDetails = ConfigDeprecationDetails | FeatureDeprecationDetails;
 
 // @public
 export interface DeprecationSettings {
@@ -971,6 +983,12 @@ export interface FakeRequest {
     headers: Headers;
 }
 
+// @public (undocumented)
+export interface FeatureDeprecationDetails extends BaseDeprecationDetails {
+    // (undocumented)
+    deprecationType?: 'feature' | undefined;
+}
+
 // @public
 export type GetAuthHeaders = (request: KibanaRequest) => AuthHeaders | undefined;
 
@@ -1695,8 +1713,6 @@ export type RedirectResponseOptions = HttpResponseOptions & {
 
 // @public (undocumented)
 export interface RegisterDeprecationsConfig {
-    // Warning: (ae-forgotten-export) The symbol "MaybePromise" needs to be exported by the entry point index.d.ts
-    //
     // (undocumented)
     getDeprecations: (context: GetDeprecationsContext) => MaybePromise<DeprecationsDetails[]>;
 }
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index 8b0714e899139..2d3b87207fcbe 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -50,7 +50,7 @@ import {
   ServiceConfigDescriptor,
 } from './internal_types';
 import { CoreUsageDataService } from './core_usage_data';
-import { DeprecationsService } from './deprecations';
+import { DeprecationsService, config as deprecationConfig } from './deprecations';
 import { CoreRouteHandlerContext } from './core_route_handler_context';
 import { config as externalUrlConfig } from './external_url';
 import { config as executionContextConfig } from './execution_context';
@@ -203,7 +203,7 @@ export class Server {
       executionContext: executionContextSetup,
     });
 
-    const deprecationsSetup = this.deprecations.setup({
+    const deprecationsSetup = await this.deprecations.setup({
       http: httpSetup,
     });
 
@@ -381,6 +381,7 @@ export class Server {
       statusConfig,
       pidConfig,
       i18nConfig,
+      deprecationConfig,
     ];
 
     this.configService.addDeprecationProvider(rootConfigPath, coreDeprecationProvider);
diff --git a/src/plugins/telemetry/server/config/deprecations.test.ts b/src/plugins/telemetry/server/config/deprecations.test.ts
index 7807cd21916d5..567ef69e8991c 100644
--- a/src/plugins/telemetry/server/config/deprecations.test.ts
+++ b/src/plugins/telemetry/server/config/deprecations.test.ts
@@ -158,6 +158,7 @@ describe('deprecateEndpointConfigs', () => {
     expect(mockAddDeprecation.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
         Object {
+          "configPath": "telemetry.url",
           "correctiveActions": Object {
             "manualSteps": Array [
               "Remove \\"telemetry.url\\" from the Kibana configuration.",
@@ -180,6 +181,7 @@ describe('deprecateEndpointConfigs', () => {
     expect(mockAddDeprecation.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
         Object {
+          "configPath": "telemetry.optInStatusUrl",
           "correctiveActions": Object {
             "manualSteps": Array [
               "Remove \\"telemetry.optInStatusUrl\\" from the Kibana configuration.",
diff --git a/src/plugins/telemetry/server/config/deprecations.ts b/src/plugins/telemetry/server/config/deprecations.ts
index 013ee51a2ddd9..38553be7d5774 100644
--- a/src/plugins/telemetry/server/config/deprecations.ts
+++ b/src/plugins/telemetry/server/config/deprecations.ts
@@ -35,6 +35,7 @@ export const deprecateEndpointConfigs: ConfigDeprecation = (
       }
 
       addDeprecation({
+        configPath: fullConfigPath,
         title: i18n.translate('telemetry.endpointConfigs.deprecationTitle', {
           defaultMessage: 'Setting "{configPath}" is deprecated',
           values: { configPath: fullConfigPath },
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts b/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts
index 650567f761aa3..5b9145be52661 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts
@@ -22,6 +22,7 @@ type ConfigType = TypeOf<typeof configSchema>;
 const configSecretDeprecation: ConfigDeprecation = (settings, fromPath, addDeprecation) => {
   if (get(settings, 'corePluginDeprecations.secret') !== 42) {
     addDeprecation({
+      configPath: 'corePluginDeprecations.secret',
       documentationUrl: 'config-secret-doc-url',
       message:
         'Kibana plugin functional tests will no longer allow corePluginDeprecations.secret ' +
diff --git a/test/plugin_functional/test_suites/core/deprecations.ts b/test/plugin_functional/test_suites/core/deprecations.ts
index dbaf10008e35e..d8dc82a56cb55 100644
--- a/test/plugin_functional/test_suites/core/deprecations.ts
+++ b/test/plugin_functional/test_suites/core/deprecations.ts
@@ -19,6 +19,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
 
   const CorePluginDeprecationsPluginDeprecations: DomainDeprecationDetails[] = [
     {
+      configPath: 'corePluginDeprecations.oldProperty',
       title: 'Setting "corePluginDeprecations.oldProperty" is deprecated',
       level: 'critical',
       message:
@@ -33,6 +34,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       requireRestart: true,
     },
     {
+      configPath: 'corePluginDeprecations.noLongerUsed',
       title: 'Setting "corePluginDeprecations.noLongerUsed" is deprecated',
       level: 'critical',
       message: 'You no longer need to configure "corePluginDeprecations.noLongerUsed".',
@@ -46,6 +48,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       requireRestart: true,
     },
     {
+      configPath: 'corePluginDeprecations.secret',
       title: 'corePluginDeprecations has a deprecated setting',
       level: 'critical',
       message:
diff --git a/x-pack/plugins/actions/server/index.ts b/x-pack/plugins/actions/server/index.ts
index f012ec83c2dfb..14cdfacd360a2 100644
--- a/x-pack/plugins/actions/server/index.ts
+++ b/x-pack/plugins/actions/server/index.ts
@@ -69,6 +69,7 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
         )
       ) {
         addDeprecation({
+          configPath: 'xpack.actions.customHostSettings.ssl.rejectUnauthorized',
           message:
             `"xpack.actions.customHostSettings[<index>].ssl.rejectUnauthorized" is deprecated.` +
             `Use "xpack.actions.customHostSettings[<index>].ssl.verificationMode" instead, ` +
@@ -96,6 +97,7 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
       const actions = get(settings, fromPath);
       if (actions?.hasOwnProperty('rejectUnauthorized')) {
         addDeprecation({
+          configPath: `${fromPath}.rejectUnauthorized`,
           message:
             `"xpack.actions.rejectUnauthorized" is deprecated. Use "xpack.actions.verificationMode" instead, ` +
             `with the setting "verificationMode:full" eql to "rejectUnauthorized:true", ` +
@@ -122,6 +124,7 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
       const actions = get(settings, fromPath);
       if (actions?.hasOwnProperty('proxyRejectUnauthorizedCertificates')) {
         addDeprecation({
+          configPath: `${fromPath}.proxyRejectUnauthorizedCertificates`,
           message:
             `"xpack.actions.proxyRejectUnauthorizedCertificates" is deprecated. Use "xpack.actions.proxyVerificationMode" instead, ` +
             `with the setting "proxyVerificationMode:full" eql to "rejectUnauthorized:true",` +
diff --git a/x-pack/plugins/fleet/server/index.ts b/x-pack/plugins/fleet/server/index.ts
index 897f160810e29..cc754b87686e6 100644
--- a/x-pack/plugins/fleet/server/index.ts
+++ b/x-pack/plugins/fleet/server/index.ts
@@ -89,6 +89,7 @@ export const config: PluginConfigDescriptor = {
         delete fullConfig.xpack.fleet.agents.elasticsearch.host;
         fullConfig.xpack.fleet.agents.elasticsearch.hosts = [oldValue];
         addDeprecation({
+          configPath: 'xpack.fleet.agents.elasticsearch.host',
           message: `Config key [xpack.fleet.agents.elasticsearch.host] is deprecated and replaced by [xpack.fleet.agents.elasticsearch.hosts]`,
           correctiveActions: {
             manualSteps: [
diff --git a/x-pack/plugins/maps/server/index.ts b/x-pack/plugins/maps/server/index.ts
index 603273efe0d95..bfb8745c4ba6f 100644
--- a/x-pack/plugins/maps/server/index.ts
+++ b/x-pack/plugins/maps/server/index.ts
@@ -33,6 +33,7 @@ export const config: PluginConfigDescriptor<MapsXPackConfig> = {
         return completeConfig;
       }
       addDeprecation({
+        configPath: 'map.proxyElasticMapsServiceInMaps',
         documentationUrl:
           'https://www.elastic.co/guide/en/kibana/current/maps-connect-to-ems.html#elastic-maps-server',
         message: i18n.translate('xpack.maps.deprecation.proxyEMS.message', {
diff --git a/x-pack/plugins/monitoring/server/deprecations.ts b/x-pack/plugins/monitoring/server/deprecations.ts
index cb09bbdb5a87c..3072e024450d0 100644
--- a/x-pack/plugins/monitoring/server/deprecations.ts
+++ b/x-pack/plugins/monitoring/server/deprecations.ts
@@ -50,6 +50,7 @@ export const deprecations = ({
       const emailNotificationsEnabled = get(config, 'cluster_alerts.email_notifications.enabled');
       if (emailNotificationsEnabled && !get(config, CLUSTER_ALERTS_ADDRESS_CONFIG_KEY)) {
         addDeprecation({
+          configPath: `cluster_alerts.email_notifications.enabled`,
           message: `Config key [${fromPath}.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}] will be required for email notifications to work in 8.0."`,
           correctiveActions: {
             manualSteps: [
@@ -65,6 +66,7 @@ export const deprecations = ({
       if (es) {
         if (es.username === 'elastic') {
           addDeprecation({
+            configPath: 'elasticsearch.username',
             message: `Setting [${fromPath}.username] to "elastic" is deprecated. You should use the "kibana_system" user instead.`,
             correctiveActions: {
               manualSteps: [`Replace [${fromPath}.username] from "elastic" to "kibana_system".`],
@@ -72,6 +74,7 @@ export const deprecations = ({
           });
         } else if (es.username === 'kibana') {
           addDeprecation({
+            configPath: 'elasticsearch.username',
             message: `Setting [${fromPath}.username] to "kibana" is deprecated. You should use the "kibana_system" user instead.`,
             correctiveActions: {
               manualSteps: [`Replace [${fromPath}.username] from "kibana" to "kibana_system".`],
@@ -86,6 +89,7 @@ export const deprecations = ({
       if (ssl) {
         if (ssl.key !== undefined && ssl.certificate === undefined) {
           addDeprecation({
+            configPath: 'elasticsearch.ssl.key',
             message: `Setting [${fromPath}.key] without [${fromPath}.certificate] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`,
             correctiveActions: {
               manualSteps: [
@@ -95,6 +99,7 @@ export const deprecations = ({
           });
         } else if (ssl.certificate !== undefined && ssl.key === undefined) {
           addDeprecation({
+            configPath: 'elasticsearch.ssl.certificate',
             message: `Setting [${fromPath}.certificate] without [${fromPath}.key] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`,
             correctiveActions: {
               manualSteps: [
diff --git a/x-pack/plugins/reporting/server/config/index.ts b/x-pack/plugins/reporting/server/config/index.ts
index 91e5fbf572ecf..adc45cef0e523 100644
--- a/x-pack/plugins/reporting/server/config/index.ts
+++ b/x-pack/plugins/reporting/server/config/index.ts
@@ -25,6 +25,7 @@ export const config: PluginConfigDescriptor<ReportingConfigType> = {
       const reporting = get(settings, fromPath);
       if (reporting?.roles?.enabled !== false) {
         addDeprecation({
+          configPath: `${fromPath}.roles.enabled`,
           level: 'warning',
           title: i18n.translate('xpack.reporting.deprecations.reportingRoles.title', {
             defaultMessage: 'Setting "{fromPath}.roles" is deprecated',
diff --git a/x-pack/plugins/security/server/config_deprecations.test.ts b/x-pack/plugins/security/server/config_deprecations.test.ts
index d9db18cdb96af..808c0aeb85b12 100644
--- a/x-pack/plugins/security/server/config_deprecations.test.ts
+++ b/x-pack/plugins/security/server/config_deprecations.test.ts
@@ -17,6 +17,7 @@ const deprecationContext = configDeprecationsMock.createContext();
 const applyConfigDeprecations = (settings: Record<string, any> = {}) => {
   const deprecations = securityConfigDeprecationProvider(configDeprecationFactory);
   const deprecationMessages: string[] = [];
+  const configPaths: string[] = [];
   const { config: migrated } = applyDeprecations(
     settings,
     deprecations.map((deprecation) => ({
@@ -25,10 +26,13 @@ const applyConfigDeprecations = (settings: Record<string, any> = {}) => {
       context: deprecationContext,
     })),
     () =>
-      ({ message }) =>
-        deprecationMessages.push(message)
+      ({ message, configPath }) => {
+        deprecationMessages.push(message);
+        configPaths.push(configPath);
+      }
   );
   return {
+    configPaths,
     messages: deprecationMessages,
     migrated,
   };
@@ -305,12 +309,14 @@ describe('Config Deprecations', () => {
         },
       },
     };
-    const { messages } = applyConfigDeprecations(cloneDeep(config));
+    const { messages, configPaths } = applyConfigDeprecations(cloneDeep(config));
     expect(messages).toMatchInlineSnapshot(`
       Array [
         "\\"xpack.security.authc.providers.saml.<provider-name>.maxRedirectURLSize\\" is no longer used.",
       ]
     `);
+
+    expect(configPaths).toEqual(['xpack.security.authc.providers.saml.saml1.maxRedirectURLSize']);
   });
 
   it(`warns when 'xpack.security.authc.providers' is an array of strings`, () => {
diff --git a/x-pack/plugins/security/server/config_deprecations.ts b/x-pack/plugins/security/server/config_deprecations.ts
index dbe708eab51a2..46fbbcec5188e 100644
--- a/x-pack/plugins/security/server/config_deprecations.ts
+++ b/x-pack/plugins/security/server/config_deprecations.ts
@@ -35,6 +35,7 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
     const legacyAuditLoggerEnabled = !settings?.xpack?.security?.audit?.appender;
     if (auditLoggingEnabled && legacyAuditLoggerEnabled) {
       addDeprecation({
+        configPath: 'xpack.security.audit.appender',
         title: i18n.translate('xpack.security.deprecations.auditLoggerTitle', {
           defaultMessage: 'The legacy audit logger is deprecated',
         }),
@@ -59,6 +60,7 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
   (settings, fromPath, addDeprecation) => {
     if (Array.isArray(settings?.xpack?.security?.authc?.providers)) {
       addDeprecation({
+        configPath: 'xpack.security.authc.providers',
         title: i18n.translate('xpack.security.deprecations.authcProvidersTitle', {
           defaultMessage:
             'Defining "xpack.security.authc.providers" as an array of provider types is deprecated',
@@ -92,6 +94,7 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
 
     if (hasProviderType('basic') && hasProviderType('token')) {
       addDeprecation({
+        configPath: 'xpack.security.authc.providers',
         title: i18n.translate('xpack.security.deprecations.basicAndTokenProvidersTitle', {
           defaultMessage:
             'Both "basic" and "token" authentication providers are enabled in "xpack.security.authc.providers"',
@@ -119,8 +122,13 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
       string,
       any
     >;
-    if (Object.values(samlProviders).find((provider) => !!provider.maxRedirectURLSize)) {
+
+    const foundProvider = Object.entries(samlProviders).find(
+      ([_, provider]) => !!provider.maxRedirectURLSize
+    );
+    if (foundProvider) {
       addDeprecation({
+        configPath: `xpack.security.authc.providers.saml.${foundProvider[0]}.maxRedirectURLSize`,
         title: i18n.translate('xpack.security.deprecations.maxRedirectURLSizeTitle', {
           defaultMessage:
             '"xpack.security.authc.providers.saml.<provider-name>.maxRedirectURLSize" is deprecated',
@@ -143,6 +151,7 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
   (settings, fromPath, addDeprecation) => {
     if (settings?.xpack?.security?.enabled === false) {
       addDeprecation({
+        configPath: 'xpack.security.enabled',
         title: i18n.translate('xpack.security.deprecations.enabledTitle', {
           defaultMessage: 'Disabling the security plugin "xpack.security.enabled" is deprecated',
         }),
diff --git a/x-pack/plugins/spaces/server/config.ts b/x-pack/plugins/spaces/server/config.ts
index 2a2f363d769f7..29f8e0cdf692f 100644
--- a/x-pack/plugins/spaces/server/config.ts
+++ b/x-pack/plugins/spaces/server/config.ts
@@ -27,6 +27,7 @@ export function createConfig$(context: PluginInitializerContext) {
 const disabledDeprecation: ConfigDeprecation = (config, fromPath, addDeprecation) => {
   if (config.xpack?.spaces?.enabled === false) {
     addDeprecation({
+      configPath: 'xpack.spaces.enabled',
       message: `Disabling the Spaces plugin (xpack.spaces.enabled) will not be supported in the next major version (8.0)`,
       correctiveActions: {
         manualSteps: [`Remove "xpack.spaces.enabled: false" from your Kibana configuration`],
diff --git a/x-pack/plugins/stack_alerts/server/index.ts b/x-pack/plugins/stack_alerts/server/index.ts
index 9491f3e646c70..1ac774a2d6c3f 100644
--- a/x-pack/plugins/stack_alerts/server/index.ts
+++ b/x-pack/plugins/stack_alerts/server/index.ts
@@ -18,6 +18,7 @@ export const config: PluginConfigDescriptor<Config> = {
       const stackAlerts = get(settings, fromPath);
       if (stackAlerts?.enabled === false || stackAlerts?.enabled === true) {
         addDeprecation({
+          configPath: 'xpack.stack_alerts.enabled',
           message: `"xpack.stack_alerts.enabled" is deprecated. The ability to disable this plugin will be removed in 8.0.0.`,
           correctiveActions: {
             manualSteps: [`Remove "xpack.stack_alerts.enabled" from your kibana configs.`],
diff --git a/x-pack/plugins/task_manager/server/index.ts b/x-pack/plugins/task_manager/server/index.ts
index 7667a18fcef54..100f95729d1b7 100644
--- a/x-pack/plugins/task_manager/server/index.ts
+++ b/x-pack/plugins/task_manager/server/index.ts
@@ -49,6 +49,7 @@ export const config: PluginConfigDescriptor<TaskManagerConfig> = {
       const taskManager = get(settings, fromPath);
       if (taskManager?.index) {
         addDeprecation({
+          configPath: `${fromPath}.index`,
           documentationUrl: 'https://ela.st/kbn-remove-legacy-multitenancy',
           message: `"${fromPath}.index" is deprecated. Multitenancy by changing "kibana.index" will not be supported starting in 8.0. See https://ela.st/kbn-remove-legacy-multitenancy for more details`,
           correctiveActions: {
@@ -61,6 +62,7 @@ export const config: PluginConfigDescriptor<TaskManagerConfig> = {
       }
       if (taskManager?.max_workers > MAX_WORKERS_LIMIT) {
         addDeprecation({
+          configPath: `${fromPath}.max_workers`,
           message: `setting "${fromPath}.max_workers" (${taskManager?.max_workers}) greater than ${MAX_WORKERS_LIMIT} is deprecated. Values greater than ${MAX_WORKERS_LIMIT} will not be supported starting in 8.0.`,
           correctiveActions: {
             manualSteps: [
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.test.ts
index 63532543a418b..296a313abef38 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.test.ts
@@ -20,7 +20,7 @@ const mockKibanaDeprecations: DomainDeprecationDetails[] = [
         'Using Kibana role-mapping management, change all role-mappings which assing the kibana_user role to the kibana_admin role.',
       ],
     },
-    deprecationType: 'config',
+    deprecationType: 'feature',
     documentationUrl: 'testDocUrl',
     level: 'critical',
     message: 'testMessage',