From 550d44ea2da437be7f1b3ab08f7125481b04737c Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:26:32 -0700
Subject: [PATCH 1/7] [i18n] remove unused translation keys

---
 x-pack/plugins/translations/translations/ja-JP.json | 1 -
 x-pack/plugins/translations/translations/zh-CN.json | 1 -
 2 files changed, 2 deletions(-)

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 69a8449c4dc70..ff8c3186d5cf8 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -5008,7 +5008,6 @@
     "xpack.apm.settings.anomaly_detection.legacy_jobs.body": "以前の統合のレガシー機械学習ジョブが見つかりました。これは、APMアプリでは使用されていません。",
     "xpack.apm.settings.anomaly_detection.legacy_jobs.button": "ジョブの確認",
     "xpack.apm.settings.anomaly_detection.legacy_jobs.title": "レガシーMLジョブはAPMアプリで使用されていません。",
-    "xpack.apm.settings.anomaly_detection.license.text": "異常検知を使用するには、Elastic Platinumライセンスのサブスクリプションが必要です。このライセンスがあれば、機械学習を活用して、サービスを監視できます。",
     "xpack.apm.settings.anomalyDetection": "異常検知",
     "xpack.apm.settings.anomalyDetection.addEnvironments.cancelButtonText": "キャンセル",
     "xpack.apm.settings.anomalyDetection.addEnvironments.createJobsButtonText": "ジョブの作成",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 898897548b7fc..bcf2f6707e7bf 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -5009,7 +5009,6 @@
     "xpack.apm.settings.anomaly_detection.legacy_jobs.body": "我们在以前的集成中发现 APM 应用中不再使用的旧版 Machine Learning 作业",
     "xpack.apm.settings.anomaly_detection.legacy_jobs.button": "复查作业",
     "xpack.apm.settings.anomaly_detection.legacy_jobs.title": "旧版 ML 作业不再用于 APM 应用",
-    "xpack.apm.settings.anomaly_detection.license.text": "要使用异常检测，必须订阅 Elastic 白金级许可。使用该许可，您将能够借助 Machine Learning 监测服务。",
     "xpack.apm.settings.anomalyDetection": "异常检测",
     "xpack.apm.settings.anomalyDetection.addEnvironments.cancelButtonText": "取消",
     "xpack.apm.settings.anomalyDetection.addEnvironments.createJobsButtonText": "创建作业",

From c09216b6698eee0189e096dd67085bbe9ff12e4b Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Thu, 30 Jul 2020 10:30:57 -0600
Subject: [PATCH 2/7] [Maps] fix application state filters transfer from other
 kibana application to maps application (#73516)

* [Maps] fix application state filters transfer from other kibana application to maps application

* clean up comment

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../maps/public/routing/routes/maps_app/maps_app_view.js  | 8 --------
 .../plugins/maps/public/routing/state_syncing/app_sync.js | 4 ++++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.js b/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.js
index 7578d2fd3d3ea..d945aa9623b21 100644
--- a/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.js
+++ b/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.js
@@ -91,14 +91,6 @@ export class MapsAppView extends React.Component {
       this._globalSyncChangeMonitorSubscription.unsubscribe();
     }
 
-    // Clean up app state filters
-    const { filterManager } = getData().query;
-    filterManager.filters.forEach((filter) => {
-      if (filter.$state.store === esFilters.FilterStateStore.APP_STATE) {
-        filterManager.removeFilter(filter);
-      }
-    });
-
     getCoreChrome().setBreadcrumbs([]);
   }
 
diff --git a/x-pack/plugins/maps/public/routing/state_syncing/app_sync.js b/x-pack/plugins/maps/public/routing/state_syncing/app_sync.js
index 8dd643607ba9c..60e8dc9cd574c 100644
--- a/x-pack/plugins/maps/public/routing/state_syncing/app_sync.js
+++ b/x-pack/plugins/maps/public/routing/state_syncing/app_sync.js
@@ -15,6 +15,10 @@ export function startAppStateSyncing(appStateManager) {
   // sync app filters with app state container from data.query to state container
   const { query } = getData();
 
+  // Filter manager state persists across applications
+  // clear app state filters to prevent application filters from other applications being transfered to maps
+  query.filterManager.setAppFilters([]);
+
   const stateContainer = {
     get: () => ({
       query: appStateManager.getQuery(),

From e8cc2ff72f967a048d64c1f5072df8b1a4f2dae9 Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Thu, 30 Jul 2020 13:02:54 -0400
Subject: [PATCH 3/7] [SECURITY_SOLUTION][ENDPOINT] Fix Endpoint Hosts crashing
 periodically when switching between policy responses from linux and windows
 (#73809)

* Fix use of hooks in policy response
* Additional fixes to use of `useMemo`
* Added error boundary to management pages
---
 .../components/management_page_view.tsx       |  7 ++-
 .../view/details/policy_response.tsx          | 12 ++----
 .../view/policy_forms/events/checkbox.tsx     |  3 +-
 .../view/policy_forms/protections/malware.tsx |  3 +-
 .../pages/policy/view/policy_list.tsx         | 43 ++++++++-----------
 5 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/management/components/management_page_view.tsx b/x-pack/plugins/security_solution/public/management/components/management_page_view.tsx
index aa562b9a20201..54d9131209d0d 100644
--- a/x-pack/plugins/security_solution/public/management/components/management_page_view.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/management_page_view.tsx
@@ -5,10 +5,15 @@
  */
 
 import React, { memo } from 'react';
+import { EuiErrorBoundary } from '@elastic/eui';
 import { PageView, PageViewProps } from '../../common/components/endpoint/page_view';
 
 export const ManagementPageView = memo<Omit<PageViewProps, 'tabs'>>((options) => {
-  return <PageView {...options} />;
+  return (
+    <EuiErrorBoundary>
+      <PageView {...options} />
+    </EuiErrorBoundary>
+  );
 });
 
 ManagementPageView.displayName = 'ManagementPageView';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/policy_response.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/policy_response.tsx
index 4cdfaad69eb72..3a1dd180405e0 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/policy_response.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/policy_response.tsx
@@ -140,20 +140,16 @@ export const PolicyResponse = memo(
     responseActions: Immutable<HostPolicyResponseAppliedAction[]>;
     responseAttentionCount: Map<string, number>;
   }) => {
+    const generateId = useMemo(() => htmlIdGenerator(), []);
+
     return (
       <>
         {Object.entries(responseConfig).map(([key, val]) => {
           const attentionCount = responseAttentionCount.get(key);
           return (
             <PolicyResponseConfigAccordion
-              id={
-                /* eslint-disable-next-line react-hooks/rules-of-hooks */
-                useMemo(() => htmlIdGenerator()(), [])
-              }
-              key={
-                /* eslint-disable-next-line react-hooks/rules-of-hooks */
-                useMemo(() => htmlIdGenerator()(), [])
-              }
+              id={generateId(`id_${key}`)}
+              key={generateId(`key_${key}`)}
               data-test-subj="hostDetailsPolicyResponseConfigAccordion"
               buttonContent={
                 <EuiText size="s">
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/checkbox.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/checkbox.tsx
index 9ceade5d0264c..76077831c670b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/checkbox.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/events/checkbox.tsx
@@ -27,6 +27,7 @@ export const EventsCheckbox = React.memo(function ({
   const policyDetailsConfig = usePolicyDetailsSelector(policyConfig);
   const selected = getter(policyDetailsConfig);
   const dispatch = useDispatch<(action: PolicyDetailsAction) => void>();
+  const checkboxId = useMemo(() => htmlIdGenerator()(), []);
 
   const handleCheckboxChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -42,7 +43,7 @@ export const EventsCheckbox = React.memo(function ({
 
   return (
     <EuiCheckbox
-      id={useMemo(() => htmlIdGenerator()(), [])}
+      id={checkboxId}
       label={name}
       checked={selected}
       onChange={handleCheckboxChange}
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx
index 84d4bf5355cd9..1698f5bc3fd0c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx
@@ -41,6 +41,7 @@ const protection = 'malware';
 const ProtectionRadio = React.memo(({ id, label }: { id: ProtectionModes; label: string }) => {
   const policyDetailsConfig = usePolicyDetailsSelector(policyConfig);
   const dispatch = useDispatch();
+  const radioButtonId = useMemo(() => htmlIdGenerator()(), []);
   // currently just taking windows.malware, but both windows.malware and mac.malware should be the same value
   const selected = policyDetailsConfig && policyDetailsConfig.windows.malware.mode;
 
@@ -66,7 +67,7 @@ const ProtectionRadio = React.memo(({ id, label }: { id: ProtectionModes; label:
     <EuiRadio
       className="policyDetailsProtectionRadio"
       label={label}
-      id={useMemo(() => htmlIdGenerator()(), [])}
+      id={radioButtonId}
       checked={selected === id}
       onChange={handleRadioChange}
       disabled={selected === ProtectionModes.off}
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
index 246dbeb39886f..39b77d259add1 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
@@ -377,6 +377,22 @@ export const PolicyList = React.memo(() => {
     [services.application, handleDeleteOnClick, formatUrl, search]
   );
 
+  const bodyContent = useMemo(() => {
+    return policyItems && policyItems.length > 0 ? (
+      <EuiBasicTable
+        items={[...policyItems]}
+        columns={columns}
+        loading={loading}
+        pagination={paginationSetup}
+        onChange={handleTableChange}
+        data-test-subj="policyTable"
+        hasActions={false}
+      />
+    ) : (
+      <PolicyEmptyState loading={loading} onActionClick={handleCreatePolicyClick} />
+    );
+  }, [policyItems, loading, columns, handleCreatePolicyClick, handleTableChange, paginationSetup]);
+
   return (
     <>
       {showDelete && (
@@ -449,32 +465,7 @@ export const PolicyList = React.memo(() => {
             <EuiHorizontalRule margin="xs" />
           </>
         )}
-        {useMemo(() => {
-          return (
-            <>
-              {policyItems && policyItems.length > 0 ? (
-                <EuiBasicTable
-                  items={[...policyItems]}
-                  columns={columns}
-                  loading={loading}
-                  pagination={paginationSetup}
-                  onChange={handleTableChange}
-                  data-test-subj="policyTable"
-                  hasActions={false}
-                />
-              ) : (
-                <PolicyEmptyState loading={loading} onActionClick={handleCreatePolicyClick} />
-              )}
-            </>
-          );
-        }, [
-          policyItems,
-          loading,
-          columns,
-          handleCreatePolicyClick,
-          handleTableChange,
-          paginationSetup,
-        ])}
+        {bodyContent}
         <SpyRoute pageName={SecurityPageName.administration} />
       </ManagementPageView>
     </>

From 585d58c202e84945877f6138769bc0414c23ab09 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Thu, 30 Jul 2020 20:12:37 +0300
Subject: [PATCH 4/7] [KP] Expose new es client (#73651)

* mark legacy ES client types as deprecated

* expose es client to plugins and update mocks

* ElasticSearchClientMock --> ElasticsearchClientMock

* expose es client mocks

* expose es client via RequestHandlerContext

* convert test/plugin_functional/config into ts

* convert top_nav test into ts

* add an integration test for the es client

* update comments to refer to the new es client

* fix import paths. do not use extensions

temp

* update docs

* fix other refs

* add test for a custom client

* fix context

* add test for scoped client

* update docs
---
 ...lugin-core-server.assistanceapiresponse.md |  3 +
 ...in-core-server.assistantapiclientparams.md |  3 +
 ...-core-server.deprecationapiclientparams.md |  3 +
 ...ugin-core-server.deprecationapiresponse.md |  3 +
 ...bana-plugin-core-server.deprecationinfo.md |  3 +
 ...n-core-server.elasticsearchclientconfig.md | 18 +++++
 ...server.elasticsearchservicestart.client.md | 22 +++++++
 ....elasticsearchservicestart.createclient.md | 23 +++++++
 ...n-core-server.elasticsearchservicestart.md |  2 +
 ...ervicesetup.registerroutehandlercontext.md |  2 +-
 ...re-server.iclusterclient.asinternaluser.md | 13 ++++
 ...gin-core-server.iclusterclient.asscoped.md | 13 ++++
 ...ibana-plugin-core-server.iclusterclient.md | 21 ++++++
 ...-core-server.icustomclusterclient.close.md | 13 ++++
 ...plugin-core-server.icustomclusterclient.md | 20 ++++++
 ...plugin-core-server.ilegacyclusterclient.md |  5 ++
 ...-core-server.ilegacycustomclusterclient.md |  5 ++
 ...-core-server.ilegacyscopedclusterclient.md |  5 ++
 ...ore-server.indexsettingsdeprecationinfo.md |  3 +
 ...rver.iscopedclusterclient.ascurrentuser.md | 13 ++++
 ...ver.iscopedclusterclient.asinternaluser.md | 13 ++++
 ...plugin-core-server.iscopedclusterclient.md | 21 ++++++
 ...bana-plugin-core-server.legacyapicaller.md |  3 +
 ...plugin-core-server.legacycallapioptions.md |  4 ++
 ...-plugin-core-server.legacyclusterclient.md |  6 ++
 ...-server.legacyelasticsearchclientconfig.md |  3 +
 ...in-core-server.legacyelasticsearcherror.md |  1 +
 ...n-core-server.legacyscopedclusterclient.md |  6 ++
 .../core/server/kibana-plugin-core-server.md  | 12 ++--
 ...erver.migration_assistance_index_action.md |  3 +
 ...core-server.migration_deprecation_level.md |  3 +
 ...-core-server.requesthandlercontext.core.md |  1 +
 ...lugin-core-server.requesthandlercontext.md |  4 +-
 scripts/functional_tests.js                   |  2 +-
 src/core/server/elasticsearch/client/mocks.ts | 15 ++---
 .../client/retry_call_cluster.test.ts         |  8 +--
 .../client/scoped_cluster_client.test.ts      |  8 +--
 .../client/scoped_cluster_client.ts           |  2 +-
 .../elasticsearch_service.mock.ts             | 30 ++++-----
 .../server/elasticsearch/legacy/api_types.ts  | 46 ++++++++++---
 .../elasticsearch/legacy/cluster_client.ts    |  4 +-
 .../legacy/elasticsearch_client_config.ts     |  1 +
 .../server/elasticsearch/legacy/errors.ts     |  5 +-
 .../legacy/scoped_cluster_client.ts           |  2 +
 src/core/server/elasticsearch/types.ts        | 64 +++++++++---------
 src/core/server/http/types.ts                 |  2 +-
 src/core/server/index.ts                      | 11 +++-
 src/core/server/mocks.ts                      |  1 +
 src/core/server/plugins/plugin_context.ts     |  2 +
 .../migrations/core/elastic_index.test.ts     |  4 +-
 .../migrations/core/index_migrator.test.ts    |  6 +-
 .../core/migration_es_client.test.ts          |  4 +-
 .../migrations/kibana/kibana_migrator.test.ts |  4 +-
 .../service/lib/repository.test.js            |  2 +-
 .../service/lib/repository_es_client.test.ts  |  4 +-
 src/core/server/server.api.md                 | 66 +++++++++++++------
 src/core/server/server.ts                     |  1 +
 src/plugins/data/server/server.api.md         |  1 +
 tasks/config/run.js                           |  2 +-
 test/api_integration/services/index.ts        |  1 -
 test/plugin_functional/README.md              |  6 +-
 .../{config.js => config.ts}                  |  6 +-
 .../elasticsearch_client_plugin/kibana.json   |  7 ++
 .../elasticsearch_client_plugin/package.json  | 15 +++++
 .../server/index.ts}                          | 10 +--
 .../server/plugin.ts                          | 53 +++++++++++++++
 .../elasticsearch_client_plugin/tsconfig.json | 12 ++++
 test/plugin_functional/services/index.ts      | 11 +---
 .../core_plugins/elasticsearch_client.ts      | 38 +++++++++++
 .../test_suites/core_plugins/index.ts         |  1 +
 .../core_plugins/{top_nav.js => top_nav.ts}   |  4 +-
 x-pack/test/plugin_api_integration/config.ts  |  1 +
 .../plugins/elasticsearch_client/kibana.json  |  7 ++
 .../plugins/elasticsearch_client/package.json | 14 ++++
 .../elasticsearch_client/server/index.ts      |  9 +++
 .../elasticsearch_client/server/plugin.ts     | 36 ++++++++++
 .../platform/elasticsearch_client.ts          | 26 ++++++++
 .../test_suites/platform/index.ts             | 14 ++++
 78 files changed, 695 insertions(+), 146 deletions(-)
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.elasticsearchclientconfig.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.client.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.createclient.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.iclusterclient.asinternaluser.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.iclusterclient.asscoped.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.iclusterclient.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.icustomclusterclient.close.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.icustomclusterclient.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.ascurrentuser.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.asinternaluser.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.md
 rename test/plugin_functional/{config.js => config.ts} (94%)
 create mode 100644 test/plugin_functional/plugins/elasticsearch_client_plugin/kibana.json
 create mode 100644 test/plugin_functional/plugins/elasticsearch_client_plugin/package.json
 rename test/plugin_functional/{services/supertest.ts => plugins/elasticsearch_client_plugin/server/index.ts} (66%)
 create mode 100644 test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts
 create mode 100644 test/plugin_functional/plugins/elasticsearch_client_plugin/tsconfig.json
 create mode 100644 test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts
 rename test/plugin_functional/test_suites/core_plugins/{top_nav.js => top_nav.ts} (88%)
 create mode 100644 x-pack/test/plugin_api_integration/plugins/elasticsearch_client/kibana.json
 create mode 100644 x-pack/test/plugin_api_integration/plugins/elasticsearch_client/package.json
 create mode 100644 x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/index.ts
 create mode 100644 x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/plugin.ts
 create mode 100644 x-pack/test/plugin_api_integration/test_suites/platform/elasticsearch_client.ts
 create mode 100644 x-pack/test/plugin_api_integration/test_suites/platform/index.ts

diff --git a/docs/development/core/server/kibana-plugin-core-server.assistanceapiresponse.md b/docs/development/core/server/kibana-plugin-core-server.assistanceapiresponse.md
index 9bc24f4d1d366..4778c98493b5b 100644
--- a/docs/development/core/server/kibana-plugin-core-server.assistanceapiresponse.md
+++ b/docs/development/core/server/kibana-plugin-core-server.assistanceapiresponse.md
@@ -4,6 +4,9 @@
 
 ## AssistanceAPIResponse interface
 
+> Warning: This API is now obsolete.
+> 
+> 
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.assistantapiclientparams.md b/docs/development/core/server/kibana-plugin-core-server.assistantapiclientparams.md
index 8be7a9edde363..6d3f8df2fa518 100644
--- a/docs/development/core/server/kibana-plugin-core-server.assistantapiclientparams.md
+++ b/docs/development/core/server/kibana-plugin-core-server.assistantapiclientparams.md
@@ -4,6 +4,9 @@
 
 ## AssistantAPIClientParams interface
 
+> Warning: This API is now obsolete.
+> 
+> 
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationapiclientparams.md b/docs/development/core/server/kibana-plugin-core-server.deprecationapiclientparams.md
index e545cf42d3c26..ed64d61e75fab 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationapiclientparams.md
+++ b/docs/development/core/server/kibana-plugin-core-server.deprecationapiclientparams.md
@@ -4,6 +4,9 @@
 
 ## DeprecationAPIClientParams interface
 
+> Warning: This API is now obsolete.
+> 
+> 
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationapiresponse.md b/docs/development/core/server/kibana-plugin-core-server.deprecationapiresponse.md
index 1f6e1f9988fc2..1d837d9b4705d 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationapiresponse.md
+++ b/docs/development/core/server/kibana-plugin-core-server.deprecationapiresponse.md
@@ -4,6 +4,9 @@
 
 ## DeprecationAPIResponse interface
 
+> Warning: This API is now obsolete.
+> 
+> 
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationinfo.md b/docs/development/core/server/kibana-plugin-core-server.deprecationinfo.md
index bd343f5bc7476..8eeb5ef638a82 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationinfo.md
+++ b/docs/development/core/server/kibana-plugin-core-server.deprecationinfo.md
@@ -4,6 +4,9 @@
 
 ## DeprecationInfo interface
 
+> Warning: This API is now obsolete.
+> 
+> 
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearchclientconfig.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearchclientconfig.md
new file mode 100644
index 0000000000000..1ba359e81b9c6
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.elasticsearchclientconfig.md
@@ -0,0 +1,18 @@
+<!-- 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; [ElasticsearchClientConfig](./kibana-plugin-core-server.elasticsearchclientconfig.md)
+
+## ElasticsearchClientConfig type
+
+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)
+
+<b>Signature:</b>
+
+```typescript
+export declare type ElasticsearchClientConfig = Pick<ElasticsearchConfig, 'customHeaders' | 'logQueries' | 'sniffOnStart' | 'sniffOnConnectionFault' | 'requestHeadersWhitelist' | 'sniffInterval' | 'hosts' | 'username' | 'password'> & {
+    pingTimeout?: ElasticsearchConfig['pingTimeout'] | ClientOptions['pingTimeout'];
+    requestTimeout?: ElasticsearchConfig['requestTimeout'] | ClientOptions['requestTimeout'];
+    ssl?: Partial<ElasticsearchConfig['ssl']>;
+    keepAlive?: boolean;
+};
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.client.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.client.md
new file mode 100644
index 0000000000000..591f126c423e3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.client.md
@@ -0,0 +1,22 @@
+<!-- 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; [ElasticsearchServiceStart](./kibana-plugin-core-server.elasticsearchservicestart.md) &gt; [client](./kibana-plugin-core-server.elasticsearchservicestart.client.md)
+
+## ElasticsearchServiceStart.client property
+
+A pre-configured [Elasticsearch client](./kibana-plugin-core-server.iclusterclient.md)
+
+<b>Signature:</b>
+
+```typescript
+readonly client: IClusterClient;
+```
+
+## Example
+
+
+```js
+const client = core.elasticsearch.client;
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.createclient.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.createclient.md
new file mode 100644
index 0000000000000..d4a13812ab533
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.createclient.md
@@ -0,0 +1,23 @@
+<!-- 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; [ElasticsearchServiceStart](./kibana-plugin-core-server.elasticsearchservicestart.md) &gt; [createClient](./kibana-plugin-core-server.elasticsearchservicestart.createclient.md)
+
+## ElasticsearchServiceStart.createClient property
+
+Create application specific Elasticsearch cluster API client with customized config. See [IClusterClient](./kibana-plugin-core-server.iclusterclient.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ICustomClusterClient;
+```
+
+## Example
+
+
+```js
+const client = elasticsearch.createClient('my-app-name', config);
+const data = await client.asInternalUser.search();
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.md
index e059acdbd52fa..860867d654435 100644
--- a/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.md
+++ b/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.md
@@ -15,5 +15,7 @@ export interface ElasticsearchServiceStart
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [client](./kibana-plugin-core-server.elasticsearchservicestart.client.md) | <code>IClusterClient</code> | A pre-configured [Elasticsearch client](./kibana-plugin-core-server.iclusterclient.md) |
+|  [createClient](./kibana-plugin-core-server.elasticsearchservicestart.createclient.md) | <code>(type: string, clientConfig?: Partial&lt;ElasticsearchClientConfig&gt;) =&gt; ICustomClusterClient</code> | Create application specific Elasticsearch cluster API client with customized config. See [IClusterClient](./kibana-plugin-core-server.iclusterclient.md)<!-- -->. |
 |  [legacy](./kibana-plugin-core-server.elasticsearchservicestart.legacy.md) | <code>{</code><br/><code>        readonly createClient: (type: string, clientConfig?: Partial&lt;LegacyElasticsearchClientConfig&gt;) =&gt; ILegacyCustomClusterClient;</code><br/><code>        readonly client: ILegacyClusterClient;</code><br/><code>    }</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.registerroutehandlercontext.md b/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.registerroutehandlercontext.md
index 8958b49d98b0c..b0dc4d44f7559 100644
--- a/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.registerroutehandlercontext.md
+++ b/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.registerroutehandlercontext.md
@@ -21,7 +21,7 @@ registerRouteHandlerContext: <T extends keyof RequestHandlerContext>(contextName
    'myApp',
    (context, req) => {
     async function search (id: string) {
-      return await context.elasticsearch.legacy.client.callAsInternalUser('endpoint', id);
+      return await context.elasticsearch.client.asCurrentUser.find(id);
     }
     return { search };
    }
diff --git a/docs/development/core/server/kibana-plugin-core-server.iclusterclient.asinternaluser.md b/docs/development/core/server/kibana-plugin-core-server.iclusterclient.asinternaluser.md
new file mode 100644
index 0000000000000..c7adc345af5a3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.iclusterclient.asinternaluser.md
@@ -0,0 +1,13 @@
+<!-- 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; [IClusterClient](./kibana-plugin-core-server.iclusterclient.md) &gt; [asInternalUser](./kibana-plugin-core-server.iclusterclient.asinternaluser.md)
+
+## IClusterClient.asInternalUser property
+
+A [client](./kibana-plugin-core-server.elasticsearchclient.md) to be used to query the ES cluster on behalf of the Kibana internal user
+
+<b>Signature:</b>
+
+```typescript
+readonly asInternalUser: ElasticsearchClient;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.iclusterclient.asscoped.md b/docs/development/core/server/kibana-plugin-core-server.iclusterclient.asscoped.md
new file mode 100644
index 0000000000000..301fcbfee5858
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.iclusterclient.asscoped.md
@@ -0,0 +1,13 @@
+<!-- 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; [IClusterClient](./kibana-plugin-core-server.iclusterclient.md) &gt; [asScoped](./kibana-plugin-core-server.iclusterclient.asscoped.md)
+
+## IClusterClient.asScoped property
+
+Creates a [scoped cluster client](./kibana-plugin-core-server.iscopedclusterclient.md) bound to given [request](./kibana-plugin-core-server.scopeablerequest.md)
+
+<b>Signature:</b>
+
+```typescript
+asScoped: (request: ScopeableRequest) => IScopedClusterClient;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.iclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.iclusterclient.md
new file mode 100644
index 0000000000000..f6bacee322538
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.iclusterclient.md
@@ -0,0 +1,21 @@
+<!-- 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; [IClusterClient](./kibana-plugin-core-server.iclusterclient.md)
+
+## IClusterClient interface
+
+Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
+
+<b>Signature:</b>
+
+```typescript
+export interface IClusterClient 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [asInternalUser](./kibana-plugin-core-server.iclusterclient.asinternaluser.md) | <code>ElasticsearchClient</code> | A [client](./kibana-plugin-core-server.elasticsearchclient.md) to be used to query the ES cluster on behalf of the Kibana internal user |
+|  [asScoped](./kibana-plugin-core-server.iclusterclient.asscoped.md) | <code>(request: ScopeableRequest) =&gt; IScopedClusterClient</code> | Creates a [scoped cluster client](./kibana-plugin-core-server.iscopedclusterclient.md) bound to given [request](./kibana-plugin-core-server.scopeablerequest.md) |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.icustomclusterclient.close.md b/docs/development/core/server/kibana-plugin-core-server.icustomclusterclient.close.md
new file mode 100644
index 0000000000000..5fa2e93cca75b
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.icustomclusterclient.close.md
@@ -0,0 +1,13 @@
+<!-- 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; [ICustomClusterClient](./kibana-plugin-core-server.icustomclusterclient.md) &gt; [close](./kibana-plugin-core-server.icustomclusterclient.close.md)
+
+## ICustomClusterClient.close property
+
+Closes the cluster client. After that client cannot be used and one should create a new client instance to be able to interact with Elasticsearch API.
+
+<b>Signature:</b>
+
+```typescript
+close: () => Promise<void>;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.icustomclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.icustomclusterclient.md
new file mode 100644
index 0000000000000..189a50b5d6c20
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.icustomclusterclient.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; [ICustomClusterClient](./kibana-plugin-core-server.icustomclusterclient.md)
+
+## ICustomClusterClient interface
+
+See [IClusterClient](./kibana-plugin-core-server.iclusterclient.md)
+
+<b>Signature:</b>
+
+```typescript
+export interface ICustomClusterClient extends IClusterClient 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [close](./kibana-plugin-core-server.icustomclusterclient.close.md) | <code>() =&gt; Promise&lt;void&gt;</code> | Closes the cluster client. After that client cannot be used and one should create a new client instance to be able to interact with Elasticsearch API. |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.ilegacyclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.ilegacyclusterclient.md
index c70a5ac07c6ad..b5fbb3d54b972 100644
--- a/docs/development/core/server/kibana-plugin-core-server.ilegacyclusterclient.md
+++ b/docs/development/core/server/kibana-plugin-core-server.ilegacyclusterclient.md
@@ -4,6 +4,11 @@
 
 ## ILegacyClusterClient type
 
+> Warning: This API is now obsolete.
+> 
+> Use [IClusterClient](./kibana-plugin-core-server.iclusterclient.md)<!-- -->.
+> 
+
 Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
 
 See [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md)<!-- -->.
diff --git a/docs/development/core/server/kibana-plugin-core-server.ilegacycustomclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.ilegacycustomclusterclient.md
index a3cb8f1315021..4da121984d084 100644
--- a/docs/development/core/server/kibana-plugin-core-server.ilegacycustomclusterclient.md
+++ b/docs/development/core/server/kibana-plugin-core-server.ilegacycustomclusterclient.md
@@ -4,6 +4,11 @@
 
 ## ILegacyCustomClusterClient type
 
+> Warning: This API is now obsolete.
+> 
+> Use [ICustomClusterClient](./kibana-plugin-core-server.icustomclusterclient.md)<!-- -->.
+> 
+
 Represents an Elasticsearch cluster API client created by a plugin. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
 
 See [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md)<!-- -->.
diff --git a/docs/development/core/server/kibana-plugin-core-server.ilegacyscopedclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.ilegacyscopedclusterclient.md
index 1263b85acb498..51d0b2e4882cb 100644
--- a/docs/development/core/server/kibana-plugin-core-server.ilegacyscopedclusterclient.md
+++ b/docs/development/core/server/kibana-plugin-core-server.ilegacyscopedclusterclient.md
@@ -4,6 +4,11 @@
 
 ## ILegacyScopedClusterClient type
 
+> Warning: This API is now obsolete.
+> 
+> Use [IScopedClusterClient](./kibana-plugin-core-server.iscopedclusterclient.md)<!-- -->.
+> 
+
 Serves the same purpose as "normal" `ClusterClient` but exposes additional `callAsCurrentUser` method that doesn't use credentials of the Kibana internal user (as `callAsInternalUser` does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API.
 
 See [LegacyScopedClusterClient](./kibana-plugin-core-server.legacyscopedclusterclient.md)<!-- -->.
diff --git a/docs/development/core/server/kibana-plugin-core-server.indexsettingsdeprecationinfo.md b/docs/development/core/server/kibana-plugin-core-server.indexsettingsdeprecationinfo.md
index 00f1659549078..706898c4ad9aa 100644
--- a/docs/development/core/server/kibana-plugin-core-server.indexsettingsdeprecationinfo.md
+++ b/docs/development/core/server/kibana-plugin-core-server.indexsettingsdeprecationinfo.md
@@ -4,6 +4,9 @@
 
 ## IndexSettingsDeprecationInfo interface
 
+> Warning: This API is now obsolete.
+> 
+> 
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.ascurrentuser.md b/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.ascurrentuser.md
new file mode 100644
index 0000000000000..ddc6357bb8835
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.ascurrentuser.md
@@ -0,0 +1,13 @@
+<!-- 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; [IScopedClusterClient](./kibana-plugin-core-server.iscopedclusterclient.md) &gt; [asCurrentUser](./kibana-plugin-core-server.iscopedclusterclient.ascurrentuser.md)
+
+## IScopedClusterClient.asCurrentUser property
+
+A [client](./kibana-plugin-core-server.elasticsearchclient.md) to be used to query the elasticsearch cluster on behalf of the user that initiated the request to the Kibana server.
+
+<b>Signature:</b>
+
+```typescript
+readonly asCurrentUser: ElasticsearchClient;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.asinternaluser.md b/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.asinternaluser.md
new file mode 100644
index 0000000000000..f7f308aa13161
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.asinternaluser.md
@@ -0,0 +1,13 @@
+<!-- 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; [IScopedClusterClient](./kibana-plugin-core-server.iscopedclusterclient.md) &gt; [asInternalUser](./kibana-plugin-core-server.iscopedclusterclient.asinternaluser.md)
+
+## IScopedClusterClient.asInternalUser property
+
+A [client](./kibana-plugin-core-server.elasticsearchclient.md) to be used to query the elasticsearch cluster on behalf of the internal Kibana user.
+
+<b>Signature:</b>
+
+```typescript
+readonly asInternalUser: ElasticsearchClient;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.md
new file mode 100644
index 0000000000000..f39db268288a6
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.md
@@ -0,0 +1,21 @@
+<!-- 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; [IScopedClusterClient](./kibana-plugin-core-server.iscopedclusterclient.md)
+
+## IScopedClusterClient interface
+
+Serves the same purpose as the normal [cluster client](./kibana-plugin-core-server.iclusterclient.md) but exposes an additional `asCurrentUser` method that doesn't use credentials of the Kibana internal user (as `asInternalUser` does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API instead.
+
+<b>Signature:</b>
+
+```typescript
+export interface IScopedClusterClient 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [asCurrentUser](./kibana-plugin-core-server.iscopedclusterclient.ascurrentuser.md) | <code>ElasticsearchClient</code> | A [client](./kibana-plugin-core-server.elasticsearchclient.md) to be used to query the elasticsearch cluster on behalf of the user that initiated the request to the Kibana server. |
+|  [asInternalUser](./kibana-plugin-core-server.iscopedclusterclient.asinternaluser.md) | <code>ElasticsearchClient</code> | A [client](./kibana-plugin-core-server.elasticsearchclient.md) to be used to query the elasticsearch cluster on behalf of the internal Kibana user. |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyapicaller.md b/docs/development/core/server/kibana-plugin-core-server.legacyapicaller.md
index e6c2878d2b355..168209659046e 100644
--- a/docs/development/core/server/kibana-plugin-core-server.legacyapicaller.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyapicaller.md
@@ -4,6 +4,9 @@
 
 ## LegacyAPICaller interface
 
+> Warning: This API is now obsolete.
+> 
+> 
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.md b/docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.md
index 9ebe2fc57a54b..40def157114ef 100644
--- a/docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.md
@@ -4,6 +4,10 @@
 
 ## LegacyCallAPIOptions interface
 
+> Warning: This API is now obsolete.
+> 
+> 
+
 The set of options that defines how API call should be made and result be processed.
 
 <b>Signature:</b>
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.md
index c51f1858c97a5..668d0b2866a26 100644
--- a/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.md
@@ -4,6 +4,12 @@
 
 ## LegacyClusterClient class
 
+> Warning: This API is now obsolete.
+> 
+> Use [IClusterClient](./kibana-plugin-core-server.iclusterclient.md)<!-- -->.
+> 
+
+Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearchclientconfig.md b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearchclientconfig.md
index 62b0f216c863c..78f7bf582d355 100644
--- a/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearchclientconfig.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearchclientconfig.md
@@ -4,6 +4,9 @@
 
 ## LegacyElasticsearchClientConfig type
 
+> Warning: This API is now obsolete.
+> 
+> 
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherror.md b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherror.md
index f760780504e55..40fc1a8e05a68 100644
--- a/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherror.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherror.md
@@ -4,6 +4,7 @@
 
 ## LegacyElasticsearchError interface
 
+@<!-- -->deprecated. The new elasticsearch client doesn't wrap errors anymore.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient.md
index c4a94d8661c47..7f752d70921ba 100644
--- a/docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient.md
@@ -4,6 +4,12 @@
 
 ## LegacyScopedClusterClient class
 
+> Warning: This API is now obsolete.
+> 
+> Use [scoped cluster client](./kibana-plugin-core-server.iscopedclusterclient.md)<!-- -->.
+> 
+
+Serves the same purpose as the normal [cluster client](./kibana-plugin-core-server.iclusterclient.md) but exposes an additional `asCurrentUser` method that doesn't use credentials of the Kibana internal user (as `asInternalUser` does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API instead.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index 95b7627398b45..5347f0b55e19b 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -20,9 +20,9 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [CspConfig](./kibana-plugin-core-server.cspconfig.md) | CSP configuration for use in Kibana. |
 |  [ElasticsearchConfig](./kibana-plugin-core-server.elasticsearchconfig.md) | Wrapper of config schema. |
 |  [KibanaRequest](./kibana-plugin-core-server.kibanarequest.md) | Kibana specific abstraction for an incoming request. |
-|  [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md) |  |
+|  [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md) | Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via <code>asScoped(...)</code>). |
 |  [LegacyElasticsearchErrorHelpers](./kibana-plugin-core-server.legacyelasticsearcherrorhelpers.md) | Helpers for working with errors returned from the Elasticsearch service.Since the internal data of errors are subject to change, consumers of the Elasticsearch service should always use these helpers to classify errors instead of checking error internals such as <code>body.error.header[WWW-Authenticate]</code> |
-|  [LegacyScopedClusterClient](./kibana-plugin-core-server.legacyscopedclusterclient.md) |  |
+|  [LegacyScopedClusterClient](./kibana-plugin-core-server.legacyscopedclusterclient.md) | Serves the same purpose as the normal [cluster client](./kibana-plugin-core-server.iclusterclient.md) but exposes an additional <code>asCurrentUser</code> method that doesn't use credentials of the Kibana internal user (as <code>asInternalUser</code> does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API instead. |
 |  [RouteValidationError](./kibana-plugin-core-server.routevalidationerror.md) | Error to return when the validation is not successful. |
 |  [SavedObjectsClient](./kibana-plugin-core-server.savedobjectsclient.md) |  |
 |  [SavedObjectsErrorHelpers](./kibana-plugin-core-server.savedobjectserrorhelpers.md) |  |
@@ -98,20 +98,23 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [HttpServerInfo](./kibana-plugin-core-server.httpserverinfo.md) |  |
 |  [HttpServiceSetup](./kibana-plugin-core-server.httpservicesetup.md) | Kibana HTTP Service provides own abstraction for work with HTTP stack. Plugins don't have direct access to <code>hapi</code> server and its primitives anymore. Moreover, plugins shouldn't rely on the fact that HTTP Service uses one or another library under the hood. This gives the platform flexibility to upgrade or changing our internal HTTP stack without breaking plugins. If the HTTP Service lacks functionality you need, we are happy to discuss and support your needs. |
 |  [HttpServiceStart](./kibana-plugin-core-server.httpservicestart.md) |  |
+|  [IClusterClient](./kibana-plugin-core-server.iclusterclient.md) | Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via <code>asScoped(...)</code>). |
 |  [IContextContainer](./kibana-plugin-core-server.icontextcontainer.md) | An object that handles registration of context providers and configuring handlers with context. |
 |  [ICspConfig](./kibana-plugin-core-server.icspconfig.md) | CSP configuration for use in Kibana. |
+|  [ICustomClusterClient](./kibana-plugin-core-server.icustomclusterclient.md) | See [IClusterClient](./kibana-plugin-core-server.iclusterclient.md) |
 |  [IKibanaResponse](./kibana-plugin-core-server.ikibanaresponse.md) | A response data object, expected to returned as a result of [RequestHandler](./kibana-plugin-core-server.requesthandler.md) execution |
 |  [IKibanaSocket](./kibana-plugin-core-server.ikibanasocket.md) | A tiny abstraction for TCP socket. |
 |  [ImageValidation](./kibana-plugin-core-server.imagevalidation.md) |  |
 |  [IndexSettingsDeprecationInfo](./kibana-plugin-core-server.indexsettingsdeprecationinfo.md) |  |
 |  [IRenderOptions](./kibana-plugin-core-server.irenderoptions.md) |  |
 |  [IRouter](./kibana-plugin-core-server.irouter.md) | Registers route handlers for specified resource path and method. See [RouteConfig](./kibana-plugin-core-server.routeconfig.md) and [RequestHandler](./kibana-plugin-core-server.requesthandler.md) for more information about arguments to route registrations. |
+|  [IScopedClusterClient](./kibana-plugin-core-server.iscopedclusterclient.md) | Serves the same purpose as the normal [cluster client](./kibana-plugin-core-server.iclusterclient.md) but exposes an additional <code>asCurrentUser</code> method that doesn't use credentials of the Kibana internal user (as <code>asInternalUser</code> does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API instead. |
 |  [IUiSettingsClient](./kibana-plugin-core-server.iuisettingsclient.md) | Server-side client that provides access to the advanced settings stored in elasticsearch. The settings provide control over the behavior of the Kibana application. For example, a user can specify how to display numeric or date fields. Users can adjust the settings via Management UI. |
 |  [KibanaRequestEvents](./kibana-plugin-core-server.kibanarequestevents.md) | Request events. |
 |  [KibanaRequestRoute](./kibana-plugin-core-server.kibanarequestroute.md) | Request specific route information exposed to a handler. |
 |  [LegacyAPICaller](./kibana-plugin-core-server.legacyapicaller.md) |  |
 |  [LegacyCallAPIOptions](./kibana-plugin-core-server.legacycallapioptions.md) | The set of options that defines how API call should be made and result be processed. |
-|  [LegacyElasticsearchError](./kibana-plugin-core-server.legacyelasticsearcherror.md) |  |
+|  [LegacyElasticsearchError](./kibana-plugin-core-server.legacyelasticsearcherror.md) | @<!-- -->deprecated. The new elasticsearch client doesn't wrap errors anymore. |
 |  [LegacyRequest](./kibana-plugin-core-server.legacyrequest.md) |  |
 |  [LegacyServiceSetupDeps](./kibana-plugin-core-server.legacyservicesetupdeps.md) |  |
 |  [LegacyServiceStartDeps](./kibana-plugin-core-server.legacyservicestartdeps.md) |  |
@@ -137,7 +140,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [PluginConfigDescriptor](./kibana-plugin-core-server.pluginconfigdescriptor.md) | Describes a plugin configuration properties. |
 |  [PluginInitializerContext](./kibana-plugin-core-server.plugininitializercontext.md) | Context that's available to plugins during initialization stage. |
 |  [PluginManifest](./kibana-plugin-core-server.pluginmanifest.md) | Describes the set of required and optional properties plugin can define in its mandatory JSON manifest file. |
-|  [RequestHandlerContext](./kibana-plugin-core-server.requesthandlercontext.md) | Plugin specific context passed to a route handler.<!-- -->Provides the following clients and services: - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.legacy.client](./kibana-plugin-core-server.legacyscopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request |
+|  [RequestHandlerContext](./kibana-plugin-core-server.requesthandlercontext.md) | Plugin specific context passed to a route handler.<!-- -->Provides the following clients and services: - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.client](./kibana-plugin-core-server.iscopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.legacy.client](./kibana-plugin-core-server.legacyscopedclusterclient.md) - The legacy Elasticsearch data client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request - [uiSettings.auditor](./kibana-plugin-core-server.auditor.md) - AuditTrail client scoped to the incoming request |
 |  [RouteConfig](./kibana-plugin-core-server.routeconfig.md) | Route specific configuration. |
 |  [RouteConfigOptions](./kibana-plugin-core-server.routeconfigoptions.md) | Additional route options. |
 |  [RouteConfigOptionsBody](./kibana-plugin-core-server.routeconfigoptionsbody.md) | Additional body options for a route |
@@ -236,6 +239,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [ConfigPath](./kibana-plugin-core-server.configpath.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) |
 |  [Freezable](./kibana-plugin-core-server.freezable.md) |  |
 |  [GetAuthHeaders](./kibana-plugin-core-server.getauthheaders.md) | Get headers to authenticate a user against Elasticsearch. |
 |  [GetAuthState](./kibana-plugin-core-server.getauthstate.md) | Gets authentication state for a request. Returned by <code>auth</code> interceptor. |
diff --git a/docs/development/core/server/kibana-plugin-core-server.migration_assistance_index_action.md b/docs/development/core/server/kibana-plugin-core-server.migration_assistance_index_action.md
index 69fb573d36530..a924f0cea6b6b 100644
--- a/docs/development/core/server/kibana-plugin-core-server.migration_assistance_index_action.md
+++ b/docs/development/core/server/kibana-plugin-core-server.migration_assistance_index_action.md
@@ -4,6 +4,9 @@
 
 ## MIGRATION\_ASSISTANCE\_INDEX\_ACTION type
 
+> Warning: This API is now obsolete.
+> 
+> 
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.migration_deprecation_level.md b/docs/development/core/server/kibana-plugin-core-server.migration_deprecation_level.md
index c3256eaa78331..0fcae8c847cb4 100644
--- a/docs/development/core/server/kibana-plugin-core-server.migration_deprecation_level.md
+++ b/docs/development/core/server/kibana-plugin-core-server.migration_deprecation_level.md
@@ -4,6 +4,9 @@
 
 ## MIGRATION\_DEPRECATION\_LEVEL type
 
+> Warning: This API is now obsolete.
+> 
+> 
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.core.md b/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.core.md
index 2d31c24a077cb..5b8492ec5ece1 100644
--- a/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.core.md
+++ b/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.core.md
@@ -13,6 +13,7 @@ core: {
             typeRegistry: ISavedObjectTypeRegistry;
         };
         elasticsearch: {
+            client: IScopedClusterClient;
             legacy: {
                 client: ILegacyScopedClusterClient;
             };
diff --git a/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.md b/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.md
index 07e6dcbdae125..4e530973f9d50 100644
--- a/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.md
+++ b/docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.md
@@ -6,7 +6,7 @@
 
 Plugin specific context passed to a route handler.
 
-Provides the following clients and services: - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.legacy.client](./kibana-plugin-core-server.legacyscopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request
+Provides the following clients and services: - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.client](./kibana-plugin-core-server.iscopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.legacy.client](./kibana-plugin-core-server.legacyscopedclusterclient.md) - The legacy Elasticsearch data client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request - [uiSettings.auditor](./kibana-plugin-core-server.auditor.md) - AuditTrail client scoped to the incoming request
 
 <b>Signature:</b>
 
@@ -18,5 +18,5 @@ export interface RequestHandlerContext
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [core](./kibana-plugin-core-server.requesthandlercontext.core.md) | <code>{</code><br/><code>        savedObjects: {</code><br/><code>            client: SavedObjectsClientContract;</code><br/><code>            typeRegistry: ISavedObjectTypeRegistry;</code><br/><code>        };</code><br/><code>        elasticsearch: {</code><br/><code>            legacy: {</code><br/><code>                client: ILegacyScopedClusterClient;</code><br/><code>            };</code><br/><code>        };</code><br/><code>        uiSettings: {</code><br/><code>            client: IUiSettingsClient;</code><br/><code>        };</code><br/><code>        auditor: Auditor;</code><br/><code>    }</code> |  |
+|  [core](./kibana-plugin-core-server.requesthandlercontext.core.md) | <code>{</code><br/><code>        savedObjects: {</code><br/><code>            client: SavedObjectsClientContract;</code><br/><code>            typeRegistry: ISavedObjectTypeRegistry;</code><br/><code>        };</code><br/><code>        elasticsearch: {</code><br/><code>            client: IScopedClusterClient;</code><br/><code>            legacy: {</code><br/><code>                client: ILegacyScopedClusterClient;</code><br/><code>            };</code><br/><code>        };</code><br/><code>        uiSettings: {</code><br/><code>            client: IUiSettingsClient;</code><br/><code>        };</code><br/><code>        auditor: Auditor;</code><br/><code>    }</code> |  |
 
diff --git a/scripts/functional_tests.js b/scripts/functional_tests.js
index 3fdab481dc750..4facbe1ffbb07 100644
--- a/scripts/functional_tests.js
+++ b/scripts/functional_tests.js
@@ -20,7 +20,7 @@
 // eslint-disable-next-line no-restricted-syntax
 const alwaysImportedTests = [
   require.resolve('../test/functional/config.js'),
-  require.resolve('../test/plugin_functional/config.js'),
+  require.resolve('../test/plugin_functional/config.ts'),
   require.resolve('../test/ui_capabilities/newsfeed_err/config.ts'),
   require.resolve('../test/new_visualize_flow/config.js'),
 ];
diff --git a/src/core/server/elasticsearch/client/mocks.ts b/src/core/server/elasticsearch/client/mocks.ts
index c93294404b52f..2f2ca08fee6f2 100644
--- a/src/core/server/elasticsearch/client/mocks.ts
+++ b/src/core/server/elasticsearch/client/mocks.ts
@@ -70,15 +70,14 @@ const createInternalClientMock = (): DeeplyMockedKeys<Client> => {
   return (mock as unknown) as DeeplyMockedKeys<Client>;
 };
 
-// TODO fix naming ElasticsearchClientMock
-export type ElasticSearchClientMock = DeeplyMockedKeys<ElasticsearchClient>;
+export type ElasticsearchClientMock = DeeplyMockedKeys<ElasticsearchClient>;
 
-const createClientMock = (): ElasticSearchClientMock =>
-  (createInternalClientMock() as unknown) as ElasticSearchClientMock;
+const createClientMock = (): ElasticsearchClientMock =>
+  (createInternalClientMock() as unknown) as ElasticsearchClientMock;
 
 interface ScopedClusterClientMock {
-  asInternalUser: ElasticSearchClientMock;
-  asCurrentUser: ElasticSearchClientMock;
+  asInternalUser: ElasticsearchClientMock;
+  asCurrentUser: ElasticsearchClientMock;
 }
 
 const createScopedClusterClientMock = () => {
@@ -91,7 +90,7 @@ const createScopedClusterClientMock = () => {
 };
 
 export interface ClusterClientMock {
-  asInternalUser: ElasticSearchClientMock;
+  asInternalUser: ElasticsearchClientMock;
   asScoped: jest.MockedFunction<() => ScopedClusterClientMock>;
 }
 
@@ -157,7 +156,7 @@ export const elasticsearchClientMock = {
   createClusterClient: createClusterClientMock,
   createCustomClusterClient: createCustomClusterClientMock,
   createScopedClusterClient: createScopedClusterClientMock,
-  createElasticSearchClient: createClientMock,
+  createElasticsearchClient: createClientMock,
   createInternalClient: createInternalClientMock,
   createSuccessTransportRequestPromise,
   createErrorTransportRequestPromise,
diff --git a/src/core/server/elasticsearch/client/retry_call_cluster.test.ts b/src/core/server/elasticsearch/client/retry_call_cluster.test.ts
index 3aa47e8b40e24..c9366c575ba74 100644
--- a/src/core/server/elasticsearch/client/retry_call_cluster.test.ts
+++ b/src/core/server/elasticsearch/client/retry_call_cluster.test.ts
@@ -27,10 +27,10 @@ const createErrorReturn = (err: any) =>
   elasticsearchClientMock.createErrorTransportRequestPromise(err);
 
 describe('retryCallCluster', () => {
-  let client: ReturnType<typeof elasticsearchClientMock.createElasticSearchClient>;
+  let client: ReturnType<typeof elasticsearchClientMock.createElasticsearchClient>;
 
   beforeEach(() => {
-    client = elasticsearchClientMock.createElasticSearchClient();
+    client = elasticsearchClientMock.createElasticsearchClient();
   });
 
   it('returns response from ES API call in case of success', async () => {
@@ -91,11 +91,11 @@ describe('retryCallCluster', () => {
 });
 
 describe('migrationRetryCallCluster', () => {
-  let client: ReturnType<typeof elasticsearchClientMock.createElasticSearchClient>;
+  let client: ReturnType<typeof elasticsearchClientMock.createElasticsearchClient>;
   let logger: ReturnType<typeof loggingSystemMock.createLogger>;
 
   beforeEach(() => {
-    client = elasticsearchClientMock.createElasticSearchClient();
+    client = elasticsearchClientMock.createElasticsearchClient();
     logger = loggingSystemMock.createLogger();
   });
 
diff --git a/src/core/server/elasticsearch/client/scoped_cluster_client.test.ts b/src/core/server/elasticsearch/client/scoped_cluster_client.test.ts
index 78ca8fcbd3c07..4288c6bf6421d 100644
--- a/src/core/server/elasticsearch/client/scoped_cluster_client.test.ts
+++ b/src/core/server/elasticsearch/client/scoped_cluster_client.test.ts
@@ -22,8 +22,8 @@ import { ScopedClusterClient } from './scoped_cluster_client';
 
 describe('ScopedClusterClient', () => {
   it('uses the internal client passed in the constructor', () => {
-    const internalClient = elasticsearchClientMock.createElasticSearchClient();
-    const scopedClient = elasticsearchClientMock.createElasticSearchClient();
+    const internalClient = elasticsearchClientMock.createElasticsearchClient();
+    const scopedClient = elasticsearchClientMock.createElasticsearchClient();
 
     const scopedClusterClient = new ScopedClusterClient(internalClient, scopedClient);
 
@@ -31,8 +31,8 @@ describe('ScopedClusterClient', () => {
   });
 
   it('uses the scoped client passed in the constructor', () => {
-    const internalClient = elasticsearchClientMock.createElasticSearchClient();
-    const scopedClient = elasticsearchClientMock.createElasticSearchClient();
+    const internalClient = elasticsearchClientMock.createElasticsearchClient();
+    const scopedClient = elasticsearchClientMock.createElasticsearchClient();
 
     const scopedClusterClient = new ScopedClusterClient(internalClient, scopedClient);
 
diff --git a/src/core/server/elasticsearch/client/scoped_cluster_client.ts b/src/core/server/elasticsearch/client/scoped_cluster_client.ts
index 1af7948a65e16..05ab67073f9e1 100644
--- a/src/core/server/elasticsearch/client/scoped_cluster_client.ts
+++ b/src/core/server/elasticsearch/client/scoped_cluster_client.ts
@@ -20,7 +20,7 @@
 import { ElasticsearchClient } from './types';
 
 /**
- * Serves the same purpose as the normal {@link ClusterClient | cluster client} but exposes
+ * Serves the same purpose as the normal {@link IClusterClient | cluster client} but exposes
  * an additional `asCurrentUser` method that doesn't use credentials of the Kibana internal
  * user (as `asInternalUser` does) to request Elasticsearch API, but rather passes HTTP headers
  * extracted from the current user request to the API instead.
diff --git a/src/core/server/elasticsearch/elasticsearch_service.mock.ts b/src/core/server/elasticsearch/elasticsearch_service.mock.ts
index b97f6df6b0afc..501ab619316c2 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.mock.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.mock.ts
@@ -24,6 +24,7 @@ import {
   ClusterClientMock,
   CustomClusterClientMock,
 } from './client/mocks';
+import { ElasticsearchClientConfig } from './client';
 import { legacyClientMock } from './legacy/mocks';
 import { ElasticsearchConfig } from './elasticsearch_config';
 import { ElasticsearchService } from './elasticsearch_service';
@@ -38,12 +39,12 @@ interface MockedElasticSearchServiceSetup {
   };
 }
 
-type MockedElasticSearchServiceStart = MockedElasticSearchServiceSetup;
-
-interface MockedInternalElasticSearchServiceStart extends MockedElasticSearchServiceStart {
+type MockedElasticSearchServiceStart = MockedElasticSearchServiceSetup & {
   client: ClusterClientMock;
-  createClient: jest.MockedFunction<() => CustomClusterClientMock>;
-}
+  createClient: jest.MockedFunction<
+    (name: string, config?: Partial<ElasticsearchClientConfig>) => CustomClusterClientMock
+  >;
+};
 
 const createSetupContractMock = () => {
   const setupContract: MockedElasticSearchServiceSetup = {
@@ -61,6 +62,8 @@ const createSetupContractMock = () => {
 
 const createStartContractMock = () => {
   const startContract: MockedElasticSearchServiceStart = {
+    client: elasticsearchClientMock.createClusterClient(),
+    createClient: jest.fn(),
     legacy: {
       createClient: jest.fn(),
       client: legacyClientMock.createClusterClient(),
@@ -70,20 +73,13 @@ const createStartContractMock = () => {
   startContract.legacy.client.asScoped.mockReturnValue(
     legacyClientMock.createScopedClusterClient()
   );
+  startContract.createClient.mockImplementation(() =>
+    elasticsearchClientMock.createCustomClusterClient()
+  );
   return startContract;
 };
 
-const createInternalStartContractMock = () => {
-  const startContract: MockedInternalElasticSearchServiceStart = {
-    ...createStartContractMock(),
-    client: elasticsearchClientMock.createClusterClient(),
-    createClient: jest.fn(),
-  };
-
-  startContract.createClient.mockReturnValue(elasticsearchClientMock.createCustomClusterClient());
-
-  return startContract;
-};
+const createInternalStartContractMock = createStartContractMock;
 
 type MockedInternalElasticSearchServiceSetup = jest.Mocked<
   InternalElasticsearchServiceSetup & {
@@ -136,4 +132,6 @@ export const elasticsearchServiceMock = {
   createLegacyCustomClusterClient: legacyClientMock.createCustomClusterClient,
   createLegacyScopedClusterClient: legacyClientMock.createScopedClusterClient,
   createLegacyElasticsearchClient: legacyClientMock.createElasticsearchClient,
+
+  ...elasticsearchClientMock,
 };
diff --git a/src/core/server/elasticsearch/legacy/api_types.ts b/src/core/server/elasticsearch/legacy/api_types.ts
index b9699ab290e3f..896a58e085d49 100644
--- a/src/core/server/elasticsearch/legacy/api_types.ts
+++ b/src/core/server/elasticsearch/legacy/api_types.ts
@@ -150,6 +150,7 @@ import {
  * processed.
  *
  * @public
+ * @deprecated
  */
 export interface LegacyCallAPIOptions {
   /**
@@ -165,7 +166,10 @@ export interface LegacyCallAPIOptions {
   signal?: AbortSignal;
 }
 
-/** @public */
+/**
+ * @deprecated
+ * @public
+ * */
 export interface LegacyAPICaller {
   /* eslint-disable */
   (endpoint: 'bulk', params: BulkIndexDocumentsParams, options?: LegacyCallAPIOptions): ReturnType<Client['bulk']>;
@@ -317,18 +321,30 @@ export interface LegacyAPICaller {
   /* eslint-enable */
 }
 
-/** @public */
+/**
+ * @deprecated
+ * @public
+ * */
 export interface AssistantAPIClientParams extends GenericParams {
   path: '/_migration/assistance';
   method: 'GET';
 }
 
-/** @public */
+/**
+ * @deprecated
+ * @public
+ * */
 export type MIGRATION_ASSISTANCE_INDEX_ACTION = 'upgrade' | 'reindex';
-/** @public */
+/**
+ * @deprecated
+ * @public
+ * */
 export type MIGRATION_DEPRECATION_LEVEL = 'none' | 'info' | 'warning' | 'critical';
 
-/** @public */
+/**
+ * @deprecated
+ * @public
+ * */
 export interface AssistanceAPIResponse {
   indices: {
     [indexName: string]: {
@@ -337,13 +353,19 @@ export interface AssistanceAPIResponse {
   };
 }
 
-/** @public */
+/**
+ * @deprecated
+ * @public
+ * */
 export interface DeprecationAPIClientParams extends GenericParams {
   path: '/_migration/deprecations';
   method: 'GET';
 }
 
-/** @public */
+/**
+ * @deprecated
+ * @public
+ * */
 export interface DeprecationInfo {
   level: MIGRATION_DEPRECATION_LEVEL;
   message: string;
@@ -351,12 +373,18 @@ export interface DeprecationInfo {
   details?: string;
 }
 
-/** @public */
+/**
+ * @deprecated
+ * @public
+ * */
 export interface IndexSettingsDeprecationInfo {
   [indexName: string]: DeprecationInfo[];
 }
 
-/** @public */
+/**
+ * @deprecated
+ * @public
+ * */
 export interface DeprecationAPIResponse {
   cluster_settings: DeprecationInfo[];
   ml_settings: DeprecationInfo[];
diff --git a/src/core/server/elasticsearch/legacy/cluster_client.ts b/src/core/server/elasticsearch/legacy/cluster_client.ts
index 7a39113d25a14..f8b2d39a4251c 100644
--- a/src/core/server/elasticsearch/legacy/cluster_client.ts
+++ b/src/core/server/elasticsearch/legacy/cluster_client.ts
@@ -88,6 +88,7 @@ const callAPI = async (
  *
  * See {@link LegacyClusterClient}.
  *
+ * @deprecated Use {@link IClusterClient}.
  * @public
  */
 export type ILegacyClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'asScoped'>;
@@ -98,7 +99,7 @@ export type ILegacyClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser
  * the actual user that is derived from the request headers (via `asScoped(...)`).
  *
  * See {@link LegacyClusterClient}.
- *
+ * @deprecated Use {@link ICustomClusterClient}.
  * @public
  */
 export type ILegacyCustomClusterClient = Pick<
@@ -108,6 +109,7 @@ export type ILegacyCustomClusterClient = Pick<
 
 /**
  * {@inheritDoc IClusterClient}
+ * @deprecated Use {@link IClusterClient}.
  * @public
  */
 export class LegacyClusterClient implements ILegacyClusterClient {
diff --git a/src/core/server/elasticsearch/legacy/elasticsearch_client_config.ts b/src/core/server/elasticsearch/legacy/elasticsearch_client_config.ts
index 260a60ac74f11..3dbc1c2c647a9 100644
--- a/src/core/server/elasticsearch/legacy/elasticsearch_client_config.ts
+++ b/src/core/server/elasticsearch/legacy/elasticsearch_client_config.ts
@@ -31,6 +31,7 @@ import { ElasticsearchConfig } from '../elasticsearch_config';
  * not only entries from standard `elasticsearch.*` yaml config, but also some Elasticsearch JS
  * client specific options like `keepAlive` or `plugins` (that eventually will be deprecated).
  *
+ * @deprecated
  * @public
  */
 export type LegacyElasticsearchClientConfig = Pick<ConfigOptions, 'keepAlive' | 'log' | 'plugins'> &
diff --git a/src/core/server/elasticsearch/legacy/errors.ts b/src/core/server/elasticsearch/legacy/errors.ts
index 3b3b8da51a907..de4d2739977bb 100644
--- a/src/core/server/elasticsearch/legacy/errors.ts
+++ b/src/core/server/elasticsearch/legacy/errors.ts
@@ -26,7 +26,10 @@ enum ErrorCode {
   NOT_AUTHORIZED = 'Elasticsearch/notAuthorized',
 }
 
-/** @public */
+/**
+ * @deprecated. The new elasticsearch client doesn't wrap errors anymore.
+ * @public
+ * */
 export interface LegacyElasticsearchError extends Boom {
   [code]?: string;
 }
diff --git a/src/core/server/elasticsearch/legacy/scoped_cluster_client.ts b/src/core/server/elasticsearch/legacy/scoped_cluster_client.ts
index 9edb73645f0e2..aee7a1daa8166 100644
--- a/src/core/server/elasticsearch/legacy/scoped_cluster_client.ts
+++ b/src/core/server/elasticsearch/legacy/scoped_cluster_client.ts
@@ -30,6 +30,7 @@ import { LegacyAPICaller, LegacyCallAPIOptions } from './api_types';
  *
  * See {@link LegacyScopedClusterClient}.
  *
+ * @deprecated Use {@link IScopedClusterClient}.
  * @public
  */
 export type ILegacyScopedClusterClient = Pick<
@@ -39,6 +40,7 @@ export type ILegacyScopedClusterClient = Pick<
 
 /**
  * {@inheritDoc IScopedClusterClient}
+ * @deprecated Use {@link IScopedClusterClient | scoped cluster client}.
  * @public
  */
 export class LegacyScopedClusterClient implements ILegacyScopedClusterClient {
diff --git a/src/core/server/elasticsearch/types.ts b/src/core/server/elasticsearch/types.ts
index 40399aecbc446..88094af8047e7 100644
--- a/src/core/server/elasticsearch/types.ts
+++ b/src/core/server/elasticsearch/types.ts
@@ -95,6 +95,37 @@ export interface InternalElasticsearchServiceSetup {
  * @public
  */
 export interface ElasticsearchServiceStart {
+  /**
+   * A pre-configured {@link IClusterClient | Elasticsearch client}
+   *
+   * @example
+   * ```js
+   * const client = core.elasticsearch.client;
+   * ```
+   */
+  readonly client: IClusterClient;
+  /**
+   * Create application specific Elasticsearch cluster API client with customized config. See {@link IClusterClient}.
+   *
+   * @param type Unique identifier of the client
+   * @param clientConfig A config consists of Elasticsearch JS client options and
+   * valid sub-set of Elasticsearch service config.
+   * We fill all the missing properties in the `clientConfig` using the default
+   * Elasticsearch config so that we don't depend on default values set and
+   * controlled by underlying Elasticsearch JS client.
+   * We don't run validation against the passed config and expect it to be valid.
+   *
+   * @example
+   * ```js
+   * const client = elasticsearch.createClient('my-app-name', config);
+   * const data = await client.asInternalUser.search();
+   * ```
+   */
+  readonly createClient: (
+    type: string,
+    clientConfig?: Partial<ElasticsearchClientConfig>
+  ) => ICustomClusterClient;
+
   /**
    * @deprecated
    * Provided for the backward compatibility.
@@ -138,38 +169,7 @@ export interface ElasticsearchServiceStart {
 /**
  * @internal
  */
-export interface InternalElasticsearchServiceStart extends ElasticsearchServiceStart {
-  /**
-   * A pre-configured {@link IClusterClient | Elasticsearch client}
-   *
-   * @example
-   * ```js
-   * const client = core.elasticsearch.client;
-   * ```
-   */
-  readonly client: IClusterClient;
-  /**
-   * Create application specific Elasticsearch cluster API client with customized config. See {@link IClusterClient}.
-   *
-   * @param type Unique identifier of the client
-   * @param clientConfig A config consists of Elasticsearch JS client options and
-   * valid sub-set of Elasticsearch service config.
-   * We fill all the missing properties in the `clientConfig` using the default
-   * Elasticsearch config so that we don't depend on default values set and
-   * controlled by underlying Elasticsearch JS client.
-   * We don't run validation against the passed config and expect it to be valid.
-   *
-   * @example
-   * ```js
-   * const client = elasticsearch.createClient('my-app-name', config);
-   * const data = await client.asInternalUser().search();
-   * ```
-   */
-  readonly createClient: (
-    type: string,
-    clientConfig?: Partial<ElasticsearchClientConfig>
-  ) => ICustomClusterClient;
-}
+export type InternalElasticsearchServiceStart = ElasticsearchServiceStart;
 
 /** @public */
 export interface ElasticsearchStatusMeta {
diff --git a/src/core/server/http/types.ts b/src/core/server/http/types.ts
index 3df098a1df00d..4345783e46e11 100644
--- a/src/core/server/http/types.ts
+++ b/src/core/server/http/types.ts
@@ -250,7 +250,7 @@ export interface HttpServiceSetup {
    *    'myApp',
    *    (context, req) => {
    *     async function search (id: string) {
-   *       return await context.elasticsearch.legacy.client.callAsInternalUser('endpoint', id);
+   *       return await context.elasticsearch.client.asCurrentUser.find(id);
    *     }
    *     return { search };
    *    }
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index f46b41d6b8793..382318ea86a34 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -44,6 +44,7 @@ import {
   ILegacyScopedClusterClient,
   configSchema as elasticsearchConfigSchema,
   ElasticsearchServiceStart,
+  IScopedClusterClient,
 } from './elasticsearch';
 
 import { HttpServiceSetup, HttpServiceStart } from './http';
@@ -110,6 +111,10 @@ export {
   FakeRequest,
   ScopeableRequest,
   ElasticsearchClient,
+  IClusterClient,
+  ICustomClusterClient,
+  ElasticsearchClientConfig,
+  IScopedClusterClient,
   SearchResponse,
   CountResponse,
   ShardsInfo,
@@ -367,10 +372,13 @@ export {
  *      which uses the credentials of the incoming request
  *    - {@link ISavedObjectTypeRegistry | savedObjects.typeRegistry} - Type registry containing
  *      all the registered types.
- *    - {@link LegacyScopedClusterClient | elasticsearch.legacy.client} - Elasticsearch
+ *    - {@link IScopedClusterClient | elasticsearch.client} - Elasticsearch
+ *      data client which uses the credentials of the incoming request
+ *    - {@link LegacyScopedClusterClient | elasticsearch.legacy.client} - The legacy Elasticsearch
  *      data client which uses the credentials of the incoming request
  *    - {@link IUiSettingsClient | uiSettings.client} - uiSettings client
  *      which uses the credentials of the incoming request
+ *    - {@link Auditor | uiSettings.auditor} - AuditTrail client scoped to the incoming request
  *
  * @public
  */
@@ -381,6 +389,7 @@ export interface RequestHandlerContext {
       typeRegistry: ISavedObjectTypeRegistry;
     };
     elasticsearch: {
+      client: IScopedClusterClient;
       legacy: {
         client: ILegacyScopedClusterClient;
       };
diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
index 84e4b4741b717..bf9dcc4abe01c 100644
--- a/src/core/server/mocks.ts
+++ b/src/core/server/mocks.ts
@@ -193,6 +193,7 @@ function createCoreRequestHandlerContextMock() {
       typeRegistry: savedObjectsTypeRegistryMock.create(),
     },
     elasticsearch: {
+      client: elasticsearchServiceMock.createScopedClusterClient(),
       legacy: {
         client: elasticsearchServiceMock.createLegacyScopedClusterClient(),
       },
diff --git a/src/core/server/plugins/plugin_context.ts b/src/core/server/plugins/plugin_context.ts
index c17b8df8bb52c..5235f3ee6d580 100644
--- a/src/core/server/plugins/plugin_context.ts
+++ b/src/core/server/plugins/plugin_context.ts
@@ -212,6 +212,8 @@ export function createPluginStartContext<TPlugin, TPluginDependencies>(
       resolveCapabilities: deps.capabilities.resolveCapabilities,
     },
     elasticsearch: {
+      client: deps.elasticsearch.client,
+      createClient: deps.elasticsearch.createClient,
       legacy: deps.elasticsearch.legacy,
     },
     http: {
diff --git a/src/core/server/saved_objects/migrations/core/elastic_index.test.ts b/src/core/server/saved_objects/migrations/core/elastic_index.test.ts
index fb8fb4ef95081..0b3ad1b6e3cc8 100644
--- a/src/core/server/saved_objects/migrations/core/elastic_index.test.ts
+++ b/src/core/server/saved_objects/migrations/core/elastic_index.test.ts
@@ -22,10 +22,10 @@ import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
 import * as Index from './elastic_index';
 
 describe('ElasticIndex', () => {
-  let client: ReturnType<typeof elasticsearchClientMock.createElasticSearchClient>;
+  let client: ReturnType<typeof elasticsearchClientMock.createElasticsearchClient>;
 
   beforeEach(() => {
-    client = elasticsearchClientMock.createElasticSearchClient();
+    client = elasticsearchClientMock.createElasticsearchClient();
   });
   describe('fetchInfo', () => {
     test('it handles 404', async () => {
diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
index 78601d033f8d8..b0669774207dd 100644
--- a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
@@ -27,13 +27,13 @@ import { loggingSystemMock } from '../../../logging/logging_system.mock';
 
 describe('IndexMigrator', () => {
   let testOpts: jest.Mocked<MigrationOpts> & {
-    client: ReturnType<typeof elasticsearchClientMock.createElasticSearchClient>;
+    client: ReturnType<typeof elasticsearchClientMock.createElasticsearchClient>;
   };
 
   beforeEach(() => {
     testOpts = {
       batchSize: 10,
-      client: elasticsearchClientMock.createElasticSearchClient(),
+      client: elasticsearchClientMock.createElasticsearchClient(),
       index: '.kibana',
       log: loggingSystemMock.create().get(),
       mappingProperties: {},
@@ -366,7 +366,7 @@ describe('IndexMigrator', () => {
 });
 
 function withIndex(
-  client: ReturnType<typeof elasticsearchClientMock.createElasticSearchClient>,
+  client: ReturnType<typeof elasticsearchClientMock.createElasticsearchClient>,
   opts: any = {}
 ) {
   const defaultIndex = {
diff --git a/src/core/server/saved_objects/migrations/core/migration_es_client.test.ts b/src/core/server/saved_objects/migrations/core/migration_es_client.test.ts
index 40c06677c4a5a..a6da62095060c 100644
--- a/src/core/server/saved_objects/migrations/core/migration_es_client.test.ts
+++ b/src/core/server/saved_objects/migrations/core/migration_es_client.test.ts
@@ -24,11 +24,11 @@ import { loggerMock } from '../../../logging/logger.mock';
 import { SavedObjectsErrorHelpers } from '../../service/lib/errors';
 
 describe('MigrationEsClient', () => {
-  let client: ReturnType<typeof elasticsearchClientMock.createElasticSearchClient>;
+  let client: ReturnType<typeof elasticsearchClientMock.createElasticsearchClient>;
   let migrationEsClient: MigrationEsClient;
 
   beforeEach(() => {
-    client = elasticsearchClientMock.createElasticSearchClient();
+    client = elasticsearchClientMock.createElasticsearchClient();
     migrationEsClient = createMigrationEsClient(client, loggerMock.create());
     migrationRetryCallClusterMock.mockClear();
   });
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
index c3ed97a89af80..cc443093e30a3 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
@@ -127,7 +127,7 @@ describe('KibanaMigrator', () => {
 });
 
 type MockedOptions = KibanaMigratorOptions & {
-  client: ReturnType<typeof elasticsearchClientMock.createElasticSearchClient>;
+  client: ReturnType<typeof elasticsearchClientMock.createElasticsearchClient>;
 };
 
 const mockOptions = () => {
@@ -170,7 +170,7 @@ const mockOptions = () => {
       scrollDuration: '10m',
       skip: false,
     },
-    client: elasticsearchClientMock.createElasticSearchClient(),
+    client: elasticsearchClientMock.createElasticsearchClient(),
   };
   return options;
 };
diff --git a/src/core/server/saved_objects/service/lib/repository.test.js b/src/core/server/saved_objects/service/lib/repository.test.js
index b902179b012ff..4a9fceb9bf357 100644
--- a/src/core/server/saved_objects/service/lib/repository.test.js
+++ b/src/core/server/saved_objects/service/lib/repository.test.js
@@ -201,7 +201,7 @@ describe('SavedObjectsRepository', () => {
   };
 
   beforeEach(() => {
-    client = elasticsearchClientMock.createElasticSearchClient();
+    client = elasticsearchClientMock.createElasticsearchClient();
     migrator = {
       migrateDocument: jest.fn().mockImplementation(documentMigrator.migrate),
       runMigrations: async () => ({ status: 'skipped' }),
diff --git a/src/core/server/saved_objects/service/lib/repository_es_client.test.ts b/src/core/server/saved_objects/service/lib/repository_es_client.test.ts
index 86a984fb67124..61df94fb6bfe2 100644
--- a/src/core/server/saved_objects/service/lib/repository_es_client.test.ts
+++ b/src/core/server/saved_objects/service/lib/repository_es_client.test.ts
@@ -23,11 +23,11 @@ import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
 import { SavedObjectsErrorHelpers } from './errors';
 
 describe('RepositoryEsClient', () => {
-  let client: ReturnType<typeof elasticsearchClientMock.createElasticSearchClient>;
+  let client: ReturnType<typeof elasticsearchClientMock.createElasticsearchClient>;
   let repositoryClient: RepositoryEsClient;
 
   beforeEach(() => {
-    client = elasticsearchClientMock.createElasticSearchClient();
+    client = elasticsearchClientMock.createElasticsearchClient();
     repositoryClient = createRepositoryEsClient(client);
     retryCallClusterMock.mockClear();
   });
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index c94151f8cee17..c1054c27d084e 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -158,7 +158,7 @@ export type AppenderConfigType = TypeOf<typeof appendersSchema>;
 // @public
 export function assertNever(x: never): never;
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export interface AssistanceAPIResponse {
     // (undocumented)
     indices: {
@@ -168,7 +168,7 @@ export interface AssistanceAPIResponse {
     };
 }
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export interface AssistantAPIClientParams extends GenericParams {
     // (undocumented)
     method: 'GET';
@@ -622,7 +622,7 @@ export interface DeleteDocumentResponse {
     _version: number;
 }
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export interface DeprecationAPIClientParams extends GenericParams {
     // (undocumented)
     method: 'GET';
@@ -630,7 +630,7 @@ export interface DeprecationAPIClientParams extends GenericParams {
     path: '/_migration/deprecations';
 }
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export interface DeprecationAPIResponse {
     // (undocumented)
     cluster_settings: DeprecationInfo[];
@@ -642,7 +642,7 @@ export interface DeprecationAPIResponse {
     node_settings: DeprecationInfo[];
 }
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export interface DeprecationInfo {
     // (undocumented)
     details?: string;
@@ -679,6 +679,14 @@ export type ElasticsearchClient = Omit<KibanaClient, 'connectionPool' | 'transpo
     };
 };
 
+// @public
+export type ElasticsearchClientConfig = Pick<ElasticsearchConfig, 'customHeaders' | 'logQueries' | 'sniffOnStart' | 'sniffOnConnectionFault' | 'requestHeadersWhitelist' | 'sniffInterval' | 'hosts' | 'username' | 'password'> & {
+    pingTimeout?: ElasticsearchConfig['pingTimeout'] | ClientOptions['pingTimeout'];
+    requestTimeout?: ElasticsearchConfig['requestTimeout'] | ClientOptions['requestTimeout'];
+    ssl?: Partial<ElasticsearchConfig['ssl']>;
+    keepAlive?: boolean;
+};
+
 // @public
 export class ElasticsearchConfig {
     constructor(rawConfig: ElasticsearchConfigType);
@@ -715,6 +723,8 @@ export interface ElasticsearchServiceSetup {
 
 // @public (undocumented)
 export interface ElasticsearchServiceStart {
+    readonly client: IClusterClient;
+    readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ICustomClusterClient;
     // @deprecated (undocumented)
     legacy: {
         readonly createClient: (type: string, clientConfig?: Partial<LegacyElasticsearchClientConfig>) => ILegacyCustomClusterClient;
@@ -895,6 +905,12 @@ export interface HttpServiceStart {
 // @public
 export type IBasePath = Pick<BasePath, keyof BasePath>;
 
+// @public
+export interface IClusterClient {
+    readonly asInternalUser: ElasticsearchClient;
+    asScoped: (request: ScopeableRequest) => IScopedClusterClient;
+}
+
 // @public
 export interface IContextContainer<THandler extends HandlerFunction<any>> {
     createHandler(pluginOpaqueId: PluginOpaqueId, handler: THandler): (...rest: HandlerParameters<THandler>) => ShallowPromise<ReturnType<THandler>>;
@@ -914,6 +930,11 @@ export interface ICspConfig {
     readonly warnLegacyBrowsers: boolean;
 }
 
+// @public
+export interface ICustomClusterClient extends IClusterClient {
+    close: () => Promise<void>;
+}
+
 // @public
 export interface IKibanaResponse<T extends HttpResponsePayload | ResponseError = any> {
     // (undocumented)
@@ -935,13 +956,13 @@ export interface IKibanaSocket {
     getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate | null;
 }
 
-// @public
+// @public @deprecated
 export type ILegacyClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'asScoped'>;
 
-// @public
+// @public @deprecated
 export type ILegacyCustomClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
 
-// @public
+// @public @deprecated
 export type ILegacyScopedClusterClient = Pick<LegacyScopedClusterClient, 'callAsCurrentUser' | 'callAsInternalUser'>;
 
 // @public (undocumented)
@@ -956,7 +977,7 @@ export interface ImageValidation {
 // @public
 export function importSavedObjectsFromStream({ readStream, objectLimit, overwrite, savedObjectsClient, supportedTypes, namespace, }: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export interface IndexSettingsDeprecationInfo {
     // (undocumented)
     [indexName: string]: DeprecationInfo[];
@@ -997,6 +1018,12 @@ export type ISavedObjectsRepository = Pick<SavedObjectsRepository, keyof SavedOb
 // @public
 export type ISavedObjectTypeRegistry = Omit<SavedObjectTypeRegistry, 'registerType'>;
 
+// @public
+export interface IScopedClusterClient {
+    readonly asCurrentUser: ElasticsearchClient;
+    readonly asInternalUser: ElasticsearchClient;
+}
+
 // @public
 export function isRelativeUrl(candidatePath: string): boolean;
 
@@ -1086,7 +1113,7 @@ export const kibanaResponseFactory: {
 // @public
 export type KnownHeaders = KnownKeys<IncomingHttpHeaders>;
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export interface LegacyAPICaller {
     // (undocumented)
     (endpoint: 'bulk', params: BulkIndexDocumentsParams, options?: LegacyCallAPIOptions): ReturnType<Client['bulk']>;
@@ -1330,15 +1357,13 @@ export interface LegacyAPICaller {
     <T = any>(endpoint: string, clientParams?: Record<string, any>, options?: LegacyCallAPIOptions): Promise<T>;
 }
 
-// @public
+// @public @deprecated
 export interface LegacyCallAPIOptions {
     signal?: AbortSignal;
     wrap401Errors?: boolean;
 }
 
-// Warning: (ae-unresolved-inheritdoc-reference) The @inheritDoc reference could not be resolved: The package "kibana" does not have an export "IClusterClient"
-//
-// @public (undocumented)
+// @public @deprecated
 export class LegacyClusterClient implements ILegacyClusterClient {
     constructor(config: LegacyElasticsearchClientConfig, log: Logger, getAuditorFactory: () => AuditorFactory, getAuthHeaders?: GetAuthHeaders);
     asScoped(request?: ScopeableRequest): ILegacyScopedClusterClient;
@@ -1360,7 +1385,7 @@ export interface LegacyConfig {
     set(config: LegacyVars): void;
 }
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type LegacyElasticsearchClientConfig = Pick<ConfigOptions, 'keepAlive' | 'log' | 'plugins'> & Pick<ElasticsearchConfig, 'apiVersion' | 'customHeaders' | 'logQueries' | 'requestHeadersWhitelist' | 'sniffOnStart' | 'sniffOnConnectionFault' | 'hosts' | 'username' | 'password'> & {
     pingTimeout?: ElasticsearchConfig['pingTimeout'] | ConfigOptions['pingTimeout'];
     requestTimeout?: ElasticsearchConfig['requestTimeout'] | ConfigOptions['requestTimeout'];
@@ -1368,7 +1393,7 @@ export type LegacyElasticsearchClientConfig = Pick<ConfigOptions, 'keepAlive' |
     ssl?: Partial<ElasticsearchConfig['ssl']>;
 };
 
-// @public (undocumented)
+// @public
 export interface LegacyElasticsearchError extends Boom {
     // (undocumented)
     [code]?: string;
@@ -1401,9 +1426,7 @@ export class LegacyInternals implements ILegacyInternals {
 export interface LegacyRequest extends Request {
 }
 
-// Warning: (ae-unresolved-inheritdoc-reference) The @inheritDoc reference could not be resolved: The package "kibana" does not have an export "IScopedClusterClient"
-//
-// @public (undocumented)
+// @public @deprecated
 export class LegacyScopedClusterClient implements ILegacyScopedClusterClient {
     constructor(internalAPICaller: LegacyAPICaller, scopedAPICaller: LegacyAPICaller, headers?: Headers | undefined, auditor?: Auditor | undefined);
     callAsCurrentUser(endpoint: string, clientParams?: Record<string, any>, options?: LegacyCallAPIOptions): Promise<any>;
@@ -1559,10 +1582,10 @@ export interface LogRecord {
 export interface MetricsServiceSetup {
 }
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type MIGRATION_ASSISTANCE_INDEX_ACTION = 'upgrade' | 'reindex';
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type MIGRATION_DEPRECATION_LEVEL = 'none' | 'info' | 'warning' | 'critical';
 
 // @public
@@ -1812,6 +1835,7 @@ export interface RequestHandlerContext {
             typeRegistry: ISavedObjectTypeRegistry;
         };
         elasticsearch: {
+            client: IScopedClusterClient;
             legacy: {
                 client: ILegacyScopedClusterClient;
             };
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index 2dae7f8f38f23..aff749ca97534 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -275,6 +275,7 @@ export class Server {
             typeRegistry: coreStart.savedObjects.getTypeRegistry(),
           },
           elasticsearch: {
+            client: coreStart.elasticsearch.client.asScoped(req),
             legacy: {
               client: coreStart.elasticsearch.legacy.client.asScoped(req),
             },
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 7ad2f9edd3325..d35a6a5bbb9a9 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -22,6 +22,7 @@ import { CatTasksParams } from 'elasticsearch';
 import { CatThreadPoolParams } from 'elasticsearch';
 import { ClearScrollParams } from 'elasticsearch';
 import { Client } from 'elasticsearch';
+import { ClientOptions } from '@elastic/elasticsearch';
 import { ClusterAllocationExplainParams } from 'elasticsearch';
 import { ClusterGetSettingsParams } from 'elasticsearch';
 import { ClusterHealthParams } from 'elasticsearch';
diff --git a/tasks/config/run.js b/tasks/config/run.js
index 9ac8f72d56d4a..132b51765b3ed 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -210,7 +210,7 @@ module.exports = function () {
       args: [
         'scripts/functional_tests',
         '--config',
-        'test/plugin_functional/config.js',
+        'test/plugin_functional/config.ts',
         '--bail',
         '--debug',
       ],
diff --git a/test/api_integration/services/index.ts b/test/api_integration/services/index.ts
index 782ea271869ba..d024943bef792 100644
--- a/test/api_integration/services/index.ts
+++ b/test/api_integration/services/index.ts
@@ -19,7 +19,6 @@
 
 import { services as commonServices } from '../../common/services';
 
-// @ts-ignore not TS yet
 import { KibanaSupertestProvider, ElasticsearchSupertestProvider } from './supertest';
 
 export const services = {
diff --git a/test/plugin_functional/README.md b/test/plugin_functional/README.md
index 476c08408658c..075d321917c39 100644
--- a/test/plugin_functional/README.md
+++ b/test/plugin_functional/README.md
@@ -17,9 +17,9 @@ To run these tests during development you can use the following commands:
 
 ```
 # Start the test server (can continue running)
-node scripts/functional_tests_server.js --config test/plugin_functional/config.js
+node scripts/functional_tests_server.js --config test/plugin_functional/config.ts
 # Start a test run
-node scripts/functional_test_runner.js --config test/plugin_functional/config.js
+node scripts/functional_test_runner.js --config test/plugin_functional/config.ts
 ```
 
 ## Run Kibana with a test plugin
@@ -42,7 +42,7 @@ If you wish to load up specific es archived data for your test, you can do so vi
 Another option, which will automatically use any specific settings the test environment may rely on, is to boot up the functional test server pointing to the plugin configuration file.
 
 ```
-node scripts/functional_tests_server --config test/plugin_functional/config.js
+node scripts/functional_tests_server --config test/plugin_functional/config.ts
 ```
 
 *Note:* you may still need to use the es_archiver script to boot up any required data.
diff --git a/test/plugin_functional/config.js b/test/plugin_functional/config.ts
similarity index 94%
rename from test/plugin_functional/config.js
rename to test/plugin_functional/config.ts
index f51fb5e1bade4..c611300eade10 100644
--- a/test/plugin_functional/config.js
+++ b/test/plugin_functional/config.ts
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
 import path from 'path';
 import fs from 'fs';
-import { services } from './services';
 
-export default async function ({ readConfigFile }) {
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const functionalConfig = await readConfigFile(require.resolve('../functional/config'));
 
   // Find all folders in ./plugins since we treat all them as plugin folder
@@ -42,7 +41,6 @@ export default async function ({ readConfigFile }) {
     ],
     services: {
       ...functionalConfig.get('services'),
-      ...services,
     },
     pageObjects: functionalConfig.get('pageObjects'),
     servers: functionalConfig.get('servers'),
diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/kibana.json b/test/plugin_functional/plugins/elasticsearch_client_plugin/kibana.json
new file mode 100644
index 0000000000000..a7674881e8ba0
--- /dev/null
+++ b/test/plugin_functional/plugins/elasticsearch_client_plugin/kibana.json
@@ -0,0 +1,7 @@
+{
+  "id": "elasticsearch_client_plugin",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "server": true,
+  "ui": false
+}
diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/package.json b/test/plugin_functional/plugins/elasticsearch_client_plugin/package.json
new file mode 100644
index 0000000000000..02c2955f26c86
--- /dev/null
+++ b/test/plugin_functional/plugins/elasticsearch_client_plugin/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "elasticsearch_client_plugin",
+  "version": "1.0.0",
+  "kibana": {
+    "version": "kibana"
+  },
+  "license": "Apache-2.0",
+  "scripts": {
+    "kbn": "node ../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && tsc"
+  },
+  "devDependencies": {
+    "typescript": "3.9.5"
+  }
+}
diff --git a/test/plugin_functional/services/supertest.ts b/test/plugin_functional/plugins/elasticsearch_client_plugin/server/index.ts
similarity index 66%
rename from test/plugin_functional/services/supertest.ts
rename to test/plugin_functional/plugins/elasticsearch_client_plugin/server/index.ts
index 6b7dc26248c06..3801e33a2cf3e 100644
--- a/test/plugin_functional/services/supertest.ts
+++ b/test/plugin_functional/plugins/elasticsearch_client_plugin/server/index.ts
@@ -16,13 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { format as formatUrl } from 'url';
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
 
-import supertestAsPromised from 'supertest-as-promised';
+import { ElasticsearchClientPlugin } from './plugin';
 
-export function KibanaSupertestProvider({ getService }: FtrProviderContext) {
-  const config = getService('config');
-  const kibanaServerUrl = formatUrl(config.get('servers.kibana'));
-  return supertestAsPromised(kibanaServerUrl);
-}
+export const plugin = () => new ElasticsearchClientPlugin();
diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts b/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts
new file mode 100644
index 0000000000000..5e018ca7818d3
--- /dev/null
+++ b/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts
@@ -0,0 +1,53 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { Plugin, CoreSetup, CoreStart, ICustomClusterClient } from 'src/core/server';
+
+export class ElasticsearchClientPlugin implements Plugin {
+  private client?: ICustomClusterClient;
+  public setup(core: CoreSetup) {
+    const router = core.http.createRouter();
+    router.get(
+      { path: '/api/elasticsearch_client_plugin/context/ping', validate: false },
+      async (context, req, res) => {
+        const { body } = await context.core.elasticsearch.client.asInternalUser.ping();
+        return res.ok({ body });
+      }
+    );
+    router.get(
+      { path: '/api/elasticsearch_client_plugin/contract/ping', validate: false },
+      async (context, req, res) => {
+        const [coreStart] = await core.getStartServices();
+        const { body } = await coreStart.elasticsearch.client.asInternalUser.ping();
+        return res.ok({ body });
+      }
+    );
+    router.get(
+      { path: '/api/elasticsearch_client_plugin/custom_client/ping', validate: false },
+      async (context, req, res) => {
+        const { body } = await this.client!.asInternalUser.ping();
+        return res.ok({ body });
+      }
+    );
+  }
+
+  public start(core: CoreStart) {
+    this.client = core.elasticsearch.createClient('my-custom-client-test');
+  }
+  public stop() {}
+}
diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/tsconfig.json b/test/plugin_functional/plugins/elasticsearch_client_plugin/tsconfig.json
new file mode 100644
index 0000000000000..d0751f31ecc5e
--- /dev/null
+++ b/test/plugin_functional/plugins/elasticsearch_client_plugin/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./target",
+    "skipLibCheck": true
+  },
+  "include": [
+    "server/**/*.ts",
+    "../../../../typings/**/*"
+  ],
+  "exclude": []
+}
diff --git a/test/plugin_functional/services/index.ts b/test/plugin_functional/services/index.ts
index dd2b25e14fe17..453cfc5a8636f 100644
--- a/test/plugin_functional/services/index.ts
+++ b/test/plugin_functional/services/index.ts
@@ -16,14 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
 
-import { KibanaSupertestProvider } from './supertest';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
-export const services = {
-  supertest: KibanaSupertestProvider,
-};
-
-export type PluginFunctionalProviderContext = FtrProviderContext &
-  GenericFtrProviderContext<typeof services, {}>;
+export type PluginFunctionalProviderContext = FtrProviderContext;
diff --git a/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts b/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts
new file mode 100644
index 0000000000000..9b9efc261126f
--- /dev/null
+++ b/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts
@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { PluginFunctionalProviderContext } from '../../services';
+import '../../plugins/core_provider_plugin/types';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
+  const supertest = getService('supertest');
+  describe('elasticsearch client', () => {
+    it('server plugins have access to elasticsearch client via request context', async () => {
+      await supertest.get('/api/elasticsearch_client_plugin/context/ping').expect(200, 'true');
+    });
+    it('server plugins have access to elasticsearch client via core contract', async () => {
+      await supertest.get('/api/elasticsearch_client_plugin/contract/ping').expect(200, 'true');
+    });
+    it('server plugins can create a custom elasticsearch client', async () => {
+      await supertest
+        .get('/api/elasticsearch_client_plugin/custom_client/ping')
+        .expect(200, 'true');
+    });
+  });
+}
diff --git a/test/plugin_functional/test_suites/core_plugins/index.ts b/test/plugin_functional/test_suites/core_plugins/index.ts
index 8f54ec6c0f4cd..99ac6dc9b8474 100644
--- a/test/plugin_functional/test_suites/core_plugins/index.ts
+++ b/test/plugin_functional/test_suites/core_plugins/index.ts
@@ -22,6 +22,7 @@ import { PluginFunctionalProviderContext } from '../../services';
 export default function ({ loadTestFile }: PluginFunctionalProviderContext) {
   describe('core plugins', () => {
     loadTestFile(require.resolve('./applications'));
+    loadTestFile(require.resolve('./elasticsearch_client'));
     loadTestFile(require.resolve('./legacy_plugins'));
     loadTestFile(require.resolve('./server_plugins'));
     loadTestFile(require.resolve('./ui_plugins'));
diff --git a/test/plugin_functional/test_suites/core_plugins/top_nav.js b/test/plugin_functional/test_suites/core_plugins/top_nav.ts
similarity index 88%
rename from test/plugin_functional/test_suites/core_plugins/top_nav.js
rename to test/plugin_functional/test_suites/core_plugins/top_nav.ts
index 5c46e3d7f76db..6d2c6b7f85d28 100644
--- a/test/plugin_functional/test_suites/core_plugins/top_nav.js
+++ b/test/plugin_functional/test_suites/core_plugins/top_nav.ts
@@ -17,8 +17,10 @@
  * under the License.
  */
 import expect from '@kbn/expect';
+import { PluginFunctionalProviderContext } from '../../services';
 
-export default function ({ getService, getPageObjects }) {
+// eslint-disable-next-line import/no-default-export
+export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   const PageObjects = getPageObjects(['common']);
 
   const browser = getService('browser');
diff --git a/x-pack/test/plugin_api_integration/config.ts b/x-pack/test/plugin_api_integration/config.ts
index 6a86bcb7176f7..b89ed6ad550a3 100644
--- a/x-pack/test/plugin_api_integration/config.ts
+++ b/x-pack/test/plugin_api_integration/config.ts
@@ -20,6 +20,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
 
   return {
     testFiles: [
+      require.resolve('./test_suites/platform'),
       require.resolve('./test_suites/task_manager'),
       require.resolve('./test_suites/event_log'),
       require.resolve('./test_suites/licensed_feature_usage'),
diff --git a/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/kibana.json b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/kibana.json
new file mode 100644
index 0000000000000..37ec33c168e76
--- /dev/null
+++ b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/kibana.json
@@ -0,0 +1,7 @@
+{
+  "id": "elasticsearch_client_xpack",
+  "version": "1.0.0",
+  "kibanaVersion": "kibana",
+  "server": true,
+  "ui": false
+}
diff --git a/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/package.json b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/package.json
new file mode 100644
index 0000000000000..ed31989472134
--- /dev/null
+++ b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "elasticsearch_client_xpack",
+  "version": "1.0.0",
+  "kibana": {
+    "version": "kibana"
+  },
+  "scripts": {
+    "kbn": "node ../../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && tsc"
+  },
+  "devDependencies": {
+    "typescript": "3.9.5"
+  }
+}
diff --git a/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/index.ts b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/index.ts
new file mode 100644
index 0000000000000..19b54a9b0326d
--- /dev/null
+++ b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ElasticsearchClientXPack } from './plugin';
+
+export const plugin = () => new ElasticsearchClientXPack();
diff --git a/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/plugin.ts b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/plugin.ts
new file mode 100644
index 0000000000000..921c8f9c50860
--- /dev/null
+++ b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/plugin.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;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Plugin, CoreSetup } from 'kibana/server';
+
+export class ElasticsearchClientXPack implements Plugin {
+  constructor() {}
+
+  public setup(core: CoreSetup) {
+    const router = core.http.createRouter();
+    router.get(
+      { path: '/api/elasticsearch_client_xpack/context/user', validate: false },
+      async (context, req, res) => {
+        const { body } = await context.core.elasticsearch.client.asCurrentUser.security.getUser();
+        return res.ok({ body });
+      }
+    );
+
+    router.get(
+      { path: '/api/elasticsearch_client_xpack/contract/user', validate: false },
+      async (context, req, res) => {
+        const [coreStart] = await core.getStartServices();
+        const { body } = await coreStart.elasticsearch.client
+          .asScoped(req)
+          .asCurrentUser.security.getUser();
+        return res.ok({ body });
+      }
+    );
+  }
+
+  public start() {}
+  public stop() {}
+}
diff --git a/x-pack/test/plugin_api_integration/test_suites/platform/elasticsearch_client.ts b/x-pack/test/plugin_api_integration/test_suites/platform/elasticsearch_client.ts
new file mode 100644
index 0000000000000..c2f6e93de83c1
--- /dev/null
+++ b/x-pack/test/plugin_api_integration/test_suites/platform/elasticsearch_client.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;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  describe('elasticsearch client', () => {
+    it('scopes the elasticsearch client provided via request context to user credentials', async () => {
+      const { body } = await supertest
+        .get('/api/elasticsearch_client_xpack/context/user')
+        .expect(200);
+      expect(body).not.to.be.empty();
+    });
+    it('scopes the elasticsearch client provided via request context to user credentials', async () => {
+      const { body } = await supertest
+        .get('/api/elasticsearch_client_xpack/contract/user')
+        .expect(200);
+      expect(body).not.to.be.empty();
+    });
+  });
+}
diff --git a/x-pack/test/plugin_api_integration/test_suites/platform/index.ts b/x-pack/test/plugin_api_integration/test_suites/platform/index.ts
new file mode 100644
index 0000000000000..3375e9ca839a5
--- /dev/null
+++ b/x-pack/test/plugin_api_integration/test_suites/platform/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('platform', function taskManagerSuite() {
+    this.tags('ciGroup2');
+    loadTestFile(require.resolve('./elasticsearch_client'));
+  });
+}

From 15f4ead00504f0fe368e423421524325e75246e6 Mon Sep 17 00:00:00 2001
From: Frank Hassanabad <frank.hassanabad@elastic.co>
Date: Thu, 30 Jul 2020 11:20:12 -0600
Subject: [PATCH 5/7] [SIEM] Fixes broken maps link to Kibana index management
 (#73757)

## Summary

Embarrassing simple fix

If you don't have an index setup like below and click configure index patterns it takes you to `/app/kibana` when it should just be `/app` and there shouldn't be anymore hashes of `#`.

<img width="1487" alt="Screen Shot 2020-07-29 at 5 09 10 PM" src="https://user-images.githubusercontent.com/1151048/88862759-4b90e580-d1be-11ea-834c-aedc73cc330a.png">
---
 .../index_patterns_missing_prompt.test.tsx.snap             | 4 ++--
 .../embeddables/index_patterns_missing_prompt.tsx           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap b/x-pack/plugins/security_solution/public/network/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap
index 30f7df940fa99..b72b9e5c73977 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`IndexPatternsMissingPrompt renders correctly against snapshot 1`] = `
     <EuiButton
       color="primary"
       fill={true}
-      href="/test/base/path/app/kibana#/management/kibana/indexPatterns"
+      href="/test/base/path/app/management/kibana/indexPatterns"
       target="_blank"
     >
       Configure index patterns
@@ -28,7 +28,7 @@ exports[`IndexPatternsMissingPrompt renders correctly against snapshot 1`] = `
                 beats
               </a>,
               "defaultIndex": <a
-                href="/test/base/path/app/kibana#/management/kibana/settings"
+                href="/test/base/path/app/management/kibana/settings"
                 rel="noopener noreferrer"
                 target="_blank"
               >
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/index_patterns_missing_prompt.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/index_patterns_missing_prompt.tsx
index 62ffad515f424..b5595daa9cf47 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/index_patterns_missing_prompt.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/index_patterns_missing_prompt.tsx
@@ -13,7 +13,7 @@ import * as i18n from './translations';
 
 export const IndexPatternsMissingPromptComponent = () => {
   const { docLinks } = useKibana().services;
-  const kibanaBasePath = `${useBasePath()}/app/kibana`;
+  const kibanaBasePath = `${useBasePath()}/app`;
 
   return (
     <EuiEmptyPrompt
@@ -29,7 +29,7 @@ export const IndexPatternsMissingPromptComponent = () => {
               values={{
                 defaultIndex: (
                   <a
-                    href={`${kibanaBasePath}#/management/kibana/settings`}
+                    href={`${kibanaBasePath}/management/kibana/settings`}
                     rel="noopener noreferrer"
                     target="_blank"
                   >
@@ -61,7 +61,7 @@ export const IndexPatternsMissingPromptComponent = () => {
       }
       actions={
         <EuiButton
-          href={`${kibanaBasePath}#/management/kibana/indexPatterns`}
+          href={`${kibanaBasePath}/management/kibana/indexPatterns`}
           color="primary"
           target="_blank"
           fill

From 0f18123b83787e736f84194e50537a2dfbcb26da Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Thu, 30 Jul 2020 13:21:12 -0400
Subject: [PATCH 6/7] [SECURITY_SOLUTION][ENDPOINT] Fix Endpoint Host page
 sometimes incorrectly showing onboarding UI (#73222)

* Fix incorrectly showing the onboarding message on hosts

* Allow loading of the Details even if list load failed

* Some test fixes

* Fix missing import

* refactor UT for the policy list view

* Refactor more UT

* remove commented out code

* Fix some failing tests following cherry-picks

* start work on mock host list apis

* Remove extra code that came from cherry-pick

* more tests fixed

* All test pass

* Refactoring ++ cleanup

* Remove unused import
---
 .../common/endpoint/generate_data.ts          | 105 +++++++++-
 .../pages/endpoint_hosts/store/action.ts      |   6 +
 .../pages/endpoint_hosts/store/index.test.ts  |   1 +
 .../pages/endpoint_hosts/store/middleware.ts  |  42 +++-
 .../store/mock_host_result_list.ts            | 148 +++++++++++++-
 .../pages/endpoint_hosts/store/reducer.ts     |   7 +
 .../pages/endpoint_hosts/store/selectors.ts   |   6 +
 .../management/pages/endpoint_hosts/types.ts  |   2 +
 .../pages/endpoint_hosts/view/index.test.tsx  | 192 +++++++++++-------
 .../pages/endpoint_hosts/view/index.tsx       |  17 +-
 .../policy/store/policy_list/index.test.ts    |   1 +
 .../policy/store/policy_list/middleware.ts    |   1 +
 .../policy_list/mock_policy_result_list.ts    |  40 ----
 .../store/policy_list/services/ingest.test.ts |   6 +-
 .../store/policy_list/services/ingest.ts      |   2 +-
 .../store/policy_list/test_mock_utils.ts      | 162 ++++++---------
 .../pages/policy/view/policy_details.test.tsx |   8 +-
 .../pages/policy/view/policy_list.test.tsx    |  46 ++---
 18 files changed, 526 insertions(+), 266 deletions(-)
 delete mode 100644 x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/mock_policy_result_list.ts

diff --git a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
index 9a92270fc9c14..aa3f0bf287fca 100644
--- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
@@ -8,16 +8,26 @@ import seedrandom from 'seedrandom';
 import {
   AlertEvent,
   EndpointEvent,
+  EndpointStatus,
   Host,
   HostMetadata,
-  OSFields,
   HostPolicyResponse,
   HostPolicyResponseActionStatus,
+  OSFields,
   PolicyData,
-  EndpointStatus,
 } from './types';
 import { factory as policyFactory } from './models/policy_config';
 import { parentEntityId } from './models/event';
+import {
+  GetAgentConfigsResponseItem,
+  GetPackagesResponse,
+} from '../../../ingest_manager/common/types/rest_spec';
+import {
+  AgentConfigStatus,
+  EsAssetReference,
+  InstallationStatus,
+  KibanaAssetReference,
+} from '../../../ingest_manager/common/types/models';
 
 export type Event = AlertEvent | EndpointEvent;
 /**
@@ -1062,6 +1072,97 @@ export class EndpointDocGenerator {
     };
   }
 
+  /**
+   * Generate an Agent Configuration (ingest)
+   */
+  public generateAgentConfig(): GetAgentConfigsResponseItem {
+    return {
+      id: this.seededUUIDv4(),
+      name: 'Agent Config',
+      status: AgentConfigStatus.Active,
+      description: 'Some description',
+      namespace: 'default',
+      monitoring_enabled: ['logs', 'metrics'],
+      revision: 2,
+      updated_at: '2020-07-22T16:36:49.196Z',
+      updated_by: 'elastic',
+      package_configs: ['852491f0-cc39-11ea-bac2-cdbf95b4b41a'],
+      agents: 0,
+    };
+  }
+
+  /**
+   * Generate an EPM Package for Endpoint
+   */
+  public generateEpmPackage(): GetPackagesResponse['response'][0] {
+    return {
+      name: 'endpoint',
+      title: 'Elastic Endpoint',
+      version: '0.5.0',
+      description: 'This is the Elastic Endpoint package.',
+      type: 'solution',
+      download: '/epr/endpoint/endpoint-0.5.0.tar.gz',
+      path: '/package/endpoint/0.5.0',
+      icons: [
+        {
+          src: '/package/endpoint/0.5.0/img/logo-endpoint-64-color.svg',
+          size: '16x16',
+          type: 'image/svg+xml',
+        },
+      ],
+      status: 'installed' as InstallationStatus,
+      savedObject: {
+        type: 'epm-packages',
+        id: 'endpoint',
+        attributes: {
+          installed_kibana: [
+            { id: '826759f0-7074-11ea-9bc8-6b38f4d29a16', type: 'dashboard' },
+            { id: '1cfceda0-728b-11ea-9bc8-6b38f4d29a16', type: 'visualization' },
+            { id: '1e525190-7074-11ea-9bc8-6b38f4d29a16', type: 'visualization' },
+            { id: '55387750-729c-11ea-9bc8-6b38f4d29a16', type: 'visualization' },
+            { id: '92b1edc0-706a-11ea-9bc8-6b38f4d29a16', type: 'visualization' },
+            { id: 'a3a3bd10-706b-11ea-9bc8-6b38f4d29a16', type: 'map' },
+          ] as KibanaAssetReference[],
+          installed_es: [
+            { id: 'logs-endpoint.alerts', type: 'index_template' },
+            { id: 'events-endpoint', type: 'index_template' },
+            { id: 'logs-endpoint.events.file', type: 'index_template' },
+            { id: 'logs-endpoint.events.library', type: 'index_template' },
+            { id: 'metrics-endpoint.metadata', type: 'index_template' },
+            { id: 'metrics-endpoint.metadata_mirror', type: 'index_template' },
+            { id: 'logs-endpoint.events.network', type: 'index_template' },
+            { id: 'metrics-endpoint.policy', type: 'index_template' },
+            { id: 'logs-endpoint.events.process', type: 'index_template' },
+            { id: 'logs-endpoint.events.registry', type: 'index_template' },
+            { id: 'logs-endpoint.events.security', type: 'index_template' },
+            { id: 'metrics-endpoint.telemetry', type: 'index_template' },
+          ] as EsAssetReference[],
+          es_index_patterns: {
+            alerts: 'logs-endpoint.alerts-*',
+            events: 'events-endpoint-*',
+            file: 'logs-endpoint.events.file-*',
+            library: 'logs-endpoint.events.library-*',
+            metadata: 'metrics-endpoint.metadata-*',
+            metadata_mirror: 'metrics-endpoint.metadata_mirror-*',
+            network: 'logs-endpoint.events.network-*',
+            policy: 'metrics-endpoint.policy-*',
+            process: 'logs-endpoint.events.process-*',
+            registry: 'logs-endpoint.events.registry-*',
+            security: 'logs-endpoint.events.security-*',
+            telemetry: 'metrics-endpoint.telemetry-*',
+          },
+          name: 'endpoint',
+          version: '0.5.0',
+          internal: false,
+          removable: false,
+        },
+        references: [],
+        updated_at: '2020-06-24T14:41:23.098Z',
+        version: 'Wzc0LDFd',
+      },
+    };
+  }
+
   /**
    * Generates a Host Policy response message
    */
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts
index 621fab2e4ee11..4a4326d5b2919 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts
@@ -81,6 +81,11 @@ interface ServerReturnedHostNonExistingPolicies {
   payload: HostState['nonExistingPolicies'];
 }
 
+interface ServerReturnedHostExistValue {
+  type: 'serverReturnedHostExistValue';
+  payload: boolean;
+}
+
 export type HostAction =
   | ServerReturnedHostList
   | ServerFailedToReturnHostList
@@ -92,6 +97,7 @@ export type HostAction =
   | ServerFailedToReturnPoliciesForOnboarding
   | UserSelectedEndpointPolicy
   | ServerCancelledHostListLoading
+  | ServerReturnedHostExistValue
   | ServerCancelledPolicyItemsLoading
   | ServerReturnedEndpointPackageInfo
   | ServerReturnedHostNonExistingPolicies;
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts
index b6e18506b6111..8ff4ad5a043b5 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts
@@ -51,6 +51,7 @@ describe('HostList store concerns', () => {
         policyItemsLoading: false,
         endpointPackageInfo: undefined,
         nonExistingPolicies: {},
+        hostsExist: true,
       });
     });
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
index edeca5659ee38..74bebf211258a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpStart } from 'kibana/public';
 import { HostInfo, HostResultList } from '../../../../../common/endpoint/types';
 import { GetPolicyListResponse } from '../../policy/types';
 import { ImmutableMiddlewareFactory } from '../../../../common/store';
@@ -28,6 +28,8 @@ export const hostMiddlewareFactory: ImmutableMiddlewareFactory<HostState> = (cor
   return ({ getState, dispatch }) => (next) => async (action) => {
     next(action);
     const state = getState();
+
+    // Host list
     if (
       action.type === 'userChangedUrl' &&
       isOnHostPage(state) &&
@@ -89,6 +91,19 @@ export const hostMiddlewareFactory: ImmutableMiddlewareFactory<HostState> = (cor
       // No hosts, so we should check to see if there are policies for onboarding
       if (hostResponse && hostResponse.hosts.length === 0) {
         const http = coreStart.http;
+
+        // The original query to the list could have had an invalid param (ex. invalid page_size),
+        // so we check first if hosts actually do exist before pulling in data for the onboarding
+        // messages.
+        if (await doHostsExist(http)) {
+          return;
+        }
+
+        dispatch({
+          type: 'serverReturnedHostExistValue',
+          payload: false,
+        });
+
         try {
           const policyDataResponse: GetPolicyListResponse = await sendGetEndpointSpecificPackageConfigs(
             http,
@@ -119,6 +134,8 @@ export const hostMiddlewareFactory: ImmutableMiddlewareFactory<HostState> = (cor
         });
       }
     }
+
+    // Host Details
     if (action.type === 'userChangedUrl' && hasSelectedHost(state) === true) {
       dispatch({
         type: 'serverCancelledPolicyItemsLoading',
@@ -160,7 +177,6 @@ export const hostMiddlewareFactory: ImmutableMiddlewareFactory<HostState> = (cor
             type: 'serverFailedToReturnHostList',
             payload: error,
           });
-          return;
         }
       } else {
         dispatch({
@@ -217,7 +233,7 @@ export const hostMiddlewareFactory: ImmutableMiddlewareFactory<HostState> = (cor
 };
 
 const getNonExistingPoliciesForHostsList = async (
-  http: HttpSetup,
+  http: HttpStart,
   hosts: HostResultList['hosts'],
   currentNonExistingPolicies: HostState['nonExistingPolicies']
 ): Promise<HostState['nonExistingPolicies'] | undefined> => {
@@ -274,3 +290,23 @@ const getNonExistingPoliciesForHostsList = async (
 
   return nonExisting;
 };
+
+const doHostsExist = async (http: HttpStart): Promise<boolean> => {
+  try {
+    return (
+      (
+        await http.post<HostResultList>('/api/endpoint/metadata', {
+          body: JSON.stringify({
+            paging_properties: [{ page_index: 0 }, { page_size: 1 }],
+          }),
+        })
+      ).hosts.length !== 0
+    );
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.error(`error while trying to check if hosts exist`);
+    // eslint-disable-next-line no-console
+    console.error(error);
+  }
+  return false;
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_host_result_list.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_host_result_list.ts
index 05af1ee062de6..355c2bb5c19fc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_host_result_list.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_host_result_list.ts
@@ -4,8 +4,27 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { HostInfo, HostResultList, HostStatus } from '../../../../../common/endpoint/types';
+import { HttpStart } from 'kibana/public';
+import {
+  GetHostPolicyResponse,
+  HostInfo,
+  HostPolicyResponse,
+  HostResultList,
+  HostStatus,
+} from '../../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
+import {
+  INGEST_API_AGENT_CONFIGS,
+  INGEST_API_EPM_PACKAGES,
+  INGEST_API_PACKAGE_CONFIGS,
+} from '../../policy/store/policy_list/services/ingest';
+import {
+  GetAgentConfigsResponse,
+  GetPackagesResponse,
+} from '../../../../../../ingest_manager/common/types/rest_spec';
+import { GetPolicyListResponse } from '../../policy/types';
+
+const generator = new EndpointDocGenerator('seed');
 
 export const mockHostResultList: (options?: {
   total?: number;
@@ -26,7 +45,6 @@ export const mockHostResultList: (options?: {
 
   const hosts = [];
   for (let index = 0; index < actualCountToReturn; index++) {
-    const generator = new EndpointDocGenerator('seed');
     hosts.push({
       metadata: generator.generateHostMetadata(),
       host_status: HostStatus.ERROR,
@@ -45,9 +63,133 @@ export const mockHostResultList: (options?: {
  * returns a mocked API response for retrieving a single host metadata
  */
 export const mockHostDetailsApiResult = (): HostInfo => {
-  const generator = new EndpointDocGenerator('seed');
   return {
     metadata: generator.generateHostMetadata(),
     host_status: HostStatus.ERROR,
   };
 };
+
+/**
+ * Mock API handlers used by the Endpoint Host list. It also sets up a list of
+ * API handlers for Host details based on a list of Host results.
+ */
+const hostListApiPathHandlerMocks = ({
+  hostsResults = mockHostResultList({ total: 3 }).hosts,
+  epmPackages = [generator.generateEpmPackage()],
+  endpointPackageConfigs = [],
+  policyResponse = generator.generatePolicyResponse(),
+}: {
+  /** route handlers will be setup for each individual host in this array */
+  hostsResults?: HostResultList['hosts'];
+  epmPackages?: GetPackagesResponse['response'];
+  endpointPackageConfigs?: GetPolicyListResponse['items'];
+  policyResponse?: HostPolicyResponse;
+} = {}) => {
+  const apiHandlers = {
+    // endpoint package info
+    [INGEST_API_EPM_PACKAGES]: (): GetPackagesResponse => {
+      return {
+        response: epmPackages,
+        success: true,
+      };
+    },
+
+    // host list
+    '/api/endpoint/metadata': (): HostResultList => {
+      return {
+        hosts: hostsResults,
+        request_page_size: 10,
+        request_page_index: 0,
+        total: hostsResults?.length || 0,
+      };
+    },
+
+    // Do policies referenced in host list exist
+    // just returns 1 single agent config that includes all of the packageConfig IDs provided
+    [INGEST_API_AGENT_CONFIGS]: (): GetAgentConfigsResponse => {
+      const agentConfig = generator.generateAgentConfig();
+      (agentConfig.package_configs as string[]).push(
+        ...endpointPackageConfigs.map((packageConfig) => packageConfig.id)
+      );
+      return {
+        items: [agentConfig],
+        total: 10,
+        success: true,
+        perPage: 10,
+        page: 1,
+      };
+    },
+
+    // Policy Response
+    '/api/endpoint/policy_response': (): GetHostPolicyResponse => {
+      return { policy_response: policyResponse };
+    },
+
+    // List of Policies (package configs) for onboarding
+    [INGEST_API_PACKAGE_CONFIGS]: (): GetPolicyListResponse => {
+      return {
+        items: endpointPackageConfigs,
+        page: 1,
+        perPage: 10,
+        total: endpointPackageConfigs?.length,
+        success: true,
+      };
+    },
+  };
+
+  // Build a GET route handler for each host details based on the list of Hosts passed on input
+  if (hostsResults) {
+    hostsResults.forEach((host) => {
+      // @ts-ignore
+      apiHandlers[`/api/endpoint/metadata/${host.metadata.host.id}`] = () => host;
+    });
+  }
+
+  return apiHandlers;
+};
+
+/**
+ * Sets up mock impelementations in support of the Hosts list view
+ *
+ * @param mockedHttpService
+ * @param hostsResults
+ * @param pathHandlersOptions
+ */
+export const setHostListApiMockImplementation: (
+  mockedHttpService: jest.Mocked<HttpStart>,
+  apiResponses?: Parameters<typeof hostListApiPathHandlerMocks>[0]
+) => void = (
+  mockedHttpService,
+  { hostsResults = mockHostResultList({ total: 3 }).hosts, ...pathHandlersOptions } = {}
+) => {
+  const apiHandlers = hostListApiPathHandlerMocks({ ...pathHandlersOptions, hostsResults });
+
+  mockedHttpService.post
+    .mockImplementation(async (...args) => {
+      throw new Error(`un-expected call to http.post: ${args}`);
+    })
+    // First time called, return list of hosts
+    .mockImplementationOnce(async () => {
+      return apiHandlers['/api/endpoint/metadata']();
+    });
+
+  // If the hosts list results is zero, then mock the second call to `/metadata` to return
+  // empty list - indicating there are no hosts currently present on the system
+  if (!hostsResults.length) {
+    mockedHttpService.post.mockImplementationOnce(async () => {
+      return apiHandlers['/api/endpoint/metadata']();
+    });
+  }
+
+  // Setup handling of GET requests
+  mockedHttpService.get.mockImplementation(async (...args) => {
+    const [path] = args;
+    if (typeof path === 'string') {
+      if (apiHandlers[path]) {
+        return apiHandlers[path]();
+      }
+    }
+
+    throw new Error(`MOCK: api request does not have a mocked handler: ${path}`);
+  });
+};
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 7f68baa4b85bd..e54f7df4d4f75 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
@@ -29,6 +29,7 @@ export const initialHostListState: Immutable<HostState> = {
   policyItemsLoading: false,
   endpointPackageInfo: undefined,
   nonExistingPolicies: {},
+  hostsExist: true,
 };
 
 /* eslint-disable-next-line complexity */
@@ -125,6 +126,11 @@ export const hostListReducer: ImmutableReducer<HostState, AppAction> = (
       ...state,
       endpointPackageInfo: action.payload,
     };
+  } else if (action.type === 'serverReturnedHostExistValue') {
+    return {
+      ...state,
+      hostsExist: action.payload,
+    };
   } else if (action.type === 'userChangedUrl') {
     const newState: Immutable<HostState> = {
       ...state,
@@ -181,6 +187,7 @@ export const hostListReducer: ImmutableReducer<HostState, AppAction> = (
       error: undefined,
       detailsError: undefined,
       policyResponseError: undefined,
+      hostsExist: true,
     };
   }
   return state;
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
index 6e0823a920413..ca006f21c29ac 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
@@ -203,3 +203,9 @@ export const policyResponseStatus: (state: Immutable<HostState>) => string = cre
 export const nonExistingPolicies: (
   state: Immutable<HostState>
 ) => Immutable<HostState['nonExistingPolicies']> = (state) => state.nonExistingPolicies;
+
+/**
+ * Return boolean that indicates whether hosts exist
+ * @param state
+ */
+export const hostsExist: (state: Immutable<HostState>) => boolean = (state) => state.hostsExist;
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
index 582a59cfd7605..6c949e9700b9a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
@@ -52,6 +52,8 @@ export interface HostState {
   endpointPackageInfo?: GetPackagesResponse['response'][0];
   /** tracks the list of policies IDs used in Host metadata that may no longer exist */
   nonExistingPolicies: Record<string, boolean>;
+  /** Tracks whether hosts exist and helps control if onboarding should be visible */
+  hostsExist: boolean;
 }
 
 /**
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
index 9d49c8705affe..3e00a5cc33db1 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
@@ -8,18 +8,22 @@ import React from 'react';
 import * as reactTestingLibrary from '@testing-library/react';
 
 import { HostList } from './index';
-import { mockHostDetailsApiResult, mockHostResultList } from '../store/mock_host_result_list';
-import { mockPolicyResultList } from '../../policy/store/policy_list/mock_policy_result_list';
+import {
+  mockHostDetailsApiResult,
+  mockHostResultList,
+  setHostListApiMockImplementation,
+} from '../store/mock_host_result_list';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../../../common/mock/endpoint';
 import {
   HostInfo,
+  HostPolicyResponse,
   HostPolicyResponseActionStatus,
   HostPolicyResponseAppliedAction,
   HostStatus,
 } from '../../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
-import { AppAction } from '../../../../common/store/actions';
 import { POLICY_STATUS_TO_HEALTH_COLOR, POLICY_STATUS_TO_TEXT } from './host_constants';
+import { mockPolicyResultList } from '../../policy/store/policy_list/test_mock_utils';
 
 jest.mock('../../../../common/components/link_to');
 
@@ -35,6 +39,9 @@ describe('when on the hosts page', () => {
     const mockedContext = createAppRootMockRenderer();
     ({ history, store, coreStart, middlewareSpy } = mockedContext);
     render = () => mockedContext.render(<HostList />);
+    reactTestingLibrary.act(() => {
+      history.push('/hosts');
+    });
   });
 
   it('should NOT display timeline', async () => {
@@ -43,35 +50,29 @@ describe('when on the hosts page', () => {
     expect(timelineFlyout).toBeNull();
   });
 
-  it('should show the empty state when there are no hosts or polices', async () => {
-    const renderResult = render();
-    // Initially, there are no hosts or policies, so we prompt to add policies first.
-    const table = await renderResult.findByTestId('emptyPolicyTable');
-    expect(table).not.toBeNull();
-  });
-
-  describe('when there are policies, but no hosts', () => {
+  describe('when there are no hosts or polices', () => {
     beforeEach(() => {
-      reactTestingLibrary.act(() => {
-        const hostListData = mockHostResultList({ total: 0 });
-        coreStart.http.get.mockReturnValue(Promise.resolve(hostListData));
-        const hostAction: AppAction = {
-          type: 'serverReturnedHostList',
-          payload: hostListData,
-        };
-        store.dispatch(hostAction);
+      setHostListApiMockImplementation(coreStart.http, {
+        hostsResults: [],
+      });
+    });
 
-        jest.clearAllMocks();
+    it('should show the empty state when there are no hosts or polices', async () => {
+      const renderResult = render();
+      await reactTestingLibrary.act(async () => {
+        await middlewareSpy.waitForAction('serverReturnedPoliciesForOnboarding');
+      });
+      // Initially, there are no hosts or policies, so we prompt to add policies first.
+      const table = await renderResult.findByTestId('emptyPolicyTable');
+      expect(table).not.toBeNull();
+    });
+  });
 
-        const policyListData = mockPolicyResultList({ total: 3 });
-        coreStart.http.get.mockReturnValue(Promise.resolve(policyListData));
-        const policyAction: AppAction = {
-          type: 'serverReturnedPoliciesForOnboarding',
-          payload: {
-            policyItems: policyListData.items,
-          },
-        };
-        store.dispatch(policyAction);
+  describe('when there are policies, but no hosts', () => {
+    beforeEach(async () => {
+      setHostListApiMockImplementation(coreStart.http, {
+        hostsResults: [],
+        endpointPackageConfigs: mockPolicyResultList({ total: 3 }).items,
       });
     });
     afterEach(() => {
@@ -80,18 +81,27 @@ describe('when on the hosts page', () => {
 
     it('should show the no hosts empty state', async () => {
       const renderResult = render();
+      await reactTestingLibrary.act(async () => {
+        await middlewareSpy.waitForAction('serverReturnedPoliciesForOnboarding');
+      });
       const emptyHostsTable = await renderResult.findByTestId('emptyHostsTable');
       expect(emptyHostsTable).not.toBeNull();
     });
 
     it('should display the onboarding steps', async () => {
       const renderResult = render();
+      await reactTestingLibrary.act(async () => {
+        await middlewareSpy.waitForAction('serverReturnedPoliciesForOnboarding');
+      });
       const onboardingSteps = await renderResult.findByTestId('onboardingSteps');
       expect(onboardingSteps).not.toBeNull();
     });
 
     it('should show policy selection', async () => {
       const renderResult = render();
+      await reactTestingLibrary.act(async () => {
+        await middlewareSpy.waitForAction('serverReturnedPoliciesForOnboarding');
+      });
       const onboardingPolicySelect = await renderResult.findByTestId('onboardingPolicySelect');
       expect(onboardingPolicySelect).not.toBeNull();
     });
@@ -112,39 +122,54 @@ describe('when on the hosts page', () => {
       let firstPolicyID: string;
       beforeEach(() => {
         reactTestingLibrary.act(() => {
-          const hostListData = mockHostResultList({ total: 4 });
-          firstPolicyID = hostListData.hosts[0].metadata.Endpoint.policy.applied.id;
+          const hostListData = mockHostResultList({ total: 4 }).hosts;
+
+          firstPolicyID = hostListData[0].metadata.Endpoint.policy.applied.id;
+
           [HostStatus.ERROR, HostStatus.ONLINE, HostStatus.OFFLINE, HostStatus.UNENROLLING].forEach(
             (status, index) => {
-              hostListData.hosts[index] = {
-                metadata: hostListData.hosts[index].metadata,
+              hostListData[index] = {
+                metadata: hostListData[index].metadata,
                 host_status: status,
               };
             }
           );
-          hostListData.hosts.forEach((item, index) => {
+          hostListData.forEach((item, index) => {
             generatedPolicyStatuses[index] = item.metadata.Endpoint.policy.applied.status;
           });
-          const action: AppAction = {
-            type: 'serverReturnedHostList',
-            payload: hostListData,
-          };
-          store.dispatch(action);
+
+          // Make sure that the first policy id in the host result is not set as non-existent
+          const ingestPackageConfigs = mockPolicyResultList({ total: 1 }).items;
+          ingestPackageConfigs[0].id = firstPolicyID;
+
+          setHostListApiMockImplementation(coreStart.http, {
+            hostsResults: hostListData,
+            endpointPackageConfigs: ingestPackageConfigs,
+          });
         });
       });
 
       it('should display rows in the table', async () => {
         const renderResult = render();
+        await reactTestingLibrary.act(async () => {
+          await middlewareSpy.waitForAction('serverReturnedHostList');
+        });
         const rows = await renderResult.findAllByRole('row');
         expect(rows).toHaveLength(5);
       });
       it('should show total', async () => {
         const renderResult = render();
+        await reactTestingLibrary.act(async () => {
+          await middlewareSpy.waitForAction('serverReturnedHostList');
+        });
         const total = await renderResult.findByTestId('hostListTableTotal');
         expect(total.textContent).toEqual('4 Hosts');
       });
       it('should display correct status', async () => {
         const renderResult = render();
+        await reactTestingLibrary.act(async () => {
+          await middlewareSpy.waitForAction('serverReturnedHostList');
+        });
         const hostStatuses = await renderResult.findAllByTestId('rowHostStatus');
 
         expect(hostStatuses[0].textContent).toEqual('Error');
@@ -168,6 +193,9 @@ describe('when on the hosts page', () => {
 
       it('should display correct policy status', async () => {
         const renderResult = render();
+        await reactTestingLibrary.act(async () => {
+          await middlewareSpy.waitForAction('serverReturnedHostList');
+        });
         const policyStatuses = await renderResult.findAllByTestId('rowPolicyStatus');
 
         policyStatuses.forEach((status, index) => {
@@ -184,6 +212,9 @@ describe('when on the hosts page', () => {
 
       it('should display policy name as a link', async () => {
         const renderResult = render();
+        await reactTestingLibrary.act(async () => {
+          await middlewareSpy.waitForAction('serverReturnedHostList');
+        });
         const firstPolicyName = (await renderResult.findAllByTestId('policyNameCellLink'))[0];
         expect(firstPolicyName).not.toBeNull();
         expect(firstPolicyName.getAttribute('href')).toContain(`policy/${firstPolicyID}`);
@@ -192,17 +223,10 @@ describe('when on the hosts page', () => {
       describe('when the user clicks the first hostname in the table', () => {
         let renderResult: reactTestingLibrary.RenderResult;
         beforeEach(async () => {
-          const hostDetailsApiResponse = mockHostDetailsApiResult();
-
-          coreStart.http.get.mockReturnValue(Promise.resolve(hostDetailsApiResponse));
-          reactTestingLibrary.act(() => {
-            store.dispatch({
-              type: 'serverReturnedHostDetails',
-              payload: hostDetailsApiResponse,
-            });
-          });
-
           renderResult = render();
+          await reactTestingLibrary.act(async () => {
+            await middlewareSpy.waitForAction('serverReturnedHostList');
+          });
           const hostNameLinks = await renderResult.findAllByTestId('hostnameCellLink');
           if (hostNameLinks.length) {
             reactTestingLibrary.fireEvent.click(hostNameLinks[0]);
@@ -221,9 +245,11 @@ describe('when on the hosts page', () => {
   describe('when there is a selected host in the url', () => {
     let hostDetails: HostInfo;
     let agentId: string;
-    const dispatchServerReturnedHostPolicyResponse = (
+    let renderAndWaitForData: () => Promise<ReturnType<AppContextTestRender['render']>>;
+
+    const createPolicyResponse = (
       overallStatus: HostPolicyResponseActionStatus = HostPolicyResponseActionStatus.success
-    ) => {
+    ): HostPolicyResponse => {
       const policyResponse = docGenerator.generatePolicyResponse();
       const malwareResponseConfigurations =
         policyResponse.Endpoint.policy.applied.response.configurations.malware;
@@ -269,21 +295,28 @@ describe('when on the hosts page', () => {
       policyResponse.Endpoint.policy.applied.actions.push(unknownAction);
       malwareResponseConfigurations.concerned_actions.push(unknownAction.name);
 
+      return policyResponse;
+    };
+
+    const dispatchServerReturnedHostPolicyResponse = (
+      overallStatus: HostPolicyResponseActionStatus = HostPolicyResponseActionStatus.success
+    ) => {
       reactTestingLibrary.act(() => {
         store.dispatch({
           type: 'serverReturnedHostPolicyResponse',
           payload: {
-            policy_response: policyResponse,
+            policy_response: createPolicyResponse(overallStatus),
           },
         });
       });
     };
 
-    beforeEach(() => {
+    beforeEach(async () => {
       const {
         host_status,
         metadata: { host, ...details },
       } = mockHostDetailsApiResult();
+
       hostDetails = {
         host_status,
         metadata: {
@@ -297,34 +330,37 @@ describe('when on the hosts page', () => {
 
       agentId = hostDetails.metadata.elastic.agent.id;
 
-      coreStart.http.get.mockReturnValue(Promise.resolve(hostDetails));
+      const policy = docGenerator.generatePolicyPackageConfig();
+      policy.id = hostDetails.metadata.Endpoint.policy.applied.id;
 
-      reactTestingLibrary.act(() => {
-        history.push({
-          ...history.location,
-          search: '?selected_host=1',
-        });
+      setHostListApiMockImplementation(coreStart.http, {
+        hostsResults: [hostDetails],
+        endpointPackageConfigs: [policy],
       });
+
       reactTestingLibrary.act(() => {
-        store.dispatch({
-          type: 'serverReturnedHostDetails',
-          payload: hostDetails,
-        });
+        history.push('/hosts?selected_host=1');
       });
+
+      renderAndWaitForData = async () => {
+        const renderResult = render();
+        await middlewareSpy.waitForAction('serverReturnedHostDetails');
+        return renderResult;
+      };
     });
     afterEach(() => {
       jest.clearAllMocks();
     });
 
-    it('should show the flyout', () => {
-      const renderResult = render();
+    it('should show the flyout', async () => {
+      const renderResult = await renderAndWaitForData();
       return renderResult.findByTestId('hostDetailsFlyout').then((flyout) => {
         expect(flyout).not.toBeNull();
       });
     });
 
     it('should display policy name value as a link', async () => {
-      const renderResult = render();
+      const renderResult = await renderAndWaitForData();
       const policyDetailsLink = await renderResult.findByTestId('policyDetailsValue');
       expect(policyDetailsLink).not.toBeNull();
       expect(policyDetailsLink.getAttribute('href')).toEqual(
@@ -333,10 +369,7 @@ describe('when on the hosts page', () => {
     });
 
     it('should update the URL when policy name link is clicked', async () => {
-      const policyItem = mockPolicyResultList({ total: 1 }).items[0];
-      coreStart.http.get.mockReturnValue(Promise.resolve({ item: policyItem }));
-
-      const renderResult = render();
+      const renderResult = await renderAndWaitForData();
       const policyDetailsLink = await renderResult.findByTestId('policyDetailsValue');
       const userChangedUrlChecker = middlewareSpy.waitForAction('userChangedUrl');
       reactTestingLibrary.act(() => {
@@ -349,7 +382,7 @@ describe('when on the hosts page', () => {
     });
 
     it('should display policy status value as a link', async () => {
-      const renderResult = render();
+      const renderResult = await renderAndWaitForData();
       const policyStatusLink = await renderResult.findByTestId('policyStatusValue');
       expect(policyStatusLink).not.toBeNull();
       expect(policyStatusLink.getAttribute('href')).toEqual(
@@ -358,7 +391,7 @@ describe('when on the hosts page', () => {
     });
 
     it('should update the URL when policy status link is clicked', async () => {
-      const renderResult = render();
+      const renderResult = await renderAndWaitForData();
       const policyStatusLink = await renderResult.findByTestId('policyStatusValue');
       const userChangedUrlChecker = middlewareSpy.waitForAction('userChangedUrl');
       reactTestingLibrary.act(() => {
@@ -371,7 +404,7 @@ describe('when on the hosts page', () => {
     });
 
     it('should display Success overall policy status', async () => {
-      const renderResult = render();
+      const renderResult = await renderAndWaitForData();
       reactTestingLibrary.act(() => {
         dispatchServerReturnedHostPolicyResponse(HostPolicyResponseActionStatus.success);
       });
@@ -385,7 +418,7 @@ describe('when on the hosts page', () => {
     });
 
     it('should display Warning overall policy status', async () => {
-      const renderResult = render();
+      const renderResult = await renderAndWaitForData();
       reactTestingLibrary.act(() => {
         dispatchServerReturnedHostPolicyResponse(HostPolicyResponseActionStatus.warning);
       });
@@ -399,7 +432,7 @@ describe('when on the hosts page', () => {
     });
 
     it('should display Failed overall policy status', async () => {
-      const renderResult = render();
+      const renderResult = await renderAndWaitForData();
       reactTestingLibrary.act(() => {
         dispatchServerReturnedHostPolicyResponse(HostPolicyResponseActionStatus.failure);
       });
@@ -413,7 +446,7 @@ describe('when on the hosts page', () => {
     });
 
     it('should display Unknown overall policy status', async () => {
-      const renderResult = render();
+      const renderResult = await renderAndWaitForData();
       reactTestingLibrary.act(() => {
         dispatchServerReturnedHostPolicyResponse('' as HostPolicyResponseActionStatus);
       });
@@ -428,7 +461,7 @@ describe('when on the hosts page', () => {
 
     it('should include the link to reassignment in Ingest', async () => {
       coreStart.application.getUrlForApp.mockReturnValue('/app/ingestManager');
-      const renderResult = render();
+      const renderResult = await renderAndWaitForData();
       const linkToReassign = await renderResult.findByTestId('hostDetailsLinkToIngest');
       expect(linkToReassign).not.toBeNull();
       expect(linkToReassign.textContent).toEqual('Reassign Configuration');
@@ -440,7 +473,7 @@ describe('when on the hosts page', () => {
     describe('when link to reassignment in Ingest is clicked', () => {
       beforeEach(async () => {
         coreStart.application.getUrlForApp.mockReturnValue('/app/ingestManager');
-        const renderResult = render();
+        const renderResult = await renderAndWaitForData();
         const linkToReassign = await renderResult.findByTestId('hostDetailsLinkToIngest');
         reactTestingLibrary.act(() => {
           reactTestingLibrary.fireEvent.click(linkToReassign);
@@ -461,13 +494,14 @@ describe('when on the hosts page', () => {
           }
           throw new Error(`POST to '${requestOptions.path}' does not have a mock response!`);
         });
-        renderResult = render();
+        renderResult = await renderAndWaitForData();
         const policyStatusLink = await renderResult.findByTestId('policyStatusValue');
         const userChangedUrlChecker = middlewareSpy.waitForAction('userChangedUrl');
         reactTestingLibrary.act(() => {
           reactTestingLibrary.fireEvent.click(policyStatusLink);
         });
         await userChangedUrlChecker;
+        await middlewareSpy.waitForAction('serverReturnedHostPolicyResponse');
         reactTestingLibrary.act(() => {
           dispatchServerReturnedHostPolicyResponse();
         });
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
index 2692f7791b7c0..58442ab417b60 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
@@ -89,6 +89,7 @@ export const HostList = () => {
     selectedPolicyId,
     policyItemsLoading,
     endpointPackageVersion,
+    hostsExist,
   } = useHostSelector(selector);
   const { formatUrl, search } = useFormatUrl(SecurityPageName.administration);
 
@@ -329,7 +330,7 @@ export const HostList = () => {
   }, [formatUrl, queryParams, search]);
 
   const renderTableOrEmptyState = useMemo(() => {
-    if (!loading && listData && listData.length > 0) {
+    if (hostsExist) {
       return (
         <EuiBasicTable
           data-test-subj="hostListTable"
@@ -338,6 +339,7 @@ export const HostList = () => {
           error={listError?.message}
           pagination={paginationSetup}
           onChange={onTableChange}
+          loading={loading}
         />
       );
     } else if (!policyItemsLoading && policyItems && policyItems.length > 0) {
@@ -356,19 +358,20 @@ export const HostList = () => {
       );
     }
   }, [
-    listData,
+    loading,
+    hostsExist,
+    policyItemsLoading,
     policyItems,
+    listData,
     columns,
-    loading,
+    listError?.message,
     paginationSetup,
     onTableChange,
-    listError?.message,
-    handleCreatePolicyClick,
     handleDeployEndpointsClick,
-    handleSelectableOnChange,
     selectedPolicyId,
+    handleSelectableOnChange,
     selectionOptions,
-    policyItemsLoading,
+    handleCreatePolicyClick,
   ]);
 
   return (
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts
index 8203aae244f24..6ee6a4232f7cf 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/index.test.ts
@@ -143,6 +143,7 @@ describe('policy list store concerns', () => {
       isLoading: false,
       isDeleting: false,
       deleteStatus: undefined,
+      endpointPackageInfo: undefined,
       pageIndex: 0,
       pageSize: 10,
       total: 0,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/middleware.ts
index b4e1da4e43da3..6fe555113617d 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/middleware.ts
@@ -29,6 +29,7 @@ export const policyListMiddlewareFactory: ImmutableMiddlewareFactory<PolicyListS
     next(action);
 
     const state = getState();
+
     if (
       (action.type === 'userChangedUrl' && isOnPolicyListPage(state)) ||
       action.type === 'serverDeletedPolicy'
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/mock_policy_result_list.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/mock_policy_result_list.ts
deleted file mode 100644
index 7043903466ad8..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/mock_policy_result_list.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;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { GetPolicyListResponse } from '../../types';
-import { EndpointDocGenerator } from '../../../../../../common/endpoint/generate_data';
-
-export const mockPolicyResultList: (options?: {
-  total?: number;
-  request_page_size?: number;
-  request_page_index?: number;
-}) => GetPolicyListResponse = (options = {}) => {
-  const {
-    total = 1,
-    request_page_size: requestPageSize = 10,
-    request_page_index: requestPageIndex = 0,
-  } = options;
-
-  // Skip any that are before the page we're on
-  const numberToSkip = requestPageSize * requestPageIndex;
-
-  // total - numberToSkip is the count of non-skipped ones, but return no more than a pageSize, and no less than 0
-  const actualCountToReturn = Math.max(Math.min(total - numberToSkip, requestPageSize), 0);
-
-  const policies = [];
-  for (let index = 0; index < actualCountToReturn; index++) {
-    const generator = new EndpointDocGenerator('seed');
-    policies.push(generator.generatePolicyPackageConfig());
-  }
-  const mock: GetPolicyListResponse = {
-    items: policies,
-    total,
-    page: requestPageIndex,
-    perPage: requestPageSize,
-    success: true,
-  };
-  return mock;
-};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts
index 7daa500ef1884..83cd8558306a0 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.test.ts
@@ -12,7 +12,7 @@ import {
 } from './ingest';
 import { httpServiceMock } from '../../../../../../../../../../src/core/public/mocks';
 import { PACKAGE_CONFIG_SAVED_OBJECT_TYPE } from '../../../../../../../../ingest_manager/common';
-import { apiPathMockResponseProviders } from '../test_mock_utils';
+import { policyListApiPathHandlers } from '../test_mock_utils';
 
 describe('ingest service', () => {
   let http: ReturnType<typeof httpServiceMock.createStartContract>;
@@ -61,7 +61,9 @@ describe('ingest service', () => {
 
   describe('sendGetEndpointSecurityPackage()', () => {
     it('should query EPM with category=security', async () => {
-      http.get.mockReturnValue(apiPathMockResponseProviders[INGEST_API_EPM_PACKAGES]());
+      http.get.mockReturnValue(
+        Promise.resolve(policyListApiPathHandlers()[INGEST_API_EPM_PACKAGES]())
+      );
       await sendGetEndpointSecurityPackage(http);
       expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/epm/packages', {
         query: { category: 'security' },
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
index c6e6146f4d5e4..266faf9eae32c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/services/ingest.ts
@@ -20,7 +20,7 @@ import { NewPolicyData } from '../../../../../../../common/endpoint/types';
 
 const INGEST_API_ROOT = `/api/ingest_manager`;
 export const INGEST_API_PACKAGE_CONFIGS = `${INGEST_API_ROOT}/package_configs`;
-const INGEST_API_AGENT_CONFIGS = `${INGEST_API_ROOT}/agent_configs`;
+export const INGEST_API_AGENT_CONFIGS = `${INGEST_API_ROOT}/agent_configs`;
 const INGEST_API_FLEET = `${INGEST_API_ROOT}/fleet`;
 const INGEST_API_FLEET_AGENT_STATUS = `${INGEST_API_FLEET}/agent-status`;
 export const INGEST_API_EPM_PACKAGES = `${INGEST_API_ROOT}/epm/packages`;
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
index b5c67cc2c2014..3c9d5fde9b826 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
@@ -5,122 +5,84 @@
  */
 
 import { HttpStart } from 'kibana/public';
-import { INGEST_API_PACKAGE_CONFIGS, INGEST_API_EPM_PACKAGES } from './services/ingest';
+import { INGEST_API_EPM_PACKAGES, INGEST_API_PACKAGE_CONFIGS } from './services/ingest';
 import { EndpointDocGenerator } from '../../../../../../common/endpoint/generate_data';
 import { GetPolicyListResponse } from '../../types';
-import {
-  KibanaAssetReference,
-  EsAssetReference,
-  GetPackagesResponse,
-  InstallationStatus,
-} from '../../../../../../../ingest_manager/common';
+import { GetPackagesResponse } from '../../../../../../../ingest_manager/common';
 
 const generator = new EndpointDocGenerator('policy-list');
 
-/**
- * a list of API paths response mock providers
- */
-export const apiPathMockResponseProviders = {
-  [INGEST_API_EPM_PACKAGES]: () =>
-    Promise.resolve<GetPackagesResponse>({
-      response: [
-        {
-          name: 'endpoint',
-          title: 'Elastic Endpoint',
-          version: '0.5.0',
-          description: 'This is the Elastic Endpoint package.',
-          type: 'solution',
-          download: '/epr/endpoint/endpoint-0.5.0.tar.gz',
-          path: '/package/endpoint/0.5.0',
-          icons: [
-            {
-              src: '/package/endpoint/0.5.0/img/logo-endpoint-64-color.svg',
-              size: '16x16',
-              type: 'image/svg+xml',
-            },
-          ],
-          status: 'installed' as InstallationStatus,
-          savedObject: {
-            type: 'epm-packages',
-            id: 'endpoint',
-            attributes: {
-              installed_kibana: [
-                { id: '826759f0-7074-11ea-9bc8-6b38f4d29a16', type: 'dashboard' },
-                { id: '1cfceda0-728b-11ea-9bc8-6b38f4d29a16', type: 'visualization' },
-                { id: '1e525190-7074-11ea-9bc8-6b38f4d29a16', type: 'visualization' },
-                { id: '55387750-729c-11ea-9bc8-6b38f4d29a16', type: 'visualization' },
-                { id: '92b1edc0-706a-11ea-9bc8-6b38f4d29a16', type: 'visualization' },
-                { id: 'a3a3bd10-706b-11ea-9bc8-6b38f4d29a16', type: 'map' },
-              ] as KibanaAssetReference[],
-              installed_es: [
-                { id: 'logs-endpoint.alerts', type: 'index_template' },
-                { id: 'events-endpoint', type: 'index_template' },
-                { id: 'logs-endpoint.events.file', type: 'index_template' },
-                { id: 'logs-endpoint.events.library', type: 'index_template' },
-                { id: 'metrics-endpoint.metadata', type: 'index_template' },
-                { id: 'metrics-endpoint.metadata_mirror', type: 'index_template' },
-                { id: 'logs-endpoint.events.network', type: 'index_template' },
-                { id: 'metrics-endpoint.policy', type: 'index_template' },
-                { id: 'logs-endpoint.events.process', type: 'index_template' },
-                { id: 'logs-endpoint.events.registry', type: 'index_template' },
-                { id: 'logs-endpoint.events.security', type: 'index_template' },
-                { id: 'metrics-endpoint.telemetry', type: 'index_template' },
-              ] as EsAssetReference[],
-              es_index_patterns: {
-                alerts: 'logs-endpoint.alerts-*',
-                events: 'events-endpoint-*',
-                file: 'logs-endpoint.events.file-*',
-                library: 'logs-endpoint.events.library-*',
-                metadata: 'metrics-endpoint.metadata-*',
-                metadata_mirror: 'metrics-endpoint.metadata_mirror-*',
-                network: 'logs-endpoint.events.network-*',
-                policy: 'metrics-endpoint.policy-*',
-                process: 'logs-endpoint.events.process-*',
-                registry: 'logs-endpoint.events.registry-*',
-                security: 'logs-endpoint.events.security-*',
-                telemetry: 'metrics-endpoint.telemetry-*',
-              },
-              name: 'endpoint',
-              version: '0.5.0',
-              internal: false,
-              removable: false,
-            },
-            references: [],
-            updated_at: '2020-06-24T14:41:23.098Z',
-            version: 'Wzc0LDFd',
-          },
-        },
-      ],
-      success: true,
-    }),
-};
-
 /**
  * It sets the mock implementation on the necessary http methods to support the policy list view
  * @param mockedHttpService
- * @param responseItems
+ * @param totalPolicies
  */
 export const setPolicyListApiMockImplementation = (
   mockedHttpService: jest.Mocked<HttpStart>,
-  responseItems: GetPolicyListResponse['items'] = [generator.generatePolicyPackageConfig()]
+  totalPolicies: number = 1
 ): void => {
-  mockedHttpService.get.mockImplementation((...args) => {
+  const policyApiHandlers = policyListApiPathHandlers(totalPolicies);
+
+  mockedHttpService.get.mockImplementation(async (...args) => {
     const [path] = args;
     if (typeof path === 'string') {
-      if (path === INGEST_API_PACKAGE_CONFIGS) {
-        return Promise.resolve<GetPolicyListResponse>({
-          items: responseItems,
-          total: 10,
-          page: 1,
-          perPage: 10,
-          success: true,
-        });
-      }
-
-      if (apiPathMockResponseProviders[path]) {
-        return apiPathMockResponseProviders[path]();
+      if (policyApiHandlers[path]) {
+        return policyApiHandlers[path]();
       }
     }
     return Promise.reject(new Error(`MOCK: unknown policy list api: ${path}`));
   });
 };
+
+/**
+ * Returns the response body for a call to get the list of Policies
+ * @param options
+ */
+export const mockPolicyResultList: (options?: {
+  total?: number;
+  request_page_size?: number;
+  request_page_index?: number;
+}) => GetPolicyListResponse = (options = {}) => {
+  const {
+    total = 1,
+    request_page_size: requestPageSize = 10,
+    request_page_index: requestPageIndex = 0,
+  } = options;
+
+  // Skip any that are before the page we're on
+  const numberToSkip = requestPageSize * requestPageIndex;
+
+  // total - numberToSkip is the count of non-skipped ones, but return no more than a pageSize, and no less than 0
+  const actualCountToReturn = Math.max(Math.min(total - numberToSkip, requestPageSize), 0);
+
+  const policies = [];
+  for (let index = 0; index < actualCountToReturn; index++) {
+    policies.push(generator.generatePolicyPackageConfig());
+  }
+  const mock: GetPolicyListResponse = {
+    items: policies,
+    total,
+    page: requestPageIndex,
+    perPage: requestPageSize,
+    success: true,
+  };
+  return mock;
+};
+
+/**
+ * Returns an object comprised of the API path as the key along with a function that
+ * returns that API's result value
+ */
+export const policyListApiPathHandlers = (totalPolicies: number = 1) => {
+  return {
+    [INGEST_API_PACKAGE_CONFIGS]: () => {
+      return mockPolicyResultList({ total: totalPolicies });
+    },
+    [INGEST_API_EPM_PACKAGES]: (): GetPackagesResponse => {
+      return {
+        response: [generator.generateEpmPackage()],
+        success: true,
+      };
+    },
+  };
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
index 03ab32dcb2b66..c81ffb0060c88 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
@@ -11,7 +11,7 @@ import { PolicyDetails } from './policy_details';
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../../../common/mock/endpoint';
 import { getPolicyDetailPath, getHostListPath } from '../../../common/routing';
-import { apiPathMockResponseProviders } from '../store/policy_list/test_mock_utils';
+import { policyListApiPathHandlers } from '../store/policy_list/test_mock_utils';
 
 jest.mock('../../../../common/components/link_to');
 
@@ -80,6 +80,8 @@ describe('Policy Details', () => {
       policyPackageConfig = generator.generatePolicyPackageConfig();
       policyPackageConfig.id = '1';
 
+      const policyListApiHandlers = policyListApiPathHandlers();
+
       http.get.mockImplementation((...args) => {
         const [path] = args;
         if (typeof path === 'string') {
@@ -103,9 +105,9 @@ describe('Policy Details', () => {
 
           // Get package data
           // Used in tests that route back to the list
-          if (apiPathMockResponseProviders[path]) {
+          if (policyListApiHandlers[path]) {
             asyncActions = asyncActions.then(async () => sleep());
-            return apiPathMockResponseProviders[path]();
+            return Promise.resolve(policyListApiHandlers[path]());
           }
         }
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx
index e35c97698f5cb..97eaceff91e9c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.test.tsx
@@ -5,12 +5,9 @@
  */
 
 import React from 'react';
-import * as reactTestingLibrary from '@testing-library/react';
-
 import { PolicyList } from './index';
-import { mockPolicyResultList } from '../store/policy_list/mock_policy_result_list';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../../../common/mock/endpoint';
-import { AppAction } from '../../../../common/store/actions';
+import { setPolicyListApiMockImplementation } from '../store/policy_list/test_mock_utils';
 
 jest.mock('../../../../common/components/link_to');
 
@@ -18,11 +15,12 @@ jest.mock('../../../../common/components/link_to');
 describe.skip('when on the policies page', () => {
   let render: () => ReturnType<AppContextTestRender['render']>;
   let history: AppContextTestRender['history'];
-  let store: AppContextTestRender['store'];
+  let coreStart: AppContextTestRender['coreStart'];
+  let middlewareSpy: AppContextTestRender['middlewareSpy'];
 
   beforeEach(() => {
     const mockedContext = createAppRootMockRenderer();
-    ({ history, store } = mockedContext);
+    ({ history, coreStart, middlewareSpy } = mockedContext);
     render = () => mockedContext.render(<PolicyList />);
   });
 
@@ -46,34 +44,30 @@ describe.skip('when on the policies page', () => {
 
   describe('when list data loads', () => {
     let firstPolicyID: string;
-    beforeEach(() => {
-      reactTestingLibrary.act(() => {
-        history.push('/policy');
-        reactTestingLibrary.act(() => {
-          const policyListData = mockPolicyResultList({ total: 3 });
-          firstPolicyID = policyListData.items[0].id;
-          const action: AppAction = {
-            type: 'serverReturnedPolicyListData',
-            payload: {
-              policyItems: policyListData.items,
-              total: policyListData.total,
-              pageSize: policyListData.perPage,
-              pageIndex: policyListData.page,
-            },
-          };
-          store.dispatch(action);
-        });
-      });
+    const renderList = async () => {
+      const renderResult = render();
+      history.push('/policy');
+      await Promise.all([
+        middlewareSpy
+          .waitForAction('serverReturnedPolicyListData')
+          .then((action) => (firstPolicyID = action.payload.policyItems[0].id)),
+        // middlewareSpy.waitForAction('serverReturnedAgentConfigListData'),
+      ]);
+      return renderResult;
+    };
+
+    beforeEach(async () => {
+      setPolicyListApiMockImplementation(coreStart.http, 3);
     });
 
     it('should display rows in the table', async () => {
-      const renderResult = render();
+      const renderResult = await renderList();
       const rows = await renderResult.findAllByRole('row');
       expect(rows).toHaveLength(4);
     });
 
     it('should display policy name value as a link', async () => {
-      const renderResult = render();
+      const renderResult = await renderList();
       const policyNameLink = (await renderResult.findAllByTestId('policyNameLink'))[0];
       expect(policyNameLink).not.toBeNull();
       expect(policyNameLink.getAttribute('href')).toContain(`policy/${firstPolicyID}`);

From 111e8758907383baea03ccefc647fc7a2c8c6e7f Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Thu, 30 Jul 2020 10:53:44 -0700
Subject: [PATCH 7/7] [kbn/optimizer] restore x-pack bundle banner (#73767)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 .../mock_repo/x-pack/baz/kibana.json          |  4 +++
 .../mock_repo/x-pack/baz/public/index.ts      | 21 ++++++++++++
 .../kbn-optimizer/src/common/bundle.test.ts   |  2 ++
 packages/kbn-optimizer/src/common/bundle.ts   | 14 ++++++++
 .../basic_optimization.test.ts.snap           | 32 +++++++++++++++++
 .../basic_optimization.test.ts                | 34 ++++++++++++++-----
 .../src/optimizer/get_plugin_bundles.test.ts  | 23 +++++++++++++
 .../src/optimizer/get_plugin_bundles.ts       |  6 ++++
 .../src/worker/webpack.config.ts              |  1 +
 src/dev/precommit_hook/casing_check_config.js |  1 +
 10 files changed, 129 insertions(+), 9 deletions(-)
 create mode 100644 packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack/baz/kibana.json
 create mode 100644 packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack/baz/public/index.ts

diff --git a/packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack/baz/kibana.json b/packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack/baz/kibana.json
new file mode 100644
index 0000000000000..10602d2e7981a
--- /dev/null
+++ b/packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack/baz/kibana.json
@@ -0,0 +1,4 @@
+{
+  "id": "baz",
+  "ui": true
+}
diff --git a/packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack/baz/public/index.ts b/packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack/baz/public/index.ts
new file mode 100644
index 0000000000000..7313de07be04c
--- /dev/null
+++ b/packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack/baz/public/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// eslint-disable-next-line no-console
+console.log('plugin in an x-pack dir');
diff --git a/packages/kbn-optimizer/src/common/bundle.test.ts b/packages/kbn-optimizer/src/common/bundle.test.ts
index 6197a08485854..b8f9b94379f20 100644
--- a/packages/kbn-optimizer/src/common/bundle.test.ts
+++ b/packages/kbn-optimizer/src/common/bundle.test.ts
@@ -48,6 +48,7 @@ it('creates cache keys', () => {
         "/foo/bar/c": 789,
       },
       "spec": Object {
+        "banner": undefined,
         "contextDir": "/foo/bar",
         "id": "bar",
         "manifestPath": undefined,
@@ -80,6 +81,7 @@ it('parses bundles from JSON specs', () => {
   expect(bundles).toMatchInlineSnapshot(`
     Array [
       Bundle {
+        "banner": undefined,
         "cache": BundleCache {
           "path": "/foo/bar/target/.kbn-optimizer-cache",
           "state": undefined,
diff --git a/packages/kbn-optimizer/src/common/bundle.ts b/packages/kbn-optimizer/src/common/bundle.ts
index a354da7a21521..25b37ace09a8f 100644
--- a/packages/kbn-optimizer/src/common/bundle.ts
+++ b/packages/kbn-optimizer/src/common/bundle.ts
@@ -43,6 +43,8 @@ export interface BundleSpec {
   readonly sourceRoot: string;
   /** Absolute path to the directory where output should be written */
   readonly outputDir: string;
+  /** Banner that should be written to all bundle JS files */
+  readonly banner?: string;
   /** Absolute path to a kibana.json manifest file, if omitted we assume there are not dependenices */
   readonly manifestPath?: string;
 }
@@ -64,6 +66,8 @@ export class Bundle {
   public readonly sourceRoot: BundleSpec['sourceRoot'];
   /** Absolute path to the output directory for this bundle */
   public readonly outputDir: BundleSpec['outputDir'];
+  /** Banner that should be written to all bundle JS files */
+  public readonly banner: BundleSpec['banner'];
   /**
    * Absolute path to a manifest file with "requiredBundles" which will be
    * used to allow bundleRefs from this bundle to the exports of another bundle.
@@ -81,6 +85,7 @@ export class Bundle {
     this.sourceRoot = spec.sourceRoot;
     this.outputDir = spec.outputDir;
     this.manifestPath = spec.manifestPath;
+    this.banner = spec.banner;
 
     this.cache = new BundleCache(Path.resolve(this.outputDir, '.kbn-optimizer-cache'));
   }
@@ -112,6 +117,7 @@ export class Bundle {
       sourceRoot: this.sourceRoot,
       outputDir: this.outputDir,
       manifestPath: this.manifestPath,
+      banner: this.banner,
     };
   }
 
@@ -220,6 +226,13 @@ export function parseBundles(json: string) {
           }
         }
 
+        const { banner } = spec;
+        if (banner !== undefined) {
+          if (!(typeof banner === 'string')) {
+            throw new Error('`bundles[]` must have a string `banner` property');
+          }
+        }
+
         return new Bundle({
           type,
           id,
@@ -227,6 +240,7 @@ export function parseBundles(json: string) {
           contextDir,
           sourceRoot,
           outputDir,
+          banner,
           manifestPath,
         });
       }
diff --git a/packages/kbn-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap b/packages/kbn-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap
index 109188e163d06..5f44d8068e694 100644
--- a/packages/kbn-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap
+++ b/packages/kbn-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap
@@ -4,6 +4,7 @@ exports[`builds expected bundles, saves bundle counts to metadata: OptimizerConf
 OptimizerConfig {
   "bundles": Array [
     Bundle {
+      "banner": undefined,
       "cache": BundleCache {
         "path": <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/plugins/bar/target/public/.kbn-optimizer-cache,
         "state": undefined,
@@ -19,6 +20,7 @@ OptimizerConfig {
       "type": "plugin",
     },
     Bundle {
+      "banner": undefined,
       "cache": BundleCache {
         "path": <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/plugins/foo/target/public/.kbn-optimizer-cache,
         "state": undefined,
@@ -33,6 +35,24 @@ OptimizerConfig {
       "sourceRoot": <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo,
       "type": "plugin",
     },
+    Bundle {
+      "banner": "/*! Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one or more contributor license agreements.
+ * Licensed under the Elastic License; you may not use this file except in compliance with the Elastic License. */
+",
+      "cache": BundleCache {
+        "path": <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz/target/public/.kbn-optimizer-cache,
+        "state": undefined,
+      },
+      "contextDir": <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz,
+      "id": "baz",
+      "manifestPath": <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz/kibana.json,
+      "outputDir": <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz/target/public,
+      "publicDirNames": Array [
+        "public",
+      ],
+      "sourceRoot": <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo,
+      "type": "plugin",
+    },
   ],
   "cache": true,
   "dist": false,
@@ -60,6 +80,13 @@ OptimizerConfig {
       "isUiPlugin": false,
       "manifestPath": <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/plugins/nested/baz/kibana.json,
     },
+    Object {
+      "directory": <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz,
+      "extraPublicDirs": Array [],
+      "id": "baz",
+      "isUiPlugin": true,
+      "manifestPath": <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz/kibana.json,
+    },
   ],
   "profileWebpack": false,
   "repoRoot": <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo,
@@ -73,6 +100,11 @@ OptimizerConfig {
 
 exports[`prepares assets for distribution: bar bundle 1`] = `"(function(modules){var installedModules={};function __webpack_require__(moduleId){if(installedModules[moduleId]){return installedModules[moduleId].exports}var module=installedModules[moduleId]={i:moduleId,l:false,exports:{}};modules[moduleId].call(module.exports,module,module.exports,__webpack_require__);module.l=true;return module.exports}__webpack_require__.m=modules;__webpack_require__.c=installedModules;__webpack_require__.d=function(exports,name,getter){if(!__webpack_require__.o(exports,name)){Object.defineProperty(exports,name,{enumerable:true,get:getter})}};__webpack_require__.r=function(exports){if(typeof Symbol!==\\"undefined\\"&&Symbol.toStringTag){Object.defineProperty(exports,Symbol.toStringTag,{value:\\"Module\\"})}Object.defineProperty(exports,\\"__esModule\\",{value:true})};__webpack_require__.t=function(value,mode){if(mode&1)value=__webpack_require__(value);if(mode&8)return value;if(mode&4&&typeof value===\\"object\\"&&value&&value.__esModule)return value;var ns=Object.create(null);__webpack_require__.r(ns);Object.defineProperty(ns,\\"default\\",{enumerable:true,value:value});if(mode&2&&typeof value!=\\"string\\")for(var key in value)__webpack_require__.d(ns,key,function(key){return value[key]}.bind(null,key));return ns};__webpack_require__.n=function(module){var getter=module&&module.__esModule?function getDefault(){return module[\\"default\\"]}:function getModuleExports(){return module};__webpack_require__.d(getter,\\"a\\",getter);return getter};__webpack_require__.o=function(object,property){return Object.prototype.hasOwnProperty.call(object,property)};__webpack_require__.p=\\"\\";return __webpack_require__(__webpack_require__.s=5)})([function(module,exports,__webpack_require__){\\"use strict\\";var isOldIE=function isOldIE(){var memo;return function memorize(){if(typeof memo===\\"undefined\\"){memo=Boolean(window&&document&&document.all&&!window.atob)}return memo}}();var getTarget=function getTarget(){var memo={};return function memorize(target){if(typeof memo[target]===\\"undefined\\"){var styleTarget=document.querySelector(target);if(window.HTMLIFrameElement&&styleTarget instanceof window.HTMLIFrameElement){try{styleTarget=styleTarget.contentDocument.head}catch(e){styleTarget=null}}memo[target]=styleTarget}return memo[target]}}();var stylesInDom=[];function getIndexByIdentifier(identifier){var result=-1;for(var i=0;i<stylesInDom.length;i++){if(stylesInDom[i].identifier===identifier){result=i;break}}return result}function modulesToDom(list,options){var idCountMap={};var identifiers=[];for(var i=0;i<list.length;i++){var item=list[i];var id=options.base?item[0]+options.base:item[0];var count=idCountMap[id]||0;var identifier=\\"\\".concat(id,\\" \\").concat(count);idCountMap[id]=count+1;var index=getIndexByIdentifier(identifier);var obj={css:item[1],media:item[2],sourceMap:item[3]};if(index!==-1){stylesInDom[index].references++;stylesInDom[index].updater(obj)}else{stylesInDom.push({identifier:identifier,updater:addStyle(obj,options),references:1})}identifiers.push(identifier)}return identifiers}function insertStyleElement(options){var style=document.createElement(\\"style\\");var attributes=options.attributes||{};if(typeof attributes.nonce===\\"undefined\\"){var nonce=true?__webpack_require__.nc:undefined;if(nonce){attributes.nonce=nonce}}Object.keys(attributes).forEach((function(key){style.setAttribute(key,attributes[key])}));if(typeof options.insert===\\"function\\"){options.insert(style)}else{var target=getTarget(options.insert||\\"head\\");if(!target){throw new Error(\\"Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.\\")}target.appendChild(style)}return style}function removeStyleElement(style){if(style.parentNode===null){return false}style.parentNode.removeChild(style)}var replaceText=function replaceText(){var textStore=[];return function replace(index,replacement){textStore[index]=replacement;return textStore.filter(Boolean).join(\\"\\\\n\\")}}();function applyToSingletonTag(style,index,remove,obj){var css=remove?\\"\\":obj.media?\\"@media \\".concat(obj.media,\\" {\\").concat(obj.css,\\"}\\"):obj.css;if(style.styleSheet){style.styleSheet.cssText=replaceText(index,css)}else{var cssNode=document.createTextNode(css);var childNodes=style.childNodes;if(childNodes[index]){style.removeChild(childNodes[index])}if(childNodes.length){style.insertBefore(cssNode,childNodes[index])}else{style.appendChild(cssNode)}}}function applyToTag(style,options,obj){var css=obj.css;var media=obj.media;var sourceMap=obj.sourceMap;if(media){style.setAttribute(\\"media\\",media)}else{style.removeAttribute(\\"media\\")}if(sourceMap&&btoa){css+=\\"\\\\n/*# sourceMappingURL=data:application/json;base64,\\".concat(btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap)))),\\" */\\")}if(style.styleSheet){style.styleSheet.cssText=css}else{while(style.firstChild){style.removeChild(style.firstChild)}style.appendChild(document.createTextNode(css))}}var singleton=null;var singletonCounter=0;function addStyle(obj,options){var style;var update;var remove;if(options.singleton){var styleIndex=singletonCounter++;style=singleton||(singleton=insertStyleElement(options));update=applyToSingletonTag.bind(null,style,styleIndex,false);remove=applyToSingletonTag.bind(null,style,styleIndex,true)}else{style=insertStyleElement(options);update=applyToTag.bind(null,style,options);remove=function remove(){removeStyleElement(style)}}update(obj);return function updateStyle(newObj){if(newObj){if(newObj.css===obj.css&&newObj.media===obj.media&&newObj.sourceMap===obj.sourceMap){return}update(obj=newObj)}else{remove()}}}module.exports=function(list,options){options=options||{};if(!options.singleton&&typeof options.singleton!==\\"boolean\\"){options.singleton=isOldIE()}list=list||[];var lastIdentifiers=modulesToDom(list,options);return function update(newList){newList=newList||[];if(Object.prototype.toString.call(newList)!==\\"[object Array]\\"){return}for(var i=0;i<lastIdentifiers.length;i++){var identifier=lastIdentifiers[i];var index=getIndexByIdentifier(identifier);stylesInDom[index].references--}var newLastIdentifiers=modulesToDom(newList,options);for(var _i=0;_i<lastIdentifiers.length;_i++){var _identifier=lastIdentifiers[_i];var _index=getIndexByIdentifier(_identifier);if(stylesInDom[_index].references===0){stylesInDom[_index].updater();stylesInDom.splice(_index,1)}}lastIdentifiers=newLastIdentifiers}}},function(module,exports,__webpack_require__){\\"use strict\\";module.exports=function(useSourceMap){var list=[];list.toString=function toString(){return this.map((function(item){var content=cssWithMappingToString(item,useSourceMap);if(item[2]){return\\"@media \\".concat(item[2],\\" {\\").concat(content,\\"}\\")}return content})).join(\\"\\")};list.i=function(modules,mediaQuery,dedupe){if(typeof modules===\\"string\\"){modules=[[null,modules,\\"\\"]]}var alreadyImportedModules={};if(dedupe){for(var i=0;i<this.length;i++){var id=this[i][0];if(id!=null){alreadyImportedModules[id]=true}}}for(var _i=0;_i<modules.length;_i++){var item=[].concat(modules[_i]);if(dedupe&&alreadyImportedModules[item[0]]){continue}if(mediaQuery){if(!item[2]){item[2]=mediaQuery}else{item[2]=\\"\\".concat(mediaQuery,\\" and \\").concat(item[2])}}list.push(item)}};return list};function cssWithMappingToString(item,useSourceMap){var content=item[1]||\\"\\";var cssMapping=item[3];if(!cssMapping){return content}if(useSourceMap&&typeof btoa===\\"function\\"){var sourceMapping=toComment(cssMapping);var sourceURLs=cssMapping.sources.map((function(source){return\\"/*# sourceURL=\\".concat(cssMapping.sourceRoot||\\"\\").concat(source,\\" */\\")}));return[content].concat(sourceURLs).concat([sourceMapping]).join(\\"\\\\n\\")}return[content].join(\\"\\\\n\\")}function toComment(sourceMap){var base64=btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))));var data=\\"sourceMappingURL=data:application/json;charset=utf-8;base64,\\".concat(base64);return\\"/*# \\".concat(data,\\" */\\")}},function(module,exports,__webpack_require__){\\"use strict\\";module.exports=function(url,options){if(!options){options={}}url=url&&url.__esModule?url.default:url;if(typeof url!==\\"string\\"){return url}if(/^['\\"].*['\\"]$/.test(url)){url=url.slice(1,-1)}if(options.hash){url+=options.hash}if(/[\\"'() \\\\t\\\\n]/.test(url)||options.needQuotes){return'\\"'.concat(url.replace(/\\"/g,'\\\\\\\\\\"').replace(/\\\\n/g,\\"\\\\\\\\n\\"),'\\"')}return url}},function(module,exports){module.exports=\\"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIiB2ZXJzaW9uPSIxLjEiPjxjaXJjbGUgY3g9IjUwIiBjeT0iNTAiIHI9IjI1Ii8+PC9zdmc+\\"},function(module,__webpack_exports__,__webpack_require__){__webpack_require__.r(__webpack_exports__);var ns=__kbnBundles__.get(\\"plugin/foo/public\\");Object.defineProperties(__webpack_exports__,Object.getOwnPropertyDescriptors(ns))},function(module,__webpack_exports__,__webpack_require__){\\"use strict\\";__webpack_require__.r(__webpack_exports__);var _node_modules_val_loader_dist_cjs_js_key_bar_kbn_ui_shared_deps_public_path_module_creator_js__WEBPACK_IMPORTED_MODULE_0__=__webpack_require__(6);var _node_modules_val_loader_dist_cjs_js_key_bar_kbn_ui_shared_deps_public_path_module_creator_js__WEBPACK_IMPORTED_MODULE_0___default=__webpack_require__.n(_node_modules_val_loader_dist_cjs_js_key_bar_kbn_ui_shared_deps_public_path_module_creator_js__WEBPACK_IMPORTED_MODULE_0__);__kbnBundles__.define(\\"plugin/bar/public\\",__webpack_require__,25)},function(module,exports,__webpack_require__){__webpack_require__.p=window.__kbnPublicPath__[\\"bar\\"]},function(module,exports,__webpack_require__){switch(window.__kbnThemeTag__){case\\"v7dark\\":return __webpack_require__(8);case\\"v7light\\":return __webpack_require__(10);case\\"v8dark\\":return __webpack_require__(12);case\\"v8light\\":return __webpack_require__(14)}},function(module,exports,__webpack_require__){var api=__webpack_require__(0);var content=__webpack_require__(9);content=content.__esModule?content.default:content;if(typeof content===\\"string\\"){content=[[module.i,content,\\"\\"]]}var options={};options.insert=\\"head\\";options.singleton=false;var update=api(content,options);var exported=content.locals?content.locals:{};module.exports=exported},function(module,exports,__webpack_require__){var ___CSS_LOADER_API_IMPORT___=__webpack_require__(1);var ___CSS_LOADER_GET_URL_IMPORT___=__webpack_require__(2);var ___CSS_LOADER_URL_IMPORT_0___=__webpack_require__(3);exports=___CSS_LOADER_API_IMPORT___(false);var ___CSS_LOADER_URL_REPLACEMENT_0___=___CSS_LOADER_GET_URL_IMPORT___(___CSS_LOADER_URL_IMPORT_0___);exports.push([module.i,\\"p {\\\\n  background-color: rebeccapurple; }\\\\n\\\\nbody {\\\\n  width: 10;\\\\n  background-image: url(\\"+___CSS_LOADER_URL_REPLACEMENT_0___+\\"); }\\\\n\\",\\"\\"]);module.exports=exports},function(module,exports,__webpack_require__){var api=__webpack_require__(0);var content=__webpack_require__(11);content=content.__esModule?content.default:content;if(typeof content===\\"string\\"){content=[[module.i,content,\\"\\"]]}var options={};options.insert=\\"head\\";options.singleton=false;var update=api(content,options);var exported=content.locals?content.locals:{};module.exports=exported},function(module,exports,__webpack_require__){var ___CSS_LOADER_API_IMPORT___=__webpack_require__(1);var ___CSS_LOADER_GET_URL_IMPORT___=__webpack_require__(2);var ___CSS_LOADER_URL_IMPORT_0___=__webpack_require__(3);exports=___CSS_LOADER_API_IMPORT___(false);var ___CSS_LOADER_URL_REPLACEMENT_0___=___CSS_LOADER_GET_URL_IMPORT___(___CSS_LOADER_URL_IMPORT_0___);exports.push([module.i,\\"p {\\\\n  background-color: rebeccapurple; }\\\\n\\\\nbody {\\\\n  width: 11;\\\\n  background-image: url(\\"+___CSS_LOADER_URL_REPLACEMENT_0___+\\"); }\\\\n\\",\\"\\"]);module.exports=exports},function(module,exports,__webpack_require__){var api=__webpack_require__(0);var content=__webpack_require__(13);content=content.__esModule?content.default:content;if(typeof content===\\"string\\"){content=[[module.i,content,\\"\\"]]}var options={};options.insert=\\"head\\";options.singleton=false;var update=api(content,options);var exported=content.locals?content.locals:{};module.exports=exported},function(module,exports,__webpack_require__){var ___CSS_LOADER_API_IMPORT___=__webpack_require__(1);var ___CSS_LOADER_GET_URL_IMPORT___=__webpack_require__(2);var ___CSS_LOADER_URL_IMPORT_0___=__webpack_require__(3);exports=___CSS_LOADER_API_IMPORT___(false);var ___CSS_LOADER_URL_REPLACEMENT_0___=___CSS_LOADER_GET_URL_IMPORT___(___CSS_LOADER_URL_IMPORT_0___);exports.push([module.i,\\"p {\\\\n  background-color: rebeccapurple; }\\\\n\\\\nbody {\\\\n  width: 12;\\\\n  background-image: url(\\"+___CSS_LOADER_URL_REPLACEMENT_0___+\\"); }\\\\n\\",\\"\\"]);module.exports=exports},function(module,exports,__webpack_require__){var api=__webpack_require__(0);var content=__webpack_require__(15);content=content.__esModule?content.default:content;if(typeof content===\\"string\\"){content=[[module.i,content,\\"\\"]]}var options={};options.insert=\\"head\\";options.singleton=false;var update=api(content,options);var exported=content.locals?content.locals:{};module.exports=exported},function(module,exports,__webpack_require__){var ___CSS_LOADER_API_IMPORT___=__webpack_require__(1);var ___CSS_LOADER_GET_URL_IMPORT___=__webpack_require__(2);var ___CSS_LOADER_URL_IMPORT_0___=__webpack_require__(3);exports=___CSS_LOADER_API_IMPORT___(false);var ___CSS_LOADER_URL_REPLACEMENT_0___=___CSS_LOADER_GET_URL_IMPORT___(___CSS_LOADER_URL_IMPORT_0___);exports.push([module.i,\\"p {\\\\n  background-color: rebeccapurple; }\\\\n\\\\nbody {\\\\n  width: 13;\\\\n  background-image: url(\\"+___CSS_LOADER_URL_REPLACEMENT_0___+\\"); }\\\\n\\",\\"\\"]);module.exports=exports},function(module,exports,__webpack_require__){switch(window.__kbnThemeTag__){case\\"v7dark\\":return __webpack_require__(17);case\\"v7light\\":return __webpack_require__(19);case\\"v8dark\\":return __webpack_require__(21);case\\"v8light\\":return __webpack_require__(23)}},function(module,exports,__webpack_require__){var api=__webpack_require__(0);var content=__webpack_require__(18);content=content.__esModule?content.default:content;if(typeof content===\\"string\\"){content=[[module.i,content,\\"\\"]]}var options={};options.insert=\\"head\\";options.singleton=false;var update=api(content,options);var exported=content.locals?content.locals:{};module.exports=exported},function(module,exports,__webpack_require__){var ___CSS_LOADER_API_IMPORT___=__webpack_require__(1);exports=___CSS_LOADER_API_IMPORT___(false);exports.push([module.i,\\"body {\\\\n  color: green; }\\\\n\\",\\"\\"]);module.exports=exports},function(module,exports,__webpack_require__){var api=__webpack_require__(0);var content=__webpack_require__(20);content=content.__esModule?content.default:content;if(typeof content===\\"string\\"){content=[[module.i,content,\\"\\"]]}var options={};options.insert=\\"head\\";options.singleton=false;var update=api(content,options);var exported=content.locals?content.locals:{};module.exports=exported},function(module,exports,__webpack_require__){var ___CSS_LOADER_API_IMPORT___=__webpack_require__(1);exports=___CSS_LOADER_API_IMPORT___(false);exports.push([module.i,\\"body {\\\\n  color: green; }\\\\n\\",\\"\\"]);module.exports=exports},function(module,exports,__webpack_require__){var api=__webpack_require__(0);var content=__webpack_require__(22);content=content.__esModule?content.default:content;if(typeof content===\\"string\\"){content=[[module.i,content,\\"\\"]]}var options={};options.insert=\\"head\\";options.singleton=false;var update=api(content,options);var exported=content.locals?content.locals:{};module.exports=exported},function(module,exports,__webpack_require__){var ___CSS_LOADER_API_IMPORT___=__webpack_require__(1);exports=___CSS_LOADER_API_IMPORT___(false);exports.push([module.i,\\"body {\\\\n  color: green; }\\\\n\\",\\"\\"]);module.exports=exports},function(module,exports,__webpack_require__){var api=__webpack_require__(0);var content=__webpack_require__(24);content=content.__esModule?content.default:content;if(typeof content===\\"string\\"){content=[[module.i,content,\\"\\"]]}var options={};options.insert=\\"head\\";options.singleton=false;var update=api(content,options);var exported=content.locals?content.locals:{};module.exports=exported},function(module,exports,__webpack_require__){var ___CSS_LOADER_API_IMPORT___=__webpack_require__(1);exports=___CSS_LOADER_API_IMPORT___(false);exports.push([module.i,\\"body {\\\\n  color: green; }\\\\n\\",\\"\\"]);module.exports=exports},function(module,__webpack_exports__,__webpack_require__){\\"use strict\\";__webpack_require__.r(__webpack_exports__);var styles=__webpack_require__(7);var public_0=__webpack_require__(16);var public_=__webpack_require__(4);function barLibFn(){return\\"bar\\"}__webpack_require__.d(__webpack_exports__,\\"barLibFn\\",(function(){return barLibFn}));__webpack_require__.d(__webpack_exports__,\\"fooLibFn\\",(function(){return public_[\\"fooLibFn\\"]}))}]);"`;
 
+exports[`prepares assets for distribution: baz bundle 1`] = `
+"/*! Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one or more contributor license agreements.
+ * Licensed under the Elastic License; you may not use this file except in compliance with the Elastic License. */(function(modules){var installedModules={};function __webpack_require__(moduleId){if(installedModules[moduleId]){return installedModules[moduleId].exports}var module=installedModules[moduleId]={i:moduleId,l:false,exports:{}};modules[moduleId].call(module.exports,module,module.exports,__webpack_require__);module.l=true;return module.exports}__webpack_require__.m=modules;__webpack_require__.c=installedModules;__webpack_require__.d=function(exports,name,getter){if(!__webpack_require__.o(exports,name)){Object.defineProperty(exports,name,{enumerable:true,get:getter})}};__webpack_require__.r=function(exports){if(typeof Symbol!==\\"undefined\\"&&Symbol.toStringTag){Object.defineProperty(exports,Symbol.toStringTag,{value:\\"Module\\"})}Object.defineProperty(exports,\\"__esModule\\",{value:true})};__webpack_require__.t=function(value,mode){if(mode&1)value=__webpack_require__(value);if(mode&8)return value;if(mode&4&&typeof value===\\"object\\"&&value&&value.__esModule)return value;var ns=Object.create(null);__webpack_require__.r(ns);Object.defineProperty(ns,\\"default\\",{enumerable:true,value:value});if(mode&2&&typeof value!=\\"string\\")for(var key in value)__webpack_require__.d(ns,key,function(key){return value[key]}.bind(null,key));return ns};__webpack_require__.n=function(module){var getter=module&&module.__esModule?function getDefault(){return module[\\"default\\"]}:function getModuleExports(){return module};__webpack_require__.d(getter,\\"a\\",getter);return getter};__webpack_require__.o=function(object,property){return Object.prototype.hasOwnProperty.call(object,property)};__webpack_require__.p=\\"\\";return __webpack_require__(__webpack_require__.s=0)})([function(module,__webpack_exports__,__webpack_require__){\\"use strict\\";__webpack_require__.r(__webpack_exports__);var _node_modules_val_loader_dist_cjs_js_key_baz_kbn_ui_shared_deps_public_path_module_creator_js__WEBPACK_IMPORTED_MODULE_0__=__webpack_require__(1);var _node_modules_val_loader_dist_cjs_js_key_baz_kbn_ui_shared_deps_public_path_module_creator_js__WEBPACK_IMPORTED_MODULE_0___default=__webpack_require__.n(_node_modules_val_loader_dist_cjs_js_key_baz_kbn_ui_shared_deps_public_path_module_creator_js__WEBPACK_IMPORTED_MODULE_0__);__kbnBundles__.define(\\"plugin/baz/public\\",__webpack_require__,2)},function(module,exports,__webpack_require__){__webpack_require__.p=window.__kbnPublicPath__[\\"baz\\"]},function(module,exports){console.log(\\"plugin in an x-pack dir\\")}]);"
+`;
+
 exports[`prepares assets for distribution: foo async bundle 1`] = `"(window[\\"foo_bundle_jsonpfunction\\"]=window[\\"foo_bundle_jsonpfunction\\"]||[]).push([[1],{3:function(module,__webpack_exports__,__webpack_require__){\\"use strict\\";__webpack_require__.r(__webpack_exports__);__webpack_require__.d(__webpack_exports__,\\"foo\\",(function(){return foo}));function foo(){}}}]);"`;
 
 exports[`prepares assets for distribution: foo bundle 1`] = `"(function(modules){function webpackJsonpCallback(data){var chunkIds=data[0];var moreModules=data[1];var moduleId,chunkId,i=0,resolves=[];for(;i<chunkIds.length;i++){chunkId=chunkIds[i];if(Object.prototype.hasOwnProperty.call(installedChunks,chunkId)&&installedChunks[chunkId]){resolves.push(installedChunks[chunkId][0])}installedChunks[chunkId]=0}for(moduleId in moreModules){if(Object.prototype.hasOwnProperty.call(moreModules,moduleId)){modules[moduleId]=moreModules[moduleId]}}if(parentJsonpFunction)parentJsonpFunction(data);while(resolves.length){resolves.shift()()}}var installedModules={};var installedChunks={0:0};function jsonpScriptSrc(chunkId){return __webpack_require__.p+\\"foo.chunk.\\"+chunkId+\\".js\\"}function __webpack_require__(moduleId){if(installedModules[moduleId]){return installedModules[moduleId].exports}var module=installedModules[moduleId]={i:moduleId,l:false,exports:{}};modules[moduleId].call(module.exports,module,module.exports,__webpack_require__);module.l=true;return module.exports}__webpack_require__.e=function requireEnsure(chunkId){var promises=[];var installedChunkData=installedChunks[chunkId];if(installedChunkData!==0){if(installedChunkData){promises.push(installedChunkData[2])}else{var promise=new Promise((function(resolve,reject){installedChunkData=installedChunks[chunkId]=[resolve,reject]}));promises.push(installedChunkData[2]=promise);var script=document.createElement(\\"script\\");var onScriptComplete;script.charset=\\"utf-8\\";script.timeout=120;if(__webpack_require__.nc){script.setAttribute(\\"nonce\\",__webpack_require__.nc)}script.src=jsonpScriptSrc(chunkId);var error=new Error;onScriptComplete=function(event){script.onerror=script.onload=null;clearTimeout(timeout);var chunk=installedChunks[chunkId];if(chunk!==0){if(chunk){var errorType=event&&(event.type===\\"load\\"?\\"missing\\":event.type);var realSrc=event&&event.target&&event.target.src;error.message=\\"Loading chunk \\"+chunkId+\\" failed.\\\\n(\\"+errorType+\\": \\"+realSrc+\\")\\";error.name=\\"ChunkLoadError\\";error.type=errorType;error.request=realSrc;chunk[1](error)}installedChunks[chunkId]=undefined}};var timeout=setTimeout((function(){onScriptComplete({type:\\"timeout\\",target:script})}),12e4);script.onerror=script.onload=onScriptComplete;document.head.appendChild(script)}}return Promise.all(promises)};__webpack_require__.m=modules;__webpack_require__.c=installedModules;__webpack_require__.d=function(exports,name,getter){if(!__webpack_require__.o(exports,name)){Object.defineProperty(exports,name,{enumerable:true,get:getter})}};__webpack_require__.r=function(exports){if(typeof Symbol!==\\"undefined\\"&&Symbol.toStringTag){Object.defineProperty(exports,Symbol.toStringTag,{value:\\"Module\\"})}Object.defineProperty(exports,\\"__esModule\\",{value:true})};__webpack_require__.t=function(value,mode){if(mode&1)value=__webpack_require__(value);if(mode&8)return value;if(mode&4&&typeof value===\\"object\\"&&value&&value.__esModule)return value;var ns=Object.create(null);__webpack_require__.r(ns);Object.defineProperty(ns,\\"default\\",{enumerable:true,value:value});if(mode&2&&typeof value!=\\"string\\")for(var key in value)__webpack_require__.d(ns,key,function(key){return value[key]}.bind(null,key));return ns};__webpack_require__.n=function(module){var getter=module&&module.__esModule?function getDefault(){return module[\\"default\\"]}:function getModuleExports(){return module};__webpack_require__.d(getter,\\"a\\",getter);return getter};__webpack_require__.o=function(object,property){return Object.prototype.hasOwnProperty.call(object,property)};__webpack_require__.p=\\"\\";__webpack_require__.oe=function(err){console.error(err);throw err};var jsonpArray=window[\\"foo_bundle_jsonpfunction\\"]=window[\\"foo_bundle_jsonpfunction\\"]||[];var oldJsonpFunction=jsonpArray.push.bind(jsonpArray);jsonpArray.push=webpackJsonpCallback;jsonpArray=jsonpArray.slice();for(var i=0;i<jsonpArray.length;i++)webpackJsonpCallback(jsonpArray[i]);var parentJsonpFunction=oldJsonpFunction;return __webpack_require__(__webpack_require__.s=0)})([function(module,__webpack_exports__,__webpack_require__){\\"use strict\\";__webpack_require__.r(__webpack_exports__);var _node_modules_val_loader_dist_cjs_js_key_foo_kbn_ui_shared_deps_public_path_module_creator_js__WEBPACK_IMPORTED_MODULE_0__=__webpack_require__(1);var _node_modules_val_loader_dist_cjs_js_key_foo_kbn_ui_shared_deps_public_path_module_creator_js__WEBPACK_IMPORTED_MODULE_0___default=__webpack_require__.n(_node_modules_val_loader_dist_cjs_js_key_foo_kbn_ui_shared_deps_public_path_module_creator_js__WEBPACK_IMPORTED_MODULE_0__);__kbnBundles__.define(\\"plugin/foo/public\\",__webpack_require__,2)},function(module,exports,__webpack_require__){__webpack_require__.p=window.__kbnPublicPath__[\\"foo\\"]},function(module,__webpack_exports__,__webpack_require__){\\"use strict\\";__webpack_require__.r(__webpack_exports__);function fooLibFn(){return\\"foo\\"}var ext=\\"TRUE\\";__webpack_require__.d(__webpack_exports__,\\"getFoo\\",(function(){return getFoo}));__webpack_require__.d(__webpack_exports__,\\"fooLibFn\\",(function(){return fooLibFn}));__webpack_require__.d(__webpack_exports__,\\"ext\\",(function(){return ext}));function asyncGeneratorStep(gen,resolve,reject,_next,_throw,key,arg){try{var info=gen[key](arg);var value=info.value}catch(error){reject(error);return}if(info.done){resolve(value)}else{Promise.resolve(value).then(_next,_throw)}}function _asyncToGenerator(fn){return function(){var self=this,args=arguments;return new Promise((function(resolve,reject){var gen=fn.apply(self,args);function _next(value){asyncGeneratorStep(gen,resolve,reject,_next,_throw,\\"next\\",value)}function _throw(err){asyncGeneratorStep(gen,resolve,reject,_next,_throw,\\"throw\\",err)}_next(undefined)}))}}function getFoo(){return _getFoo.apply(this,arguments)}function _getFoo(){_getFoo=_asyncToGenerator(regeneratorRuntime.mark((function _callee(){return regeneratorRuntime.wrap((function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:_context.next=2;return __webpack_require__.e(1).then(__webpack_require__.bind(null,3));case 2:return _context.abrupt(\\"return\\",_context.sent);case 3:case\\"end\\":return _context.stop()}}}),_callee)})));return _getFoo.apply(this,arguments)}}]);"`;
diff --git a/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts b/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
index 716dd5e3edbc1..2d0d60da1e4a0 100644
--- a/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
+++ b/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
@@ -66,7 +66,7 @@ afterAll(async () => {
 it('builds expected bundles, saves bundle counts to metadata', async () => {
   const config = OptimizerConfig.create({
     repoRoot: MOCK_REPO_DIR,
-    pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],
+    pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins'), Path.resolve(MOCK_REPO_DIR, 'x-pack')],
     maxWorkerCount: 1,
     dist: false,
   });
@@ -100,7 +100,7 @@ it('builds expected bundles, saves bundle counts to metadata', async () => {
       (msg.event?.type === 'bundle cached' || msg.event?.type === 'bundle not cached') &&
       msg.state.phase === 'initializing'
   );
-  assert('produce two bundle cache events while initializing', bundleCacheStates.length === 2);
+  assert('produce three bundle cache events while initializing', bundleCacheStates.length === 3);
 
   const initializedStates = msgs.filter((msg) => msg.state.phase === 'initialized');
   assert('produce at least one initialized event', initializedStates.length >= 1);
@@ -110,17 +110,17 @@ it('builds expected bundles, saves bundle counts to metadata', async () => {
 
   const runningStates = msgs.filter((msg) => msg.state.phase === 'running');
   assert(
-    'produce two or three "running" states',
-    runningStates.length === 2 || runningStates.length === 3
+    'produce three to five "running" states',
+    runningStates.length >= 3 && runningStates.length <= 5
   );
 
   const bundleNotCachedEvents = msgs.filter((msg) => msg.event?.type === 'bundle not cached');
-  assert('produce two "bundle not cached" events', bundleNotCachedEvents.length === 2);
+  assert('produce three "bundle not cached" events', bundleNotCachedEvents.length === 3);
 
   const successStates = msgs.filter((msg) => msg.state.phase === 'success');
   assert(
-    'produce one or two "compiler success" states',
-    successStates.length === 1 || successStates.length === 2
+    'produce one to three "compiler success" states',
+    successStates.length >= 1 && successStates.length <= 3
   );
 
   const otherStates = msgs.filter(
@@ -175,12 +175,26 @@ it('builds expected bundles, saves bundle counts to metadata', async () => {
       <absolute path>/packages/kbn-ui-shared-deps/public_path_module_creator.js,
     ]
   `);
+
+  const baz = config.bundles.find((b) => b.id === 'baz')!;
+  expect(baz).toBeTruthy();
+  baz.cache.refresh();
+  expect(baz.cache.getModuleCount()).toBe(3);
+
+  expect(baz.cache.getReferencedFiles()).toMatchInlineSnapshot(`
+    Array [
+      <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz/kibana.json,
+      <absolute path>/packages/kbn-optimizer/src/__fixtures__/__tmp__/mock_repo/x-pack/baz/public/index.ts,
+      <absolute path>/packages/kbn-optimizer/target/worker/entry_point_creator.js,
+      <absolute path>/packages/kbn-ui-shared-deps/public_path_module_creator.js,
+    ]
+  `);
 });
 
 it('uses cache on second run and exist cleanly', async () => {
   const config = OptimizerConfig.create({
     repoRoot: MOCK_REPO_DIR,
-    pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],
+    pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins'), Path.resolve(MOCK_REPO_DIR, 'x-pack')],
     maxWorkerCount: 1,
     dist: false,
   });
@@ -202,6 +216,7 @@ it('uses cache on second run and exist cleanly', async () => {
       "initializing",
       "initializing",
       "initializing",
+      "initializing",
       "initialized",
       "success",
     ]
@@ -211,7 +226,7 @@ it('uses cache on second run and exist cleanly', async () => {
 it('prepares assets for distribution', async () => {
   const config = OptimizerConfig.create({
     repoRoot: MOCK_REPO_DIR,
-    pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],
+    pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins'), Path.resolve(MOCK_REPO_DIR, 'x-pack')],
     maxWorkerCount: 1,
     dist: true,
   });
@@ -224,6 +239,7 @@ it('prepares assets for distribution', async () => {
     'foo async bundle'
   );
   expectFileMatchesSnapshotWithCompression('plugins/bar/target/public/bar.plugin.js', 'bar bundle');
+  expectFileMatchesSnapshotWithCompression('x-pack/baz/target/public/baz.plugin.js', 'baz bundle');
 });
 
 /**
diff --git a/packages/kbn-optimizer/src/optimizer/get_plugin_bundles.test.ts b/packages/kbn-optimizer/src/optimizer/get_plugin_bundles.test.ts
index a70cfc759dd55..a823f66cf767b 100644
--- a/packages/kbn-optimizer/src/optimizer/get_plugin_bundles.test.ts
+++ b/packages/kbn-optimizer/src/optimizer/get_plugin_bundles.test.ts
@@ -48,12 +48,20 @@ it('returns a bundle for core and each plugin', () => {
           extraPublicDirs: [],
           manifestPath: '/outside/of/repo/plugins/baz/kibana.json',
         },
+        {
+          directory: '/repo/x-pack/plugins/box',
+          id: 'box',
+          isUiPlugin: true,
+          extraPublicDirs: [],
+          manifestPath: '/repo/x-pack/plugins/box/kibana.json',
+        },
       ],
       '/repo'
     ).map((b) => b.toSpec())
   ).toMatchInlineSnapshot(`
     Array [
       Object {
+        "banner": undefined,
         "contextDir": <absolute path>/plugins/foo,
         "id": "foo",
         "manifestPath": <absolute path>/plugins/foo/kibana.json,
@@ -65,6 +73,7 @@ it('returns a bundle for core and each plugin', () => {
         "type": "plugin",
       },
       Object {
+        "banner": undefined,
         "contextDir": "/outside/of/repo/plugins/baz",
         "id": "baz",
         "manifestPath": "/outside/of/repo/plugins/baz/kibana.json",
@@ -75,6 +84,20 @@ it('returns a bundle for core and each plugin', () => {
         "sourceRoot": <absolute path>,
         "type": "plugin",
       },
+      Object {
+        "banner": "/*! Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one or more contributor license agreements.
+     * Licensed under the Elastic License; you may not use this file except in compliance with the Elastic License. */
+    ",
+        "contextDir": <absolute path>/x-pack/plugins/box,
+        "id": "box",
+        "manifestPath": <absolute path>/x-pack/plugins/box/kibana.json,
+        "outputDir": <absolute path>/x-pack/plugins/box/target/public,
+        "publicDirNames": Array [
+          "public",
+        ],
+        "sourceRoot": <absolute path>,
+        "type": "plugin",
+      },
     ]
   `);
 });
diff --git a/packages/kbn-optimizer/src/optimizer/get_plugin_bundles.ts b/packages/kbn-optimizer/src/optimizer/get_plugin_bundles.ts
index 04ab992addeec..9350b9464242a 100644
--- a/packages/kbn-optimizer/src/optimizer/get_plugin_bundles.ts
+++ b/packages/kbn-optimizer/src/optimizer/get_plugin_bundles.ts
@@ -24,6 +24,8 @@ import { Bundle } from '../common';
 import { KibanaPlatformPlugin } from './kibana_platform_plugins';
 
 export function getPluginBundles(plugins: KibanaPlatformPlugin[], repoRoot: string) {
+  const xpackDirSlash = Path.resolve(repoRoot, 'x-pack') + Path.sep;
+
   return plugins
     .filter((p) => p.isUiPlugin)
     .map(
@@ -36,6 +38,10 @@ export function getPluginBundles(plugins: KibanaPlatformPlugin[], repoRoot: stri
           contextDir: p.directory,
           outputDir: Path.resolve(p.directory, 'target/public'),
           manifestPath: p.manifestPath,
+          banner: p.directory.startsWith(xpackDirSlash)
+            ? `/*! Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one or more contributor license agreements.\n` +
+              ` * Licensed under the Elastic License; you may not use this file except in compliance with the Elastic License. */\n`
+            : undefined,
         })
     );
 }
diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts
index 271ad49aee351..3d62ed1636869 100644
--- a/packages/kbn-optimizer/src/worker/webpack.config.ts
+++ b/packages/kbn-optimizer/src/worker/webpack.config.ts
@@ -72,6 +72,7 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker:
       new CleanWebpackPlugin(),
       new DisallowedSyntaxPlugin(),
       new BundleRefsPlugin(bundle, bundleRefs),
+      ...(bundle.banner ? [new webpack.BannerPlugin({ banner: bundle.banner, raw: true })] : []),
     ],
 
     module: {
diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js
index 864bf7515053c..404ad67174681 100644
--- a/src/dev/precommit_hook/casing_check_config.js
+++ b/src/dev/precommit_hook/casing_check_config.js
@@ -105,6 +105,7 @@ export const IGNORE_DIRECTORY_GLOBS = [
   'test/functional/fixtures/es_archiver/visualize_source-filters',
   'packages/kbn-pm/src/utils/__fixtures__/*',
   'x-pack/dev-tools',
+  'packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack',
 ];
 
 /**