diff --git a/.eslintrc.js b/.eslintrc.js
index 8d5b4525d51ba5..ffc49a60d5bca0 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -888,7 +888,7 @@ module.exports = {
     {
       // typescript only for front and back end
       files: [
-        'x-pack/{,legacy/}plugins/{alerting,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
+        'x-pack/{,legacy/}plugins/{alerts,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
       ],
       rules: {
         '@typescript-eslint/no-explicit-any': 'error',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e6f6e83253c8bb..47f9942162f75c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -170,6 +170,7 @@
 
 # Kibana Telemetry
 /packages/kbn-analytics/ @elastic/kibana-telemetry
+/packages/kbn-telemetry-tools/ @elastic/kibana-telemetry
 /src/plugins/kibana_usage_collection/ @elastic/kibana-telemetry
 /src/plugins/newsfeed/ @elastic/kibana-telemetry
 /src/plugins/telemetry/ @elastic/kibana-telemetry
@@ -177,6 +178,11 @@
 /src/plugins/telemetry_management_section/ @elastic/kibana-telemetry
 /src/plugins/usage_collection/ @elastic/kibana-telemetry
 /x-pack/plugins/telemetry_collection_xpack/ @elastic/kibana-telemetry
+/.telemetryrc.json @elastic/kibana-telemetry
+/x-pack/.telemetryrc.json @elastic/kibana-telemetry
+src/plugins/telemetry/schema/legacy_oss_plugins.json @elastic/kibana-telemetry
+src/plugins/telemetry/schema/oss_plugins.json @elastic/kibana-telemetry
+x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kibana-telemetry
 
 # Kibana Alerting Services
 /x-pack/plugins/alerts/ @elastic/kibana-alerting-services
diff --git a/.telemetryrc.json b/.telemetryrc.json
new file mode 100644
index 00000000000000..30643a104c1cd2
--- /dev/null
+++ b/.telemetryrc.json
@@ -0,0 +1,25 @@
+[
+  {
+    "output": "src/plugins/telemetry/schema/legacy_oss_plugins.json",
+    "root": "src/legacy/core_plugins/",
+    "exclude": [
+      "src/legacy/core_plugins/testbed",
+      "src/legacy/core_plugins/elasticsearch",
+      "src/legacy/core_plugins/tests_bundle"
+    ]
+  },
+  {
+    "output": "src/plugins/telemetry/schema/oss_plugins.json",
+    "root": "src/plugins/",
+    "exclude": [
+      "src/plugins/kibana_react/",
+      "src/plugins/testbed/",
+      "src/plugins/kibana_utils/",
+      "src/plugins/kibana_usage_collection/server/collectors/kibana/kibana_usage_collector.ts",
+      "src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts",
+      "src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts",
+      "src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts",
+      "src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts"
+    ]
+  }
+]
diff --git a/docs/apm/apm-alerts.asciidoc b/docs/apm/apm-alerts.asciidoc
index 75ce5f56c96c65..bc5e1ccc1dd55e 100644
--- a/docs/apm/apm-alerts.asciidoc
+++ b/docs/apm/apm-alerts.asciidoc
@@ -15,15 +15,20 @@ and enables central management of all alerts from <<management,Kibana Management
 [role="screenshot"]
 image::apm/images/apm-alert.png[Create an alert in the APM app]
 
-There are two different types of threshold alerts: transaction duration, and error rate.
+For a walkthrough of the alert flyout panel, including detailed information on each configurable property,
+see Kibana's <<defining-alerts,defining alerts>>.
+
+The APM app supports two different types of threshold alerts: transaction duration, and error rate.
 Below, we'll create one of each.
 
 [float]
 [[apm-create-transaction-alert]]
 === Create a transaction duration alert
 
-This guide creates an alert for the `opbeans-java` service based on the following criteria:
+Transaction duration alerts trigger when the duration of a specific transaction type in a service exceeds a defined threshold.
+This guide will create an alert for the `opbeans-java` service based on the following criteria:
 
+* Environment: Production
 * Transaction type: `transaction.type:request`
 * Average request is above `1500ms` for the last 5 minutes
 * Check every 10 minutes, and repeat the alert every 30 minutes
@@ -52,14 +57,22 @@ Enter a name for the connector,
 and paste the webhook URL.
 See Slack's webhook documentation if you need to create one.
 
+Add a message body in markdown format.
+You can use the https://mustache.github.io/[Mustache] template syntax, i.e., `{{variable}}`
+to pass alert values at the time a condition is detected to an action.
+A list of available variables can be accessed by selecting the
+**add variable** button image:apm/images/add-variable.png[add variable button].
+
 Select **Save**. The alert has been created and is now active!
 
 [float]
 [[apm-create-error-alert]]
 === Create an error rate alert
 
+Error rate alerts trigger when the number of errors in a service exceeds a defined threshold.
 This guide creates an alert for the `opbeans-python` service based on the following criteria:
 
+* Environment: Production
 * Error rate is above 25 for the last minute
 * Check every 1 minute, and repeat the alert every 10 minutes
 * Send the alert via email to the `opbeans-python` team
@@ -81,6 +94,12 @@ Based on the alert criteria, define the following alert details:
 Select the **Email** action type and click **Create a connector**.
 Fill out the required details: sender, host, port, etc., and click **save**.
 
+Add a message body in markdown format.
+You can use the https://mustache.github.io/[Mustache] template syntax, i.e., `{{variable}}`
+to pass alert values at the time a condition is detected to an action.
+A list of available variables can be accessed by selecting the
+**add variable** button image:apm/images/add-variable.png[add variable button].
+
 Select **Save**. The alert has been created and is now active!
 
 [float]
diff --git a/docs/apm/images/add-variable.png b/docs/apm/images/add-variable.png
new file mode 100644
index 00000000000000..860ab66f22f4e2
Binary files /dev/null and b/docs/apm/images/add-variable.png differ
diff --git a/docs/apm/troubleshooting.asciidoc b/docs/apm/troubleshooting.asciidoc
index eb4fb790afd7fd..65f7a378ec2443 100644
--- a/docs/apm/troubleshooting.asciidoc
+++ b/docs/apm/troubleshooting.asciidoc
@@ -10,6 +10,11 @@ your proposed changes at https://github.com/elastic/kibana.
 
 Also, check out the https://discuss.elastic.co/c/apm[APM discussion forum].
 
+* <<no-apm-data-found>>
+* <<troubleshooting-too-many-transactions>>
+* <<troubleshooting-unknown-route>>
+* <<troubleshooting-fields-unsearchable>>
+
 [float]
 [[no-apm-data-found]]
 === No APM data found
@@ -58,6 +63,66 @@ Navigate to *APM* > *Settings* > *Indices*, and change all `apm_oss.*Pattern` va
 include the new index pattern. For example: `customIndexName-*`.
 
 [float]
+[[troubleshooting-too-many-transactions]]
+=== Too many unique transaction names
+
+Transaction names are defined in each APM Agent; when an Agent supports a framework,
+it includes logic for naming the transactions that the framework creates.
+In some cases though, like when using an Agent's API to create custom transactions,
+it is up to the user to define a pattern for transaction naming.
+When transactions are named incorrectly, each unique URL can be associated with a unique transaction group—causing
+an explosion in the number of transaction groups per service, and leading to inaccuracies in the APM app.
+
+To fix a large number of unique transaction names,
+you need to change how you are using the Agent API to name your transactions.
+To do this, ensure you are **not** naming based on parameters that can change.
+For example, user ids, product ids, order numbers, query parameters, etc.,
+should be stripped away, and commonality should be found between your unique URLs.
+
+Let's look at an example from the RUM Agent documentation. Here are a few URLs you might find on Elastic.co:
+
+[source,yml]
+----
+// Blog Posts
+https://www.elastic.co/blog/reflections-on-three-years-in-the-elastic-public-sector
+https://www.elastic.co/blog/say-heya-to-the-elastic-search-awards
+https://www.elastic.co/blog/and-the-winner-of-the-elasticon-2018-training-subscription-drawing-is
+
+// Documentation
+https://www.elastic.co/guide/en/elastic-stack/current/index.html
+https://www.elastic.co/guide/en/apm/get-started/current/index.html
+https://www.elastic.co/guide/en/infrastructure/guide/current/index.html
+----
+
+These URLs, like most, include unique names.
+If we named transactions based on each unique URL, we'd end up with the problem described above—a
+very large number of different transaction names.
+Instead, we should strip away the unique information and group our transactions based on common information.
+In this case, that means naming all blog transactions, `/blog`, and all documentation transactions, `/guide`.
+
+If you feel like you'd be losing valuable information by following this naming convention, don't fret!
+You can always add additional metadata to your transactions using {apm-overview-ref-v}/metadata.html#labels-fields[labels] (indexed) or
+{apm-overview-ref-v}/metadata.html#custom-fields[custom context] (non-indexed).
+
+After ensuring you've correctly named your transactions,
+you might still see an error in the APM app related to too many transaction names.
+If this is the case, you can increase the default number of transaction groups displayed in the APM app by configuring
+<<apm-settings-kb,`xpack.apm.ui.transactionGroupBucketSize`>>.
+
+**More information**
+
+While this can happen with any APM Agent, it typically occurs with the RUM Agent.
+For more information on how to correctly set `transaction.name` in the RUM Agent,
+see {apm-rum-ref}/custom-transaction-name.html[custom initial page load transaction names].
+
+The RUM Agent can also set the `transaction.name` when observing for transaction events.
+See {apm-rum-ref}/agent-api.html#observe[`apm.observe()`] for more information.
+
+If your problem is occurring in a different Agent, the tips above still apply.
+See the relevant {apm-agents-ref}[Agent API documentation] to adjust how you're naming your transactions.
+
+[float]
+[[troubleshooting-unknown-route]]
 === Unknown route
 
 The {apm-app-ref}/transactions.html[transaction overview] will only display helpful information
@@ -78,6 +143,7 @@ Specifically, view the Agent's supported technologies page.
 You can also use the Agent's public API to manually set a name for the transaction.
 
 [float]
+[[troubleshooting-fields-unsearchable]]
 === Fields are not searchable
 
 In Elasticsearch, index templates are used to define settings and mappings that determine how fields should be analyzed.
diff --git a/docs/development/core/public/kibana-plugin-core-public.publicappinfo.md b/docs/development/core/public/kibana-plugin-core-public.publicappinfo.md
index c70f3a97a8882f..4b3b103c92731d 100644
--- a/docs/development/core/public/kibana-plugin-core-public.publicappinfo.md
+++ b/docs/development/core/public/kibana-plugin-core-public.publicappinfo.md
@@ -11,5 +11,8 @@ Public information about a registered [application](./kibana-plugin-core-public.
 ```typescript
 export declare type PublicAppInfo = Omit<App, 'mount' | 'updater$'> & {
     legacy: false;
+    status: AppStatus;
+    navLinkStatus: AppNavLinkStatus;
+    appRoute: string;
 };
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.publiclegacyappinfo.md b/docs/development/core/public/kibana-plugin-core-public.publiclegacyappinfo.md
index cc3e9de3193cb8..051638daabd12f 100644
--- a/docs/development/core/public/kibana-plugin-core-public.publiclegacyappinfo.md
+++ b/docs/development/core/public/kibana-plugin-core-public.publiclegacyappinfo.md
@@ -11,5 +11,7 @@ Information about a registered [legacy application](./kibana-plugin-core-public.
 ```typescript
 export declare type PublicLegacyAppInfo = Omit<LegacyApp, 'updater$'> & {
     legacy: true;
+    status: AppStatus;
+    navLinkStatus: AppNavLinkStatus;
 };
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.callapioptions.md b/docs/development/core/server/kibana-plugin-core-server.callapioptions.md
deleted file mode 100644
index 03f74424acf99b..00000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.callapioptions.md
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- 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; [CallAPIOptions](./kibana-plugin-core-server.callapioptions.md)
-
-## CallAPIOptions interface
-
-The set of options that defines how API call should be made and result be processed.
-
-<b>Signature:</b>
-
-```typescript
-export interface CallAPIOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [signal](./kibana-plugin-core-server.callapioptions.signal.md) | <code>AbortSignal</code> | A signal object that allows you to abort the request via an AbortController object. |
-|  [wrap401Errors](./kibana-plugin-core-server.callapioptions.wrap401errors.md) | <code>boolean</code> | Indicates whether <code>401 Unauthorized</code> errors returned from the Elasticsearch API should be wrapped into <code>Boom</code> error instances with properly set <code>WWW-Authenticate</code> header that could have been returned by the API itself. If API didn't specify that then <code>Basic realm=&quot;Authorization Required&quot;</code> is used as <code>WWW-Authenticate</code>. |
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.clusterclient._constructor_.md b/docs/development/core/server/kibana-plugin-core-server.clusterclient._constructor_.md
deleted file mode 100644
index d4b2f80443acb6..00000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.clusterclient._constructor_.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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; [ClusterClient](./kibana-plugin-core-server.clusterclient.md) &gt; [(constructor)](./kibana-plugin-core-server.clusterclient._constructor_.md)
-
-## ClusterClient.(constructor)
-
-Constructs a new instance of the `ClusterClient` class
-
-<b>Signature:</b>
-
-```typescript
-constructor(config: ElasticsearchClientConfig, log: Logger, getAuthHeaders?: GetAuthHeaders);
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  config | <code>ElasticsearchClientConfig</code> |  |
-|  log | <code>Logger</code> |  |
-|  getAuthHeaders | <code>GetAuthHeaders</code> |  |
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.clusterclient.asscoped.md b/docs/development/core/server/kibana-plugin-core-server.clusterclient.asscoped.md
deleted file mode 100644
index dd1dcffc5a969f..00000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.clusterclient.asscoped.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- 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; [ClusterClient](./kibana-plugin-core-server.clusterclient.md) &gt; [asScoped](./kibana-plugin-core-server.clusterclient.asscoped.md)
-
-## ClusterClient.asScoped() method
-
-Creates an instance of [IScopedClusterClient](./kibana-plugin-core-server.iscopedclusterclient.md) based on the configuration the current cluster client that exposes additional `callAsCurrentUser` method scoped to the provided req. Consumers shouldn't worry about closing scoped client instances, these will be automatically closed as soon as the original cluster client isn't needed anymore and closed.
-
-<b>Signature:</b>
-
-```typescript
-asScoped(request?: ScopeableRequest): IScopedClusterClient;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  request | <code>ScopeableRequest</code> | Request the <code>IScopedClusterClient</code> instance will be scoped to. Supports request optionality, Legacy.Request &amp; FakeRequest for BWC with LegacyPlatform |
-
-<b>Returns:</b>
-
-`IScopedClusterClient`
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.clusterclient.callasinternaluser.md b/docs/development/core/server/kibana-plugin-core-server.clusterclient.callasinternaluser.md
deleted file mode 100644
index ae9a9b46b52b6b..00000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.clusterclient.callasinternaluser.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- 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; [ClusterClient](./kibana-plugin-core-server.clusterclient.md) &gt; [callAsInternalUser](./kibana-plugin-core-server.clusterclient.callasinternaluser.md)
-
-## ClusterClient.callAsInternalUser property
-
-Calls specified endpoint with provided clientParams on behalf of the Kibana internal user. See [APICaller](./kibana-plugin-core-server.apicaller.md)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-callAsInternalUser: APICaller;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.clusterclient.md b/docs/development/core/server/kibana-plugin-core-server.clusterclient.md
deleted file mode 100644
index 0f6b2512a6d94c..00000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.clusterclient.md
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- 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; [ClusterClient](./kibana-plugin-core-server.clusterclient.md)
-
-## ClusterClient class
-
-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 [ClusterClient](./kibana-plugin-core-server.clusterclient.md)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-export declare class ClusterClient implements IClusterClient 
-```
-
-## Constructors
-
-|  Constructor | Modifiers | Description |
-|  --- | --- | --- |
-|  [(constructor)(config, log, getAuthHeaders)](./kibana-plugin-core-server.clusterclient._constructor_.md) |  | Constructs a new instance of the <code>ClusterClient</code> class |
-
-## Properties
-
-|  Property | Modifiers | Type | Description |
-|  --- | --- | --- | --- |
-|  [callAsInternalUser](./kibana-plugin-core-server.clusterclient.callasinternaluser.md) |  | <code>APICaller</code> | Calls specified endpoint with provided clientParams on behalf of the Kibana internal user. See [APICaller](./kibana-plugin-core-server.apicaller.md)<!-- -->. |
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [asScoped(request)](./kibana-plugin-core-server.clusterclient.asscoped.md) |  | Creates an instance of [IScopedClusterClient](./kibana-plugin-core-server.iscopedclusterclient.md) based on the configuration the current cluster client that exposes additional <code>callAsCurrentUser</code> method scoped to the provided req. Consumers shouldn't worry about closing scoped client instances, these will be automatically closed as soon as the original cluster client isn't needed anymore and closed. |
-|  [close()](./kibana-plugin-core-server.clusterclient.close.md) |  | 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.elasticsearcherror._code_.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearcherror._code_.md
deleted file mode 100644
index d2b07e8d116bab..00000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.elasticsearcherror._code_.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [ElasticsearchError](./kibana-plugin-core-server.elasticsearcherror.md) &gt; [\[code\]](./kibana-plugin-core-server.elasticsearcherror._code_.md)
-
-## ElasticsearchError.\[code\] property
-
-<b>Signature:</b>
-
-```typescript
-[code]?: string;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearcherror.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearcherror.md
deleted file mode 100644
index 42079c02689c53..00000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.elasticsearcherror.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- 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; [ElasticsearchError](./kibana-plugin-core-server.elasticsearcherror.md)
-
-## ElasticsearchError interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface ElasticsearchError extends Boom 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [\[code\]](./kibana-plugin-core-server.elasticsearcherror._code_.md) | <code>string</code> |  |
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearcherrorhelpers.isnotauthorizederror.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearcherrorhelpers.isnotauthorizederror.md
deleted file mode 100644
index d85ae4f9ab5303..00000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.elasticsearcherrorhelpers.isnotauthorizederror.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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; [ElasticsearchErrorHelpers](./kibana-plugin-core-server.elasticsearcherrorhelpers.md) &gt; [isNotAuthorizedError](./kibana-plugin-core-server.elasticsearcherrorhelpers.isnotauthorizederror.md)
-
-## ElasticsearchErrorHelpers.isNotAuthorizedError() method
-
-<b>Signature:</b>
-
-```typescript
-static isNotAuthorizedError(error: any): error is ElasticsearchError;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  error | <code>any</code> |  |
-
-<b>Returns:</b>
-
-`error is ElasticsearchError`
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.legacy.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.legacy.md
index e8c4c63dc6a964..c683f0ba33189f 100644
--- a/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.legacy.md
+++ b/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.legacy.md
@@ -13,7 +13,7 @@
 
 ```typescript
 legacy: {
-        readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ICustomClusterClient;
-        readonly client: IClusterClient;
+        readonly createClient: (type: string, clientConfig?: Partial<LegacyElasticsearchClientConfig>) => ILegacyCustomClusterClient;
+        readonly client: ILegacyClusterClient;
     };
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.md
index c1e23527e95163..0dd41a6154a1e8 100644
--- a/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.md
+++ b/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.md
@@ -15,5 +15,5 @@ export interface ElasticsearchServiceSetup
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [legacy](./kibana-plugin-core-server.elasticsearchservicesetup.legacy.md) | <code>{</code><br/><code>        readonly createClient: (type: string, clientConfig?: Partial&lt;ElasticsearchClientConfig&gt;) =&gt; ICustomClusterClient;</code><br/><code>        readonly client: IClusterClient;</code><br/><code>    }</code> |  |
+|  [legacy](./kibana-plugin-core-server.elasticsearchservicesetup.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.elasticsearchservicestart.legacy.md b/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.legacy.md
index 667a36091f2326..5f346d7887c2af 100644
--- a/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.legacy.md
+++ b/docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.legacy.md
@@ -13,7 +13,7 @@
 
 ```typescript
 legacy: {
-        readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ICustomClusterClient;
-        readonly client: IClusterClient;
+        readonly createClient: (type: string, clientConfig?: Partial<LegacyElasticsearchClientConfig>) => ILegacyCustomClusterClient;
+        readonly client: ILegacyClusterClient;
     };
 ```
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 39c794af2c881f..e059acdbd52fa2 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,5 @@ export interface ElasticsearchServiceStart
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [legacy](./kibana-plugin-core-server.elasticsearchservicestart.legacy.md) | <code>{</code><br/><code>        readonly createClient: (type: string, clientConfig?: Partial&lt;ElasticsearchClientConfig&gt;) =&gt; ICustomClusterClient;</code><br/><code>        readonly client: IClusterClient;</code><br/><code>    }</code> |  |
+|  [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.iclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.ilegacyclusterclient.md
similarity index 56%
rename from docs/development/core/server/kibana-plugin-core-server.iclusterclient.md
rename to docs/development/core/server/kibana-plugin-core-server.ilegacyclusterclient.md
index 28fbdf17cf31c9..c70a5ac07c6ad8 100644
--- a/docs/development/core/server/kibana-plugin-core-server.iclusterclient.md
+++ b/docs/development/core/server/kibana-plugin-core-server.ilegacyclusterclient.md
@@ -1,15 +1,15 @@
 <!-- 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)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [ILegacyClusterClient](./kibana-plugin-core-server.ilegacyclusterclient.md)
 
-## IClusterClient type
+## ILegacyClusterClient type
 
 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 [ClusterClient](./kibana-plugin-core-server.clusterclient.md)<!-- -->.
+See [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md)<!-- -->.
 
 <b>Signature:</b>
 
 ```typescript
-export declare type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
+export declare type ILegacyClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'asScoped'>;
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.icustomclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.ilegacycustomclusterclient.md
similarity index 53%
rename from docs/development/core/server/kibana-plugin-core-server.icustomclusterclient.md
rename to docs/development/core/server/kibana-plugin-core-server.ilegacycustomclusterclient.md
index 3d379e1231cb15..a3cb8f13150212 100644
--- a/docs/development/core/server/kibana-plugin-core-server.icustomclusterclient.md
+++ b/docs/development/core/server/kibana-plugin-core-server.ilegacycustomclusterclient.md
@@ -1,15 +1,15 @@
 <!-- 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)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [ILegacyCustomClusterClient](./kibana-plugin-core-server.ilegacycustomclusterclient.md)
 
-## ICustomClusterClient type
+## ILegacyCustomClusterClient type
 
 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 [ClusterClient](./kibana-plugin-core-server.clusterclient.md)<!-- -->.
+See [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md)<!-- -->.
 
 <b>Signature:</b>
 
 ```typescript
-export declare type ICustomClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+export declare type ILegacyCustomClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.ilegacyscopedclusterclient.md
similarity index 56%
rename from docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.md
rename to docs/development/core/server/kibana-plugin-core-server.ilegacyscopedclusterclient.md
index 378836ee461f38..1263b85acb4983 100644
--- a/docs/development/core/server/kibana-plugin-core-server.iscopedclusterclient.md
+++ b/docs/development/core/server/kibana-plugin-core-server.ilegacyscopedclusterclient.md
@@ -1,15 +1,15 @@
 <!-- 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)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [ILegacyScopedClusterClient](./kibana-plugin-core-server.ilegacyscopedclusterclient.md)
 
-## IScopedClusterClient type
+## ILegacyScopedClusterClient type
 
 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 [ScopedClusterClient](./kibana-plugin-core-server.scopedclusterclient.md)<!-- -->.
+See [LegacyScopedClusterClient](./kibana-plugin-core-server.legacyscopedclusterclient.md)<!-- -->.
 
 <b>Signature:</b>
 
 ```typescript
-export declare type IScopedClusterClient = Pick<ScopedClusterClient, 'callAsCurrentUser' | 'callAsInternalUser'>;
+export declare type ILegacyScopedClusterClient = Pick<LegacyScopedClusterClient, 'callAsCurrentUser' | 'callAsInternalUser'>;
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.apicaller.md b/docs/development/core/server/kibana-plugin-core-server.legacyapicaller.md
similarity index 54%
rename from docs/development/core/server/kibana-plugin-core-server.apicaller.md
rename to docs/development/core/server/kibana-plugin-core-server.legacyapicaller.md
index 4da23b3f821c5b..e6c2878d2b3556 100644
--- a/docs/development/core/server/kibana-plugin-core-server.apicaller.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyapicaller.md
@@ -1,12 +1,12 @@
 <!-- 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; [APICaller](./kibana-plugin-core-server.apicaller.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [LegacyAPICaller](./kibana-plugin-core-server.legacyapicaller.md)
 
-## APICaller interface
+## LegacyAPICaller interface
 
 
 <b>Signature:</b>
 
 ```typescript
-export interface APICaller 
+export interface LegacyAPICaller 
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.md b/docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.md
new file mode 100644
index 00000000000000..9ebe2fc57a54bf
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.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; [LegacyCallAPIOptions](./kibana-plugin-core-server.legacycallapioptions.md)
+
+## LegacyCallAPIOptions interface
+
+The set of options that defines how API call should be made and result be processed.
+
+<b>Signature:</b>
+
+```typescript
+export interface LegacyCallAPIOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [signal](./kibana-plugin-core-server.legacycallapioptions.signal.md) | <code>AbortSignal</code> | A signal object that allows you to abort the request via an AbortController object. |
+|  [wrap401Errors](./kibana-plugin-core-server.legacycallapioptions.wrap401errors.md) | <code>boolean</code> | Indicates whether <code>401 Unauthorized</code> errors returned from the Elasticsearch API should be wrapped into <code>Boom</code> error instances with properly set <code>WWW-Authenticate</code> header that could have been returned by the API itself. If API didn't specify that then <code>Basic realm=&quot;Authorization Required&quot;</code> is used as <code>WWW-Authenticate</code>. |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.callapioptions.signal.md b/docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.signal.md
similarity index 57%
rename from docs/development/core/server/kibana-plugin-core-server.callapioptions.signal.md
rename to docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.signal.md
index 8b35924826f151..7d795a59e41a54 100644
--- a/docs/development/core/server/kibana-plugin-core-server.callapioptions.signal.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.signal.md
@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [CallAPIOptions](./kibana-plugin-core-server.callapioptions.md) &gt; [signal](./kibana-plugin-core-server.callapioptions.signal.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [LegacyCallAPIOptions](./kibana-plugin-core-server.legacycallapioptions.md) &gt; [signal](./kibana-plugin-core-server.legacycallapioptions.signal.md)
 
-## CallAPIOptions.signal property
+## LegacyCallAPIOptions.signal property
 
 A signal object that allows you to abort the request via an AbortController object.
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.callapioptions.wrap401errors.md b/docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.wrap401errors.md
similarity index 69%
rename from docs/development/core/server/kibana-plugin-core-server.callapioptions.wrap401errors.md
rename to docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.wrap401errors.md
index 2a5b8054819a3a..38fac54db77a42 100644
--- a/docs/development/core/server/kibana-plugin-core-server.callapioptions.wrap401errors.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacycallapioptions.wrap401errors.md
@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [CallAPIOptions](./kibana-plugin-core-server.callapioptions.md) &gt; [wrap401Errors](./kibana-plugin-core-server.callapioptions.wrap401errors.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [LegacyCallAPIOptions](./kibana-plugin-core-server.legacycallapioptions.md) &gt; [wrap401Errors](./kibana-plugin-core-server.legacycallapioptions.wrap401errors.md)
 
-## CallAPIOptions.wrap401Errors property
+## LegacyCallAPIOptions.wrap401Errors property
 
 Indicates whether `401 Unauthorized` errors returned from the Elasticsearch API should be wrapped into `Boom` error instances with properly set `WWW-Authenticate` header that could have been returned by the API itself. If API didn't specify that then `Basic realm="Authorization Required"` is used as `WWW-Authenticate`<!-- -->.
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient._constructor_.md b/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient._constructor_.md
new file mode 100644
index 00000000000000..823f34bd7dd237
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient._constructor_.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; [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md) &gt; [(constructor)](./kibana-plugin-core-server.legacyclusterclient._constructor_.md)
+
+## LegacyClusterClient.(constructor)
+
+Constructs a new instance of the `LegacyClusterClient` class
+
+<b>Signature:</b>
+
+```typescript
+constructor(config: LegacyElasticsearchClientConfig, log: Logger, getAuthHeaders?: GetAuthHeaders);
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  config | <code>LegacyElasticsearchClientConfig</code> |  |
+|  log | <code>Logger</code> |  |
+|  getAuthHeaders | <code>GetAuthHeaders</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.asscoped.md b/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.asscoped.md
new file mode 100644
index 00000000000000..1c25fc1d072b61
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.asscoped.md
@@ -0,0 +1,24 @@
+<!-- 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; [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md) &gt; [asScoped](./kibana-plugin-core-server.legacyclusterclient.asscoped.md)
+
+## LegacyClusterClient.asScoped() method
+
+Creates an instance of [ILegacyScopedClusterClient](./kibana-plugin-core-server.ilegacyscopedclusterclient.md) based on the configuration the current cluster client that exposes additional `callAsCurrentUser` method scoped to the provided req. Consumers shouldn't worry about closing scoped client instances, these will be automatically closed as soon as the original cluster client isn't needed anymore and closed.
+
+<b>Signature:</b>
+
+```typescript
+asScoped(request?: ScopeableRequest): ILegacyScopedClusterClient;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  request | <code>ScopeableRequest</code> | Request the <code>IScopedClusterClient</code> instance will be scoped to. Supports request optionality, Legacy.Request &amp; FakeRequest for BWC with LegacyPlatform |
+
+<b>Returns:</b>
+
+`ILegacyScopedClusterClient`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.callasinternaluser.md b/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.callasinternaluser.md
new file mode 100644
index 00000000000000..2e235485711c6e
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.callasinternaluser.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; [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md) &gt; [callAsInternalUser](./kibana-plugin-core-server.legacyclusterclient.callasinternaluser.md)
+
+## LegacyClusterClient.callAsInternalUser property
+
+Calls specified endpoint with provided clientParams on behalf of the Kibana internal user. See [LegacyAPICaller](./kibana-plugin-core-server.legacyapicaller.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+callAsInternalUser: LegacyAPICaller;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.clusterclient.close.md b/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.close.md
similarity index 64%
rename from docs/development/core/server/kibana-plugin-core-server.clusterclient.close.md
rename to docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.close.md
index 68a1bd4b9d7cf2..88a5ffce5bb17c 100644
--- a/docs/development/core/server/kibana-plugin-core-server.clusterclient.close.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.close.md
@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [ClusterClient](./kibana-plugin-core-server.clusterclient.md) &gt; [close](./kibana-plugin-core-server.clusterclient.close.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md) &gt; [close](./kibana-plugin-core-server.legacyclusterclient.close.md)
 
-## ClusterClient.close() method
+## LegacyClusterClient.close() method
 
 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.legacyclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.md
new file mode 100644
index 00000000000000..4f218ae552c99b
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.md
@@ -0,0 +1,32 @@
+<!-- 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; [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md)
+
+## LegacyClusterClient class
+
+
+<b>Signature:</b>
+
+```typescript
+export declare class LegacyClusterClient implements ILegacyClusterClient 
+```
+
+## Constructors
+
+|  Constructor | Modifiers | Description |
+|  --- | --- | --- |
+|  [(constructor)(config, log, getAuthHeaders)](./kibana-plugin-core-server.legacyclusterclient._constructor_.md) |  | Constructs a new instance of the <code>LegacyClusterClient</code> class |
+
+## Properties
+
+|  Property | Modifiers | Type | Description |
+|  --- | --- | --- | --- |
+|  [callAsInternalUser](./kibana-plugin-core-server.legacyclusterclient.callasinternaluser.md) |  | <code>LegacyAPICaller</code> | Calls specified endpoint with provided clientParams on behalf of the Kibana internal user. See [LegacyAPICaller](./kibana-plugin-core-server.legacyapicaller.md)<!-- -->. |
+
+## Methods
+
+|  Method | Modifiers | Description |
+|  --- | --- | --- |
+|  [asScoped(request)](./kibana-plugin-core-server.legacyclusterclient.asscoped.md) |  | Creates an instance of [ILegacyScopedClusterClient](./kibana-plugin-core-server.ilegacyscopedclusterclient.md) based on the configuration the current cluster client that exposes additional <code>callAsCurrentUser</code> method scoped to the provided req. Consumers shouldn't worry about closing scoped client instances, these will be automatically closed as soon as the original cluster client isn't needed anymore and closed. |
+|  [close()](./kibana-plugin-core-server.legacyclusterclient.close.md) |  | 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.elasticsearchclientconfig.md b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearchclientconfig.md
similarity index 52%
rename from docs/development/core/server/kibana-plugin-core-server.elasticsearchclientconfig.md
rename to docs/development/core/server/kibana-plugin-core-server.legacyelasticsearchclientconfig.md
index 703b07808aca3b..62b0f216c863c0 100644
--- a/docs/development/core/server/kibana-plugin-core-server.elasticsearchclientconfig.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearchclientconfig.md
@@ -1,14 +1,14 @@
 <!-- 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)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [LegacyElasticsearchClientConfig](./kibana-plugin-core-server.legacyelasticsearchclientconfig.md)
 
-## ElasticsearchClientConfig type
+## LegacyElasticsearchClientConfig type
 
 
 <b>Signature:</b>
 
 ```typescript
-export declare type ElasticsearchClientConfig = Pick<ConfigOptions, 'keepAlive' | 'log' | 'plugins'> & Pick<ElasticsearchConfig, 'apiVersion' | 'customHeaders' | 'logQueries' | 'requestHeadersWhitelist' | 'sniffOnStart' | 'sniffOnConnectionFault' | 'hosts' | 'username' | 'password'> & {
+export declare 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'];
     sniffInterval?: ElasticsearchConfig['sniffInterval'] | ConfigOptions['sniffInterval'];
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherror._code_.md b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherror._code_.md
new file mode 100644
index 00000000000000..05530ceb0d568b
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherror._code_.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [LegacyElasticsearchError](./kibana-plugin-core-server.legacyelasticsearcherror.md) &gt; [\[code\]](./kibana-plugin-core-server.legacyelasticsearcherror._code_.md)
+
+## LegacyElasticsearchError.\[code\] property
+
+<b>Signature:</b>
+
+```typescript
+[code]?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherror.md b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherror.md
new file mode 100644
index 00000000000000..f760780504e55f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherror.md
@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [LegacyElasticsearchError](./kibana-plugin-core-server.legacyelasticsearcherror.md)
+
+## LegacyElasticsearchError interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface LegacyElasticsearchError extends Boom 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [\[code\]](./kibana-plugin-core-server.legacyelasticsearcherror._code_.md) | <code>string</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearcherrorhelpers.decoratenotauthorizederror.md b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherrorhelpers.decoratenotauthorizederror.md
similarity index 52%
rename from docs/development/core/server/kibana-plugin-core-server.elasticsearcherrorhelpers.decoratenotauthorizederror.md
rename to docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherrorhelpers.decoratenotauthorizederror.md
index 2b2eeceb4e3c9d..bd802a39e9339f 100644
--- a/docs/development/core/server/kibana-plugin-core-server.elasticsearcherrorhelpers.decoratenotauthorizederror.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherrorhelpers.decoratenotauthorizederror.md
@@ -1,13 +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; [ElasticsearchErrorHelpers](./kibana-plugin-core-server.elasticsearcherrorhelpers.md) &gt; [decorateNotAuthorizedError](./kibana-plugin-core-server.elasticsearcherrorhelpers.decoratenotauthorizederror.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [LegacyElasticsearchErrorHelpers](./kibana-plugin-core-server.legacyelasticsearcherrorhelpers.md) &gt; [decorateNotAuthorizedError](./kibana-plugin-core-server.legacyelasticsearcherrorhelpers.decoratenotauthorizederror.md)
 
-## ElasticsearchErrorHelpers.decorateNotAuthorizedError() method
+## LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError() method
 
 <b>Signature:</b>
 
 ```typescript
-static decorateNotAuthorizedError(error: Error, reason?: string): ElasticsearchError;
+static decorateNotAuthorizedError(error: Error, reason?: string): LegacyElasticsearchError;
 ```
 
 ## Parameters
@@ -19,5 +19,5 @@ static decorateNotAuthorizedError(error: Error, reason?: string): ElasticsearchE
 
 <b>Returns:</b>
 
-`ElasticsearchError`
+`LegacyElasticsearchError`
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherrorhelpers.isnotauthorizederror.md b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherrorhelpers.isnotauthorizederror.md
new file mode 100644
index 00000000000000..f647916149458e
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherrorhelpers.isnotauthorizederror.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; [LegacyElasticsearchErrorHelpers](./kibana-plugin-core-server.legacyelasticsearcherrorhelpers.md) &gt; [isNotAuthorizedError](./kibana-plugin-core-server.legacyelasticsearcherrorhelpers.isnotauthorizederror.md)
+
+## LegacyElasticsearchErrorHelpers.isNotAuthorizedError() method
+
+<b>Signature:</b>
+
+```typescript
+static isNotAuthorizedError(error: any): error is LegacyElasticsearchError;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  error | <code>any</code> |  |
+
+<b>Returns:</b>
+
+`error is LegacyElasticsearchError`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.elasticsearcherrorhelpers.md b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherrorhelpers.md
similarity index 65%
rename from docs/development/core/server/kibana-plugin-core-server.elasticsearcherrorhelpers.md
rename to docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherrorhelpers.md
index e9c205e3dfa2c4..e20dcd4ed253eb 100644
--- a/docs/development/core/server/kibana-plugin-core-server.elasticsearcherrorhelpers.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyelasticsearcherrorhelpers.md
@@ -1,15 +1,15 @@
 <!-- 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; [ElasticsearchErrorHelpers](./kibana-plugin-core-server.elasticsearcherrorhelpers.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [LegacyElasticsearchErrorHelpers](./kibana-plugin-core-server.legacyelasticsearcherrorhelpers.md)
 
-## ElasticsearchErrorHelpers class
+## LegacyElasticsearchErrorHelpers class
 
 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 `body.error.header[WWW-Authenticate]`
 
 <b>Signature:</b>
 
 ```typescript
-export declare class ElasticsearchErrorHelpers 
+export declare class LegacyElasticsearchErrorHelpers 
 ```
 
 ## Example
@@ -30,6 +30,6 @@ try {
 
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
-|  [decorateNotAuthorizedError(error, reason)](./kibana-plugin-core-server.elasticsearcherrorhelpers.decoratenotauthorizederror.md) | <code>static</code> |  |
-|  [isNotAuthorizedError(error)](./kibana-plugin-core-server.elasticsearcherrorhelpers.isnotauthorizederror.md) | <code>static</code> |  |
+|  [decorateNotAuthorizedError(error, reason)](./kibana-plugin-core-server.legacyelasticsearcherrorhelpers.decoratenotauthorizederror.md) | <code>static</code> |  |
+|  [isNotAuthorizedError(error)](./kibana-plugin-core-server.legacyelasticsearcherrorhelpers.isnotauthorizederror.md) | <code>static</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient._constructor_.md b/docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient._constructor_.md
new file mode 100644
index 00000000000000..bd1cd1e9f3d9b3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient._constructor_.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; [LegacyScopedClusterClient](./kibana-plugin-core-server.legacyscopedclusterclient.md) &gt; [(constructor)](./kibana-plugin-core-server.legacyscopedclusterclient._constructor_.md)
+
+## LegacyScopedClusterClient.(constructor)
+
+Constructs a new instance of the `LegacyScopedClusterClient` class
+
+<b>Signature:</b>
+
+```typescript
+constructor(internalAPICaller: LegacyAPICaller, scopedAPICaller: LegacyAPICaller, headers?: Headers | undefined);
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  internalAPICaller | <code>LegacyAPICaller</code> |  |
+|  scopedAPICaller | <code>LegacyAPICaller</code> |  |
+|  headers | <code>Headers &#124; undefined</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.scopedclusterclient.callascurrentuser.md b/docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient.callascurrentuser.md
similarity index 58%
rename from docs/development/core/server/kibana-plugin-core-server.scopedclusterclient.callascurrentuser.md
rename to docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient.callascurrentuser.md
index 68c0f8e6be1be0..9130f9adde76e0 100644
--- a/docs/development/core/server/kibana-plugin-core-server.scopedclusterclient.callascurrentuser.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient.callascurrentuser.md
@@ -1,15 +1,15 @@
 <!-- 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; [ScopedClusterClient](./kibana-plugin-core-server.scopedclusterclient.md) &gt; [callAsCurrentUser](./kibana-plugin-core-server.scopedclusterclient.callascurrentuser.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [LegacyScopedClusterClient](./kibana-plugin-core-server.legacyscopedclusterclient.md) &gt; [callAsCurrentUser](./kibana-plugin-core-server.legacyscopedclusterclient.callascurrentuser.md)
 
-## ScopedClusterClient.callAsCurrentUser() method
+## LegacyScopedClusterClient.callAsCurrentUser() method
 
-Calls specified `endpoint` with provided `clientParams` on behalf of the user initiated request to the Kibana server (via HTTP request headers). See [APICaller](./kibana-plugin-core-server.apicaller.md)<!-- -->.
+Calls specified `endpoint` with provided `clientParams` on behalf of the user initiated request to the Kibana server (via HTTP request headers). See [LegacyAPICaller](./kibana-plugin-core-server.legacyapicaller.md)<!-- -->.
 
 <b>Signature:</b>
 
 ```typescript
-callAsCurrentUser(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<any>;
+callAsCurrentUser(endpoint: string, clientParams?: Record<string, any>, options?: LegacyCallAPIOptions): Promise<any>;
 ```
 
 ## Parameters
@@ -18,7 +18,7 @@ callAsCurrentUser(endpoint: string, clientParams?: Record<string, any>, options?
 |  --- | --- | --- |
 |  endpoint | <code>string</code> | String descriptor of the endpoint e.g. <code>cluster.getSettings</code> or <code>ping</code>. |
 |  clientParams | <code>Record&lt;string, any&gt;</code> | A dictionary of parameters that will be passed directly to the Elasticsearch JS client. |
-|  options | <code>CallAPIOptions</code> | Options that affect the way we call the API and process the result. |
+|  options | <code>LegacyCallAPIOptions</code> | Options that affect the way we call the API and process the result. |
 
 <b>Returns:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.scopedclusterclient.callasinternaluser.md b/docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient.callasinternaluser.md
similarity index 55%
rename from docs/development/core/server/kibana-plugin-core-server.scopedclusterclient.callasinternaluser.md
rename to docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient.callasinternaluser.md
index e769fd692a4d1d..bf95782299e720 100644
--- a/docs/development/core/server/kibana-plugin-core-server.scopedclusterclient.callasinternaluser.md
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient.callasinternaluser.md
@@ -1,15 +1,15 @@
 <!-- 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; [ScopedClusterClient](./kibana-plugin-core-server.scopedclusterclient.md) &gt; [callAsInternalUser](./kibana-plugin-core-server.scopedclusterclient.callasinternaluser.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [LegacyScopedClusterClient](./kibana-plugin-core-server.legacyscopedclusterclient.md) &gt; [callAsInternalUser](./kibana-plugin-core-server.legacyscopedclusterclient.callasinternaluser.md)
 
-## ScopedClusterClient.callAsInternalUser() method
+## LegacyScopedClusterClient.callAsInternalUser() method
 
-Calls specified `endpoint` with provided `clientParams` on behalf of the Kibana internal user. See [APICaller](./kibana-plugin-core-server.apicaller.md)<!-- -->.
+Calls specified `endpoint` with provided `clientParams` on behalf of the Kibana internal user. See [LegacyAPICaller](./kibana-plugin-core-server.legacyapicaller.md)<!-- -->.
 
 <b>Signature:</b>
 
 ```typescript
-callAsInternalUser(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<any>;
+callAsInternalUser(endpoint: string, clientParams?: Record<string, any>, options?: LegacyCallAPIOptions): Promise<any>;
 ```
 
 ## Parameters
@@ -18,7 +18,7 @@ callAsInternalUser(endpoint: string, clientParams?: Record<string, any>, options
 |  --- | --- | --- |
 |  endpoint | <code>string</code> | String descriptor of the endpoint e.g. <code>cluster.getSettings</code> or <code>ping</code>. |
 |  clientParams | <code>Record&lt;string, any&gt;</code> | A dictionary of parameters that will be passed directly to the Elasticsearch JS client. |
-|  options | <code>CallAPIOptions</code> | Options that affect the way we call the API and process the result. |
+|  options | <code>LegacyCallAPIOptions</code> | Options that affect the way we call the API and process the result. |
 
 <b>Returns:</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
new file mode 100644
index 00000000000000..f3d8a69b8ed053
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.legacyscopedclusterclient.md
@@ -0,0 +1,26 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [LegacyScopedClusterClient](./kibana-plugin-core-server.legacyscopedclusterclient.md)
+
+## LegacyScopedClusterClient class
+
+
+<b>Signature:</b>
+
+```typescript
+export declare class LegacyScopedClusterClient implements ILegacyScopedClusterClient 
+```
+
+## Constructors
+
+|  Constructor | Modifiers | Description |
+|  --- | --- | --- |
+|  [(constructor)(internalAPICaller, scopedAPICaller, headers)](./kibana-plugin-core-server.legacyscopedclusterclient._constructor_.md) |  | Constructs a new instance of the <code>LegacyScopedClusterClient</code> class |
+
+## Methods
+
+|  Method | Modifiers | Description |
+|  --- | --- | --- |
+|  [callAsCurrentUser(endpoint, clientParams, options)](./kibana-plugin-core-server.legacyscopedclusterclient.callascurrentuser.md) |  | Calls specified <code>endpoint</code> with provided <code>clientParams</code> on behalf of the user initiated request to the Kibana server (via HTTP request headers). See [LegacyAPICaller](./kibana-plugin-core-server.legacyapicaller.md)<!-- -->. |
+|  [callAsInternalUser(endpoint, clientParams, options)](./kibana-plugin-core-server.legacyscopedclusterclient.callasinternaluser.md) |  | Calls specified <code>endpoint</code> with provided <code>clientParams</code> on behalf of the Kibana internal user. See [LegacyAPICaller](./kibana-plugin-core-server.legacyapicaller.md)<!-- -->. |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index 74422c82fc9ea7..7e777d51f147f7 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -17,18 +17,18 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  Class | Description |
 |  --- | --- |
 |  [BasePath](./kibana-plugin-core-server.basepath.md) | Access or manipulate the Kibana base path |
-|  [ClusterClient](./kibana-plugin-core-server.clusterclient.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>).<!-- -->See [ClusterClient](./kibana-plugin-core-server.clusterclient.md)<!-- -->. |
 |  [CspConfig](./kibana-plugin-core-server.cspconfig.md) | CSP configuration for use in Kibana. |
 |  [ElasticsearchConfig](./kibana-plugin-core-server.elasticsearchconfig.md) | Wrapper of config schema. |
-|  [ElasticsearchErrorHelpers](./kibana-plugin-core-server.elasticsearcherrorhelpers.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> |
 |  [KibanaRequest](./kibana-plugin-core-server.kibanarequest.md) | Kibana specific abstraction for an incoming request. |
+|  [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md) |  |
+|  [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) |  |
 |  [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) |  |
 |  [SavedObjectsRepository](./kibana-plugin-core-server.savedobjectsrepository.md) |  |
 |  [SavedObjectsSerializer](./kibana-plugin-core-server.savedobjectsserializer.md) | A serializer that can be used to manually convert [raw](./kibana-plugin-core-server.savedobjectsrawdoc.md) or [sanitized](./kibana-plugin-core-server.savedobjectsanitizeddoc.md) documents to the other kind. |
 |  [SavedObjectTypeRegistry](./kibana-plugin-core-server.savedobjecttyperegistry.md) | Registry holding information about all the registered [saved object types](./kibana-plugin-core-server.savedobjectstype.md)<!-- -->. |
-|  [ScopedClusterClient](./kibana-plugin-core-server.scopedclusterclient.md) | Serves the same purpose as "normal" <code>ClusterClient</code> but exposes additional <code>callAsCurrentUser</code> method that doesn't use credentials of the Kibana internal user (as <code>callAsInternalUser</code> does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API.<!-- -->See [ScopedClusterClient](./kibana-plugin-core-server.scopedclusterclient.md)<!-- -->. |
 
 ## Enumerations
 
@@ -54,7 +54,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 
 |  Interface | Description |
 |  --- | --- |
-|  [APICaller](./kibana-plugin-core-server.apicaller.md) |  |
 |  [AssistanceAPIResponse](./kibana-plugin-core-server.assistanceapiresponse.md) |  |
 |  [AssistantAPIClientParams](./kibana-plugin-core-server.assistantapiclientparams.md) |  |
 |  [Authenticated](./kibana-plugin-core-server.authenticated.md) |  |
@@ -63,7 +62,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [AuthRedirectedParams](./kibana-plugin-core-server.authredirectedparams.md) | Result of auth redirection. |
 |  [AuthResultParams](./kibana-plugin-core-server.authresultparams.md) | Result of successful authentication. |
 |  [AuthToolkit](./kibana-plugin-core-server.authtoolkit.md) | A tool set defining an outcome of Auth interceptor for incoming request. |
-|  [CallAPIOptions](./kibana-plugin-core-server.callapioptions.md) | The set of options that defines how API call should be made and result be processed. |
 |  [Capabilities](./kibana-plugin-core-server.capabilities.md) | The read-only set of capabilities available for the current UI session. Capabilities are simple key-value pairs of (string, boolean), where the string denotes the capability ID, and the boolean is a flag indicating if the capability is enabled or disabled. |
 |  [CapabilitiesSetup](./kibana-plugin-core-server.capabilitiessetup.md) | APIs to manage the [Capabilities](./kibana-plugin-core-server.capabilities.md) that will be used by the application.<!-- -->Plugins relying on capabilities to toggle some of their features should register them during the setup phase using the <code>registerProvider</code> method.<!-- -->Plugins having the responsibility to restrict capabilities depending on a given context should register their capabilities switcher using the <code>registerSwitcher</code> method.<!-- -->Refers to the methods documentation for complete description and examples. |
 |  [CapabilitiesStart](./kibana-plugin-core-server.capabilitiesstart.md) | APIs to access the application [Capabilities](./kibana-plugin-core-server.capabilities.md)<!-- -->. |
@@ -78,7 +76,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [DeprecationInfo](./kibana-plugin-core-server.deprecationinfo.md) |  |
 |  [DeprecationSettings](./kibana-plugin-core-server.deprecationsettings.md) | UiSettings deprecation field options. |
 |  [DiscoveredPlugin](./kibana-plugin-core-server.discoveredplugin.md) | Small container object used to expose information about discovered plugins that may or may not have been started. |
-|  [ElasticsearchError](./kibana-plugin-core-server.elasticsearcherror.md) |  |
 |  [ElasticsearchServiceSetup](./kibana-plugin-core-server.elasticsearchservicesetup.md) |  |
 |  [ElasticsearchServiceStart](./kibana-plugin-core-server.elasticsearchservicestart.md) |  |
 |  [ElasticsearchStatusMeta](./kibana-plugin-core-server.elasticsearchstatusmeta.md) |  |
@@ -104,6 +101,9 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [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) |  |
 |  [LegacyRequest](./kibana-plugin-core-server.legacyrequest.md) |  |
 |  [LegacyServiceSetupDeps](./kibana-plugin-core-server.legacyservicesetupdeps.md) |  |
 |  [LegacyServiceStartDeps](./kibana-plugin-core-server.legacyservicestartdeps.md) |  |
@@ -128,7 +128,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.scopedclusterclient.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.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 |
 |  [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 |
@@ -222,7 +222,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [ConfigDeprecationProvider](./kibana-plugin-core-server.configdeprecationprovider.md) | A provider that should returns a list of [ConfigDeprecation](./kibana-plugin-core-server.configdeprecation.md)<!-- -->.<!-- -->See [ConfigDeprecationFactory](./kibana-plugin-core-server.configdeprecationfactory.md) for more usage examples. |
 |  [ConfigPath](./kibana-plugin-core-server.configpath.md) |  |
 |  [DestructiveRouteMethod](./kibana-plugin-core-server.destructiveroutemethod.md) | Set of HTTP methods changing the state of the server. |
-|  [ElasticsearchClientConfig](./kibana-plugin-core-server.elasticsearchclientconfig.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. |
@@ -234,16 +233,17 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [HttpResourcesResponseOptions](./kibana-plugin-core-server.httpresourcesresponseoptions.md) | HTTP Resources response parameters |
 |  [HttpResponsePayload](./kibana-plugin-core-server.httpresponsepayload.md) | Data send to the client as a response payload. |
 |  [IBasePath](./kibana-plugin-core-server.ibasepath.md) | Access or manipulate the Kibana base path[BasePath](./kibana-plugin-core-server.basepath.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>).<!-- -->See [ClusterClient](./kibana-plugin-core-server.clusterclient.md)<!-- -->. |
 |  [IContextProvider](./kibana-plugin-core-server.icontextprovider.md) | A function that returns a context value for a specific key of given context type. |
-|  [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 <code>asScoped(...)</code>).<!-- -->See [ClusterClient](./kibana-plugin-core-server.clusterclient.md)<!-- -->. |
+|  [ILegacyClusterClient](./kibana-plugin-core-server.ilegacyclusterclient.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>).<!-- -->See [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md)<!-- -->. |
+|  [ILegacyCustomClusterClient](./kibana-plugin-core-server.ilegacycustomclusterclient.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 <code>asScoped(...)</code>).<!-- -->See [LegacyClusterClient](./kibana-plugin-core-server.legacyclusterclient.md)<!-- -->. |
+|  [ILegacyScopedClusterClient](./kibana-plugin-core-server.ilegacyscopedclusterclient.md) | Serves the same purpose as "normal" <code>ClusterClient</code> but exposes additional <code>callAsCurrentUser</code> method that doesn't use credentials of the Kibana internal user (as <code>callAsInternalUser</code> 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)<!-- -->. |
 |  [IsAuthenticated](./kibana-plugin-core-server.isauthenticated.md) | Returns authentication status for a request. |
 |  [ISavedObjectsRepository](./kibana-plugin-core-server.isavedobjectsrepository.md) | See [SavedObjectsRepository](./kibana-plugin-core-server.savedobjectsrepository.md) |
 |  [ISavedObjectTypeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) | See [SavedObjectTypeRegistry](./kibana-plugin-core-server.savedobjecttyperegistry.md) for documentation. |
-|  [IScopedClusterClient](./kibana-plugin-core-server.iscopedclusterclient.md) | Serves the same purpose as "normal" <code>ClusterClient</code> but exposes additional <code>callAsCurrentUser</code> method that doesn't use credentials of the Kibana internal user (as <code>callAsInternalUser</code> does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API.<!-- -->See [ScopedClusterClient](./kibana-plugin-core-server.scopedclusterclient.md)<!-- -->. |
 |  [KibanaRequestRouteOptions](./kibana-plugin-core-server.kibanarequestrouteoptions.md) | Route options: If 'GET' or 'OPTIONS' method, body options won't be returned. |
 |  [KibanaResponseFactory](./kibana-plugin-core-server.kibanaresponsefactory.md) | Creates an object containing request response payload, HTTP headers, error details, and other data transmitted to the client. |
 |  [KnownHeaders](./kibana-plugin-core-server.knownheaders.md) | Set of well-known HTTP headers. |
+|  [LegacyElasticsearchClientConfig](./kibana-plugin-core-server.legacyelasticsearchclientconfig.md) |  |
 |  [LifecycleResponseFactory](./kibana-plugin-core-server.lifecycleresponsefactory.md) | Creates an object containing redirection or error response with error details, HTTP headers, and other data transmitted to the client. |
 |  [LoggerConfigType](./kibana-plugin-core-server.loggerconfigtype.md) |  |
 |  [MIGRATION\_ASSISTANCE\_INDEX\_ACTION](./kibana-plugin-core-server.migration_assistance_index_action.md) |  |
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 7b887d6d421e4c..b09fb121b8a632 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
@@ -14,7 +14,7 @@ core: {
         };
         elasticsearch: {
             legacy: {
-                client: IScopedClusterClient;
+                client: ILegacyScopedClusterClient;
             };
         };
         uiSettings: {
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 99be0676bcda3d..55d6e931ac1584 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.scopedclusterclient.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.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
 
 <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: IScopedClusterClient;</code><br/><code>            };</code><br/><code>        };</code><br/><code>        uiSettings: {</code><br/><code>            client: IUiSettingsClient;</code><br/><code>        };</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>            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>    }</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.scopedclusterclient._constructor_.md b/docs/development/core/server/kibana-plugin-core-server.scopedclusterclient._constructor_.md
deleted file mode 100644
index d4d1d442a57f98..00000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.scopedclusterclient._constructor_.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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; [ScopedClusterClient](./kibana-plugin-core-server.scopedclusterclient.md) &gt; [(constructor)](./kibana-plugin-core-server.scopedclusterclient._constructor_.md)
-
-## ScopedClusterClient.(constructor)
-
-Constructs a new instance of the `ScopedClusterClient` class
-
-<b>Signature:</b>
-
-```typescript
-constructor(internalAPICaller: APICaller, scopedAPICaller: APICaller, headers?: Headers | undefined);
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  internalAPICaller | <code>APICaller</code> |  |
-|  scopedAPICaller | <code>APICaller</code> |  |
-|  headers | <code>Headers &#124; undefined</code> |  |
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.scopedclusterclient.md b/docs/development/core/server/kibana-plugin-core-server.scopedclusterclient.md
deleted file mode 100644
index 058d65b587dbed..00000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.scopedclusterclient.md
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- 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; [ScopedClusterClient](./kibana-plugin-core-server.scopedclusterclient.md)
-
-## ScopedClusterClient class
-
-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 [ScopedClusterClient](./kibana-plugin-core-server.scopedclusterclient.md)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-export declare class ScopedClusterClient implements IScopedClusterClient 
-```
-
-## Constructors
-
-|  Constructor | Modifiers | Description |
-|  --- | --- | --- |
-|  [(constructor)(internalAPICaller, scopedAPICaller, headers)](./kibana-plugin-core-server.scopedclusterclient._constructor_.md) |  | Constructs a new instance of the <code>ScopedClusterClient</code> class |
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [callAsCurrentUser(endpoint, clientParams, options)](./kibana-plugin-core-server.scopedclusterclient.callascurrentuser.md) |  | Calls specified <code>endpoint</code> with provided <code>clientParams</code> on behalf of the user initiated request to the Kibana server (via HTTP request headers). See [APICaller](./kibana-plugin-core-server.apicaller.md)<!-- -->. |
-|  [callAsInternalUser(endpoint, clientParams, options)](./kibana-plugin-core-server.scopedclusterclient.callasinternaluser.md) |  | Calls specified <code>endpoint</code> with provided <code>clientParams</code> on behalf of the Kibana internal user. See [APICaller](./kibana-plugin-core-server.apicaller.md)<!-- -->. |
-
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.gettime.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.gettime.md
new file mode 100644
index 00000000000000..54e7cf92f500cf
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.gettime.md
@@ -0,0 +1,27 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [getTime](./kibana-plugin-plugins-data-server.gettime.md)
+
+## getTime() function
+
+<b>Signature:</b>
+
+```typescript
+export declare function getTime(indexPattern: IIndexPattern | undefined, timeRange: TimeRange, options?: {
+    forceNow?: Date;
+    fieldName?: string;
+}): import("../..").RangeFilter | undefined;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  indexPattern | <code>IIndexPattern &#124; undefined</code> |  |
+|  timeRange | <code>TimeRange</code> |  |
+|  options | <code>{</code><br/><code>    forceNow?: Date;</code><br/><code>    fieldName?: string;</code><br/><code>}</code> |  |
+
+<b>Returns:</b>
+
+`import("../..").RangeFilter | undefined`
+
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher._constructor_.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher._constructor_.md
index f9bbcc5a356e13..d36ebd0745e8d0 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher._constructor_.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher._constructor_.md
@@ -9,12 +9,12 @@ Constructs a new instance of the `IndexPatternsFetcher` class
 <b>Signature:</b>
 
 ```typescript
-constructor(callDataCluster: APICaller);
+constructor(callDataCluster: LegacyAPICaller);
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  callDataCluster | <code>APICaller</code> |  |
+|  callDataCluster | <code>LegacyAPICaller</code> |  |
 
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
index f492ba2843a697..c80112fb17dde5 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
@@ -23,6 +23,7 @@
 |  Function | Description |
 |  --- | --- |
 |  [getDefaultSearchParams(config)](./kibana-plugin-plugins-data-server.getdefaultsearchparams.md) |  |
+|  [getTime(indexPattern, timeRange, options)](./kibana-plugin-plugins-data-server.gettime.md) |  |
 |  [parseInterval(interval)](./kibana-plugin-plugins-data-server.parseinterval.md) |  |
 |  [plugin(initializerContext)](./kibana-plugin-plugins-data-server.plugin.md) | Static code to be shared externally |
 |  [shouldReadFieldFromDocValues(aggregatable, esType)](./kibana-plugin-plugins-data-server.shouldreadfieldfromdocvalues.md) |  |
diff --git a/package.json b/package.json
index 10eaef8ed5dc74..c225435b4e4ffd 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,6 @@
   "resolutions": {
     "**/@types/node": ">=10.17.17 <10.20.0",
     "**/@types/react": "^16.9.36",
-    "**/@types/react-router": "^5.1.3",
     "**/@types/hapi": "^17.0.18",
     "**/@types/angular": "^1.6.56",
     "**/@types/hoist-non-react-statics": "^3.3.1",
@@ -139,6 +138,7 @@
     "@kbn/babel-preset": "1.0.0",
     "@kbn/config-schema": "1.0.0",
     "@kbn/i18n": "1.0.0",
+    "@kbn/telemetry-tools": "1.0.0",
     "@kbn/interpreter": "1.0.0",
     "@kbn/pm": "1.0.0",
     "@kbn/test-subj-selector": "0.2.1",
@@ -201,6 +201,7 @@
     "inline-style": "^2.0.0",
     "joi": "^13.5.2",
     "jquery": "^3.5.0",
+    "js-levenshtein": "^1.1.6",
     "js-yaml": "3.13.1",
     "json-stable-stringify": "^1.0.1",
     "json-stringify-pretty-compact": "1.2.0",
@@ -244,8 +245,8 @@
     "react-monaco-editor": "~0.27.0",
     "react-redux": "^7.2.0",
     "react-resize-detector": "^4.2.0",
-    "react-router": "^5.1.2",
-    "react-router-dom": "^5.1.2",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
     "react-sizeme": "^2.3.6",
     "react-use": "^13.27.0",
     "reactcss": "1.2.3",
@@ -376,8 +377,8 @@
     "@types/react-grid-layout": "^0.16.7",
     "@types/react-redux": "^7.1.9",
     "@types/react-resize-detector": "^4.0.1",
-    "@types/react-router": "^5.1.3",
-    "@types/react-router-dom": "^5.1.3",
+    "@types/react-router": "^5.1.7",
+    "@types/react-router-dom": "^5.1.5",
     "@types/react-virtualized": "^9.18.7",
     "@types/recompose": "^0.30.6",
     "@types/redux-actions": "^2.6.1",
diff --git a/packages/kbn-telemetry-tools/README.md b/packages/kbn-telemetry-tools/README.md
new file mode 100644
index 00000000000000..ccd092c76a17c4
--- /dev/null
+++ b/packages/kbn-telemetry-tools/README.md
@@ -0,0 +1,89 @@
+# Telemetry Tools
+
+## Schema extraction tool
+
+### Description
+
+The tool is used to extract telemetry collectors schema from all `*.{ts}` files in provided plugins directories to JSON files. The tool looks for `.telemetryrc.json` files in the root of the project and in the `x-pack` dir for its runtime configurations.
+
+It uses typescript parser to build an AST for each file. The tool is able to validate, extract and match collector schemas.
+
+### Examples and restrictions
+
+**Global restrictions**:
+
+The `id` can be only a string literal, it cannot be a template literals w/o expressions or string-only concatenation expressions or anything else.
+
+```
+export const myCollector = makeUsageCollector<Usage>({
+  type: 'string_literal_only',
+  ...
+});
+```
+
+### Usage
+
+```bash
+node scripts/telemetry_extract.js
+```
+
+This command has no additional flags or arguments. The `.telemetryrc.json` files specify the path to the directory where searching should start, output json files, and files to exclude.
+
+
+### Output
+
+
+The generated JSON files contain an ES mapping for each schema. This mapping is used to verify changes in the collectors and as the basis to map those fields into the external telemetry cluster.
+
+**Example**:
+
+```json
+{
+  "properties": {
+    "cloud": {
+      "properties": {
+        "isCloudEnabled": {
+          "type": "boolean"
+        }
+      }
+    }
+  }
+}
+```
+
+## Schema validation tool
+
+### Description
+
+The tool performs a number of checks on all telemetry collectors and verifies the following:
+
+1. Verifies the collector structure, fields, and returned values are using the appropriate types.
+2. Verifies that the collector `fetch` function Type matches the specified `schema` in the collector.
+3. Verifies that the collector `schema` matches the stored json schema .
+
+### Notes
+
+We don't catch every possible misuse of the collectors, but only the most common and critical ones.
+
+What will not be caught by the validator:
+
+* Mistyped SavedObject/CallCluster return value. Since the hits returned from ES can be typed to anything without any checks. It is advised to add functional tests that grabs the schema json file and checks that the returned usage matches the types exactly. 
+
+* Fields in the schema that are never collected. If you are trying to report a field from ES but that value is never stored in ES, the check will not be able to detect if that field is ever collected in the first palce. It is advised to add unit/functional tests to check that all the fields are being reported as expected.
+
+The tool looks for `.telemetryrc.json` files in the root of the project and in the `x-pack` dir for its runtime configurations.
+
+Currently auto-fixer (`--fix`) can automatically fix the json files with the following errors:
+
+* incompatible schema - this error means that the collector schema was changed but the stored json schema file was not updated.
+
+* unused schemas - this error means that a collector was removed or its `type` renamed, the json schema file contains a schema that does not have a corrisponding collector.
+
+### Usage
+
+```bash
+node scripts/telemetry_check --fix
+```
+
+* `--path` specifies a collector path instead of checking all collectors specified in the `.telemetryrc.json` files. Accepts a `.ts` file. The file must be discoverable by at least one rc file.
+* `--fix` tells the tool to try to fix as many violations as possible. All errors that tool won't be able to fix will be reported.
diff --git a/src/plugins/kibana_utils/common/default_feedback_message.ts b/packages/kbn-telemetry-tools/babel.config.js
similarity index 69%
rename from src/plugins/kibana_utils/common/default_feedback_message.ts
rename to packages/kbn-telemetry-tools/babel.config.js
index f61f36bc8810cc..3b09c7d74ccb56 100644
--- a/src/plugins/kibana_utils/common/default_feedback_message.ts
+++ b/packages/kbn-telemetry-tools/babel.config.js
@@ -17,12 +17,7 @@
  * under the License.
  */
 
-import { i18n } from '@kbn/i18n';
-
-export const defaultFeedbackMessage = i18n.translate('kibana_utils.defaultFeedbackMessage', {
-  defaultMessage: 'Have feedback? Please create an issue in {link}.',
-  values: {
-    link:
-      '<a href="https://github.com/elastic/kibana/issues/new/choose" rel="noopener noreferrer" target="_blank">GitHub</a>',
-  },
-});
+module.exports = {
+  presets: ['@kbn/babel-preset/node_preset'],
+  ignore: ['**/*.test.ts', '**/__fixture__/**'],
+};
diff --git a/packages/kbn-telemetry-tools/package.json b/packages/kbn-telemetry-tools/package.json
new file mode 100644
index 00000000000000..5593a72ecd965a
--- /dev/null
+++ b/packages/kbn-telemetry-tools/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@kbn/telemetry-tools",
+  "version": "1.0.0",
+  "license": "Apache-2.0",
+  "main": "./target/index.js",
+  "private": true,
+  "scripts": {
+    "build": "babel src --out-dir target --delete-dir-on-start --extensions .ts --source-maps=inline",
+    "kbn:bootstrap": "yarn build",
+    "kbn:watch": "yarn build --watch"
+  },
+  "devDependencies": {
+    "lodash": "npm:@elastic/lodash@3.10.1-kibana4",
+    "@kbn/dev-utils": "1.0.0",
+    "@kbn/utility-types": "1.0.0",
+    "@types/normalize-path": "^3.0.0",
+    "normalize-path": "^3.0.0",
+    "@types/lodash": "^3.10.1",
+    "moment": "^2.24.0",
+    "typescript": "3.9.5"
+  }
+}
diff --git a/packages/kbn-telemetry-tools/src/cli/run_telemetry_check.ts b/packages/kbn-telemetry-tools/src/cli/run_telemetry_check.ts
new file mode 100644
index 00000000000000..116c484a5c36af
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/cli/run_telemetry_check.ts
@@ -0,0 +1,109 @@
+/*
+ * 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 Listr from 'listr';
+import chalk from 'chalk';
+import { createFailError, run } from '@kbn/dev-utils';
+
+import {
+  createTaskContext,
+  ErrorReporter,
+  parseConfigsTask,
+  extractCollectorsTask,
+  checkMatchingSchemasTask,
+  generateSchemasTask,
+  checkCompatibleTypesTask,
+  writeToFileTask,
+  TaskContext,
+} from '../tools/tasks';
+
+export function runTelemetryCheck() {
+  run(
+    async ({ flags: { fix = false, path }, log }) => {
+      if (typeof fix !== 'boolean') {
+        throw createFailError(`${chalk.white.bgRed(' TELEMETRY ERROR ')} --fix can't have a value`);
+      }
+
+      if (typeof path === 'boolean') {
+        throw createFailError(`${chalk.white.bgRed(' TELEMETRY ERROR ')} --path require a value`);
+      }
+
+      if (fix && typeof path !== 'undefined') {
+        throw createFailError(
+          `${chalk.white.bgRed(' TELEMETRY ERROR ')} --fix is incompatible with --path flag.`
+        );
+      }
+
+      const list = new Listr([
+        {
+          title: 'Checking .telemetryrc.json files',
+          task: () => new Listr(parseConfigsTask(), { exitOnError: true }),
+        },
+        {
+          title: 'Extracting Collectors',
+          task: (context) => new Listr(extractCollectorsTask(context, path), { exitOnError: true }),
+        },
+        {
+          title: 'Checking Compatible collector.schema with collector.fetch type',
+          task: (context) => new Listr(checkCompatibleTypesTask(context), { exitOnError: true }),
+        },
+        {
+          title: 'Checking Matching collector.schema against stored json files',
+          task: (context) => new Listr(checkMatchingSchemasTask(context), { exitOnError: true }),
+        },
+        {
+          enabled: (_) => fix,
+          skip: ({ roots }: TaskContext) => {
+            return roots.every(({ esMappingDiffs }) => !esMappingDiffs || !esMappingDiffs.length);
+          },
+          title: 'Generating new telemetry mappings',
+          task: (context) => new Listr(generateSchemasTask(context), { exitOnError: true }),
+        },
+        {
+          enabled: (_) => fix,
+          skip: ({ roots }: TaskContext) => {
+            return roots.every(({ esMappingDiffs }) => !esMappingDiffs || !esMappingDiffs.length);
+          },
+          title: 'Updating telemetry mapping files',
+          task: (context) => new Listr(writeToFileTask(context), { exitOnError: true }),
+        },
+      ]);
+
+      try {
+        const context = createTaskContext();
+        await list.run(context);
+      } catch (error) {
+        process.exitCode = 1;
+        if (error instanceof ErrorReporter) {
+          error.errors.forEach((e: string | Error) => log.error(e));
+        } else {
+          log.error('Unhandled exception!');
+          log.error(error);
+        }
+      }
+      process.exit();
+    },
+    {
+      flags: {
+        allowUnexpected: true,
+        guessTypesForUnexpectedFlags: true,
+      },
+    }
+  );
+}
diff --git a/packages/kbn-telemetry-tools/src/cli/run_telemetry_extract.ts b/packages/kbn-telemetry-tools/src/cli/run_telemetry_extract.ts
new file mode 100644
index 00000000000000..27a406a4e216d2
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/cli/run_telemetry_extract.ts
@@ -0,0 +1,75 @@
+/*
+ * 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 Listr from 'listr';
+import { run } from '@kbn/dev-utils';
+
+import {
+  createTaskContext,
+  ErrorReporter,
+  parseConfigsTask,
+  extractCollectorsTask,
+  generateSchemasTask,
+  writeToFileTask,
+} from '../tools/tasks';
+
+export function runTelemetryExtract() {
+  run(
+    async ({ flags: {}, log }) => {
+      const list = new Listr([
+        {
+          title: 'Parsing .telemetryrc.json files',
+          task: () => new Listr(parseConfigsTask(), { exitOnError: true }),
+        },
+        {
+          title: 'Extracting Telemetry Collectors',
+          task: (context) => new Listr(extractCollectorsTask(context), { exitOnError: true }),
+        },
+        {
+          title: 'Generating Schema files',
+          task: (context) => new Listr(generateSchemasTask(context), { exitOnError: true }),
+        },
+        {
+          title: 'Writing to file',
+          task: (context) => new Listr(writeToFileTask(context), { exitOnError: true }),
+        },
+      ]);
+
+      try {
+        const context = createTaskContext();
+        await list.run(context);
+      } catch (error) {
+        process.exitCode = 1;
+        if (error instanceof ErrorReporter) {
+          error.errors.forEach((e: string | Error) => log.error(e));
+        } else {
+          log.error('Unhandled exception');
+          log.error(error);
+        }
+      }
+      process.exit();
+    },
+    {
+      flags: {
+        allowUnexpected: true,
+        guessTypesForUnexpectedFlags: true,
+      },
+    }
+  );
+}
diff --git a/src/plugins/visualize/public/application/editor/lib/index.ts b/packages/kbn-telemetry-tools/src/index.ts
similarity index 80%
rename from src/plugins/visualize/public/application/editor/lib/index.ts
rename to packages/kbn-telemetry-tools/src/index.ts
index 78589383925fb9..3a018a9b3002c3 100644
--- a/src/plugins/visualize/public/application/editor/lib/index.ts
+++ b/packages/kbn-telemetry-tools/src/index.ts
@@ -17,6 +17,5 @@
  * under the License.
  */
 
-export { useVisualizeAppState } from './visualize_app_state';
-export { makeStateful } from './make_stateful';
-export { addEmbeddableToDashboardUrl } from '../../../../../dashboard/public/';
+export { runTelemetryCheck } from './cli/run_telemetry_check';
+export { runTelemetryExtract } from './cli/run_telemetry_extract';
diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/mock_schema.json b/packages/kbn-telemetry-tools/src/tools/__fixture__/mock_schema.json
new file mode 100644
index 00000000000000..885fe0e38dacfe
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/mock_schema.json
@@ -0,0 +1,24 @@
+{
+  "properties": {
+    "my_working_collector": {
+      "properties": {
+        "flat": {
+          "type": "keyword"
+        },
+        "my_str": {
+          "type": "text"
+        },
+        "my_objects": {
+          "properties": {
+            "total": {
+              "type": "number"
+            },
+            "type": {
+              "type": "boolean"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_externally_defined_collector.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_externally_defined_collector.ts
new file mode 100644
index 00000000000000..fe45f6b7f30427
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_externally_defined_collector.ts
@@ -0,0 +1,68 @@
+/*
+ * 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 { SyntaxKind } from 'typescript';
+import { ParsedUsageCollection } from '../ts_parser';
+
+export const parsedExternallyDefinedCollector: ParsedUsageCollection[] = [
+  [
+    'src/fixtures/telemetry_collectors/externally_defined_collector.ts',
+    {
+      collectorName: 'from_variable_collector',
+      schema: {
+        value: {
+          locale: {
+            type: 'keyword',
+          },
+        },
+      },
+      fetch: {
+        typeName: 'Usage',
+        typeDescriptor: {
+          locale: {
+            kind: SyntaxKind.StringKeyword,
+            type: 'StringKeyword',
+          },
+        },
+      },
+    },
+  ],
+  [
+    'src/fixtures/telemetry_collectors/externally_defined_collector.ts',
+    {
+      collectorName: 'from_fn_collector',
+      schema: {
+        value: {
+          locale: {
+            type: 'keyword',
+          },
+        },
+      },
+      fetch: {
+        typeName: 'Usage',
+        typeDescriptor: {
+          locale: {
+            kind: SyntaxKind.StringKeyword,
+            type: 'StringKeyword',
+          },
+        },
+      },
+    },
+  ],
+];
diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_schema.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_schema.ts
new file mode 100644
index 00000000000000..48702520829502
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_schema.ts
@@ -0,0 +1,46 @@
+/*
+ * 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 { SyntaxKind } from 'typescript';
+import { ParsedUsageCollection } from '../ts_parser';
+
+export const parsedImportedSchemaCollector: ParsedUsageCollection[] = [
+  [
+    'src/fixtures/telemetry_collectors/imported_schema.ts',
+    {
+      collectorName: 'with_imported_schema',
+      schema: {
+        value: {
+          locale: {
+            type: 'keyword',
+          },
+        },
+      },
+      fetch: {
+        typeName: 'Usage',
+        typeDescriptor: {
+          locale: {
+            kind: SyntaxKind.StringKeyword,
+            type: 'StringKeyword',
+          },
+        },
+      },
+    },
+  ],
+];
diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_usage_interface.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_usage_interface.ts
new file mode 100644
index 00000000000000..42ed2140b5208a
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_imported_usage_interface.ts
@@ -0,0 +1,46 @@
+/*
+ * 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 { SyntaxKind } from 'typescript';
+import { ParsedUsageCollection } from '../ts_parser';
+
+export const parsedImportedUsageInterface: ParsedUsageCollection[] = [
+  [
+    'src/fixtures/telemetry_collectors/imported_usage_interface.ts',
+    {
+      collectorName: 'imported_usage_interface_collector',
+      schema: {
+        value: {
+          locale: {
+            type: 'keyword',
+          },
+        },
+      },
+      fetch: {
+        typeName: 'Usage',
+        typeDescriptor: {
+          locale: {
+            kind: SyntaxKind.StringKeyword,
+            type: 'StringKeyword',
+          },
+        },
+      },
+    },
+  ],
+];
diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_nested_collector.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_nested_collector.ts
new file mode 100644
index 00000000000000..ed727c15b7c86e
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_nested_collector.ts
@@ -0,0 +1,44 @@
+/*
+ * 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 { SyntaxKind } from 'typescript';
+import { ParsedUsageCollection } from '../ts_parser';
+
+export const parsedNestedCollector: ParsedUsageCollection = [
+  'src/fixtures/telemetry_collectors/nested_collector.ts',
+  {
+    collectorName: 'my_nested_collector',
+    schema: {
+      value: {
+        locale: {
+          type: 'keyword',
+        },
+      },
+    },
+    fetch: {
+      typeName: 'Usage',
+      typeDescriptor: {
+        locale: {
+          kind: SyntaxKind.StringKeyword,
+          type: 'StringKeyword',
+        },
+      },
+    },
+  },
+];
diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts
new file mode 100644
index 00000000000000..25e49ea221c941
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts
@@ -0,0 +1,69 @@
+/*
+ * 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 { SyntaxKind } from 'typescript';
+import { ParsedUsageCollection } from '../ts_parser';
+
+export const parsedWorkingCollector: ParsedUsageCollection = [
+  'src/fixtures/telemetry_collectors/working_collector.ts',
+  {
+    collectorName: 'my_working_collector',
+    schema: {
+      value: {
+        flat: {
+          type: 'keyword',
+        },
+        my_str: {
+          type: 'text',
+        },
+        my_objects: {
+          total: {
+            type: 'number',
+          },
+          type: {
+            type: 'boolean',
+          },
+        },
+      },
+    },
+    fetch: {
+      typeName: 'Usage',
+      typeDescriptor: {
+        flat: {
+          kind: SyntaxKind.StringKeyword,
+          type: 'StringKeyword',
+        },
+        my_str: {
+          kind: SyntaxKind.StringKeyword,
+          type: 'StringKeyword',
+        },
+        my_objects: {
+          total: {
+            kind: SyntaxKind.NumberKeyword,
+            type: 'NumberKeyword',
+          },
+          type: {
+            kind: SyntaxKind.BooleanKeyword,
+            type: 'BooleanKeyword',
+          },
+        },
+      },
+    },
+  },
+];
diff --git a/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap b/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap
new file mode 100644
index 00000000000000..44a12dfa9030cc
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap
@@ -0,0 +1,163 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`extractCollectors extracts collectors given rc file 1`] = `
+Array [
+  Array [
+    "src/fixtures/telemetry_collectors/externally_defined_collector.ts",
+    Object {
+      "collectorName": "from_variable_collector",
+      "fetch": Object {
+        "typeDescriptor": Object {
+          "locale": Object {
+            "kind": 143,
+            "type": "StringKeyword",
+          },
+        },
+        "typeName": "Usage",
+      },
+      "schema": Object {
+        "value": Object {
+          "locale": Object {
+            "type": "keyword",
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "src/fixtures/telemetry_collectors/externally_defined_collector.ts",
+    Object {
+      "collectorName": "from_fn_collector",
+      "fetch": Object {
+        "typeDescriptor": Object {
+          "locale": Object {
+            "kind": 143,
+            "type": "StringKeyword",
+          },
+        },
+        "typeName": "Usage",
+      },
+      "schema": Object {
+        "value": Object {
+          "locale": Object {
+            "type": "keyword",
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "src/fixtures/telemetry_collectors/imported_schema.ts",
+    Object {
+      "collectorName": "with_imported_schema",
+      "fetch": Object {
+        "typeDescriptor": Object {
+          "locale": Object {
+            "kind": 143,
+            "type": "StringKeyword",
+          },
+        },
+        "typeName": "Usage",
+      },
+      "schema": Object {
+        "value": Object {
+          "locale": Object {
+            "type": "keyword",
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "src/fixtures/telemetry_collectors/imported_usage_interface.ts",
+    Object {
+      "collectorName": "imported_usage_interface_collector",
+      "fetch": Object {
+        "typeDescriptor": Object {
+          "locale": Object {
+            "kind": 143,
+            "type": "StringKeyword",
+          },
+        },
+        "typeName": "Usage",
+      },
+      "schema": Object {
+        "value": Object {
+          "locale": Object {
+            "type": "keyword",
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "src/fixtures/telemetry_collectors/nested_collector.ts",
+    Object {
+      "collectorName": "my_nested_collector",
+      "fetch": Object {
+        "typeDescriptor": Object {
+          "locale": Object {
+            "kind": 143,
+            "type": "StringKeyword",
+          },
+        },
+        "typeName": "Usage",
+      },
+      "schema": Object {
+        "value": Object {
+          "locale": Object {
+            "type": "keyword",
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "src/fixtures/telemetry_collectors/working_collector.ts",
+    Object {
+      "collectorName": "my_working_collector",
+      "fetch": Object {
+        "typeDescriptor": Object {
+          "flat": Object {
+            "kind": 143,
+            "type": "StringKeyword",
+          },
+          "my_objects": Object {
+            "total": Object {
+              "kind": 140,
+              "type": "NumberKeyword",
+            },
+            "type": Object {
+              "kind": 128,
+              "type": "BooleanKeyword",
+            },
+          },
+          "my_str": Object {
+            "kind": 143,
+            "type": "StringKeyword",
+          },
+        },
+        "typeName": "Usage",
+      },
+      "schema": Object {
+        "value": Object {
+          "flat": Object {
+            "type": "keyword",
+          },
+          "my_objects": Object {
+            "total": Object {
+              "type": "number",
+            },
+            "type": Object {
+              "type": "boolean",
+            },
+          },
+          "my_str": Object {
+            "type": "text",
+          },
+        },
+      },
+    },
+  ],
+]
+`;
diff --git a/packages/kbn-telemetry-tools/src/tools/__snapshots__/ts_parser.test.ts.snap b/packages/kbn-telemetry-tools/src/tools/__snapshots__/ts_parser.test.ts.snap
new file mode 100644
index 00000000000000..5b1b3d9d352990
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/__snapshots__/ts_parser.test.ts.snap
@@ -0,0 +1,6 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`parseUsageCollection throws when mapping fields is not defined 1`] = `
+"Error extracting collector in src/fixtures/telemetry_collectors/unmapped_collector.ts
+Error: usageCollector.schema must be defined."
+`;
diff --git a/packages/kbn-telemetry-tools/src/tools/check_collector__integrity.test.ts b/packages/kbn-telemetry-tools/src/tools/check_collector__integrity.test.ts
new file mode 100644
index 00000000000000..6083593431d9b3
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/check_collector__integrity.test.ts
@@ -0,0 +1,125 @@
+/*
+ * 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 * as _ from 'lodash';
+import * as ts from 'typescript';
+import { parsedWorkingCollector } from './__fixture__/parsed_working_collector';
+import { checkCompatibleTypeDescriptor, checkMatchingMapping } from './check_collector_integrity';
+import * as path from 'path';
+import { readFile } from 'fs';
+import { promisify } from 'util';
+const read = promisify(readFile);
+
+async function parseJsonFile(relativePath: string) {
+  const schemaPath = path.resolve(__dirname, '__fixture__', relativePath);
+  const fileContent = await read(schemaPath, 'utf8');
+  return JSON.parse(fileContent);
+}
+
+describe('checkMatchingMapping', () => {
+  it('returns no diff on matching parsedCollections and stored mapping', async () => {
+    const mockSchema = await parseJsonFile('mock_schema.json');
+    const diffs = checkMatchingMapping([parsedWorkingCollector], mockSchema);
+    expect(diffs).toEqual({});
+  });
+
+  describe('Collector change', () => {
+    it('returns diff on mismatching parsedCollections and stored mapping', async () => {
+      const mockSchema = await parseJsonFile('mock_schema.json');
+      const malformedParsedCollector = _.cloneDeep(parsedWorkingCollector);
+      const fieldMapping = { type: 'number' };
+      malformedParsedCollector[1].schema.value.flat = fieldMapping;
+
+      const diffs = checkMatchingMapping([malformedParsedCollector], mockSchema);
+      expect(diffs).toEqual({
+        properties: {
+          my_working_collector: {
+            properties: { flat: fieldMapping },
+          },
+        },
+      });
+    });
+
+    it('returns diff on unknown parsedCollections', async () => {
+      const mockSchema = await parseJsonFile('mock_schema.json');
+      const malformedParsedCollector = _.cloneDeep(parsedWorkingCollector);
+      const collectorName = 'New Collector in town!';
+      const collectorMapping = { some_usage: { type: 'number' } };
+      malformedParsedCollector[1].collectorName = collectorName;
+      malformedParsedCollector[1].schema.value = { some_usage: { type: 'number' } };
+
+      const diffs = checkMatchingMapping([malformedParsedCollector], mockSchema);
+      expect(diffs).toEqual({
+        properties: {
+          [collectorName]: {
+            properties: collectorMapping,
+          },
+        },
+      });
+    });
+  });
+});
+
+describe('checkCompatibleTypeDescriptor', () => {
+  it('returns no diff on compatible type descriptor with mapping', () => {
+    const incompatibles = checkCompatibleTypeDescriptor([parsedWorkingCollector]);
+    expect(incompatibles).toHaveLength(0);
+  });
+
+  describe('Interface Change', () => {
+    it('returns diff on incompatible type descriptor with mapping', () => {
+      const malformedParsedCollector = _.cloneDeep(parsedWorkingCollector);
+      malformedParsedCollector[1].fetch.typeDescriptor.flat.kind = ts.SyntaxKind.BooleanKeyword;
+      const incompatibles = checkCompatibleTypeDescriptor([malformedParsedCollector]);
+      expect(incompatibles).toHaveLength(1);
+      const { diff, message } = incompatibles[0];
+      expect(diff).toEqual({ 'flat.kind': 'boolean' });
+      expect(message).toHaveLength(1);
+      expect(message).toEqual([
+        'incompatible Type key (Usage.flat): expected ("string") got ("boolean").',
+      ]);
+    });
+
+    it.todo('returns diff when missing type descriptor');
+  });
+
+  describe('Mapping change', () => {
+    it('returns no diff when mapping change between text and keyword', () => {
+      const malformedParsedCollector = _.cloneDeep(parsedWorkingCollector);
+      malformedParsedCollector[1].schema.value.flat.type = 'text';
+      const incompatibles = checkCompatibleTypeDescriptor([malformedParsedCollector]);
+      expect(incompatibles).toHaveLength(0);
+    });
+
+    it('returns diff on incompatible type descriptor with mapping', () => {
+      const malformedParsedCollector = _.cloneDeep(parsedWorkingCollector);
+      malformedParsedCollector[1].schema.value.flat.type = 'boolean';
+      const incompatibles = checkCompatibleTypeDescriptor([malformedParsedCollector]);
+      expect(incompatibles).toHaveLength(1);
+      const { diff, message } = incompatibles[0];
+      expect(diff).toEqual({ 'flat.kind': 'string' });
+      expect(message).toHaveLength(1);
+      expect(message).toEqual([
+        'incompatible Type key (Usage.flat): expected ("boolean") got ("string").',
+      ]);
+    });
+
+    it.todo('returns diff when missing mapping');
+  });
+});
diff --git a/packages/kbn-telemetry-tools/src/tools/check_collector_integrity.ts b/packages/kbn-telemetry-tools/src/tools/check_collector_integrity.ts
new file mode 100644
index 00000000000000..824132b05732ce
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/check_collector_integrity.ts
@@ -0,0 +1,103 @@
+/*
+ * 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 * as _ from 'lodash';
+import { difference, flattenKeys, pickDeep } from './utils';
+import { ParsedUsageCollection } from './ts_parser';
+import { generateMapping, compatibleSchemaTypes } from './manage_schema';
+import { kindToDescriptorName } from './serializer';
+
+export function checkMatchingMapping(
+  UsageCollections: ParsedUsageCollection[],
+  esMapping: any
+): any {
+  const generatedMapping = generateMapping(UsageCollections);
+  return difference(generatedMapping, esMapping);
+}
+
+interface IncompatibleDescriptor {
+  diff: Record<string, number>;
+  collectorPath: string;
+  message: string[];
+}
+export function checkCompatibleTypeDescriptor(
+  usageCollections: ParsedUsageCollection[]
+): IncompatibleDescriptor[] {
+  const results: Array<IncompatibleDescriptor | false> = usageCollections.map(
+    ([collectorPath, collectorDetails]) => {
+      const typeDescriptorTypes = flattenKeys(
+        pickDeep(collectorDetails.fetch.typeDescriptor, 'kind')
+      );
+      const typeDescriptorKinds = _.reduce(
+        typeDescriptorTypes,
+        (acc: any, type: number, key: string) => {
+          try {
+            acc[key] = kindToDescriptorName(type);
+          } catch (err) {
+            throw Error(`Unrecognized type (${key}: ${type}) in ${collectorPath}`);
+          }
+          return acc;
+        },
+        {} as any
+      );
+
+      const schemaTypes = flattenKeys(pickDeep(collectorDetails.schema.value, 'type'));
+      const transformedMappingKinds = _.reduce(
+        schemaTypes,
+        (acc: any, type: string, key: string) => {
+          try {
+            acc[key.replace(/.type$/, '.kind')] = compatibleSchemaTypes(type as any);
+          } catch (err) {
+            throw Error(`Unrecognized type (${key}: ${type}) in ${collectorPath}`);
+          }
+          return acc;
+        },
+        {} as any
+      );
+
+      const diff: any = difference(typeDescriptorKinds, transformedMappingKinds);
+      const diffEntries = Object.entries(diff);
+
+      if (!diffEntries.length) {
+        return false;
+      }
+
+      return {
+        diff,
+        collectorPath,
+        message: diffEntries.map(([key]) => {
+          const interfaceKey = key.replace('.kind', '');
+          try {
+            const expectedDescriptorType = JSON.stringify(transformedMappingKinds[key], null, 2);
+            const actualDescriptorType = JSON.stringify(typeDescriptorKinds[key], null, 2);
+            return `incompatible Type key (${collectorDetails.fetch.typeName}.${interfaceKey}): expected (${expectedDescriptorType}) got (${actualDescriptorType}).`;
+          } catch (err) {
+            throw Error(`Error converting ${key} in ${collectorPath}.\n${err}`);
+          }
+        }),
+      };
+    }
+  );
+
+  return results.filter((entry): entry is IncompatibleDescriptor => entry !== false);
+}
+
+export function checkCollectorIntegrity(UsageCollections: ParsedUsageCollection[], esMapping: any) {
+  return UsageCollections;
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/config.test.ts b/packages/kbn-telemetry-tools/src/tools/config.test.ts
new file mode 100644
index 00000000000000..51ca0493cbb5a4
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/config.test.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 * as path from 'path';
+import { parseTelemetryRC } from './config';
+
+describe('parseTelemetryRC', () => {
+  it('throw if config path is not absolute', async () => {
+    const fixtureDir = './__fixture__/';
+    await expect(parseTelemetryRC(fixtureDir)).rejects.toThrowError();
+  });
+
+  it('returns parsed rc file', async () => {
+    const configRoot = path.join(process.cwd(), 'src', 'fixtures', 'telemetry_collectors');
+    const config = await parseTelemetryRC(configRoot);
+    expect(config).toStrictEqual([
+      {
+        root: configRoot,
+        output: configRoot,
+        exclude: [path.resolve(configRoot, './unmapped_collector.ts')],
+      },
+    ]);
+  });
+});
diff --git a/packages/kbn-telemetry-tools/src/tools/config.ts b/packages/kbn-telemetry-tools/src/tools/config.ts
new file mode 100644
index 00000000000000..5724b869e8f5ea
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/config.ts
@@ -0,0 +1,60 @@
+/*
+ * 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 * as path from 'path';
+import { readFileAsync } from './utils';
+import { TELEMETRY_RC } from './constants';
+
+export interface TelemetryRC {
+  root: string;
+  output: string;
+  exclude: string[];
+}
+
+export async function readRcFile(rcRoot: string) {
+  if (!path.isAbsolute(rcRoot)) {
+    throw Error(`config root (${rcRoot}) must be an absolute path.`);
+  }
+
+  const rcFile = path.resolve(rcRoot, TELEMETRY_RC);
+  const configString = await readFileAsync(rcFile, 'utf8');
+  return JSON.parse(configString);
+}
+
+export async function parseTelemetryRC(rcRoot: string): Promise<TelemetryRC[]> {
+  const parsedRc = await readRcFile(rcRoot);
+  const configs = Array.isArray(parsedRc) ? parsedRc : [parsedRc];
+  return configs.map(({ root, output, exclude = [] }) => {
+    if (typeof root !== 'string') {
+      throw Error('config.root must be a string.');
+    }
+    if (typeof output !== 'string') {
+      throw Error('config.output must be a string.');
+    }
+    if (!Array.isArray(exclude)) {
+      throw Error('config.exclude must be an array of strings.');
+    }
+
+    return {
+      root: path.join(rcRoot, root),
+      output: path.join(rcRoot, output),
+      exclude: exclude.map((excludedPath) => path.resolve(rcRoot, excludedPath)),
+    };
+  });
+}
diff --git a/src/plugins/kibana_utils/common/default_feedback_message.test.ts b/packages/kbn-telemetry-tools/src/tools/constants.ts
similarity index 68%
rename from src/plugins/kibana_utils/common/default_feedback_message.test.ts
rename to packages/kbn-telemetry-tools/src/tools/constants.ts
index 5c1afa4634b71e..8635b1a2e2528e 100644
--- a/src/plugins/kibana_utils/common/default_feedback_message.test.ts
+++ b/packages/kbn-telemetry-tools/src/tools/constants.ts
@@ -17,10 +17,4 @@
  * under the License.
  */
 
-import { defaultFeedbackMessage } from './default_feedback_message';
-
-test('default feedback message with link', () => {
-  expect(defaultFeedbackMessage).toMatchInlineSnapshot(
-    `"Have feedback? Please create an issue in <a href=\\"https://github.com/elastic/kibana/issues/new/choose\\" rel=\\"noopener noreferrer\\" target=\\"_blank\\">GitHub</a>."`
-  );
-});
+export const TELEMETRY_RC = '.telemetryrc.json';
diff --git a/packages/kbn-telemetry-tools/src/tools/extract_collectors.test.ts b/packages/kbn-telemetry-tools/src/tools/extract_collectors.test.ts
new file mode 100644
index 00000000000000..1b4ed21a1635cf
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/extract_collectors.test.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 * as ts from 'typescript';
+import * as path from 'path';
+import { extractCollectors, getProgramPaths } from './extract_collectors';
+import { parseTelemetryRC } from './config';
+
+describe('extractCollectors', () => {
+  it('extracts collectors given rc file', async () => {
+    const configRoot = path.join(process.cwd(), 'src', 'fixtures', 'telemetry_collectors');
+    const tsConfig = ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json');
+    if (!tsConfig) {
+      throw new Error('Could not find a valid tsconfig.json.');
+    }
+    const configs = await parseTelemetryRC(configRoot);
+    expect(configs).toHaveLength(1);
+    const programPaths = await getProgramPaths(configs[0]);
+
+    const results = [...extractCollectors(programPaths, tsConfig)];
+    expect(results).toHaveLength(6);
+    expect(results).toMatchSnapshot();
+  });
+});
diff --git a/packages/kbn-telemetry-tools/src/tools/extract_collectors.ts b/packages/kbn-telemetry-tools/src/tools/extract_collectors.ts
new file mode 100644
index 00000000000000..a638fde0214580
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/extract_collectors.ts
@@ -0,0 +1,75 @@
+/*
+ * 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 * as ts from 'typescript';
+import * as path from 'path';
+import { parseUsageCollection } from './ts_parser';
+import { globAsync } from './utils';
+import { TelemetryRC } from './config';
+
+export async function getProgramPaths({
+  root,
+  exclude,
+}: Pick<TelemetryRC, 'root' | 'exclude'>): Promise<string[]> {
+  const filePaths = await globAsync('**/*.ts', {
+    cwd: root,
+    ignore: [
+      '**/node_modules/**',
+      '**/*.test.*',
+      '**/*.mock.*',
+      '**/mocks.*',
+      '**/__fixture__/**',
+      '**/__tests__/**',
+      '**/public/**',
+      '**/dist/**',
+      '**/target/**',
+      '**/*.d.ts',
+    ],
+  });
+
+  if (filePaths.length === 0) {
+    throw Error(`No files found in ${root}`);
+  }
+
+  const fullPaths = filePaths
+    .map((filePath) => path.join(root, filePath))
+    .filter((fullPath) => !exclude.some((excludedPath) => fullPath.startsWith(excludedPath)));
+
+  if (fullPaths.length === 0) {
+    throw Error(`No paths covered from ${root} by the .telemetryrc.json`);
+  }
+
+  return fullPaths;
+}
+
+export function* extractCollectors(fullPaths: string[], tsConfig: any) {
+  const program = ts.createProgram(fullPaths, tsConfig);
+  program.getTypeChecker();
+  const sourceFiles = fullPaths.map((fullPath) => {
+    const sourceFile = program.getSourceFile(fullPath);
+    if (!sourceFile) {
+      throw Error(`Unable to get sourceFile ${fullPath}.`);
+    }
+    return sourceFile;
+  });
+
+  for (const sourceFile of sourceFiles) {
+    yield* parseUsageCollection(sourceFile, program);
+  }
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/manage_schema.test.ts b/packages/kbn-telemetry-tools/src/tools/manage_schema.test.ts
new file mode 100644
index 00000000000000..8f4bfc66b32aeb
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/manage_schema.test.ts
@@ -0,0 +1,39 @@
+/*
+ * 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 { generateMapping } from './manage_schema';
+import { parsedWorkingCollector } from './__fixture__/parsed_working_collector';
+import * as path from 'path';
+import { readFile } from 'fs';
+import { promisify } from 'util';
+const read = promisify(readFile);
+
+async function parseJsonFile(relativePath: string) {
+  const schemaPath = path.resolve(__dirname, '__fixture__', relativePath);
+  const fileContent = await read(schemaPath, 'utf8');
+  return JSON.parse(fileContent);
+}
+
+describe('generateMapping', () => {
+  it('generates a mapping file', async () => {
+    const mockSchema = await parseJsonFile('mock_schema.json');
+    const result = generateMapping([parsedWorkingCollector]);
+    expect(result).toEqual(mockSchema);
+  });
+});
diff --git a/packages/kbn-telemetry-tools/src/tools/manage_schema.ts b/packages/kbn-telemetry-tools/src/tools/manage_schema.ts
new file mode 100644
index 00000000000000..d422837140d802
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/manage_schema.ts
@@ -0,0 +1,86 @@
+/*
+ * 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 { ParsedUsageCollection } from './ts_parser';
+
+export type AllowedSchemaTypes =
+  | 'keyword'
+  | 'text'
+  | 'number'
+  | 'boolean'
+  | 'long'
+  | 'date'
+  | 'float';
+
+export function compatibleSchemaTypes(type: AllowedSchemaTypes) {
+  switch (type) {
+    case 'keyword':
+    case 'text':
+    case 'date':
+      return 'string';
+    case 'boolean':
+      return 'boolean';
+    case 'number':
+    case 'float':
+    case 'long':
+      return 'number';
+    default:
+      throw new Error(`Unknown schema type ${type}`);
+  }
+}
+
+export function isObjectMapping(entity: any) {
+  if (typeof entity === 'object') {
+    // 'type' is explicitly specified to be an object.
+    if (typeof entity.type === 'string' && entity.type === 'object') {
+      return true;
+    }
+
+    // 'type' is not set; ES defaults to object mapping for when type is unspecified.
+    if (typeof entity.type === 'undefined') {
+      return true;
+    }
+
+    // 'type' is a field in the mapping and is not the type of the mapping.
+    if (typeof entity.type === 'object') {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+function transformToEsMapping(usageMappingValue: any) {
+  const fieldMapping: any = { properties: {} };
+  for (const [key, value] of Object.entries(usageMappingValue)) {
+    fieldMapping.properties[key] = isObjectMapping(value) ? transformToEsMapping(value) : value;
+  }
+  return fieldMapping;
+}
+
+export function generateMapping(usageCollections: ParsedUsageCollection[]) {
+  const esMapping: any = { properties: {} };
+  for (const [, collecionDetails] of usageCollections) {
+    esMapping.properties[collecionDetails.collectorName] = transformToEsMapping(
+      collecionDetails.schema.value
+    );
+  }
+
+  return esMapping;
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/serializer.test.ts b/packages/kbn-telemetry-tools/src/tools/serializer.test.ts
new file mode 100644
index 00000000000000..9475574a442192
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/serializer.test.ts
@@ -0,0 +1,105 @@
+/*
+ * 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 * as ts from 'typescript';
+import * as path from 'path';
+import { getDescriptor, TelemetryKinds } from './serializer';
+import { traverseNodes } from './ts_parser';
+
+export function loadFixtureProgram(fixtureName: string) {
+  const fixturePath = path.resolve(
+    process.cwd(),
+    'src',
+    'fixtures',
+    'telemetry_collectors',
+    `${fixtureName}.ts`
+  );
+  const tsConfig = ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json');
+  if (!tsConfig) {
+    throw new Error('Could not find a valid tsconfig.json.');
+  }
+  const program = ts.createProgram([fixturePath], tsConfig as any);
+  const checker = program.getTypeChecker();
+  const sourceFile = program.getSourceFile(fixturePath);
+  if (!sourceFile) {
+    throw Error('sourceFile is undefined!');
+  }
+  return { program, checker, sourceFile };
+}
+
+describe('getDescriptor', () => {
+  const usageInterfaces = new Map<string, ts.InterfaceDeclaration>();
+  let tsProgram: ts.Program;
+  beforeAll(() => {
+    const { program, sourceFile } = loadFixtureProgram('constants');
+    tsProgram = program;
+    for (const node of traverseNodes(sourceFile)) {
+      if (ts.isInterfaceDeclaration(node)) {
+        const interfaceName = node.name.getText();
+        usageInterfaces.set(interfaceName, node);
+      }
+    }
+  });
+
+  it('serializes flat types', () => {
+    const usageInterface = usageInterfaces.get('Usage');
+    const descriptor = getDescriptor(usageInterface!, tsProgram);
+    expect(descriptor).toEqual({
+      locale: { kind: ts.SyntaxKind.StringKeyword, type: 'StringKeyword' },
+    });
+  });
+
+  it('serializes union types', () => {
+    const usageInterface = usageInterfaces.get('WithUnion');
+    const descriptor = getDescriptor(usageInterface!, tsProgram);
+
+    expect(descriptor).toEqual({
+      prop1: { kind: ts.SyntaxKind.StringKeyword, type: 'StringKeyword' },
+      prop2: { kind: ts.SyntaxKind.StringKeyword, type: 'StringKeyword' },
+      prop3: { kind: ts.SyntaxKind.StringKeyword, type: 'StringKeyword' },
+      prop4: { kind: ts.SyntaxKind.StringLiteral, type: 'StringLiteral' },
+      prop5: { kind: ts.SyntaxKind.FirstLiteralToken, type: 'FirstLiteralToken' },
+    });
+  });
+
+  it('serializes Moment Dates', () => {
+    const usageInterface = usageInterfaces.get('WithMoment');
+    const descriptor = getDescriptor(usageInterface!, tsProgram);
+    expect(descriptor).toEqual({
+      prop1: { kind: TelemetryKinds.MomentDate, type: 'MomentDate' },
+      prop2: { kind: TelemetryKinds.MomentDate, type: 'MomentDate' },
+      prop3: { kind: TelemetryKinds.MomentDate, type: 'MomentDate' },
+      prop4: { kind: TelemetryKinds.Date, type: 'Date' },
+    });
+  });
+
+  it('throws error on conflicting union types', () => {
+    const usageInterface = usageInterfaces.get('WithConflictingUnion');
+    expect(() => getDescriptor(usageInterface!, tsProgram)).toThrowError(
+      'Mapping does not support conflicting union types.'
+    );
+  });
+
+  it('throws error on unsupported union types', () => {
+    const usageInterface = usageInterfaces.get('WithUnsupportedUnion');
+    expect(() => getDescriptor(usageInterface!, tsProgram)).toThrowError(
+      'Mapping does not support conflicting union types.'
+    );
+  });
+});
diff --git a/packages/kbn-telemetry-tools/src/tools/serializer.ts b/packages/kbn-telemetry-tools/src/tools/serializer.ts
new file mode 100644
index 00000000000000..bce5dd7f58643b
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/serializer.ts
@@ -0,0 +1,169 @@
+/*
+ * 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 * as ts from 'typescript';
+import { uniq } from 'lodash';
+import {
+  getResolvedModuleSourceFile,
+  getIdentifierDeclarationFromSource,
+  getModuleSpecifier,
+} from './utils';
+
+export enum TelemetryKinds {
+  MomentDate = 1000,
+  Date = 10001,
+}
+
+interface DescriptorValue {
+  kind: ts.SyntaxKind | TelemetryKinds;
+  type: keyof typeof ts.SyntaxKind | keyof typeof TelemetryKinds;
+}
+
+export interface Descriptor {
+  [name: string]: Descriptor | DescriptorValue;
+}
+
+export function isObjectDescriptor(value: any) {
+  if (typeof value === 'object') {
+    if (typeof value.type === 'string' && value.type === 'object') {
+      return true;
+    }
+
+    if (typeof value.type === 'undefined') {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+export function kindToDescriptorName(kind: number) {
+  switch (kind) {
+    case ts.SyntaxKind.StringKeyword:
+    case ts.SyntaxKind.StringLiteral:
+    case ts.SyntaxKind.SetKeyword:
+    case TelemetryKinds.Date:
+    case TelemetryKinds.MomentDate:
+      return 'string';
+    case ts.SyntaxKind.BooleanKeyword:
+      return 'boolean';
+    case ts.SyntaxKind.NumberKeyword:
+    case ts.SyntaxKind.NumericLiteral:
+      return 'number';
+    default:
+      throw new Error(`Unknown kind ${kind}`);
+  }
+}
+
+export function getDescriptor(node: ts.Node, program: ts.Program): Descriptor | DescriptorValue {
+  if (ts.isMethodSignature(node) || ts.isPropertySignature(node)) {
+    if (node.type) {
+      return getDescriptor(node.type, program);
+    }
+  }
+  if (ts.isTypeLiteralNode(node) || ts.isInterfaceDeclaration(node)) {
+    return node.members.reduce((acc, m) => {
+      acc[m.name?.getText() || ''] = getDescriptor(m, program);
+      return acc;
+    }, {} as any);
+  }
+
+  if (ts.SyntaxKind.FirstNode === node.kind) {
+    return getDescriptor((node as any).right, program);
+  }
+
+  if (ts.isIdentifier(node)) {
+    const identifierName = node.getText();
+    if (identifierName === 'Date') {
+      return { kind: TelemetryKinds.Date, type: 'Date' };
+    }
+    if (identifierName === 'Moment') {
+      return { kind: TelemetryKinds.MomentDate, type: 'MomentDate' };
+    }
+    throw new Error(`Unsupported Identifier ${identifierName}.`);
+  }
+
+  if (ts.isTypeReferenceNode(node)) {
+    const typeChecker = program.getTypeChecker();
+    const symbol = typeChecker.getSymbolAtLocation(node.typeName);
+    const symbolName = symbol?.getName();
+    if (symbolName === 'Moment') {
+      return { kind: TelemetryKinds.MomentDate, type: 'MomentDate' };
+    }
+    if (symbolName === 'Date') {
+      return { kind: TelemetryKinds.Date, type: 'Date' };
+    }
+    const declaration = (symbol?.getDeclarations() || [])[0];
+    if (declaration) {
+      return getDescriptor(declaration, program);
+    }
+    return getDescriptor(node.typeName, program);
+  }
+
+  if (ts.isImportSpecifier(node)) {
+    const source = node.getSourceFile();
+    const importedModuleName = getModuleSpecifier(node);
+
+    const declarationSource = getResolvedModuleSourceFile(source, program, importedModuleName);
+    const declarationNode = getIdentifierDeclarationFromSource(node.name, declarationSource);
+    return getDescriptor(declarationNode, program);
+  }
+
+  if (ts.isArrayTypeNode(node)) {
+    return getDescriptor(node.elementType, program);
+  }
+
+  if (ts.isLiteralTypeNode(node)) {
+    return {
+      kind: node.literal.kind,
+      type: ts.SyntaxKind[node.literal.kind] as keyof typeof ts.SyntaxKind,
+    };
+  }
+
+  if (ts.isUnionTypeNode(node)) {
+    const types = node.types.filter((typeNode) => {
+      return (
+        typeNode.kind !== ts.SyntaxKind.NullKeyword &&
+        typeNode.kind !== ts.SyntaxKind.UndefinedKeyword
+      );
+    });
+
+    const kinds = types.map((typeNode) => getDescriptor(typeNode, program));
+
+    const uniqueKinds = uniq(kinds, 'kind');
+
+    if (uniqueKinds.length !== 1) {
+      throw Error('Mapping does not support conflicting union types.');
+    }
+
+    return uniqueKinds[0];
+  }
+
+  switch (node.kind) {
+    case ts.SyntaxKind.NumberKeyword:
+    case ts.SyntaxKind.BooleanKeyword:
+    case ts.SyntaxKind.StringKeyword:
+    case ts.SyntaxKind.SetKeyword:
+      return { kind: node.kind, type: ts.SyntaxKind[node.kind] as keyof typeof ts.SyntaxKind };
+    case ts.SyntaxKind.UnionType:
+    case ts.SyntaxKind.AnyKeyword:
+    default:
+      throw new Error(`Unknown type ${ts.SyntaxKind[node.kind]}; ${node.getText()}`);
+  }
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/tasks/check_compatible_types_task.ts b/packages/kbn-telemetry-tools/src/tools/tasks/check_compatible_types_task.ts
new file mode 100644
index 00000000000000..dae4d0f1ad168a
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/tasks/check_compatible_types_task.ts
@@ -0,0 +1,43 @@
+/*
+ * 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 { TaskContext } from './task_context';
+import { checkCompatibleTypeDescriptor } from '../check_collector_integrity';
+
+export function checkCompatibleTypesTask({ reporter, roots }: TaskContext) {
+  return roots.map((root) => ({
+    task: async () => {
+      if (root.parsedCollections) {
+        const differences = checkCompatibleTypeDescriptor(root.parsedCollections);
+        const reporterWithContext = reporter.withContext({ name: root.config.root });
+        if (differences.length) {
+          reporterWithContext.report(
+            `${JSON.stringify(
+              differences,
+              null,
+              2
+            )}. \nPlease fix the collectors and run the check again.`
+          );
+          throw reporter;
+        }
+      }
+    },
+    title: `Checking in ${root.config.root}`,
+  }));
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/tasks/check_matching_schemas_task.ts b/packages/kbn-telemetry-tools/src/tools/tasks/check_matching_schemas_task.ts
new file mode 100644
index 00000000000000..a1f23bcd44c765
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/tasks/check_matching_schemas_task.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 * as path from 'path';
+import { TaskContext } from './task_context';
+import { checkMatchingMapping } from '../check_collector_integrity';
+import { readFileAsync } from '../utils';
+
+export function checkMatchingSchemasTask({ roots }: TaskContext) {
+  return roots.map((root) => ({
+    task: async () => {
+      const fullPath = path.resolve(process.cwd(), root.config.output);
+      const esMappingString = await readFileAsync(fullPath, 'utf-8');
+      const esMapping = JSON.parse(esMappingString);
+
+      if (root.parsedCollections) {
+        const differences = checkMatchingMapping(root.parsedCollections, esMapping);
+
+        root.esMappingDiffs = Object.keys(differences);
+      }
+    },
+    title: `Checking in ${root.config.root}`,
+  }));
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/tasks/error_reporter.ts b/packages/kbn-telemetry-tools/src/tools/tasks/error_reporter.ts
new file mode 100644
index 00000000000000..246d659667281e
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/tasks/error_reporter.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 chalk from 'chalk';
+import { normalizePath } from '../utils';
+
+export class ErrorReporter {
+  errors: string[] = [];
+
+  withContext(context: any) {
+    return { report: (error: any) => this.report(error, context) };
+  }
+  report(error: any, context: any) {
+    this.errors.push(
+      `${chalk.white.bgRed(' TELEMETRY ERROR ')} Error in ${normalizePath(context.name)}\n${error}`
+    );
+  }
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/tasks/extract_collectors_task.ts b/packages/kbn-telemetry-tools/src/tools/tasks/extract_collectors_task.ts
new file mode 100644
index 00000000000000..834ec71e220320
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/tasks/extract_collectors_task.ts
@@ -0,0 +1,58 @@
+/*
+ * 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 * as ts from 'typescript';
+import * as path from 'path';
+import { TaskContext } from './task_context';
+import { extractCollectors, getProgramPaths } from '../extract_collectors';
+
+export function extractCollectorsTask(
+  { roots }: TaskContext,
+  restrictProgramToPath?: string | string[]
+) {
+  return roots.map((root) => ({
+    task: async () => {
+      const tsConfig = ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json');
+      if (!tsConfig) {
+        throw new Error('Could not find a valid tsconfig.json.');
+      }
+      const programPaths = await getProgramPaths(root.config);
+
+      if (typeof restrictProgramToPath !== 'undefined') {
+        const restrictProgramToPaths = Array.isArray(restrictProgramToPath)
+          ? restrictProgramToPath
+          : [restrictProgramToPath];
+
+        const fullRestrictedPaths = restrictProgramToPaths.map((collectorPath) =>
+          path.resolve(process.cwd(), collectorPath)
+        );
+        const restrictedProgramPaths = programPaths.filter((programPath) =>
+          fullRestrictedPaths.includes(programPath)
+        );
+        if (restrictedProgramPaths.length) {
+          root.parsedCollections = [...extractCollectors(restrictedProgramPaths, tsConfig)];
+        }
+        return;
+      }
+
+      root.parsedCollections = [...extractCollectors(programPaths, tsConfig)];
+    },
+    title: `Extracting collectors in ${root.config.root}`,
+  }));
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/tasks/generate_schemas_task.ts b/packages/kbn-telemetry-tools/src/tools/tasks/generate_schemas_task.ts
new file mode 100644
index 00000000000000..f6d15c7127d4eb
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/tasks/generate_schemas_task.ts
@@ -0,0 +1,35 @@
+/*
+ * 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 * as _ from 'lodash';
+import { TaskContext } from './task_context';
+import { generateMapping } from '../manage_schema';
+
+export function generateSchemasTask({ roots }: TaskContext) {
+  return roots.map((root) => ({
+    task: () => {
+      if (!root.parsedCollections || !root.parsedCollections.length) {
+        return;
+      }
+      const mapping = generateMapping(root.parsedCollections);
+      root.mapping = mapping;
+    },
+    title: `Generating mapping for ${root.config.root}`,
+  }));
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/tasks/index.ts b/packages/kbn-telemetry-tools/src/tools/tasks/index.ts
new file mode 100644
index 00000000000000..cbe74aeb483e41
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/tasks/index.ts
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+export { ErrorReporter } from './error_reporter';
+export { TaskContext, createTaskContext } from './task_context';
+
+export { parseConfigsTask } from './parse_configs_task';
+export { extractCollectorsTask } from './extract_collectors_task';
+export { generateSchemasTask } from './generate_schemas_task';
+export { writeToFileTask } from './write_to_file_task';
+export { checkMatchingSchemasTask } from './check_matching_schemas_task';
+export { checkCompatibleTypesTask } from './check_compatible_types_task';
diff --git a/packages/kbn-telemetry-tools/src/tools/tasks/parse_configs_task.ts b/packages/kbn-telemetry-tools/src/tools/tasks/parse_configs_task.ts
new file mode 100644
index 00000000000000..00b319006e2ee3
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/tasks/parse_configs_task.ts
@@ -0,0 +1,46 @@
+/*
+ * 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 * as path from 'path';
+import { parseTelemetryRC } from '../config';
+import { TaskContext } from './task_context';
+
+export function parseConfigsTask() {
+  const kibanaRoot = process.cwd();
+  const xpackRoot = path.join(kibanaRoot, 'x-pack');
+
+  const configRoots = [kibanaRoot, xpackRoot];
+
+  return configRoots.map((configRoot) => ({
+    task: async (context: TaskContext) => {
+      try {
+        const configs = await parseTelemetryRC(configRoot);
+        configs.forEach((config) => {
+          context.roots.push({ config });
+        });
+      } catch (err) {
+        const { reporter } = context;
+        const reporterWithContext = reporter.withContext({ name: configRoot });
+        reporterWithContext.report(err);
+        throw reporter;
+      }
+    },
+    title: `Parsing configs in ${configRoot}`,
+  }));
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/tasks/task_context.ts b/packages/kbn-telemetry-tools/src/tools/tasks/task_context.ts
new file mode 100644
index 00000000000000..78d0b7fbd6c2d7
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/tasks/task_context.ts
@@ -0,0 +1,41 @@
+/*
+ * 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 { TelemetryRC } from '../config';
+import { ErrorReporter } from './error_reporter';
+import { ParsedUsageCollection } from '../ts_parser';
+export interface TelemetryRoot {
+  config: TelemetryRC;
+  parsedCollections?: ParsedUsageCollection[];
+  mapping?: any;
+  esMappingDiffs?: string[];
+}
+
+export interface TaskContext {
+  reporter: ErrorReporter;
+  roots: TelemetryRoot[];
+}
+
+export function createTaskContext(): TaskContext {
+  const reporter = new ErrorReporter();
+  return {
+    roots: [],
+    reporter,
+  };
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/tasks/write_to_file_task.ts b/packages/kbn-telemetry-tools/src/tools/tasks/write_to_file_task.ts
new file mode 100644
index 00000000000000..fcfc09db65426f
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/tasks/write_to_file_task.ts
@@ -0,0 +1,35 @@
+/*
+ * 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 * as path from 'path';
+import { writeFileAsync } from '../utils';
+import { TaskContext } from './task_context';
+
+export function writeToFileTask({ roots }: TaskContext) {
+  return roots.map((root) => ({
+    task: async () => {
+      const fullPath = path.resolve(process.cwd(), root.config.output);
+      if (root.mapping && Object.keys(root.mapping.properties).length > 0) {
+        const serializedMapping = JSON.stringify(root.mapping, null, 2).concat('\n');
+        await writeFileAsync(fullPath, serializedMapping);
+      }
+    },
+    title: `Writing mapping for ${root.config.root}`,
+  }));
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts b/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts
new file mode 100644
index 00000000000000..b7ca33a7bcd743
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts
@@ -0,0 +1,94 @@
+/*
+ * 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 { parseUsageCollection } from './ts_parser';
+import * as ts from 'typescript';
+import * as path from 'path';
+import { parsedWorkingCollector } from './__fixture__/parsed_working_collector';
+import { parsedNestedCollector } from './__fixture__/parsed_nested_collector';
+import { parsedExternallyDefinedCollector } from './__fixture__/parsed_externally_defined_collector';
+import { parsedImportedUsageInterface } from './__fixture__/parsed_imported_usage_interface';
+import { parsedImportedSchemaCollector } from './__fixture__/parsed_imported_schema';
+
+export function loadFixtureProgram(fixtureName: string) {
+  const fixturePath = path.resolve(
+    process.cwd(),
+    'src',
+    'fixtures',
+    'telemetry_collectors',
+    `${fixtureName}.ts`
+  );
+  const tsConfig = ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json');
+  if (!tsConfig) {
+    throw new Error('Could not find a valid tsconfig.json.');
+  }
+  const program = ts.createProgram([fixturePath], tsConfig as any);
+  const checker = program.getTypeChecker();
+  const sourceFile = program.getSourceFile(fixturePath);
+  if (!sourceFile) {
+    throw Error('sourceFile is undefined!');
+  }
+  return { program, checker, sourceFile };
+}
+
+describe('parseUsageCollection', () => {
+  it.todo('throws when a function is returned from fetch');
+  it.todo('throws when an object is not returned from fetch');
+
+  it('throws when mapping fields is not defined', () => {
+    const { program, sourceFile } = loadFixtureProgram('unmapped_collector');
+    expect(() => [...parseUsageCollection(sourceFile, program)]).toThrowErrorMatchingSnapshot();
+  });
+
+  it('parses root level defined collector', () => {
+    const { program, sourceFile } = loadFixtureProgram('working_collector');
+    const result = [...parseUsageCollection(sourceFile, program)];
+    expect(result).toEqual([parsedWorkingCollector]);
+  });
+
+  it('parses nested collectors', () => {
+    const { program, sourceFile } = loadFixtureProgram('nested_collector');
+    const result = [...parseUsageCollection(sourceFile, program)];
+    expect(result).toEqual([parsedNestedCollector]);
+  });
+
+  it('parses imported schema property', () => {
+    const { program, sourceFile } = loadFixtureProgram('imported_schema');
+    const result = [...parseUsageCollection(sourceFile, program)];
+    expect(result).toEqual(parsedImportedSchemaCollector);
+  });
+
+  it('parses externally defined collectors', () => {
+    const { program, sourceFile } = loadFixtureProgram('externally_defined_collector');
+    const result = [...parseUsageCollection(sourceFile, program)];
+    expect(result).toEqual(parsedExternallyDefinedCollector);
+  });
+
+  it('parses imported Usage interface', () => {
+    const { program, sourceFile } = loadFixtureProgram('imported_usage_interface');
+    const result = [...parseUsageCollection(sourceFile, program)];
+    expect(result).toEqual(parsedImportedUsageInterface);
+  });
+
+  it('skips files that do not define a collector', () => {
+    const { program, sourceFile } = loadFixtureProgram('file_with_no_collector');
+    const result = [...parseUsageCollection(sourceFile, program)];
+    expect(result).toEqual([]);
+  });
+});
diff --git a/packages/kbn-telemetry-tools/src/tools/ts_parser.ts b/packages/kbn-telemetry-tools/src/tools/ts_parser.ts
new file mode 100644
index 00000000000000..6af8450f5a2e8c
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/ts_parser.ts
@@ -0,0 +1,210 @@
+/*
+ * 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 * as ts from 'typescript';
+import { createFailError } from '@kbn/dev-utils';
+import * as path from 'path';
+import { getProperty, getPropertyValue } from './utils';
+import { getDescriptor, Descriptor } from './serializer';
+
+export function* traverseNodes(maybeNodes: ts.Node | ts.Node[]): Generator<ts.Node> {
+  const nodes: ts.Node[] = Array.isArray(maybeNodes) ? maybeNodes : [maybeNodes];
+
+  for (const node of nodes) {
+    const children: ts.Node[] = [];
+    yield node;
+    ts.forEachChild(node, (child) => {
+      children.push(child);
+    });
+    for (const child of children) {
+      yield* traverseNodes(child);
+    }
+  }
+}
+
+export function isMakeUsageCollectorFunction(
+  node: ts.Node,
+  sourceFile: ts.SourceFile
+): node is ts.CallExpression {
+  if (ts.isCallExpression(node)) {
+    const isMakeUsageCollector = /makeUsageCollector$/.test(node.expression.getText(sourceFile));
+    if (isMakeUsageCollector) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+export interface CollectorDetails {
+  collectorName: string;
+  fetch: { typeName: string; typeDescriptor: Descriptor };
+  schema: { value: any };
+}
+
+function getCollectionConfigNode(
+  collectorNode: ts.CallExpression,
+  sourceFile: ts.SourceFile
+): ts.Expression {
+  if (collectorNode.arguments.length > 1) {
+    throw Error(`makeUsageCollector does not accept more than one argument.`);
+  }
+  const collectorConfig = collectorNode.arguments[0];
+
+  if (ts.isObjectLiteralExpression(collectorConfig)) {
+    return collectorConfig;
+  }
+
+  const variableDefintionName = collectorConfig.getText();
+  for (const node of traverseNodes(sourceFile)) {
+    if (ts.isVariableDeclaration(node)) {
+      const declarationName = node.name.getText();
+      if (declarationName === variableDefintionName) {
+        if (!node.initializer) {
+          throw Error(`Unable to parse collector configs.`);
+        }
+        if (ts.isObjectLiteralExpression(node.initializer)) {
+          return node.initializer;
+        }
+        if (ts.isCallExpression(node.initializer)) {
+          const functionName = node.initializer.expression.getText(sourceFile);
+          for (const sfNode of traverseNodes(sourceFile)) {
+            if (ts.isFunctionDeclaration(sfNode)) {
+              const fnDeclarationName = sfNode.name?.getText();
+              if (fnDeclarationName === functionName) {
+                const returnStatements: ts.ReturnStatement[] = [];
+                for (const fnNode of traverseNodes(sfNode)) {
+                  if (ts.isReturnStatement(fnNode) && fnNode.parent === sfNode.body) {
+                    returnStatements.push(fnNode);
+                  }
+                }
+
+                if (returnStatements.length > 1) {
+                  throw Error(`Collector function cannot have multiple return statements.`);
+                }
+                if (returnStatements.length === 0) {
+                  throw Error(`Collector function must have a return statement.`);
+                }
+                if (!returnStatements[0].expression) {
+                  throw Error(`Collector function return statement must be an expression.`);
+                }
+
+                return returnStatements[0].expression;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  throw Error(`makeUsageCollector argument must be an object.`);
+}
+
+function extractCollectorDetails(
+  collectorNode: ts.CallExpression,
+  program: ts.Program,
+  sourceFile: ts.SourceFile
+): CollectorDetails {
+  if (collectorNode.arguments.length > 1) {
+    throw Error(`makeUsageCollector does not accept more than one argument.`);
+  }
+
+  const collectorConfig = getCollectionConfigNode(collectorNode, sourceFile);
+
+  const typeProperty = getProperty(collectorConfig, 'type');
+  if (!typeProperty) {
+    throw Error(`usageCollector.type must be defined.`);
+  }
+  const typePropertyValue = getPropertyValue(typeProperty, program);
+  if (!typePropertyValue || typeof typePropertyValue !== 'string') {
+    throw Error(`usageCollector.type must be be a non-empty string literal.`);
+  }
+
+  const fetchProperty = getProperty(collectorConfig, 'fetch');
+  if (!fetchProperty) {
+    throw Error(`usageCollector.fetch must be defined.`);
+  }
+  const schemaProperty = getProperty(collectorConfig, 'schema');
+  if (!schemaProperty) {
+    throw Error(`usageCollector.schema must be defined.`);
+  }
+
+  const schemaPropertyValue = getPropertyValue(schemaProperty, program, { chaseImport: true });
+  if (!schemaPropertyValue || typeof schemaPropertyValue !== 'object') {
+    throw Error(`usageCollector.schema must be be an object.`);
+  }
+
+  const collectorNodeType = collectorNode.typeArguments;
+  if (!collectorNodeType || collectorNodeType?.length === 0) {
+    throw Error(`makeUsageCollector requires a Usage type makeUsageCollector<Usage>({ ... }).`);
+  }
+
+  const usageTypeNode = collectorNodeType[0];
+  const usageTypeName = usageTypeNode.getText();
+  const usageType = getDescriptor(usageTypeNode, program) as Descriptor;
+
+  return {
+    collectorName: typePropertyValue,
+    schema: {
+      value: schemaPropertyValue,
+    },
+    fetch: {
+      typeName: usageTypeName,
+      typeDescriptor: usageType,
+    },
+  };
+}
+
+export function sourceHasUsageCollector(sourceFile: ts.SourceFile) {
+  if (sourceFile.isDeclarationFile === true || (sourceFile as any).identifierCount === 0) {
+    return false;
+  }
+
+  const identifiers = (sourceFile as any).identifiers;
+  if (
+    (!identifiers.get('makeUsageCollector') && !identifiers.get('type')) ||
+    !identifiers.get('fetch')
+  ) {
+    return false;
+  }
+
+  return true;
+}
+
+export type ParsedUsageCollection = [string, CollectorDetails];
+
+export function* parseUsageCollection(
+  sourceFile: ts.SourceFile,
+  program: ts.Program
+): Generator<ParsedUsageCollection> {
+  const relativePath = path.relative(process.cwd(), sourceFile.fileName);
+  if (sourceHasUsageCollector(sourceFile)) {
+    for (const node of traverseNodes(sourceFile)) {
+      if (isMakeUsageCollectorFunction(node, sourceFile)) {
+        try {
+          const collectorDetails = extractCollectorDetails(node, program, sourceFile);
+          yield [relativePath, collectorDetails];
+        } catch (err) {
+          throw createFailError(`Error extracting collector in ${relativePath}\n${err}`);
+        }
+      }
+    }
+  }
+}
diff --git a/packages/kbn-telemetry-tools/src/tools/utils.ts b/packages/kbn-telemetry-tools/src/tools/utils.ts
new file mode 100644
index 00000000000000..f5cf74ae35e456
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/utils.ts
@@ -0,0 +1,238 @@
+/*
+ * 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 * as ts from 'typescript';
+import * as _ from 'lodash';
+import * as path from 'path';
+import glob from 'glob';
+import { readFile, writeFile } from 'fs';
+import { promisify } from 'util';
+import normalize from 'normalize-path';
+import { Optional } from '@kbn/utility-types';
+
+export const readFileAsync = promisify(readFile);
+export const writeFileAsync = promisify(writeFile);
+export const globAsync = promisify(glob);
+
+export function isPropertyWithKey(property: ts.Node, identifierName: string) {
+  if (ts.isPropertyAssignment(property) || ts.isMethodDeclaration(property)) {
+    if (ts.isIdentifier(property.name)) {
+      return property.name.text === identifierName;
+    }
+  }
+
+  return false;
+}
+
+export function getProperty(objectNode: any, propertyName: string): ts.Node | null {
+  let foundProperty = null;
+  ts.visitNodes(objectNode?.properties || [], (node) => {
+    if (isPropertyWithKey(node, propertyName)) {
+      foundProperty = node;
+      return node;
+    }
+  });
+
+  return foundProperty;
+}
+
+export function getModuleSpecifier(node: ts.Node): string {
+  if ((node as any).moduleSpecifier) {
+    return (node as any).moduleSpecifier.text;
+  }
+  return getModuleSpecifier(node.parent);
+}
+
+export function getIdentifierDeclarationFromSource(node: ts.Node, source: ts.SourceFile) {
+  if (!ts.isIdentifier(node)) {
+    throw new Error(`node is not an identifier ${node.getText()}`);
+  }
+
+  const identifierName = node.getText();
+  const identifierDefinition: ts.Node = (source as any).locals.get(identifierName);
+  if (!identifierDefinition) {
+    throw new Error(`Unable to fine identifier in source ${identifierName}`);
+  }
+  const declarations = (identifierDefinition as any).declarations as ts.Node[];
+
+  const latestDeclaration: ts.Node | false | undefined =
+    Array.isArray(declarations) && declarations[declarations.length - 1];
+  if (!latestDeclaration) {
+    throw new Error(`Unable to fine declaration for identifier ${identifierName}`);
+  }
+
+  return latestDeclaration;
+}
+
+export function getIdentifierDeclaration(node: ts.Node) {
+  const source = node.getSourceFile();
+  if (!source) {
+    throw new Error('Unable to get source from node; check program configs.');
+  }
+
+  return getIdentifierDeclarationFromSource(node, source);
+}
+
+export function getVariableValue(node: ts.Node): string | Record<string, any> {
+  if (ts.isStringLiteral(node) || ts.isNumericLiteral(node)) {
+    return node.text;
+  }
+
+  if (ts.isObjectLiteralExpression(node)) {
+    return serializeObject(node);
+  }
+
+  throw Error(`Unsuppored Node: cannot get value of node (${node.getText()}) of kind ${node.kind}`);
+}
+
+export function serializeObject(node: ts.Node) {
+  if (!ts.isObjectLiteralExpression(node)) {
+    throw new Error(`Expecting Object literal Expression got ${node.getText()}`);
+  }
+
+  const value: Record<string, any> = {};
+  for (const property of node.properties) {
+    const propertyName = property.name?.getText();
+    if (typeof propertyName === 'undefined') {
+      throw new Error(`Unable to get property name ${property.getText()}`);
+    }
+    if (ts.isPropertyAssignment(property)) {
+      value[propertyName] = getVariableValue(property.initializer);
+    } else {
+      value[propertyName] = getVariableValue(property);
+    }
+  }
+
+  return value;
+}
+
+export function getResolvedModuleSourceFile(
+  originalSource: ts.SourceFile,
+  program: ts.Program,
+  importedModuleName: string
+) {
+  const resolvedModule = (originalSource as any).resolvedModules.get(importedModuleName);
+  const resolvedModuleSourceFile = program.getSourceFile(resolvedModule.resolvedFileName);
+  if (!resolvedModuleSourceFile) {
+    throw new Error(`Unable to find resolved module ${importedModuleName}`);
+  }
+  return resolvedModuleSourceFile;
+}
+
+export function getPropertyValue(
+  node: ts.Node,
+  program: ts.Program,
+  config: Optional<{ chaseImport: boolean }> = {}
+) {
+  const { chaseImport = false } = config;
+
+  if (ts.isPropertyAssignment(node)) {
+    const { initializer } = node;
+
+    if (ts.isIdentifier(initializer)) {
+      const identifierName = initializer.getText();
+      const declaration = getIdentifierDeclaration(initializer);
+      if (ts.isImportSpecifier(declaration)) {
+        if (!chaseImport) {
+          throw new Error(
+            `Value of node ${identifierName} is imported from another file. Chasing imports is not allowed.`
+          );
+        }
+
+        const importedModuleName = getModuleSpecifier(declaration);
+
+        const source = node.getSourceFile();
+        const declarationSource = getResolvedModuleSourceFile(source, program, importedModuleName);
+        const declarationNode = getIdentifierDeclarationFromSource(initializer, declarationSource);
+        if (!ts.isVariableDeclaration(declarationNode)) {
+          throw new Error(`Expected ${identifierName} to be variable declaration.`);
+        }
+        if (!declarationNode.initializer) {
+          throw new Error(`Expected ${identifierName} to be initialized.`);
+        }
+        const serializedObject = serializeObject(declarationNode.initializer);
+        return serializedObject;
+      }
+
+      return getVariableValue(declaration);
+    }
+
+    return getVariableValue(initializer);
+  }
+}
+
+export function pickDeep(collection: any, identity: any, thisArg?: any) {
+  const picked: any = _.pick(collection, identity, thisArg);
+  const collections = _.pick(collection, _.isObject, thisArg);
+
+  _.each(collections, function (item, key) {
+    let object;
+    if (_.isArray(item)) {
+      object = _.reduce(
+        item,
+        function (result, value) {
+          const pickedDeep = pickDeep(value, identity, thisArg);
+          if (!_.isEmpty(pickedDeep)) {
+            result.push(pickedDeep);
+          }
+          return result;
+        },
+        [] as any[]
+      );
+    } else {
+      object = pickDeep(item, identity, thisArg);
+    }
+
+    if (!_.isEmpty(object)) {
+      picked[key || ''] = object;
+    }
+  });
+
+  return picked;
+}
+
+export const flattenKeys = (obj: any, keyPath: any[] = []): any => {
+  if (_.isObject(obj)) {
+    return _.reduce(
+      obj,
+      (cum, next, key) => {
+        const keys = [...keyPath, key];
+        return _.merge(cum, flattenKeys(next, keys));
+      },
+      {}
+    );
+  }
+  return { [keyPath.join('.')]: obj };
+};
+
+export function difference(actual: any, expected: any) {
+  function changes(obj: any, base: any) {
+    return _.transform(obj, function (result, value, key) {
+      if (key && !_.isEqual(value, base[key])) {
+        result[key] =
+          _.isObject(value) && _.isObject(base[key]) ? changes(value, base[key]) : value;
+      }
+    });
+  }
+  return changes(actual, expected);
+}
+
+export function normalizePath(inputPath: string) {
+  return normalize(path.relative('.', inputPath));
+}
diff --git a/packages/kbn-telemetry-tools/tsconfig.json b/packages/kbn-telemetry-tools/tsconfig.json
new file mode 100644
index 00000000000000..13ce8ef2bad60b
--- /dev/null
+++ b/packages/kbn-telemetry-tools/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "src/**/*",
+  ]
+}
diff --git a/packages/kbn-ui-shared-deps/entry.js b/packages/kbn-ui-shared-deps/entry.js
index 88e84fc87ae533..aaa46ab74714f1 100644
--- a/packages/kbn-ui-shared-deps/entry.js
+++ b/packages/kbn-ui-shared-deps/entry.js
@@ -38,6 +38,7 @@ export const ReactDomServer = require('react-dom/server');
 export const ReactIntl = require('react-intl');
 export const ReactRouter = require('react-router'); // eslint-disable-line
 export const ReactRouterDom = require('react-router-dom');
+export const StyledComponents = require('styled-components');
 
 Moment.tz.load(require('moment-timezone/data/packed/latest.json'));
 
diff --git a/packages/kbn-ui-shared-deps/index.js b/packages/kbn-ui-shared-deps/index.js
index 301d1765558479..596c31820e80d0 100644
--- a/packages/kbn-ui-shared-deps/index.js
+++ b/packages/kbn-ui-shared-deps/index.js
@@ -42,6 +42,7 @@ exports.externals = {
   'react-intl': '__kbnSharedDeps__.ReactIntl',
   'react-router': '__kbnSharedDeps__.ReactRouter',
   'react-router-dom': '__kbnSharedDeps__.ReactRouterDom',
+  'styled-components': '__kbnSharedDeps__.StyledComponents',
   '@kbn/monaco': '__kbnSharedDeps__.KbnMonaco',
   // this is how plugins/consumers from npm load monaco
   'monaco-editor/esm/vs/editor/editor.api': '__kbnSharedDeps__.MonacoBarePluginApi',
diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json
index 1cc04afad56696..0e3bb235c3d9f5 100644
--- a/packages/kbn-ui-shared-deps/package.json
+++ b/packages/kbn-ui-shared-deps/package.json
@@ -26,20 +26,22 @@
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-intl": "^2.8.0",
-    "react-router": "^5.1.2",
-    "react-router-dom": "^5.1.2",
+    "react-is": "^16.8.0",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
     "regenerator-runtime": "^0.13.3",
     "rxjs": "^6.5.5",
+    "styled-components": "^5.1.0",
     "symbol-observable": "^1.2.0",
     "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
-    "loader-utils": "^1.2.3",
-    "val-loader": "^1.1.1",
     "css-loader": "^3.4.2",
     "del": "^5.1.0",
+    "loader-utils": "^1.2.3",
+    "val-loader": "^1.1.1",
     "webpack": "^4.41.5"
   }
 }
diff --git a/scripts/telemetry_check.js b/scripts/telemetry_check.js
new file mode 100644
index 00000000000000..06b3ed46bdba6a
--- /dev/null
+++ b/scripts/telemetry_check.js
@@ -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.
+ */
+
+require('../src/setup_node_env/prebuilt_dev_only_entry');
+require('@kbn/telemetry-tools').runTelemetryCheck();
diff --git a/scripts/telemetry_extract.js b/scripts/telemetry_extract.js
new file mode 100644
index 00000000000000..051bee26537b9b
--- /dev/null
+++ b/scripts/telemetry_extract.js
@@ -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.
+ */
+
+require('../src/setup_node_env/prebuilt_dev_only_entry');
+require('@kbn/telemetry-tools').runTelemetryExtract();
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
index 6926b6acf24115..cd2dd99c30c116 100644
--- a/src/core/public/application/types.ts
+++ b/src/core/public/application/types.ts
@@ -269,6 +269,10 @@ export interface LegacyApp extends AppBase {
  */
 export type PublicAppInfo = Omit<App, 'mount' | 'updater$'> & {
   legacy: false;
+  // remove optional on fields populated with default values
+  status: AppStatus;
+  navLinkStatus: AppNavLinkStatus;
+  appRoute: string;
 };
 
 /**
@@ -278,6 +282,9 @@ export type PublicAppInfo = Omit<App, 'mount' | 'updater$'> & {
  */
 export type PublicLegacyAppInfo = Omit<LegacyApp, 'updater$'> & {
   legacy: true;
+  // remove optional on fields populated with default values
+  status: AppStatus;
+  navLinkStatus: AppNavLinkStatus;
 };
 
 /**
diff --git a/src/core/public/application/utils.ts b/src/core/public/application/utils.ts
index 1dc9ec70590017..92d25fa468c4a5 100644
--- a/src/core/public/application/utils.ts
+++ b/src/core/public/application/utils.ts
@@ -120,12 +120,17 @@ export function getAppInfo(app: App<unknown> | LegacyApp): PublicAppInfo | Publi
     const { updater$, ...infos } = app;
     return {
       ...infos,
+      status: app.status!,
+      navLinkStatus: app.navLinkStatus!,
       legacy: true,
     };
   } else {
     const { updater$, mount, ...infos } = app;
     return {
       ...infos,
+      status: app.status!,
+      navLinkStatus: app.navLinkStatus!,
+      appRoute: app.appRoute!,
       legacy: false,
     };
   }
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index d10e351f4d13ed..a65b9dd9d242a7 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -1143,11 +1143,16 @@ export type PluginOpaqueId = symbol;
 // @public
 export type PublicAppInfo = Omit<App, 'mount' | 'updater$'> & {
     legacy: false;
+    status: AppStatus;
+    navLinkStatus: AppNavLinkStatus;
+    appRoute: string;
 };
 
 // @public
 export type PublicLegacyAppInfo = Omit<LegacyApp, 'updater$'> & {
     legacy: true;
+    status: AppStatus;
+    navLinkStatus: AppNavLinkStatus;
 };
 
 // @public
diff --git a/src/core/server/elasticsearch/__snapshots__/elasticsearch_config.test.ts.snap b/src/core/server/elasticsearch/__snapshots__/elasticsearch_config.test.ts.snap
deleted file mode 100644
index 75627f311d9a58..00000000000000
--- a/src/core/server/elasticsearch/__snapshots__/elasticsearch_config.test.ts.snap
+++ /dev/null
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`#username throws if equal to "elastic", only while running from source 1`] = `"[username]: value of \\"elastic\\" is forbidden. This is a superuser account that can obfuscate privilege-related issues. You should use the \\"kibana_system\\" user instead."`;
diff --git a/src/core/server/elasticsearch/elasticsearch_config.test.ts b/src/core/server/elasticsearch/elasticsearch_config.test.ts
index ccd5fd0c7a5718..648eaaf8a97f27 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.test.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.test.ts
@@ -367,6 +367,8 @@ test('#username throws if equal to "elastic", only while running from source', (
   const obj = {
     username: 'elastic',
   };
-  expect(() => config.schema.validate(obj, { dist: false })).toThrowErrorMatchingSnapshot();
+  expect(() => config.schema.validate(obj, { dist: false })).toThrowErrorMatchingInlineSnapshot(
+    `"[username]: value of \\"elastic\\" is forbidden. This is a superuser account that can obfuscate privilege-related issues. You should use the \\"kibana_system\\" user instead."`
+  );
   expect(() => config.schema.validate(obj, { dist: true })).not.toThrow();
 });
diff --git a/src/core/server/elasticsearch/elasticsearch_service.mock.ts b/src/core/server/elasticsearch/elasticsearch_service.mock.ts
index 55e60f5987604e..fdfc48fa9f754b 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.mock.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.mock.ts
@@ -19,26 +19,29 @@
 
 import { BehaviorSubject } from 'rxjs';
 import { Client } from 'elasticsearch';
-import { IClusterClient, ICustomClusterClient } from './cluster_client';
-import { IScopedClusterClient } from './scoped_cluster_client';
+import {
+  ILegacyClusterClient,
+  ILegacyCustomClusterClient,
+  ILegacyScopedClusterClient,
+} from './legacy';
 import { ElasticsearchConfig } from './elasticsearch_config';
 import { ElasticsearchService } from './elasticsearch_service';
 import { InternalElasticsearchServiceSetup, ElasticsearchStatusMeta } from './types';
 import { NodesVersionCompatibility } from './version_check/ensure_es_version';
 import { ServiceStatus, ServiceStatusLevels } from '../status';
 
-const createScopedClusterClientMock = (): jest.Mocked<IScopedClusterClient> => ({
+const createScopedClusterClientMock = (): jest.Mocked<ILegacyScopedClusterClient> => ({
   callAsInternalUser: jest.fn(),
   callAsCurrentUser: jest.fn(),
 });
 
-const createCustomClusterClientMock = (): jest.Mocked<ICustomClusterClient> => ({
+const createCustomClusterClientMock = (): jest.Mocked<ILegacyCustomClusterClient> => ({
   ...createClusterClientMock(),
   close: jest.fn(),
 });
 
 function createClusterClientMock() {
-  const client: jest.Mocked<IClusterClient> = {
+  const client: jest.Mocked<ILegacyClusterClient> = {
     callAsInternalUser: jest.fn(),
     asScoped: jest.fn(),
   };
@@ -48,8 +51,8 @@ function createClusterClientMock() {
 
 interface MockedElasticSearchServiceSetup {
   legacy: {
-    createClient: jest.Mock<ICustomClusterClient, any>;
-    client: jest.Mocked<IClusterClient>;
+    createClient: jest.Mock<ILegacyCustomClusterClient, any>;
+    client: jest.Mocked<ILegacyClusterClient>;
   };
 }
 
@@ -81,7 +84,7 @@ const createStartContractMock = () => {
 
 type MockedInternalElasticSearchServiceSetup = jest.Mocked<
   InternalElasticsearchServiceSetup & {
-    legacy: { client: jest.Mocked<IClusterClient> };
+    legacy: { client: jest.Mocked<ILegacyClusterClient> };
   }
 >;
 const createInternalSetupContractMock = () => {
diff --git a/src/core/server/elasticsearch/elasticsearch_service.test.mocks.ts b/src/core/server/elasticsearch/elasticsearch_service.test.mocks.ts
index e87913a3c5e4ff..c30230a7847a0e 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.test.mocks.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.test.mocks.ts
@@ -18,4 +18,4 @@
  */
 
 export const MockClusterClient = jest.fn();
-jest.mock('./cluster_client', () => ({ ClusterClient: MockClusterClient }));
+jest.mock('./legacy/cluster_client', () => ({ LegacyClusterClient: MockClusterClient }));
diff --git a/src/core/server/elasticsearch/elasticsearch_service.ts b/src/core/server/elasticsearch/elasticsearch_service.ts
index 26001bf83924fb..f47b33dd410f6c 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.ts
@@ -34,23 +34,26 @@ import { merge } from '../../utils';
 import { CoreContext } from '../core_context';
 import { Logger } from '../logging';
 import {
-  ClusterClient,
-  ScopeableRequest,
-  IClusterClient,
-  ICustomClusterClient,
-} from './cluster_client';
-import { ElasticsearchClientConfig } from './elasticsearch_client_config';
+  LegacyClusterClient,
+  ILegacyClusterClient,
+  ILegacyCustomClusterClient,
+  LegacyElasticsearchClientConfig,
+  LegacyCallAPIOptions,
+} from './legacy';
 import { ElasticsearchConfig, ElasticsearchConfigType } from './elasticsearch_config';
 import { InternalHttpServiceSetup, GetAuthHeaders } from '../http/';
-import { InternalElasticsearchServiceSetup, ElasticsearchServiceStart } from './types';
-import { CallAPIOptions } from './api_types';
+import {
+  InternalElasticsearchServiceSetup,
+  ElasticsearchServiceStart,
+  ScopeableRequest,
+} from './types';
 import { pollEsNodesVersion } from './version_check/ensure_es_version';
 import { calculateStatus$ } from './status';
 
 /** @internal */
 interface CoreClusterClients {
   config: ElasticsearchConfig;
-  client: ClusterClient;
+  client: LegacyClusterClient;
 }
 
 interface SetupDeps {
@@ -67,9 +70,9 @@ export class ElasticsearchService
   private kibanaVersion: string;
   private createClient?: (
     type: string,
-    clientConfig?: Partial<ElasticsearchClientConfig>
-  ) => ICustomClusterClient;
-  private client?: IClusterClient;
+    clientConfig?: Partial<LegacyElasticsearchClientConfig>
+  ) => ILegacyCustomClusterClient;
+  private client?: ILegacyClusterClient;
 
   constructor(private readonly coreContext: CoreContext) {
     this.kibanaVersion = coreContext.env.packageInfo.version;
@@ -123,7 +126,7 @@ export class ElasticsearchService
       async callAsInternalUser(
         endpoint: string,
         clientParams: Record<string, any> = {},
-        options?: CallAPIOptions
+        options?: LegacyCallAPIOptions
       ) {
         const _client = await client$.pipe(take(1)).toPromise();
         return await _client.callAsInternalUser(endpoint, clientParams, options);
@@ -134,7 +137,7 @@ export class ElasticsearchService
           async callAsCurrentUser(
             endpoint: string,
             clientParams: Record<string, any> = {},
-            options?: CallAPIOptions
+            options?: LegacyCallAPIOptions
           ) {
             const _client = await client$.pipe(take(1)).toPromise();
             return await _client
@@ -155,7 +158,10 @@ export class ElasticsearchService
       kibanaVersion: this.kibanaVersion,
     }).pipe(takeUntil(this.stop$), shareReplay({ refCount: true, bufferSize: 1 }));
 
-    this.createClient = (type: string, clientConfig: Partial<ElasticsearchClientConfig> = {}) => {
+    this.createClient = (
+      type: string,
+      clientConfig: Partial<LegacyElasticsearchClientConfig> = {}
+    ) => {
       const finalConfig = merge({}, config, clientConfig);
       return this.createClusterClient(type, finalConfig, deps.http.getAuthHeaders);
     };
@@ -193,10 +199,10 @@ export class ElasticsearchService
 
   private createClusterClient(
     type: string,
-    config: ElasticsearchClientConfig,
+    config: LegacyElasticsearchClientConfig,
     getAuthHeaders?: GetAuthHeaders
   ) {
-    return new ClusterClient(
+    return new LegacyClusterClient(
       config,
       this.coreContext.logger.get('elasticsearch', type),
       getAuthHeaders
diff --git a/src/core/server/elasticsearch/index.ts b/src/core/server/elasticsearch/index.ts
index 2e45f710c4dcfd..f5f5f5cc7b6f88 100644
--- a/src/core/server/elasticsearch/index.ts
+++ b/src/core/server/elasticsearch/index.ts
@@ -18,17 +18,14 @@
  */
 
 export { ElasticsearchService } from './elasticsearch_service';
+export { config, configSchema, ElasticsearchConfig } from './elasticsearch_config';
+export { NodesVersionCompatibility } from './version_check/ensure_es_version';
 export {
-  ClusterClient,
+  ElasticsearchServiceSetup,
+  ElasticsearchServiceStart,
+  ElasticsearchStatusMeta,
+  InternalElasticsearchServiceSetup,
   FakeRequest,
-  IClusterClient,
-  ICustomClusterClient,
   ScopeableRequest,
-} from './cluster_client';
-export { IScopedClusterClient, ScopedClusterClient, Headers } from './scoped_cluster_client';
-export { ElasticsearchClientConfig } from './elasticsearch_client_config';
-export { config, configSchema, ElasticsearchConfig } from './elasticsearch_config';
-export { ElasticsearchError, ElasticsearchErrorHelpers } from './errors';
-export * from './api_types';
-export * from './types';
-export { NodesVersionCompatibility } from './version_check/ensure_es_version';
+} from './types';
+export * from './legacy';
diff --git a/src/core/server/elasticsearch/api_types.ts b/src/core/server/elasticsearch/legacy/api_types.ts
similarity index 54%
rename from src/core/server/elasticsearch/api_types.ts
rename to src/core/server/elasticsearch/legacy/api_types.ts
index 5f2b61eb4935fd..b9699ab290e3fc 100644
--- a/src/core/server/elasticsearch/api_types.ts
+++ b/src/core/server/elasticsearch/legacy/api_types.ts
@@ -151,7 +151,7 @@ import {
  *
  * @public
  */
-export interface CallAPIOptions {
+export interface LegacyCallAPIOptions {
   /**
    * Indicates whether `401 Unauthorized` errors returned from the Elasticsearch API
    * should be wrapped into `Boom` error instances with properly set `WWW-Authenticate`
@@ -166,154 +166,154 @@ export interface CallAPIOptions {
 }
 
 /** @public */
-export interface APICaller {
+export interface LegacyAPICaller {
   /* eslint-disable */
-  (endpoint: 'bulk', params: BulkIndexDocumentsParams, options?: CallAPIOptions): ReturnType<Client['bulk']>;
-  (endpoint: 'clearScroll', params: ClearScrollParams, options?: CallAPIOptions): ReturnType<Client['clearScroll']>;
-  (endpoint: 'count', params: CountParams, options?: CallAPIOptions): ReturnType<Client['count']>;
-  (endpoint: 'create', params: CreateDocumentParams, options?: CallAPIOptions): ReturnType<Client['create']>;
-  (endpoint: 'delete', params: DeleteDocumentParams, options?: CallAPIOptions): ReturnType<Client['delete']>;
-  (endpoint: 'deleteByQuery', params: DeleteDocumentByQueryParams, options?: CallAPIOptions): ReturnType<Client['deleteByQuery']>;
-  (endpoint: 'deleteScript', params: DeleteScriptParams, options?: CallAPIOptions): ReturnType<Client['deleteScript']>;
-  (endpoint: 'deleteTemplate', params: DeleteTemplateParams, options?: CallAPIOptions): ReturnType<Client['deleteTemplate']>;
-  (endpoint: 'exists', params: ExistsParams, options?: CallAPIOptions): ReturnType<Client['exists']>;
-  (endpoint: 'explain', params: ExplainParams, options?: CallAPIOptions): ReturnType<Client['explain']>;
-  (endpoint: 'fieldStats', params: FieldStatsParams, options?: CallAPIOptions): ReturnType<Client['fieldStats']>;
+  (endpoint: 'bulk', params: BulkIndexDocumentsParams, options?: LegacyCallAPIOptions): ReturnType<Client['bulk']>;
+  (endpoint: 'clearScroll', params: ClearScrollParams, options?: LegacyCallAPIOptions): ReturnType<Client['clearScroll']>;
+  (endpoint: 'count', params: CountParams, options?: LegacyCallAPIOptions): ReturnType<Client['count']>;
+  (endpoint: 'create', params: CreateDocumentParams, options?: LegacyCallAPIOptions): ReturnType<Client['create']>;
+  (endpoint: 'delete', params: DeleteDocumentParams, options?: LegacyCallAPIOptions): ReturnType<Client['delete']>;
+  (endpoint: 'deleteByQuery', params: DeleteDocumentByQueryParams, options?: LegacyCallAPIOptions): ReturnType<Client['deleteByQuery']>;
+  (endpoint: 'deleteScript', params: DeleteScriptParams, options?: LegacyCallAPIOptions): ReturnType<Client['deleteScript']>;
+  (endpoint: 'deleteTemplate', params: DeleteTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['deleteTemplate']>;
+  (endpoint: 'exists', params: ExistsParams, options?: LegacyCallAPIOptions): ReturnType<Client['exists']>;
+  (endpoint: 'explain', params: ExplainParams, options?: LegacyCallAPIOptions): ReturnType<Client['explain']>;
+  (endpoint: 'fieldStats', params: FieldStatsParams, options?: LegacyCallAPIOptions): ReturnType<Client['fieldStats']>;
   // Generic types cannot be properly looked up with ReturnType. Hard code these explicitly.
-  <T>(endpoint: 'get', params: GetParams, options?: CallAPIOptions): Promise<GetResponse<T>>;
-  (endpoint: 'getScript', params: GetScriptParams, options?: CallAPIOptions): ReturnType<Client['getScript']>;
-  (endpoint: 'getSource', params: GetSourceParams, options?: CallAPIOptions): ReturnType<Client['getSource']>;
-  (endpoint: 'getTemplate', params: GetTemplateParams, options?: CallAPIOptions): ReturnType<Client['getTemplate']>;
+  <T>(endpoint: 'get', params: GetParams, options?: LegacyCallAPIOptions): Promise<GetResponse<T>>;
+  (endpoint: 'getScript', params: GetScriptParams, options?: LegacyCallAPIOptions): ReturnType<Client['getScript']>;
+  (endpoint: 'getSource', params: GetSourceParams, options?: LegacyCallAPIOptions): ReturnType<Client['getSource']>;
+  (endpoint: 'getTemplate', params: GetTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['getTemplate']>;
   // Generic types cannot be properly looked up with ReturnType. Hard code these explicitly.
-  <T>(endpoint: 'index', params: IndexDocumentParams<T>, options?: CallAPIOptions): ReturnType<Client['index']>;
-  (endpoint: 'info', params: InfoParams, options?: CallAPIOptions): ReturnType<Client['info']>;
+  <T>(endpoint: 'index', params: IndexDocumentParams<T>, options?: LegacyCallAPIOptions): ReturnType<Client['index']>;
+  (endpoint: 'info', params: InfoParams, options?: LegacyCallAPIOptions): ReturnType<Client['info']>;
   // Generic types cannot be properly looked up with ReturnType. Hard code these explicitly.
-  <T>(endpoint: 'mget', params: MGetParams, options?: CallAPIOptions): Promise<MGetResponse<T>>;
-  <T>(endpoint: 'msearch', params: MSearchParams, options?: CallAPIOptions): Promise<MSearchResponse<T>>;
-  <T>(endpoint: 'msearchTemplate', params: MSearchTemplateParams, options?: CallAPIOptions): Promise<MSearchResponse<T>>;
-  (endpoint: 'mtermvectors', params: MTermVectorsParams, options?: CallAPIOptions): ReturnType<Client['mtermvectors']>;
-  (endpoint: 'ping', params: PingParams, options?: CallAPIOptions): ReturnType<Client['ping']>;
-  (endpoint: 'putScript', params: PutScriptParams, options?: CallAPIOptions): ReturnType<Client['putScript']>;
-  (endpoint: 'putTemplate', params: PutTemplateParams, options?: CallAPIOptions): ReturnType<Client['putTemplate']>;
-  (endpoint: 'reindex', params: ReindexParams, options?: CallAPIOptions): ReturnType<Client['reindex']>;
-  (endpoint: 'reindexRethrottle', params: ReindexRethrottleParams, options?: CallAPIOptions): ReturnType<Client['reindexRethrottle']>;
-  (endpoint: 'renderSearchTemplate', params: RenderSearchTemplateParams, options?: CallAPIOptions): ReturnType<Client['renderSearchTemplate']>;
+  <T>(endpoint: 'mget', params: MGetParams, options?: LegacyCallAPIOptions): Promise<MGetResponse<T>>;
+  <T>(endpoint: 'msearch', params: MSearchParams, options?: LegacyCallAPIOptions): Promise<MSearchResponse<T>>;
+  <T>(endpoint: 'msearchTemplate', params: MSearchTemplateParams, options?: LegacyCallAPIOptions): Promise<MSearchResponse<T>>;
+  (endpoint: 'mtermvectors', params: MTermVectorsParams, options?: LegacyCallAPIOptions): ReturnType<Client['mtermvectors']>;
+  (endpoint: 'ping', params: PingParams, options?: LegacyCallAPIOptions): ReturnType<Client['ping']>;
+  (endpoint: 'putScript', params: PutScriptParams, options?: LegacyCallAPIOptions): ReturnType<Client['putScript']>;
+  (endpoint: 'putTemplate', params: PutTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['putTemplate']>;
+  (endpoint: 'reindex', params: ReindexParams, options?: LegacyCallAPIOptions): ReturnType<Client['reindex']>;
+  (endpoint: 'reindexRethrottle', params: ReindexRethrottleParams, options?: LegacyCallAPIOptions): ReturnType<Client['reindexRethrottle']>;
+  (endpoint: 'renderSearchTemplate', params: RenderSearchTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['renderSearchTemplate']>;
   // Generic types cannot be properly looked up with ReturnType. Hard code these explicitly.
-  <T>(endpoint: 'scroll', params: ScrollParams, options?: CallAPIOptions): Promise<SearchResponse<T>>;
-  <T>(endpoint: 'search', params: SearchParams, options?: CallAPIOptions): Promise<SearchResponse<T>>;
-  (endpoint: 'searchShards', params: SearchShardsParams, options?: CallAPIOptions): ReturnType<Client['searchShards']>;
-  (endpoint: 'searchTemplate', params: SearchTemplateParams, options?: CallAPIOptions): ReturnType<Client['searchTemplate']>;
-  (endpoint: 'suggest', params: SuggestParams, options?: CallAPIOptions): ReturnType<Client['suggest']>;
-  (endpoint: 'termvectors', params: TermvectorsParams, options?: CallAPIOptions): ReturnType<Client['termvectors']>;
-  (endpoint: 'update', params: UpdateDocumentParams, options?: CallAPIOptions): ReturnType<Client['update']>;
-  (endpoint: 'updateByQuery', params: UpdateDocumentByQueryParams, options?: CallAPIOptions): ReturnType<Client['updateByQuery']>;
+  <T>(endpoint: 'scroll', params: ScrollParams, options?: LegacyCallAPIOptions): Promise<SearchResponse<T>>;
+  <T>(endpoint: 'search', params: SearchParams, options?: LegacyCallAPIOptions): Promise<SearchResponse<T>>;
+  (endpoint: 'searchShards', params: SearchShardsParams, options?: LegacyCallAPIOptions): ReturnType<Client['searchShards']>;
+  (endpoint: 'searchTemplate', params: SearchTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['searchTemplate']>;
+  (endpoint: 'suggest', params: SuggestParams, options?: LegacyCallAPIOptions): ReturnType<Client['suggest']>;
+  (endpoint: 'termvectors', params: TermvectorsParams, options?: LegacyCallAPIOptions): ReturnType<Client['termvectors']>;
+  (endpoint: 'update', params: UpdateDocumentParams, options?: LegacyCallAPIOptions): ReturnType<Client['update']>;
+  (endpoint: 'updateByQuery', params: UpdateDocumentByQueryParams, options?: LegacyCallAPIOptions): ReturnType<Client['updateByQuery']>;
 
   // cat namespace
-  (endpoint: 'cat.aliases', params: CatAliasesParams, options?: CallAPIOptions): ReturnType<Client['cat']['aliases']>;
-  (endpoint: 'cat.allocation', params: CatAllocationParams, options?: CallAPIOptions): ReturnType<Client['cat']['allocation']>;
-  (endpoint: 'cat.count', params: CatAllocationParams, options?: CallAPIOptions): ReturnType<Client['cat']['count']>;
-  (endpoint: 'cat.fielddata', params: CatFielddataParams, options?: CallAPIOptions): ReturnType<Client['cat']['fielddata']>;
-  (endpoint: 'cat.health', params: CatHealthParams, options?: CallAPIOptions): ReturnType<Client['cat']['health']>;
-  (endpoint: 'cat.help', params: CatHelpParams, options?: CallAPIOptions): ReturnType<Client['cat']['help']>;
-  (endpoint: 'cat.indices', params: CatIndicesParams, options?: CallAPIOptions): ReturnType<Client['cat']['indices']>;
-  (endpoint: 'cat.master', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['master']>;
-  (endpoint: 'cat.nodeattrs', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['nodeattrs']>;
-  (endpoint: 'cat.nodes', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['nodes']>;
-  (endpoint: 'cat.pendingTasks', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['pendingTasks']>;
-  (endpoint: 'cat.plugins', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['plugins']>;
-  (endpoint: 'cat.recovery', params: CatRecoveryParams, options?: CallAPIOptions): ReturnType<Client['cat']['recovery']>;
-  (endpoint: 'cat.repositories', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['repositories']>;
-  (endpoint: 'cat.segments', params: CatSegmentsParams, options?: CallAPIOptions): ReturnType<Client['cat']['segments']>;
-  (endpoint: 'cat.shards', params: CatShardsParams, options?: CallAPIOptions): ReturnType<Client['cat']['shards']>;
-  (endpoint: 'cat.snapshots', params: CatSnapshotsParams, options?: CallAPIOptions): ReturnType<Client['cat']['snapshots']>;
-  (endpoint: 'cat.tasks', params: CatTasksParams, options?: CallAPIOptions): ReturnType<Client['cat']['tasks']>;
-  (endpoint: 'cat.threadPool', params: CatThreadPoolParams, options?: CallAPIOptions): ReturnType<Client['cat']['threadPool']>;
+  (endpoint: 'cat.aliases', params: CatAliasesParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['aliases']>;
+  (endpoint: 'cat.allocation', params: CatAllocationParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['allocation']>;
+  (endpoint: 'cat.count', params: CatAllocationParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['count']>;
+  (endpoint: 'cat.fielddata', params: CatFielddataParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['fielddata']>;
+  (endpoint: 'cat.health', params: CatHealthParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['health']>;
+  (endpoint: 'cat.help', params: CatHelpParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['help']>;
+  (endpoint: 'cat.indices', params: CatIndicesParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['indices']>;
+  (endpoint: 'cat.master', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['master']>;
+  (endpoint: 'cat.nodeattrs', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['nodeattrs']>;
+  (endpoint: 'cat.nodes', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['nodes']>;
+  (endpoint: 'cat.pendingTasks', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['pendingTasks']>;
+  (endpoint: 'cat.plugins', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['plugins']>;
+  (endpoint: 'cat.recovery', params: CatRecoveryParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['recovery']>;
+  (endpoint: 'cat.repositories', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['repositories']>;
+  (endpoint: 'cat.segments', params: CatSegmentsParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['segments']>;
+  (endpoint: 'cat.shards', params: CatShardsParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['shards']>;
+  (endpoint: 'cat.snapshots', params: CatSnapshotsParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['snapshots']>;
+  (endpoint: 'cat.tasks', params: CatTasksParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['tasks']>;
+  (endpoint: 'cat.threadPool', params: CatThreadPoolParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['threadPool']>;
 
   // cluster namespace
-  (endpoint: 'cluster.allocationExplain', params: ClusterAllocationExplainParams, options?: CallAPIOptions): ReturnType<Client['cluster']['allocationExplain']>;
-  (endpoint: 'cluster.getSettings', params: ClusterGetSettingsParams, options?: CallAPIOptions): ReturnType<Client['cluster']['getSettings']>;
-  (endpoint: 'cluster.health', params: ClusterHealthParams, options?: CallAPIOptions): ReturnType<Client['cluster']['health']>;
-  (endpoint: 'cluster.pendingTasks', params: ClusterPendingTasksParams, options?: CallAPIOptions): ReturnType<Client['cluster']['pendingTasks']>;
-  (endpoint: 'cluster.putSettings', params: ClusterPutSettingsParams, options?: CallAPIOptions): ReturnType<Client['cluster']['putSettings']>;
-  (endpoint: 'cluster.reroute', params: ClusterRerouteParams, options?: CallAPIOptions): ReturnType<Client['cluster']['reroute']>;
-  (endpoint: 'cluster.state', params: ClusterStateParams, options?: CallAPIOptions): ReturnType<Client['cluster']['state']>;
-  (endpoint: 'cluster.stats', params: ClusterStatsParams, options?: CallAPIOptions): ReturnType<Client['cluster']['stats']>;
+  (endpoint: 'cluster.allocationExplain', params: ClusterAllocationExplainParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['allocationExplain']>;
+  (endpoint: 'cluster.getSettings', params: ClusterGetSettingsParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['getSettings']>;
+  (endpoint: 'cluster.health', params: ClusterHealthParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['health']>;
+  (endpoint: 'cluster.pendingTasks', params: ClusterPendingTasksParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['pendingTasks']>;
+  (endpoint: 'cluster.putSettings', params: ClusterPutSettingsParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['putSettings']>;
+  (endpoint: 'cluster.reroute', params: ClusterRerouteParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['reroute']>;
+  (endpoint: 'cluster.state', params: ClusterStateParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['state']>;
+  (endpoint: 'cluster.stats', params: ClusterStatsParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['stats']>;
 
   // indices namespace
-  (endpoint: 'indices.analyze', params: IndicesAnalyzeParams, options?: CallAPIOptions): ReturnType<Client['indices']['analyze']>;
-  (endpoint: 'indices.clearCache', params: IndicesClearCacheParams, options?: CallAPIOptions): ReturnType<Client['indices']['clearCache']>;
-  (endpoint: 'indices.close', params: IndicesCloseParams, options?: CallAPIOptions): ReturnType<Client['indices']['close']>;
-  (endpoint: 'indices.create', params: IndicesCreateParams, options?: CallAPIOptions): ReturnType<Client['indices']['create']>;
-  (endpoint: 'indices.delete', params: IndicesDeleteParams, options?: CallAPIOptions): ReturnType<Client['indices']['delete']>;
-  (endpoint: 'indices.deleteAlias', params: IndicesDeleteAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['deleteAlias']>;
-  (endpoint: 'indices.deleteTemplate', params: IndicesDeleteTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['deleteTemplate']>;
-  (endpoint: 'indices.exists', params: IndicesExistsParams, options?: CallAPIOptions): ReturnType<Client['indices']['exists']>;
-  (endpoint: 'indices.existsAlias', params: IndicesExistsAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['existsAlias']>;
-  (endpoint: 'indices.existsTemplate', params: IndicesExistsTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['existsTemplate']>;
-  (endpoint: 'indices.existsType', params: IndicesExistsTypeParams, options?: CallAPIOptions): ReturnType<Client['indices']['existsType']>;
-  (endpoint: 'indices.flush', params: IndicesFlushParams, options?: CallAPIOptions): ReturnType<Client['indices']['flush']>;
-  (endpoint: 'indices.flushSynced', params: IndicesFlushSyncedParams, options?: CallAPIOptions): ReturnType<Client['indices']['flushSynced']>;
-  (endpoint: 'indices.forcemerge', params: IndicesForcemergeParams, options?: CallAPIOptions): ReturnType<Client['indices']['forcemerge']>;
-  (endpoint: 'indices.get', params: IndicesGetParams, options?: CallAPIOptions): ReturnType<Client['indices']['get']>;
-  (endpoint: 'indices.getAlias', params: IndicesGetAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['getAlias']>;
-  (endpoint: 'indices.getFieldMapping', params: IndicesGetFieldMappingParams, options?: CallAPIOptions): ReturnType<Client['indices']['getFieldMapping']>;
-  (endpoint: 'indices.getMapping', params: IndicesGetMappingParams, options?: CallAPIOptions): ReturnType<Client['indices']['getMapping']>;
-  (endpoint: 'indices.getSettings', params: IndicesGetSettingsParams, options?: CallAPIOptions): ReturnType<Client['indices']['getSettings']>;
-  (endpoint: 'indices.getTemplate', params: IndicesGetTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['getTemplate']>;
-  (endpoint: 'indices.getUpgrade', params: IndicesGetUpgradeParams, options?: CallAPIOptions): ReturnType<Client['indices']['getUpgrade']>;
-  (endpoint: 'indices.open', params: IndicesOpenParams, options?: CallAPIOptions): ReturnType<Client['indices']['open']>;
-  (endpoint: 'indices.putAlias', params: IndicesPutAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['putAlias']>;
-  (endpoint: 'indices.putMapping', params: IndicesPutMappingParams, options?: CallAPIOptions): ReturnType<Client['indices']['putMapping']>;
-  (endpoint: 'indices.putSettings', params: IndicesPutSettingsParams, options?: CallAPIOptions): ReturnType<Client['indices']['putSettings']>;
-  (endpoint: 'indices.putTemplate', params: IndicesPutTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['putTemplate']>;
-  (endpoint: 'indices.recovery', params: IndicesRecoveryParams, options?: CallAPIOptions): ReturnType<Client['indices']['recovery']>;
-  (endpoint: 'indices.refresh', params: IndicesRefreshParams, options?: CallAPIOptions): ReturnType<Client['indices']['refresh']>;
-  (endpoint: 'indices.rollover', params: IndicesRolloverParams, options?: CallAPIOptions): ReturnType<Client['indices']['rollover']>;
-  (endpoint: 'indices.segments', params: IndicesSegmentsParams, options?: CallAPIOptions): ReturnType<Client['indices']['segments']>;
-  (endpoint: 'indices.shardStores', params: IndicesShardStoresParams, options?: CallAPIOptions): ReturnType<Client['indices']['shardStores']>;
-  (endpoint: 'indices.shrink', params: IndicesShrinkParams, options?: CallAPIOptions): ReturnType<Client['indices']['shrink']>;
-  (endpoint: 'indices.stats', params: IndicesStatsParams, options?: CallAPIOptions): ReturnType<Client['indices']['stats']>;
-  (endpoint: 'indices.updateAliases', params: IndicesUpdateAliasesParams, options?: CallAPIOptions): ReturnType<Client['indices']['updateAliases']>;
-  (endpoint: 'indices.upgrade', params: IndicesUpgradeParams, options?: CallAPIOptions): ReturnType<Client['indices']['upgrade']>;
-  (endpoint: 'indices.validateQuery', params: IndicesValidateQueryParams, options?: CallAPIOptions): ReturnType<Client['indices']['validateQuery']>;
+  (endpoint: 'indices.analyze', params: IndicesAnalyzeParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['analyze']>;
+  (endpoint: 'indices.clearCache', params: IndicesClearCacheParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['clearCache']>;
+  (endpoint: 'indices.close', params: IndicesCloseParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['close']>;
+  (endpoint: 'indices.create', params: IndicesCreateParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['create']>;
+  (endpoint: 'indices.delete', params: IndicesDeleteParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['delete']>;
+  (endpoint: 'indices.deleteAlias', params: IndicesDeleteAliasParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['deleteAlias']>;
+  (endpoint: 'indices.deleteTemplate', params: IndicesDeleteTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['deleteTemplate']>;
+  (endpoint: 'indices.exists', params: IndicesExistsParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['exists']>;
+  (endpoint: 'indices.existsAlias', params: IndicesExistsAliasParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['existsAlias']>;
+  (endpoint: 'indices.existsTemplate', params: IndicesExistsTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['existsTemplate']>;
+  (endpoint: 'indices.existsType', params: IndicesExistsTypeParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['existsType']>;
+  (endpoint: 'indices.flush', params: IndicesFlushParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['flush']>;
+  (endpoint: 'indices.flushSynced', params: IndicesFlushSyncedParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['flushSynced']>;
+  (endpoint: 'indices.forcemerge', params: IndicesForcemergeParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['forcemerge']>;
+  (endpoint: 'indices.get', params: IndicesGetParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['get']>;
+  (endpoint: 'indices.getAlias', params: IndicesGetAliasParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['getAlias']>;
+  (endpoint: 'indices.getFieldMapping', params: IndicesGetFieldMappingParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['getFieldMapping']>;
+  (endpoint: 'indices.getMapping', params: IndicesGetMappingParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['getMapping']>;
+  (endpoint: 'indices.getSettings', params: IndicesGetSettingsParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['getSettings']>;
+  (endpoint: 'indices.getTemplate', params: IndicesGetTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['getTemplate']>;
+  (endpoint: 'indices.getUpgrade', params: IndicesGetUpgradeParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['getUpgrade']>;
+  (endpoint: 'indices.open', params: IndicesOpenParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['open']>;
+  (endpoint: 'indices.putAlias', params: IndicesPutAliasParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['putAlias']>;
+  (endpoint: 'indices.putMapping', params: IndicesPutMappingParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['putMapping']>;
+  (endpoint: 'indices.putSettings', params: IndicesPutSettingsParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['putSettings']>;
+  (endpoint: 'indices.putTemplate', params: IndicesPutTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['putTemplate']>;
+  (endpoint: 'indices.recovery', params: IndicesRecoveryParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['recovery']>;
+  (endpoint: 'indices.refresh', params: IndicesRefreshParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['refresh']>;
+  (endpoint: 'indices.rollover', params: IndicesRolloverParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['rollover']>;
+  (endpoint: 'indices.segments', params: IndicesSegmentsParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['segments']>;
+  (endpoint: 'indices.shardStores', params: IndicesShardStoresParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['shardStores']>;
+  (endpoint: 'indices.shrink', params: IndicesShrinkParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['shrink']>;
+  (endpoint: 'indices.stats', params: IndicesStatsParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['stats']>;
+  (endpoint: 'indices.updateAliases', params: IndicesUpdateAliasesParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['updateAliases']>;
+  (endpoint: 'indices.upgrade', params: IndicesUpgradeParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['upgrade']>;
+  (endpoint: 'indices.validateQuery', params: IndicesValidateQueryParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['validateQuery']>;
 
   // ingest namepsace
-  (endpoint: 'ingest.deletePipeline', params: IngestDeletePipelineParams, options?: CallAPIOptions): ReturnType<Client['ingest']['deletePipeline']>;
-  (endpoint: 'ingest.getPipeline', params: IngestGetPipelineParams, options?: CallAPIOptions): ReturnType<Client['ingest']['getPipeline']>;
-  (endpoint: 'ingest.putPipeline', params: IngestPutPipelineParams, options?: CallAPIOptions): ReturnType<Client['ingest']['putPipeline']>;
-  (endpoint: 'ingest.simulate', params: IngestSimulateParams, options?: CallAPIOptions): ReturnType<Client['ingest']['simulate']>;
+  (endpoint: 'ingest.deletePipeline', params: IngestDeletePipelineParams, options?: LegacyCallAPIOptions): ReturnType<Client['ingest']['deletePipeline']>;
+  (endpoint: 'ingest.getPipeline', params: IngestGetPipelineParams, options?: LegacyCallAPIOptions): ReturnType<Client['ingest']['getPipeline']>;
+  (endpoint: 'ingest.putPipeline', params: IngestPutPipelineParams, options?: LegacyCallAPIOptions): ReturnType<Client['ingest']['putPipeline']>;
+  (endpoint: 'ingest.simulate', params: IngestSimulateParams, options?: LegacyCallAPIOptions): ReturnType<Client['ingest']['simulate']>;
 
   // nodes namespace
-  (endpoint: 'nodes.hotThreads', params: NodesHotThreadsParams, options?: CallAPIOptions): ReturnType<Client['nodes']['hotThreads']>;
-  (endpoint: 'nodes.info', params: NodesInfoParams, options?: CallAPIOptions): ReturnType<Client['nodes']['info']>;
-  (endpoint: 'nodes.stats', params: NodesStatsParams, options?: CallAPIOptions): ReturnType<Client['nodes']['stats']>;
+  (endpoint: 'nodes.hotThreads', params: NodesHotThreadsParams, options?: LegacyCallAPIOptions): ReturnType<Client['nodes']['hotThreads']>;
+  (endpoint: 'nodes.info', params: NodesInfoParams, options?: LegacyCallAPIOptions): ReturnType<Client['nodes']['info']>;
+  (endpoint: 'nodes.stats', params: NodesStatsParams, options?: LegacyCallAPIOptions): ReturnType<Client['nodes']['stats']>;
 
   // snapshot namespace
-  (endpoint: 'snapshot.create', params: SnapshotCreateParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['create']>;
-  (endpoint: 'snapshot.createRepository', params: SnapshotCreateRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['createRepository']>;
-  (endpoint: 'snapshot.delete', params: SnapshotDeleteParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['delete']>;
-  (endpoint: 'snapshot.deleteRepository', params: SnapshotDeleteRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['deleteRepository']>;
-  (endpoint: 'snapshot.get', params: SnapshotGetParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['get']>;
-  (endpoint: 'snapshot.getRepository', params: SnapshotGetRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['getRepository']>;
-  (endpoint: 'snapshot.restore', params: SnapshotRestoreParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['restore']>;
-  (endpoint: 'snapshot.status', params: SnapshotStatusParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['status']>;
-  (endpoint: 'snapshot.verifyRepository', params: SnapshotVerifyRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['verifyRepository']>;
+  (endpoint: 'snapshot.create', params: SnapshotCreateParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['create']>;
+  (endpoint: 'snapshot.createRepository', params: SnapshotCreateRepositoryParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['createRepository']>;
+  (endpoint: 'snapshot.delete', params: SnapshotDeleteParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['delete']>;
+  (endpoint: 'snapshot.deleteRepository', params: SnapshotDeleteRepositoryParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['deleteRepository']>;
+  (endpoint: 'snapshot.get', params: SnapshotGetParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['get']>;
+  (endpoint: 'snapshot.getRepository', params: SnapshotGetRepositoryParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['getRepository']>;
+  (endpoint: 'snapshot.restore', params: SnapshotRestoreParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['restore']>;
+  (endpoint: 'snapshot.status', params: SnapshotStatusParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['status']>;
+  (endpoint: 'snapshot.verifyRepository', params: SnapshotVerifyRepositoryParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['verifyRepository']>;
 
   // tasks namespace
-  (endpoint: 'tasks.cancel', params: TasksCancelParams, options?: CallAPIOptions): ReturnType<Client['tasks']['cancel']>;
-  (endpoint: 'tasks.get', params: TasksGetParams, options?: CallAPIOptions): ReturnType<Client['tasks']['get']>;
-  (endpoint: 'tasks.list', params: TasksListParams, options?: CallAPIOptions): ReturnType<Client['tasks']['list']>;
+  (endpoint: 'tasks.cancel', params: TasksCancelParams, options?: LegacyCallAPIOptions): ReturnType<Client['tasks']['cancel']>;
+  (endpoint: 'tasks.get', params: TasksGetParams, options?: LegacyCallAPIOptions): ReturnType<Client['tasks']['get']>;
+  (endpoint: 'tasks.list', params: TasksListParams, options?: LegacyCallAPIOptions): ReturnType<Client['tasks']['list']>;
 
   // other APIs accessed via transport.request
-  (endpoint: 'transport.request', clientParams: AssistantAPIClientParams, options?: CallAPIOptions): Promise<
+  (endpoint: 'transport.request', clientParams: AssistantAPIClientParams, options?: LegacyCallAPIOptions): Promise<
     AssistanceAPIResponse
   >;
-  (endpoint: 'transport.request', clientParams: DeprecationAPIClientParams, options?: CallAPIOptions): Promise<
+  (endpoint: 'transport.request', clientParams: DeprecationAPIClientParams, options?: LegacyCallAPIOptions): Promise<
     DeprecationAPIResponse
   >;
 
   // Catch-all definition
-  <T = any>(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<T>;
+  <T = any>(endpoint: string, clientParams?: Record<string, any>, options?: LegacyCallAPIOptions): Promise<T>;
   /* eslint-enable */
 }
 
diff --git a/src/core/server/elasticsearch/cluster_client.test.mocks.ts b/src/core/server/elasticsearch/legacy/cluster_client.test.mocks.ts
similarity index 95%
rename from src/core/server/elasticsearch/cluster_client.test.mocks.ts
rename to src/core/server/elasticsearch/legacy/cluster_client.test.mocks.ts
index 6873117aecc35e..08585c2305e9bf 100644
--- a/src/core/server/elasticsearch/cluster_client.test.mocks.ts
+++ b/src/core/server/elasticsearch/legacy/cluster_client.test.mocks.ts
@@ -29,7 +29,7 @@ jest.mock('elasticsearch', () => {
 
 export const MockScopedClusterClient = jest.fn();
 jest.mock('./scoped_cluster_client', () => ({
-  ScopedClusterClient: MockScopedClusterClient,
+  LegacyScopedClusterClient: MockScopedClusterClient,
 }));
 
 export const mockParseElasticsearchClientConfig = jest.fn();
diff --git a/src/core/server/elasticsearch/cluster_client.test.ts b/src/core/server/elasticsearch/legacy/cluster_client.test.ts
similarity index 91%
rename from src/core/server/elasticsearch/cluster_client.test.ts
rename to src/core/server/elasticsearch/legacy/cluster_client.test.ts
index 820272bdf14b81..9ab4862a1ab4c5 100644
--- a/src/core/server/elasticsearch/cluster_client.test.ts
+++ b/src/core/server/elasticsearch/legacy/cluster_client.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { ElasticsearchConfig } from './elasticsearch_config';
+import { ElasticsearchConfig } from '../elasticsearch_config';
 
 import {
   MockClient,
@@ -27,10 +27,10 @@ import {
 
 import { errors } from 'elasticsearch';
 import { get } from 'lodash';
-import { Logger } from '../logging';
-import { loggingSystemMock } from '../logging/logging_system.mock';
-import { httpServerMock } from '../http/http_server.mocks';
-import { ClusterClient } from './cluster_client';
+import { Logger } from '../../logging';
+import { loggingSystemMock } from '../../logging/logging_system.mock';
+import { httpServerMock } from '../../http/http_server.mocks';
+import { LegacyClusterClient } from './cluster_client';
 
 const logger = loggingSystemMock.create();
 afterEach(() => jest.clearAllMocks());
@@ -42,7 +42,7 @@ test('#constructor creates client with parsed config', () => {
   const mockEsConfig = { apiVersion: 'es-version' } as any;
   const mockLogger = logger.get();
 
-  const clusterClient = new ClusterClient(mockEsConfig, mockLogger);
+  const clusterClient = new LegacyClusterClient(mockEsConfig, mockLogger);
   expect(clusterClient).toBeDefined();
 
   expect(mockParseElasticsearchClientConfig).toHaveBeenCalledTimes(1);
@@ -58,7 +58,7 @@ describe('#callAsInternalUser', () => {
     ping: jest.Mock;
     security: { authenticate: jest.Mock };
   };
-  let clusterClient: ClusterClient;
+  let clusterClient: LegacyClusterClient;
 
   beforeEach(() => {
     mockEsClientInstance = {
@@ -68,7 +68,7 @@ describe('#callAsInternalUser', () => {
     };
     MockClient.mockImplementation(() => mockEsClientInstance);
 
-    clusterClient = new ClusterClient({ apiVersion: 'es-version' } as any, logger.get());
+    clusterClient = new LegacyClusterClient({ apiVersion: 'es-version' } as any, logger.get());
   });
 
   test('fails if cluster client is closed', async () => {
@@ -220,7 +220,7 @@ describe('#asScoped', () => {
   let mockEsClientInstance: { ping: jest.Mock; close: jest.Mock };
   let mockScopedEsClientInstance: { ping: jest.Mock; close: jest.Mock };
 
-  let clusterClient: ClusterClient;
+  let clusterClient: LegacyClusterClient;
   let mockLogger: Logger;
   let mockEsConfig: ElasticsearchConfig;
 
@@ -237,7 +237,7 @@ describe('#asScoped', () => {
       requestHeadersWhitelist: ['one', 'two'],
     } as any;
 
-    clusterClient = new ClusterClient(mockEsConfig, mockLogger);
+    clusterClient = new LegacyClusterClient(mockEsConfig, mockLogger);
     jest.clearAllMocks();
   });
 
@@ -272,7 +272,7 @@ describe('#asScoped', () => {
 
   test('properly configures `ignoreCertAndKey` for various configurations', () => {
     // Config without SSL.
-    clusterClient = new ClusterClient(mockEsConfig, mockLogger);
+    clusterClient = new LegacyClusterClient(mockEsConfig, mockLogger);
 
     mockParseElasticsearchClientConfig.mockClear();
     clusterClient.asScoped(httpServerMock.createRawRequest({ headers: { one: '1' } }));
@@ -285,7 +285,7 @@ describe('#asScoped', () => {
 
     // Config ssl.alwaysPresentCertificate === false
     mockEsConfig = { ...mockEsConfig, ssl: { alwaysPresentCertificate: false } } as any;
-    clusterClient = new ClusterClient(mockEsConfig, mockLogger);
+    clusterClient = new LegacyClusterClient(mockEsConfig, mockLogger);
 
     mockParseElasticsearchClientConfig.mockClear();
     clusterClient.asScoped(httpServerMock.createRawRequest({ headers: { one: '1' } }));
@@ -298,7 +298,7 @@ describe('#asScoped', () => {
 
     // Config ssl.alwaysPresentCertificate === true
     mockEsConfig = { ...mockEsConfig, ssl: { alwaysPresentCertificate: true } } as any;
-    clusterClient = new ClusterClient(mockEsConfig, mockLogger);
+    clusterClient = new LegacyClusterClient(mockEsConfig, mockLogger);
 
     mockParseElasticsearchClientConfig.mockClear();
     clusterClient.asScoped(httpServerMock.createRawRequest({ headers: { one: '1' } }));
@@ -341,7 +341,7 @@ describe('#asScoped', () => {
   });
 
   test('does not fail when scope to not defined request', async () => {
-    clusterClient = new ClusterClient(mockEsConfig, mockLogger);
+    clusterClient = new LegacyClusterClient(mockEsConfig, mockLogger);
     clusterClient.asScoped();
     expect(MockScopedClusterClient).toHaveBeenCalledTimes(1);
     expect(MockScopedClusterClient).toHaveBeenCalledWith(
@@ -352,7 +352,7 @@ describe('#asScoped', () => {
   });
 
   test('does not fail when scope to a request without headers', async () => {
-    clusterClient = new ClusterClient(mockEsConfig, mockLogger);
+    clusterClient = new LegacyClusterClient(mockEsConfig, mockLogger);
     clusterClient.asScoped({} as any);
     expect(MockScopedClusterClient).toHaveBeenCalledTimes(1);
     expect(MockScopedClusterClient).toHaveBeenCalledWith(
@@ -363,7 +363,10 @@ describe('#asScoped', () => {
   });
 
   test('calls getAuthHeaders and filters results for a real request', async () => {
-    clusterClient = new ClusterClient(mockEsConfig, mockLogger, () => ({ one: '1', three: '3' }));
+    clusterClient = new LegacyClusterClient(mockEsConfig, mockLogger, () => ({
+      one: '1',
+      three: '3',
+    }));
     clusterClient.asScoped(httpServerMock.createRawRequest({ headers: { two: '2' } }));
     expect(MockScopedClusterClient).toHaveBeenCalledTimes(1);
     expect(MockScopedClusterClient).toHaveBeenCalledWith(
@@ -374,7 +377,7 @@ describe('#asScoped', () => {
   });
 
   test('getAuthHeaders results rewrite extends a request headers', async () => {
-    clusterClient = new ClusterClient(mockEsConfig, mockLogger, () => ({ one: 'foo' }));
+    clusterClient = new LegacyClusterClient(mockEsConfig, mockLogger, () => ({ one: 'foo' }));
     clusterClient.asScoped(httpServerMock.createRawRequest({ headers: { one: '1', two: '2' } }));
     expect(MockScopedClusterClient).toHaveBeenCalledTimes(1);
     expect(MockScopedClusterClient).toHaveBeenCalledWith(
@@ -386,14 +389,14 @@ describe('#asScoped', () => {
 
   test("doesn't call getAuthHeaders for a fake request", async () => {
     const getAuthHeaders = jest.fn();
-    clusterClient = new ClusterClient(mockEsConfig, mockLogger, getAuthHeaders);
+    clusterClient = new LegacyClusterClient(mockEsConfig, mockLogger, getAuthHeaders);
     clusterClient.asScoped({ headers: { one: '1', two: '2', three: '3' } });
 
     expect(getAuthHeaders).not.toHaveBeenCalled();
   });
 
   test('filters a fake request headers', async () => {
-    clusterClient = new ClusterClient(mockEsConfig, mockLogger);
+    clusterClient = new LegacyClusterClient(mockEsConfig, mockLogger);
     clusterClient.asScoped({ headers: { one: '1', two: '2', three: '3' } });
 
     expect(MockScopedClusterClient).toHaveBeenCalledTimes(1);
@@ -409,7 +412,7 @@ describe('#close', () => {
   let mockEsClientInstance: { close: jest.Mock };
   let mockScopedEsClientInstance: { close: jest.Mock };
 
-  let clusterClient: ClusterClient;
+  let clusterClient: LegacyClusterClient;
 
   beforeEach(() => {
     mockEsClientInstance = { close: jest.fn() };
@@ -418,7 +421,7 @@ describe('#close', () => {
       () => mockScopedEsClientInstance
     );
 
-    clusterClient = new ClusterClient(
+    clusterClient = new LegacyClusterClient(
       { apiVersion: 'es-version', requestHeadersWhitelist: [] } as any,
       logger.get()
     );
diff --git a/src/core/server/elasticsearch/cluster_client.ts b/src/core/server/elasticsearch/legacy/cluster_client.ts
similarity index 77%
rename from src/core/server/elasticsearch/cluster_client.ts
rename to src/core/server/elasticsearch/legacy/cluster_client.ts
index 2352677b8d3e0a..8e2d20a8972fc9 100644
--- a/src/core/server/elasticsearch/cluster_client.ts
+++ b/src/core/server/elasticsearch/legacy/cluster_client.ts
@@ -19,16 +19,17 @@
 import { Client } from 'elasticsearch';
 import { get } from 'lodash';
 
-import { ElasticsearchErrorHelpers } from './errors';
-import { GetAuthHeaders, isRealRequest, LegacyRequest } from '../http';
-import { filterHeaders, Headers, KibanaRequest, ensureRawRequest } from '../http/router';
-import { Logger } from '../logging';
+import { LegacyElasticsearchErrorHelpers } from './errors';
+import { GetAuthHeaders, isRealRequest } from '../../http';
+import { filterHeaders, ensureRawRequest } from '../../http/router';
+import { Logger } from '../../logging';
+import { ScopeableRequest } from '../types';
 import {
-  ElasticsearchClientConfig,
+  LegacyElasticsearchClientConfig,
   parseElasticsearchClientConfig,
 } from './elasticsearch_client_config';
-import { ScopedClusterClient, IScopedClusterClient } from './scoped_cluster_client';
-import { CallAPIOptions, APICaller } from './api_types';
+import { LegacyScopedClusterClient, ILegacyScopedClusterClient } from './scoped_cluster_client';
+import { LegacyCallAPIOptions, LegacyAPICaller } from './api_types';
 
 /**
  * Support Legacy platform request for the period of migration.
@@ -50,7 +51,7 @@ const callAPI = async (
   client: Client,
   endpoint: string,
   clientParams: Record<string, any> = {},
-  options: CallAPIOptions = { wrap401Errors: true }
+  options: LegacyCallAPIOptions = { wrap401Errors: true }
 ) => {
   const clientPath = endpoint.split('.');
   const api: any = get(client, clientPath);
@@ -75,55 +76,40 @@ const callAPI = async (
       throw err;
     }
 
-    throw ElasticsearchErrorHelpers.decorateNotAuthorizedError(err);
+    throw LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(err);
   }
 };
 
-/**
- * Fake request object created manually by Kibana plugins.
- * @public
- */
-export interface FakeRequest {
-  /** Headers used for authentication against Elasticsearch */
-  headers: Headers;
-}
-
 /**
  * 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 {@link ClusterClient}.
+ * See {@link LegacyClusterClient}.
  *
  * @public
  */
-export type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
+export type ILegacyClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'asScoped'>;
 
 /**
  * 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 {@link ClusterClient}.
- *
- * @public
- */
-export type ICustomClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
-
-/**
- A user credentials container.
- * It accommodates the necessary auth credentials to impersonate the current user.
+ * See {@link LegacyClusterClient}.
  *
  * @public
- * See {@link KibanaRequest}.
  */
-export type ScopeableRequest = KibanaRequest | LegacyRequest | FakeRequest;
+export type ILegacyCustomClusterClient = Pick<
+  LegacyClusterClient,
+  'callAsInternalUser' | 'close' | 'asScoped'
+>;
 
 /**
  * {@inheritDoc IClusterClient}
  * @public
  */
-export class ClusterClient implements IClusterClient {
+export class LegacyClusterClient implements ILegacyClusterClient {
   /**
    * Raw Elasticsearch JS client that acts on behalf of the Kibana internal user.
    */
@@ -141,7 +127,7 @@ export class ClusterClient implements IClusterClient {
   private isClosed = false;
 
   constructor(
-    private readonly config: ElasticsearchClientConfig,
+    private readonly config: LegacyElasticsearchClientConfig,
     private readonly log: Logger,
     private readonly getAuthHeaders: GetAuthHeaders = noop
   ) {
@@ -151,20 +137,24 @@ export class ClusterClient implements IClusterClient {
   /**
    * Calls specified endpoint with provided clientParams on behalf of the
    * Kibana internal user.
-   * See {@link APICaller}.
+   * See {@link LegacyAPICaller}.
    *
    * @param endpoint - String descriptor of the endpoint e.g. `cluster.getSettings` or `ping`.
    * @param clientParams - A dictionary of parameters that will be passed directly to the Elasticsearch JS client.
    * @param options - Options that affect the way we call the API and process the result.
    */
-  public callAsInternalUser: APICaller = async (
+  public callAsInternalUser: LegacyAPICaller = async (
     endpoint: string,
     clientParams: Record<string, any> = {},
-    options?: CallAPIOptions
+    options?: LegacyCallAPIOptions
   ) => {
     this.assertIsNotClosed();
 
-    return await (callAPI.bind(null, this.client) as APICaller)(endpoint, clientParams, options);
+    return await (callAPI.bind(null, this.client) as LegacyAPICaller)(
+      endpoint,
+      clientParams,
+      options
+    );
   };
 
   /**
@@ -185,7 +175,7 @@ export class ClusterClient implements IClusterClient {
   }
 
   /**
-   * Creates an instance of {@link IScopedClusterClient} based on the configuration the
+   * Creates an instance of {@link ILegacyScopedClusterClient} based on the configuration the
    * current cluster client that exposes additional `callAsCurrentUser` method
    * scoped to the provided req. Consumers shouldn't worry about closing
    * scoped client instances, these will be automatically closed as soon as the
@@ -194,7 +184,7 @@ export class ClusterClient implements IClusterClient {
    * @param request - Request the `IScopedClusterClient` instance will be scoped to.
    * Supports request optionality, Legacy.Request & FakeRequest for BWC with LegacyPlatform
    */
-  public asScoped(request?: ScopeableRequest): IScopedClusterClient {
+  public asScoped(request?: ScopeableRequest): ILegacyScopedClusterClient {
     // It'd have been quite expensive to create and configure client for every incoming
     // request since it involves parsing of the config, reading of the SSL certificate and
     // key files etc. Moreover scoped client needs two Elasticsearch JS clients at the same
@@ -210,7 +200,7 @@ export class ClusterClient implements IClusterClient {
       );
     }
 
-    return new ScopedClusterClient(
+    return new LegacyScopedClusterClient(
       this.callAsInternalUser,
       this.callAsCurrentUser,
       filterHeaders(this.getHeaders(request), this.config.requestHeadersWhitelist)
@@ -220,20 +210,20 @@ export class ClusterClient implements IClusterClient {
   /**
    * Calls specified endpoint with provided clientParams on behalf of the
    * user initiated request to the Kibana server (via HTTP request headers).
-   * See {@link APICaller}.
+   * See {@link LegacyAPICaller}.
    *
    * @param endpoint - String descriptor of the endpoint e.g. `cluster.getSettings` or `ping`.
    * @param clientParams - A dictionary of parameters that will be passed directly to the Elasticsearch JS client.
    * @param options - Options that affect the way we call the API and process the result.
    */
-  private callAsCurrentUser: APICaller = async (
+  private callAsCurrentUser: LegacyAPICaller = async (
     endpoint: string,
     clientParams: Record<string, any> = {},
-    options?: CallAPIOptions
+    options?: LegacyCallAPIOptions
   ) => {
     this.assertIsNotClosed();
 
-    return await (callAPI.bind(null, this.scopedClient!) as APICaller)(
+    return await (callAPI.bind(null, this.scopedClient!) as LegacyAPICaller)(
       endpoint,
       clientParams,
       options
@@ -246,9 +236,7 @@ export class ClusterClient implements IClusterClient {
     }
   }
 
-  private getHeaders(
-    request?: KibanaRequest | LegacyRequest | FakeRequest
-  ): Record<string, string | string[] | undefined> {
+  private getHeaders(request?: ScopeableRequest): Record<string, string | string[] | undefined> {
     if (!isRealRequest(request)) {
       return request && request.headers ? request.headers : {};
     }
diff --git a/src/core/server/elasticsearch/elasticsearch_client_config.test.ts b/src/core/server/elasticsearch/legacy/elasticsearch_client_config.test.ts
similarity index 98%
rename from src/core/server/elasticsearch/elasticsearch_client_config.test.ts
rename to src/core/server/elasticsearch/legacy/elasticsearch_client_config.test.ts
index 77d1e41c9ad833..d6b65da7726d26 100644
--- a/src/core/server/elasticsearch/elasticsearch_client_config.test.ts
+++ b/src/core/server/elasticsearch/legacy/elasticsearch_client_config.test.ts
@@ -18,9 +18,9 @@
  */
 
 import { duration } from 'moment';
-import { loggingSystemMock } from '../logging/logging_system.mock';
+import { loggingSystemMock } from '../../logging/logging_system.mock';
 import {
-  ElasticsearchClientConfig,
+  LegacyElasticsearchClientConfig,
   parseElasticsearchClientConfig,
 } from './elasticsearch_client_config';
 const logger = loggingSystemMock.create();
@@ -64,7 +64,7 @@ Object {
 });
 
 test('parses fully specified config', () => {
-  const elasticsearchConfig: ElasticsearchClientConfig = {
+  const elasticsearchConfig: LegacyElasticsearchClientConfig = {
     apiVersion: 'v7.0.0',
     customHeaders: { xsrf: 'something' },
     logQueries: true,
diff --git a/src/core/server/elasticsearch/elasticsearch_client_config.ts b/src/core/server/elasticsearch/legacy/elasticsearch_client_config.ts
similarity index 93%
rename from src/core/server/elasticsearch/elasticsearch_client_config.ts
rename to src/core/server/elasticsearch/legacy/elasticsearch_client_config.ts
index 287d835c40351b..260a60ac74f118 100644
--- a/src/core/server/elasticsearch/elasticsearch_client_config.ts
+++ b/src/core/server/elasticsearch/legacy/elasticsearch_client_config.ts
@@ -22,9 +22,9 @@ import { cloneDeep } from 'lodash';
 import { Duration } from 'moment';
 import { checkServerIdentity } from 'tls';
 import url from 'url';
-import { pick } from '../../utils';
-import { Logger } from '../logging';
-import { ElasticsearchConfig } from './elasticsearch_config';
+import { pick } from '../../../utils';
+import { Logger } from '../../logging';
+import { ElasticsearchConfig } from '../elasticsearch_config';
 
 /**
  * @privateRemarks Config that consumers can pass to the Elasticsearch JS client is complex and includes
@@ -33,7 +33,7 @@ import { ElasticsearchConfig } from './elasticsearch_config';
  *
  * @public
  */
-export type ElasticsearchClientConfig = Pick<ConfigOptions, 'keepAlive' | 'log' | 'plugins'> &
+export type LegacyElasticsearchClientConfig = Pick<ConfigOptions, 'keepAlive' | 'log' | 'plugins'> &
   Pick<
     ElasticsearchConfig,
     | 'apiVersion'
@@ -53,7 +53,7 @@ export type ElasticsearchClientConfig = Pick<ConfigOptions, 'keepAlive' | 'log'
   };
 
 /** @internal */
-interface ElasticsearchClientConfigOverrides {
+interface LegacyElasticsearchClientConfigOverrides {
   /**
    * If set to `true`, username and password from the config won't be used
    * to access Elasticsearch API even if these are specified.
@@ -83,9 +83,9 @@ type ExtendedConfigOptions = ConfigOptions &
 
 /** @internal */
 export function parseElasticsearchClientConfig(
-  config: ElasticsearchClientConfig,
+  config: LegacyElasticsearchClientConfig,
   log: Logger,
-  { ignoreCertAndKey = false, auth = true }: ElasticsearchClientConfigOverrides = {}
+  { ignoreCertAndKey = false, auth = true }: LegacyElasticsearchClientConfigOverrides = {}
 ) {
   const esClientConfig: ExtendedConfigOptions = {
     keepAlive: true,
diff --git a/src/core/server/elasticsearch/errors.test.ts b/src/core/server/elasticsearch/legacy/errors.test.ts
similarity index 68%
rename from src/core/server/elasticsearch/errors.test.ts
rename to src/core/server/elasticsearch/legacy/errors.test.ts
index f2bb89244af387..85e5eba721b34e 100644
--- a/src/core/server/elasticsearch/errors.test.ts
+++ b/src/core/server/elasticsearch/legacy/errors.test.ts
@@ -19,49 +19,53 @@
 
 import Boom from 'boom';
 
-import { ElasticsearchErrorHelpers } from './errors';
+import { LegacyElasticsearchErrorHelpers } from './errors';
 
 describe('ElasticsearchErrorHelpers', () => {
   describe('NotAuthorized error', () => {
     describe('decorateNotAuthorizedError', () => {
       it('returns original object', () => {
         const error = new Error();
-        expect(ElasticsearchErrorHelpers.decorateNotAuthorizedError(error)).toBe(error);
+        expect(LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(error)).toBe(error);
       });
 
       it('makes the error identifiable as a NotAuthorized error', () => {
         const error = new Error();
-        expect(ElasticsearchErrorHelpers.isNotAuthorizedError(error)).toBe(false);
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(error);
-        expect(ElasticsearchErrorHelpers.isNotAuthorizedError(error)).toBe(true);
+        expect(LegacyElasticsearchErrorHelpers.isNotAuthorizedError(error)).toBe(false);
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(error);
+        expect(LegacyElasticsearchErrorHelpers.isNotAuthorizedError(error)).toBe(true);
       });
 
       it('adds boom properties', () => {
-        const error = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
+        const error = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
         expect(typeof error.output).toBe('object');
         expect(error.output.statusCode).toBe(401);
       });
 
       it('preserves boom properties of input', () => {
         const error = Boom.notFound();
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(error);
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(error);
         expect(error.output.statusCode).toBe(404);
       });
 
       describe('error.output', () => {
         it('defaults to message of error', () => {
-          const error = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error('foobar'));
+          const error = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(
+            new Error('foobar')
+          );
           expect(error.output.payload).toHaveProperty('message', 'foobar');
         });
         it('prefixes message with passed reason', () => {
-          const error = ElasticsearchErrorHelpers.decorateNotAuthorizedError(
+          const error = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(
             new Error('foobar'),
             'biz'
           );
           expect(error.output.payload).toHaveProperty('message', 'biz: foobar');
         });
         it('sets statusCode to 401', () => {
-          const error = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error('foo'));
+          const error = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(
+            new Error('foo')
+          );
           expect(error.output).toHaveProperty('statusCode', 401);
         });
       });
diff --git a/src/core/server/elasticsearch/errors.ts b/src/core/server/elasticsearch/legacy/errors.ts
similarity index 88%
rename from src/core/server/elasticsearch/errors.ts
rename to src/core/server/elasticsearch/legacy/errors.ts
index 6852b8632ebf12..f81903d76547a3 100644
--- a/src/core/server/elasticsearch/errors.ts
+++ b/src/core/server/elasticsearch/legacy/errors.ts
@@ -27,11 +27,11 @@ enum ErrorCode {
 }
 
 /** @public */
-export interface ElasticsearchError extends Boom {
+export interface LegacyElasticsearchError extends Boom {
   [code]?: string;
 }
 
-function isElasticsearchError(error: any): error is ElasticsearchError {
+function isElasticsearchError(error: any): error is LegacyElasticsearchError {
   return Boolean(error && error[code]);
 }
 
@@ -40,7 +40,7 @@ function decorate(
   errorCode: ErrorCode,
   statusCode: number,
   message?: string
-): ElasticsearchError {
+): LegacyElasticsearchError {
   if (isElasticsearchError(error)) {
     return error;
   }
@@ -50,7 +50,7 @@ function decorate(
     message,
     // keep status and messages if Boom error object already has them
     override: false,
-  }) as ElasticsearchError;
+  }) as LegacyElasticsearchError;
 
   boom[code] = errorCode;
 
@@ -74,8 +74,8 @@ function decorate(
  *   }
  * ```
  */
-export class ElasticsearchErrorHelpers {
-  public static isNotAuthorizedError(error: any): error is ElasticsearchError {
+export class LegacyElasticsearchErrorHelpers {
+  public static isNotAuthorizedError(error: any): error is LegacyElasticsearchError {
     return isElasticsearchError(error) && error[code] === ErrorCode.NOT_AUTHORIZED;
   }
 
diff --git a/src/core/server/elasticsearch/legacy/index.ts b/src/core/server/elasticsearch/legacy/index.ts
new file mode 100644
index 00000000000000..165980b9f45223
--- /dev/null
+++ b/src/core/server/elasticsearch/legacy/index.ts
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+export {
+  LegacyClusterClient,
+  ILegacyClusterClient,
+  ILegacyCustomClusterClient,
+} from './cluster_client';
+export { ILegacyScopedClusterClient, LegacyScopedClusterClient } from './scoped_cluster_client';
+export { LegacyElasticsearchClientConfig } from './elasticsearch_client_config';
+export { retryCallCluster, migrationsRetryCallCluster } from './retry_call_cluster';
+export { LegacyElasticsearchError, LegacyElasticsearchErrorHelpers } from './errors';
+export * from './api_types';
diff --git a/src/core/server/elasticsearch/retry_call_cluster.test.ts b/src/core/server/elasticsearch/legacy/retry_call_cluster.test.ts
similarity index 98%
rename from src/core/server/elasticsearch/retry_call_cluster.test.ts
rename to src/core/server/elasticsearch/legacy/retry_call_cluster.test.ts
index 18ffa95048c4d9..62789a4fe952d7 100644
--- a/src/core/server/elasticsearch/retry_call_cluster.test.ts
+++ b/src/core/server/elasticsearch/legacy/retry_call_cluster.test.ts
@@ -19,7 +19,7 @@
 import * as legacyElasticsearch from 'elasticsearch';
 
 import { retryCallCluster, migrationsRetryCallCluster } from './retry_call_cluster';
-import { loggingSystemMock } from '../logging/logging_system.mock';
+import { loggingSystemMock } from '../../logging/logging_system.mock';
 
 describe('retryCallCluster', () => {
   it('retries ES API calls that rejects with NoConnections', () => {
diff --git a/src/core/server/elasticsearch/retry_call_cluster.ts b/src/core/server/elasticsearch/legacy/retry_call_cluster.ts
similarity index 88%
rename from src/core/server/elasticsearch/retry_call_cluster.ts
rename to src/core/server/elasticsearch/legacy/retry_call_cluster.ts
index aa3e39d948593a..b12ecc889eb2d7 100644
--- a/src/core/server/elasticsearch/retry_call_cluster.ts
+++ b/src/core/server/elasticsearch/legacy/retry_call_cluster.ts
@@ -21,9 +21,9 @@ import { retryWhen, concatMap } from 'rxjs/operators';
 import { defer, throwError, iif, timer } from 'rxjs';
 import * as legacyElasticsearch from 'elasticsearch';
 
-import { CallAPIOptions } from '.';
-import { APICaller } from './api_types';
-import { Logger } from '../logging';
+import { LegacyCallAPIOptions } from '.';
+import { LegacyAPICaller } from './api_types';
+import { Logger } from '../../logging';
 
 const esErrors = legacyElasticsearch.errors;
 
@@ -39,12 +39,16 @@ const esErrors = legacyElasticsearch.errors;
  * @param delay
  */
 export function migrationsRetryCallCluster(
-  apiCaller: APICaller,
+  apiCaller: LegacyAPICaller,
   log: Logger,
   delay: number = 2500
 ) {
   const previousErrors: string[] = [];
-  return (endpoint: string, clientParams: Record<string, any> = {}, options?: CallAPIOptions) => {
+  return (
+    endpoint: string,
+    clientParams: Record<string, any> = {},
+    options?: LegacyCallAPIOptions
+  ) => {
     return defer(() => apiCaller(endpoint, clientParams, options))
       .pipe(
         retryWhen((error$) =>
@@ -86,8 +90,12 @@ export function migrationsRetryCallCluster(
  *
  * @param apiCaller
  */
-export function retryCallCluster(apiCaller: APICaller) {
-  return (endpoint: string, clientParams: Record<string, any> = {}, options?: CallAPIOptions) => {
+export function retryCallCluster(apiCaller: LegacyAPICaller) {
+  return (
+    endpoint: string,
+    clientParams: Record<string, any> = {},
+    options?: LegacyCallAPIOptions
+  ) => {
     return defer(() => apiCaller(endpoint, clientParams, options))
       .pipe(
         retryWhen((errors) =>
diff --git a/src/core/server/elasticsearch/scoped_cluster_client.test.ts b/src/core/server/elasticsearch/legacy/scoped_cluster_client.test.ts
similarity index 95%
rename from src/core/server/elasticsearch/scoped_cluster_client.test.ts
rename to src/core/server/elasticsearch/legacy/scoped_cluster_client.test.ts
index 04c13f85a1ef7a..2eb8cefb564ae6 100644
--- a/src/core/server/elasticsearch/scoped_cluster_client.test.ts
+++ b/src/core/server/elasticsearch/legacy/scoped_cluster_client.test.ts
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-import { ScopedClusterClient } from './scoped_cluster_client';
+import { LegacyScopedClusterClient } from './scoped_cluster_client';
 
 let internalAPICaller: jest.Mock;
 let scopedAPICaller: jest.Mock;
-let clusterClient: ScopedClusterClient;
+let clusterClient: LegacyScopedClusterClient;
 beforeEach(() => {
   internalAPICaller = jest.fn();
   scopedAPICaller = jest.fn();
-  clusterClient = new ScopedClusterClient(internalAPICaller, scopedAPICaller, { one: '1' });
+  clusterClient = new LegacyScopedClusterClient(internalAPICaller, scopedAPICaller, { one: '1' });
 });
 
 afterEach(() => jest.clearAllMocks());
@@ -184,7 +184,10 @@ describe('#callAsCurrentUser', () => {
     const mockResponse = { data: 'response' };
     scopedAPICaller.mockResolvedValue(mockResponse);
 
-    const clusterClientWithoutHeaders = new ScopedClusterClient(internalAPICaller, scopedAPICaller);
+    const clusterClientWithoutHeaders = new LegacyScopedClusterClient(
+      internalAPICaller,
+      scopedAPICaller
+    );
 
     await expect(clusterClientWithoutHeaders.callAsCurrentUser('ping')).resolves.toBe(mockResponse);
     expect(scopedAPICaller).toHaveBeenCalledTimes(1);
diff --git a/src/core/server/elasticsearch/scoped_cluster_client.ts b/src/core/server/elasticsearch/legacy/scoped_cluster_client.ts
similarity index 85%
rename from src/core/server/elasticsearch/scoped_cluster_client.ts
rename to src/core/server/elasticsearch/legacy/scoped_cluster_client.ts
index 4b64bfba151907..e62409ff00c7ed 100644
--- a/src/core/server/elasticsearch/scoped_cluster_client.ts
+++ b/src/core/server/elasticsearch/legacy/scoped_cluster_client.ts
@@ -18,11 +18,8 @@
  */
 
 import { intersection, isObject } from 'lodash';
-import { Headers } from '../http/router';
-import { APICaller, CallAPIOptions } from './api_types';
-
-/** @public */
-export { Headers };
+import { Headers } from '../../http/router';
+import { LegacyAPICaller, LegacyCallAPIOptions } from './api_types';
 
 /**
  * Serves the same purpose as "normal" `ClusterClient` but exposes additional
@@ -30,12 +27,12 @@ export { Headers };
  * user (as `callAsInternalUser` does) to request Elasticsearch API, but rather
  * passes HTTP headers extracted from the current user request to the API.
  *
- * See {@link ScopedClusterClient}.
+ * See {@link LegacyScopedClusterClient}.
  *
  * @public
  */
-export type IScopedClusterClient = Pick<
-  ScopedClusterClient,
+export type ILegacyScopedClusterClient = Pick<
+  LegacyScopedClusterClient,
   'callAsCurrentUser' | 'callAsInternalUser'
 >;
 
@@ -43,10 +40,10 @@ export type IScopedClusterClient = Pick<
  * {@inheritDoc IScopedClusterClient}
  * @public
  */
-export class ScopedClusterClient implements IScopedClusterClient {
+export class LegacyScopedClusterClient implements ILegacyScopedClusterClient {
   constructor(
-    private readonly internalAPICaller: APICaller,
-    private readonly scopedAPICaller: APICaller,
+    private readonly internalAPICaller: LegacyAPICaller,
+    private readonly scopedAPICaller: LegacyAPICaller,
     private readonly headers?: Headers
   ) {
     this.callAsCurrentUser = this.callAsCurrentUser.bind(this);
@@ -56,7 +53,7 @@ export class ScopedClusterClient implements IScopedClusterClient {
   /**
    * Calls specified `endpoint` with provided `clientParams` on behalf of the
    * Kibana internal user.
-   * See {@link APICaller}.
+   * See {@link LegacyAPICaller}.
    *
    * @param endpoint - String descriptor of the endpoint e.g. `cluster.getSettings` or `ping`.
    * @param clientParams - A dictionary of parameters that will be passed directly to the Elasticsearch JS client.
@@ -65,7 +62,7 @@ export class ScopedClusterClient implements IScopedClusterClient {
   public callAsInternalUser(
     endpoint: string,
     clientParams: Record<string, any> = {},
-    options?: CallAPIOptions
+    options?: LegacyCallAPIOptions
   ) {
     return this.internalAPICaller(endpoint, clientParams, options);
   }
@@ -73,7 +70,7 @@ export class ScopedClusterClient implements IScopedClusterClient {
   /**
    * Calls specified `endpoint` with provided `clientParams` on behalf of the
    * user initiated request to the Kibana server (via HTTP request headers).
-   * See {@link APICaller}.
+   * See {@link LegacyAPICaller}.
    *
    * @param endpoint - String descriptor of the endpoint e.g. `cluster.getSettings` or `ping`.
    * @param clientParams - A dictionary of parameters that will be passed directly to the Elasticsearch JS client.
@@ -82,7 +79,7 @@ export class ScopedClusterClient implements IScopedClusterClient {
   public callAsCurrentUser(
     endpoint: string,
     clientParams: Record<string, any> = {},
-    options?: CallAPIOptions
+    options?: LegacyCallAPIOptions
   ) {
     const defaultHeaders = this.headers;
     if (defaultHeaders !== undefined) {
diff --git a/src/core/server/elasticsearch/types.ts b/src/core/server/elasticsearch/types.ts
index 6fef08fc298ffa..2b4ba4b0a0a550 100644
--- a/src/core/server/elasticsearch/types.ts
+++ b/src/core/server/elasticsearch/types.ts
@@ -18,9 +18,14 @@
  */
 
 import { Observable } from 'rxjs';
+import { Headers } from '../http/router';
+import { LegacyRequest, KibanaRequest } from '../http';
 import { ElasticsearchConfig } from './elasticsearch_config';
-import { ElasticsearchClientConfig } from './elasticsearch_client_config';
-import { IClusterClient, ICustomClusterClient } from './cluster_client';
+import {
+  LegacyElasticsearchClientConfig,
+  ILegacyClusterClient,
+  ILegacyCustomClusterClient,
+} from './legacy';
 import { NodesVersionCompatibility } from './version_check/ensure_es_version';
 import { ServiceStatus } from '../status';
 
@@ -38,7 +43,7 @@ export interface ElasticsearchServiceSetup {
      * @deprecated
      * Use {@link ElasticsearchServiceStart.legacy | ElasticsearchServiceStart.legacy.createClient} instead.
      *
-     * Create application specific Elasticsearch cluster API client with customized config. See {@link IClusterClient}.
+     * Create application specific Elasticsearch cluster API client with customized config. See {@link ILegacyClusterClient}.
      *
      * @param type Unique identifier of the client
      * @param clientConfig A config consists of Elasticsearch JS client options and
@@ -56,22 +61,22 @@ export interface ElasticsearchServiceSetup {
      */
     readonly createClient: (
       type: string,
-      clientConfig?: Partial<ElasticsearchClientConfig>
-    ) => ICustomClusterClient;
+      clientConfig?: Partial<LegacyElasticsearchClientConfig>
+    ) => ILegacyCustomClusterClient;
 
     /**
      * @deprecated
      * Use {@link ElasticsearchServiceStart.legacy | ElasticsearchServiceStart.legacy.client} instead.
      *
      * All Elasticsearch config value changes are processed under the hood.
-     * See {@link IClusterClient}.
+     * See {@link ILegacyClusterClient}.
      *
      * @example
      * ```js
      * const client = core.elasticsearch.legacy.client;
      * ```
      */
-    readonly client: IClusterClient;
+    readonly client: ILegacyClusterClient;
   };
 }
 
@@ -86,7 +91,7 @@ export interface ElasticsearchServiceStart {
    * */
   legacy: {
     /**
-     * Create application specific Elasticsearch cluster API client with customized config. See {@link IClusterClient}.
+     * Create application specific Elasticsearch cluster API client with customized config. See {@link ILegacyClusterClient}.
      *
      * @param type Unique identifier of the client
      * @param clientConfig A config consists of Elasticsearch JS client options and
@@ -104,19 +109,19 @@ export interface ElasticsearchServiceStart {
      */
     readonly createClient: (
       type: string,
-      clientConfig?: Partial<ElasticsearchClientConfig>
-    ) => ICustomClusterClient;
+      clientConfig?: Partial<LegacyElasticsearchClientConfig>
+    ) => ILegacyCustomClusterClient;
 
     /**
      * A pre-configured Elasticsearch client. All Elasticsearch config value changes are processed under the hood.
-     * See {@link IClusterClient}.
+     * See {@link ILegacyClusterClient}.
      *
      * @example
      * ```js
      * const client = core.elasticsearch.client;
      * ```
      */
-    readonly client: IClusterClient;
+    readonly client: ILegacyClusterClient;
   };
 }
 
@@ -135,3 +140,21 @@ export interface ElasticsearchStatusMeta {
   warningNodes: NodesVersionCompatibility['warningNodes'];
   incompatibleNodes: NodesVersionCompatibility['incompatibleNodes'];
 }
+
+/**
+ * Fake request object created manually by Kibana plugins.
+ * @public
+ */
+export interface FakeRequest {
+  /** Headers used for authentication against Elasticsearch */
+  headers: Headers;
+}
+
+/**
+ A user credentials container.
+ * It accommodates the necessary auth credentials to impersonate the current user.
+ *
+ * @public
+ * See {@link KibanaRequest}.
+ */
+export type ScopeableRequest = KibanaRequest | LegacyRequest | FakeRequest;
diff --git a/src/core/server/elasticsearch/version_check/ensure_es_version.ts b/src/core/server/elasticsearch/version_check/ensure_es_version.ts
index 776298e5869a0d..3f562dac22a028 100644
--- a/src/core/server/elasticsearch/version_check/ensure_es_version.ts
+++ b/src/core/server/elasticsearch/version_check/ensure_es_version.ts
@@ -29,10 +29,10 @@ import {
   esVersionEqualsKibana,
 } from './es_kibana_version_compatability';
 import { Logger } from '../../logging';
-import { APICaller } from '..';
+import { LegacyAPICaller } from '..';
 
 export interface PollEsNodesVersionOptions {
-  callWithInternalUser: APICaller;
+  callWithInternalUser: LegacyAPICaller;
   log: Logger;
   kibanaVersion: string;
   ignoreVersionMismatch: boolean;
diff --git a/src/core/server/http/index.ts b/src/core/server/http/index.ts
index ca9dfde2e71dce..65d633260a7911 100644
--- a/src/core/server/http/index.ts
+++ b/src/core/server/http/index.ts
@@ -25,6 +25,7 @@ export {
   CustomHttpResponseOptions,
   IKibanaSocket,
   isRealRequest,
+  Headers,
   HttpResponseOptions,
   HttpResponsePayload,
   ErrorHttpResponseOptions,
diff --git a/src/core/server/http/integration_tests/core_service.test.mocks.ts b/src/core/server/http/integration_tests/core_service.test.mocks.ts
index 8e782970e2a8e4..6f9b4b96eae9d6 100644
--- a/src/core/server/http/integration_tests/core_service.test.mocks.ts
+++ b/src/core/server/http/integration_tests/core_service.test.mocks.ts
@@ -19,8 +19,8 @@
 import { elasticsearchServiceMock } from '../../elasticsearch/elasticsearch_service.mock';
 
 export const clusterClientMock = jest.fn();
-jest.doMock('../../elasticsearch/scoped_cluster_client', () => ({
-  ScopedClusterClient: clusterClientMock.mockImplementation(function () {
+jest.doMock('../../elasticsearch/legacy/scoped_cluster_client', () => ({
+  LegacyScopedClusterClient: clusterClientMock.mockImplementation(function () {
     return elasticsearchServiceMock.createScopedClusterClient();
   }),
 }));
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 7520111bf33ac5..91c33fac41646b 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -41,7 +41,7 @@
 
 import {
   ElasticsearchServiceSetup,
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
   configSchema as elasticsearchConfigSchema,
   ElasticsearchServiceStart,
 } from './elasticsearch';
@@ -91,25 +91,24 @@ export {
 export { CoreId } from './core_context';
 export { CspConfig, ICspConfig } from './csp';
 export {
-  ClusterClient,
-  IClusterClient,
-  ICustomClusterClient,
-  Headers,
-  ScopedClusterClient,
-  IScopedClusterClient,
+  LegacyClusterClient,
+  ILegacyClusterClient,
+  ILegacyCustomClusterClient,
+  LegacyScopedClusterClient,
+  ILegacyScopedClusterClient,
   ElasticsearchConfig,
-  ElasticsearchClientConfig,
-  ElasticsearchError,
-  ElasticsearchErrorHelpers,
+  LegacyElasticsearchClientConfig,
+  LegacyElasticsearchError,
+  LegacyElasticsearchErrorHelpers,
   ElasticsearchServiceSetup,
   ElasticsearchServiceStart,
   ElasticsearchStatusMeta,
   NodesVersionCompatibility,
-  APICaller,
+  LegacyAPICaller,
   FakeRequest,
   ScopeableRequest,
 } from './elasticsearch';
-export * from './elasticsearch/api_types';
+export * from './elasticsearch/legacy/api_types';
 export {
   AuthenticationHandler,
   AuthHeaders,
@@ -127,6 +126,7 @@ export {
   CustomHttpResponseOptions,
   GetAuthHeaders,
   GetAuthState,
+  Headers,
   HttpAuth,
   HttpResponseOptions,
   HttpResponsePayload,
@@ -356,7 +356,7 @@ export {
  *      which uses the credentials of the incoming request
  *    - {@link ISavedObjectTypeRegistry | savedObjects.typeRegistry} - Type registry containing
  *      all the registered types.
- *    - {@link ScopedClusterClient | elasticsearch.legacy.client} - Elasticsearch
+ *    - {@link LegacyScopedClusterClient | elasticsearch.legacy.client} - 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
@@ -371,7 +371,7 @@ export interface RequestHandlerContext {
     };
     elasticsearch: {
       legacy: {
-        client: IScopedClusterClient;
+        client: ILegacyScopedClusterClient;
       };
     };
     uiSettings: {
diff --git a/src/core/server/logging/logging_system.test.ts b/src/core/server/logging/logging_system.test.ts
index f73e40fe320dc3..ac52973081106e 100644
--- a/src/core/server/logging/logging_system.test.ts
+++ b/src/core/server/logging/logging_system.test.ts
@@ -230,6 +230,49 @@ test('setContextConfig() updates config with relative contexts', () => {
   );
 });
 
+test('setContextConfig() updates config for a root context', () => {
+  const testsLogger = system.get('tests');
+  const testsChildLogger = system.get('tests', 'child');
+  const testsGrandchildLogger = system.get('tests', 'child', 'grandchild');
+
+  system.upgrade(
+    config.schema.validate({
+      appenders: { default: { kind: 'console', layout: { kind: 'json' } } },
+      root: { level: 'info' },
+    })
+  );
+
+  system.setContextConfig(['tests', 'child'], {
+    appenders: new Map([
+      [
+        'custom',
+        { kind: 'console', layout: { kind: 'pattern', pattern: '[%level][%logger] %message' } },
+      ],
+    ]),
+    loggers: [{ context: '', appenders: ['custom'], level: 'debug' }],
+  });
+
+  testsLogger.warn('tests log to default!');
+  testsChildLogger.error('tests.child log to custom!');
+  testsGrandchildLogger.debug('tests.child.grandchild log to custom!');
+
+  expect(mockConsoleLog).toHaveBeenCalledTimes(3);
+  // Parent context is unaffected
+  expect(JSON.parse(mockConsoleLog.mock.calls[0][0])).toMatchObject({
+    context: 'tests',
+    message: 'tests log to default!',
+    level: 'WARN',
+  });
+  // Customized contexts
+  expect(mockConsoleLog.mock.calls[1][0]).toMatchInlineSnapshot(
+    `"[ERROR][tests.child] tests.child log to custom!"`
+  );
+
+  expect(mockConsoleLog.mock.calls[2][0]).toMatchInlineSnapshot(
+    `"[DEBUG][tests.child.grandchild] tests.child.grandchild log to custom!"`
+  );
+});
+
 test('custom context configs are applied on subsequent calls to update()', () => {
   system.setContextConfig(['tests', 'child'], {
     appenders: new Map([
diff --git a/src/core/server/logging/logging_system.ts b/src/core/server/logging/logging_system.ts
index 0bab9534d2d053..8aadab83bf7163 100644
--- a/src/core/server/logging/logging_system.ts
+++ b/src/core/server/logging/logging_system.ts
@@ -100,7 +100,9 @@ export class LoggingSystem implements LoggerFactory {
       // Automatically prepend the base context to the logger sub-contexts
       loggers: contextConfig.loggers.map((l) => ({
         ...l,
-        context: LoggingConfig.getLoggerContext([context, l.context]),
+        context: LoggingConfig.getLoggerContext(
+          l.context.length > 0 ? [context, l.context] : [context]
+        ),
       })),
     });
 
diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts
index 48b1e12fc187ed..c2d4f49d7ee2ac 100644
--- a/src/core/server/saved_objects/saved_objects_service.ts
+++ b/src/core/server/saved_objects/saved_objects_service.ts
@@ -30,13 +30,13 @@ import { KibanaMigrator, IKibanaMigrator } from './migrations';
 import { CoreContext } from '../core_context';
 import { LegacyServiceDiscoverPlugins } from '../legacy';
 import {
-  APICaller,
+  LegacyAPICaller,
   ElasticsearchServiceStart,
-  IClusterClient,
+  ILegacyClusterClient,
   InternalElasticsearchServiceSetup,
 } from '../elasticsearch';
 import { KibanaConfigType } from '../kibana_config';
-import { migrationsRetryCallCluster } from '../elasticsearch/retry_call_cluster';
+import { migrationsRetryCallCluster } from '../elasticsearch/legacy';
 import {
   SavedObjectsConfigType,
   SavedObjectsMigrationConfigType,
@@ -434,7 +434,7 @@ export class SavedObjectsService
       await migrator.runMigrations();
     }
 
-    const createRepository = (callCluster: APICaller, includedHiddenTypes: string[] = []) => {
+    const createRepository = (callCluster: LegacyAPICaller, includedHiddenTypes: string[] = []) => {
       return SavedObjectsRepository.createRepository(
         migrator,
         this.typeRegistry,
@@ -484,7 +484,7 @@ export class SavedObjectsService
   private createMigrator(
     kibanaConfig: KibanaConfigType,
     savedObjectsConfig: SavedObjectsMigrationConfigType,
-    esClient: IClusterClient,
+    esClient: ILegacyClusterClient,
     migrationsRetryDelay?: number
   ): KibanaMigrator {
     return new KibanaMigrator({
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index 40c5282a77e499..f24195c0f295e3 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -19,8 +19,8 @@
 
 import { omit } from 'lodash';
 import uuid from 'uuid';
-import { retryCallCluster } from '../../../elasticsearch/retry_call_cluster';
-import { APICaller } from '../../../elasticsearch/';
+import { retryCallCluster } from '../../../elasticsearch/legacy';
+import { LegacyAPICaller } from '../../../elasticsearch/';
 
 import { getRootPropertiesObjects, IndexMapping } from '../../mappings';
 import { getSearchDsl } from './search_dsl';
@@ -74,7 +74,7 @@ const isRight = (either: Either): either is Right => either.tag === 'Right';
 export interface SavedObjectsRepositoryOptions {
   index: string;
   mappings: IndexMapping;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   typeRegistry: SavedObjectTypeRegistry;
   serializer: SavedObjectsSerializer;
   migrator: KibanaMigrator;
@@ -117,7 +117,7 @@ export class SavedObjectsRepository {
   private _mappings: IndexMapping;
   private _registry: SavedObjectTypeRegistry;
   private _allowedTypes: string[];
-  private _unwrappedCallCluster: APICaller;
+  private _unwrappedCallCluster: LegacyAPICaller;
   private _serializer: SavedObjectsSerializer;
 
   /**
@@ -132,7 +132,7 @@ export class SavedObjectsRepository {
     migrator: KibanaMigrator,
     typeRegistry: SavedObjectTypeRegistry,
     indexName: string,
-    callCluster: APICaller,
+    callCluster: LegacyAPICaller,
     includedHiddenTypes: string[] = [],
     injectedConstructor: any = SavedObjectsRepository
   ): ISavedObjectsRepository {
@@ -188,7 +188,7 @@ export class SavedObjectsRepository {
     }
     this._allowedTypes = allowedTypes;
 
-    this._unwrappedCallCluster = async (...args: Parameters<APICaller>) => {
+    this._unwrappedCallCluster = async (...args: Parameters<LegacyAPICaller>) => {
       await migrator.runMigrations();
       return callCluster(...args);
     };
@@ -1300,7 +1300,7 @@ export class SavedObjectsRepository {
     };
   }
 
-  private async _writeToCluster(...args: Parameters<APICaller>) {
+  private async _writeToCluster(...args: Parameters<LegacyAPICaller>) {
     try {
       return await this._callCluster(...args);
     } catch (err) {
@@ -1308,7 +1308,7 @@ export class SavedObjectsRepository {
     }
   }
 
-  private async _callCluster(...args: Parameters<APICaller>) {
+  private async _callCluster(...args: Parameters<LegacyAPICaller>) {
     try {
       return await this._unwrappedCallCluster(...args);
     } catch (err) {
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 108826ad61aa26..5973e300e098e1 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -144,250 +144,6 @@ import { UpdateDocumentByQueryParams } from 'elasticsearch';
 import { UpdateDocumentParams } from 'elasticsearch';
 import { Url } from 'url';
 
-// @public (undocumented)
-export interface APICaller {
-    // (undocumented)
-    (endpoint: 'bulk', params: BulkIndexDocumentsParams, options?: CallAPIOptions): ReturnType<Client['bulk']>;
-    // (undocumented)
-    (endpoint: 'clearScroll', params: ClearScrollParams, options?: CallAPIOptions): ReturnType<Client['clearScroll']>;
-    // (undocumented)
-    (endpoint: 'count', params: CountParams, options?: CallAPIOptions): ReturnType<Client['count']>;
-    // (undocumented)
-    (endpoint: 'create', params: CreateDocumentParams, options?: CallAPIOptions): ReturnType<Client['create']>;
-    // (undocumented)
-    (endpoint: 'delete', params: DeleteDocumentParams, options?: CallAPIOptions): ReturnType<Client['delete']>;
-    // (undocumented)
-    (endpoint: 'deleteByQuery', params: DeleteDocumentByQueryParams, options?: CallAPIOptions): ReturnType<Client['deleteByQuery']>;
-    // (undocumented)
-    (endpoint: 'deleteScript', params: DeleteScriptParams, options?: CallAPIOptions): ReturnType<Client['deleteScript']>;
-    // (undocumented)
-    (endpoint: 'deleteTemplate', params: DeleteTemplateParams, options?: CallAPIOptions): ReturnType<Client['deleteTemplate']>;
-    // (undocumented)
-    (endpoint: 'exists', params: ExistsParams, options?: CallAPIOptions): ReturnType<Client['exists']>;
-    // (undocumented)
-    (endpoint: 'explain', params: ExplainParams, options?: CallAPIOptions): ReturnType<Client['explain']>;
-    // (undocumented)
-    (endpoint: 'fieldStats', params: FieldStatsParams, options?: CallAPIOptions): ReturnType<Client['fieldStats']>;
-    // (undocumented)
-    <T>(endpoint: 'get', params: GetParams, options?: CallAPIOptions): Promise<GetResponse<T>>;
-    // (undocumented)
-    (endpoint: 'getScript', params: GetScriptParams, options?: CallAPIOptions): ReturnType<Client['getScript']>;
-    // (undocumented)
-    (endpoint: 'getSource', params: GetSourceParams, options?: CallAPIOptions): ReturnType<Client['getSource']>;
-    // (undocumented)
-    (endpoint: 'getTemplate', params: GetTemplateParams, options?: CallAPIOptions): ReturnType<Client['getTemplate']>;
-    // (undocumented)
-    <T>(endpoint: 'index', params: IndexDocumentParams<T>, options?: CallAPIOptions): ReturnType<Client['index']>;
-    // (undocumented)
-    (endpoint: 'info', params: InfoParams, options?: CallAPIOptions): ReturnType<Client['info']>;
-    // (undocumented)
-    <T>(endpoint: 'mget', params: MGetParams, options?: CallAPIOptions): Promise<MGetResponse<T>>;
-    // (undocumented)
-    <T>(endpoint: 'msearch', params: MSearchParams, options?: CallAPIOptions): Promise<MSearchResponse<T>>;
-    // (undocumented)
-    <T>(endpoint: 'msearchTemplate', params: MSearchTemplateParams, options?: CallAPIOptions): Promise<MSearchResponse<T>>;
-    // (undocumented)
-    (endpoint: 'mtermvectors', params: MTermVectorsParams, options?: CallAPIOptions): ReturnType<Client['mtermvectors']>;
-    // (undocumented)
-    (endpoint: 'ping', params: PingParams, options?: CallAPIOptions): ReturnType<Client['ping']>;
-    // (undocumented)
-    (endpoint: 'putScript', params: PutScriptParams, options?: CallAPIOptions): ReturnType<Client['putScript']>;
-    // (undocumented)
-    (endpoint: 'putTemplate', params: PutTemplateParams, options?: CallAPIOptions): ReturnType<Client['putTemplate']>;
-    // (undocumented)
-    (endpoint: 'reindex', params: ReindexParams, options?: CallAPIOptions): ReturnType<Client['reindex']>;
-    // (undocumented)
-    (endpoint: 'reindexRethrottle', params: ReindexRethrottleParams, options?: CallAPIOptions): ReturnType<Client['reindexRethrottle']>;
-    // (undocumented)
-    (endpoint: 'renderSearchTemplate', params: RenderSearchTemplateParams, options?: CallAPIOptions): ReturnType<Client['renderSearchTemplate']>;
-    // (undocumented)
-    <T>(endpoint: 'scroll', params: ScrollParams, options?: CallAPIOptions): Promise<SearchResponse<T>>;
-    // (undocumented)
-    <T>(endpoint: 'search', params: SearchParams, options?: CallAPIOptions): Promise<SearchResponse<T>>;
-    // (undocumented)
-    (endpoint: 'searchShards', params: SearchShardsParams, options?: CallAPIOptions): ReturnType<Client['searchShards']>;
-    // (undocumented)
-    (endpoint: 'searchTemplate', params: SearchTemplateParams, options?: CallAPIOptions): ReturnType<Client['searchTemplate']>;
-    // (undocumented)
-    (endpoint: 'suggest', params: SuggestParams, options?: CallAPIOptions): ReturnType<Client['suggest']>;
-    // (undocumented)
-    (endpoint: 'termvectors', params: TermvectorsParams, options?: CallAPIOptions): ReturnType<Client['termvectors']>;
-    // (undocumented)
-    (endpoint: 'update', params: UpdateDocumentParams, options?: CallAPIOptions): ReturnType<Client['update']>;
-    // (undocumented)
-    (endpoint: 'updateByQuery', params: UpdateDocumentByQueryParams, options?: CallAPIOptions): ReturnType<Client['updateByQuery']>;
-    // (undocumented)
-    (endpoint: 'cat.aliases', params: CatAliasesParams, options?: CallAPIOptions): ReturnType<Client['cat']['aliases']>;
-    // (undocumented)
-    (endpoint: 'cat.allocation', params: CatAllocationParams, options?: CallAPIOptions): ReturnType<Client['cat']['allocation']>;
-    // (undocumented)
-    (endpoint: 'cat.count', params: CatAllocationParams, options?: CallAPIOptions): ReturnType<Client['cat']['count']>;
-    // (undocumented)
-    (endpoint: 'cat.fielddata', params: CatFielddataParams, options?: CallAPIOptions): ReturnType<Client['cat']['fielddata']>;
-    // (undocumented)
-    (endpoint: 'cat.health', params: CatHealthParams, options?: CallAPIOptions): ReturnType<Client['cat']['health']>;
-    // (undocumented)
-    (endpoint: 'cat.help', params: CatHelpParams, options?: CallAPIOptions): ReturnType<Client['cat']['help']>;
-    // (undocumented)
-    (endpoint: 'cat.indices', params: CatIndicesParams, options?: CallAPIOptions): ReturnType<Client['cat']['indices']>;
-    // (undocumented)
-    (endpoint: 'cat.master', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['master']>;
-    // (undocumented)
-    (endpoint: 'cat.nodeattrs', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['nodeattrs']>;
-    // (undocumented)
-    (endpoint: 'cat.nodes', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['nodes']>;
-    // (undocumented)
-    (endpoint: 'cat.pendingTasks', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['pendingTasks']>;
-    // (undocumented)
-    (endpoint: 'cat.plugins', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['plugins']>;
-    // (undocumented)
-    (endpoint: 'cat.recovery', params: CatRecoveryParams, options?: CallAPIOptions): ReturnType<Client['cat']['recovery']>;
-    // (undocumented)
-    (endpoint: 'cat.repositories', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['repositories']>;
-    // (undocumented)
-    (endpoint: 'cat.segments', params: CatSegmentsParams, options?: CallAPIOptions): ReturnType<Client['cat']['segments']>;
-    // (undocumented)
-    (endpoint: 'cat.shards', params: CatShardsParams, options?: CallAPIOptions): ReturnType<Client['cat']['shards']>;
-    // (undocumented)
-    (endpoint: 'cat.snapshots', params: CatSnapshotsParams, options?: CallAPIOptions): ReturnType<Client['cat']['snapshots']>;
-    // (undocumented)
-    (endpoint: 'cat.tasks', params: CatTasksParams, options?: CallAPIOptions): ReturnType<Client['cat']['tasks']>;
-    // (undocumented)
-    (endpoint: 'cat.threadPool', params: CatThreadPoolParams, options?: CallAPIOptions): ReturnType<Client['cat']['threadPool']>;
-    // (undocumented)
-    (endpoint: 'cluster.allocationExplain', params: ClusterAllocationExplainParams, options?: CallAPIOptions): ReturnType<Client['cluster']['allocationExplain']>;
-    // (undocumented)
-    (endpoint: 'cluster.getSettings', params: ClusterGetSettingsParams, options?: CallAPIOptions): ReturnType<Client['cluster']['getSettings']>;
-    // (undocumented)
-    (endpoint: 'cluster.health', params: ClusterHealthParams, options?: CallAPIOptions): ReturnType<Client['cluster']['health']>;
-    // (undocumented)
-    (endpoint: 'cluster.pendingTasks', params: ClusterPendingTasksParams, options?: CallAPIOptions): ReturnType<Client['cluster']['pendingTasks']>;
-    // (undocumented)
-    (endpoint: 'cluster.putSettings', params: ClusterPutSettingsParams, options?: CallAPIOptions): ReturnType<Client['cluster']['putSettings']>;
-    // (undocumented)
-    (endpoint: 'cluster.reroute', params: ClusterRerouteParams, options?: CallAPIOptions): ReturnType<Client['cluster']['reroute']>;
-    // (undocumented)
-    (endpoint: 'cluster.state', params: ClusterStateParams, options?: CallAPIOptions): ReturnType<Client['cluster']['state']>;
-    // (undocumented)
-    (endpoint: 'cluster.stats', params: ClusterStatsParams, options?: CallAPIOptions): ReturnType<Client['cluster']['stats']>;
-    // (undocumented)
-    (endpoint: 'indices.analyze', params: IndicesAnalyzeParams, options?: CallAPIOptions): ReturnType<Client['indices']['analyze']>;
-    // (undocumented)
-    (endpoint: 'indices.clearCache', params: IndicesClearCacheParams, options?: CallAPIOptions): ReturnType<Client['indices']['clearCache']>;
-    // (undocumented)
-    (endpoint: 'indices.close', params: IndicesCloseParams, options?: CallAPIOptions): ReturnType<Client['indices']['close']>;
-    // (undocumented)
-    (endpoint: 'indices.create', params: IndicesCreateParams, options?: CallAPIOptions): ReturnType<Client['indices']['create']>;
-    // (undocumented)
-    (endpoint: 'indices.delete', params: IndicesDeleteParams, options?: CallAPIOptions): ReturnType<Client['indices']['delete']>;
-    // (undocumented)
-    (endpoint: 'indices.deleteAlias', params: IndicesDeleteAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['deleteAlias']>;
-    // (undocumented)
-    (endpoint: 'indices.deleteTemplate', params: IndicesDeleteTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['deleteTemplate']>;
-    // (undocumented)
-    (endpoint: 'indices.exists', params: IndicesExistsParams, options?: CallAPIOptions): ReturnType<Client['indices']['exists']>;
-    // (undocumented)
-    (endpoint: 'indices.existsAlias', params: IndicesExistsAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['existsAlias']>;
-    // (undocumented)
-    (endpoint: 'indices.existsTemplate', params: IndicesExistsTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['existsTemplate']>;
-    // (undocumented)
-    (endpoint: 'indices.existsType', params: IndicesExistsTypeParams, options?: CallAPIOptions): ReturnType<Client['indices']['existsType']>;
-    // (undocumented)
-    (endpoint: 'indices.flush', params: IndicesFlushParams, options?: CallAPIOptions): ReturnType<Client['indices']['flush']>;
-    // (undocumented)
-    (endpoint: 'indices.flushSynced', params: IndicesFlushSyncedParams, options?: CallAPIOptions): ReturnType<Client['indices']['flushSynced']>;
-    // (undocumented)
-    (endpoint: 'indices.forcemerge', params: IndicesForcemergeParams, options?: CallAPIOptions): ReturnType<Client['indices']['forcemerge']>;
-    // (undocumented)
-    (endpoint: 'indices.get', params: IndicesGetParams, options?: CallAPIOptions): ReturnType<Client['indices']['get']>;
-    // (undocumented)
-    (endpoint: 'indices.getAlias', params: IndicesGetAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['getAlias']>;
-    // (undocumented)
-    (endpoint: 'indices.getFieldMapping', params: IndicesGetFieldMappingParams, options?: CallAPIOptions): ReturnType<Client['indices']['getFieldMapping']>;
-    // (undocumented)
-    (endpoint: 'indices.getMapping', params: IndicesGetMappingParams, options?: CallAPIOptions): ReturnType<Client['indices']['getMapping']>;
-    // (undocumented)
-    (endpoint: 'indices.getSettings', params: IndicesGetSettingsParams, options?: CallAPIOptions): ReturnType<Client['indices']['getSettings']>;
-    // (undocumented)
-    (endpoint: 'indices.getTemplate', params: IndicesGetTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['getTemplate']>;
-    // (undocumented)
-    (endpoint: 'indices.getUpgrade', params: IndicesGetUpgradeParams, options?: CallAPIOptions): ReturnType<Client['indices']['getUpgrade']>;
-    // (undocumented)
-    (endpoint: 'indices.open', params: IndicesOpenParams, options?: CallAPIOptions): ReturnType<Client['indices']['open']>;
-    // (undocumented)
-    (endpoint: 'indices.putAlias', params: IndicesPutAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['putAlias']>;
-    // (undocumented)
-    (endpoint: 'indices.putMapping', params: IndicesPutMappingParams, options?: CallAPIOptions): ReturnType<Client['indices']['putMapping']>;
-    // (undocumented)
-    (endpoint: 'indices.putSettings', params: IndicesPutSettingsParams, options?: CallAPIOptions): ReturnType<Client['indices']['putSettings']>;
-    // (undocumented)
-    (endpoint: 'indices.putTemplate', params: IndicesPutTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['putTemplate']>;
-    // (undocumented)
-    (endpoint: 'indices.recovery', params: IndicesRecoveryParams, options?: CallAPIOptions): ReturnType<Client['indices']['recovery']>;
-    // (undocumented)
-    (endpoint: 'indices.refresh', params: IndicesRefreshParams, options?: CallAPIOptions): ReturnType<Client['indices']['refresh']>;
-    // (undocumented)
-    (endpoint: 'indices.rollover', params: IndicesRolloverParams, options?: CallAPIOptions): ReturnType<Client['indices']['rollover']>;
-    // (undocumented)
-    (endpoint: 'indices.segments', params: IndicesSegmentsParams, options?: CallAPIOptions): ReturnType<Client['indices']['segments']>;
-    // (undocumented)
-    (endpoint: 'indices.shardStores', params: IndicesShardStoresParams, options?: CallAPIOptions): ReturnType<Client['indices']['shardStores']>;
-    // (undocumented)
-    (endpoint: 'indices.shrink', params: IndicesShrinkParams, options?: CallAPIOptions): ReturnType<Client['indices']['shrink']>;
-    // (undocumented)
-    (endpoint: 'indices.stats', params: IndicesStatsParams, options?: CallAPIOptions): ReturnType<Client['indices']['stats']>;
-    // (undocumented)
-    (endpoint: 'indices.updateAliases', params: IndicesUpdateAliasesParams, options?: CallAPIOptions): ReturnType<Client['indices']['updateAliases']>;
-    // (undocumented)
-    (endpoint: 'indices.upgrade', params: IndicesUpgradeParams, options?: CallAPIOptions): ReturnType<Client['indices']['upgrade']>;
-    // (undocumented)
-    (endpoint: 'indices.validateQuery', params: IndicesValidateQueryParams, options?: CallAPIOptions): ReturnType<Client['indices']['validateQuery']>;
-    // (undocumented)
-    (endpoint: 'ingest.deletePipeline', params: IngestDeletePipelineParams, options?: CallAPIOptions): ReturnType<Client['ingest']['deletePipeline']>;
-    // (undocumented)
-    (endpoint: 'ingest.getPipeline', params: IngestGetPipelineParams, options?: CallAPIOptions): ReturnType<Client['ingest']['getPipeline']>;
-    // (undocumented)
-    (endpoint: 'ingest.putPipeline', params: IngestPutPipelineParams, options?: CallAPIOptions): ReturnType<Client['ingest']['putPipeline']>;
-    // (undocumented)
-    (endpoint: 'ingest.simulate', params: IngestSimulateParams, options?: CallAPIOptions): ReturnType<Client['ingest']['simulate']>;
-    // (undocumented)
-    (endpoint: 'nodes.hotThreads', params: NodesHotThreadsParams, options?: CallAPIOptions): ReturnType<Client['nodes']['hotThreads']>;
-    // (undocumented)
-    (endpoint: 'nodes.info', params: NodesInfoParams, options?: CallAPIOptions): ReturnType<Client['nodes']['info']>;
-    // (undocumented)
-    (endpoint: 'nodes.stats', params: NodesStatsParams, options?: CallAPIOptions): ReturnType<Client['nodes']['stats']>;
-    // (undocumented)
-    (endpoint: 'snapshot.create', params: SnapshotCreateParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['create']>;
-    // (undocumented)
-    (endpoint: 'snapshot.createRepository', params: SnapshotCreateRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['createRepository']>;
-    // (undocumented)
-    (endpoint: 'snapshot.delete', params: SnapshotDeleteParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['delete']>;
-    // (undocumented)
-    (endpoint: 'snapshot.deleteRepository', params: SnapshotDeleteRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['deleteRepository']>;
-    // (undocumented)
-    (endpoint: 'snapshot.get', params: SnapshotGetParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['get']>;
-    // (undocumented)
-    (endpoint: 'snapshot.getRepository', params: SnapshotGetRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['getRepository']>;
-    // (undocumented)
-    (endpoint: 'snapshot.restore', params: SnapshotRestoreParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['restore']>;
-    // (undocumented)
-    (endpoint: 'snapshot.status', params: SnapshotStatusParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['status']>;
-    // (undocumented)
-    (endpoint: 'snapshot.verifyRepository', params: SnapshotVerifyRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['verifyRepository']>;
-    // (undocumented)
-    (endpoint: 'tasks.cancel', params: TasksCancelParams, options?: CallAPIOptions): ReturnType<Client['tasks']['cancel']>;
-    // (undocumented)
-    (endpoint: 'tasks.get', params: TasksGetParams, options?: CallAPIOptions): ReturnType<Client['tasks']['get']>;
-    // (undocumented)
-    (endpoint: 'tasks.list', params: TasksListParams, options?: CallAPIOptions): ReturnType<Client['tasks']['list']>;
-    // (undocumented)
-    (endpoint: 'transport.request', clientParams: AssistantAPIClientParams, options?: CallAPIOptions): Promise<AssistanceAPIResponse>;
-    // (undocumented)
-    (endpoint: 'transport.request', clientParams: DeprecationAPIClientParams, options?: CallAPIOptions): Promise<DeprecationAPIResponse>;
-    // (undocumented)
-    <T = any>(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<T>;
-}
-
 // Warning: (ae-forgotten-export) The symbol "appendersSchema" needs to be exported by the entry point index.d.ts
 //
 // @public (undocumented)
@@ -497,12 +253,6 @@ export class BasePath {
 // @internal (undocumented)
 export function bootstrap({ configs, cliArgs, applyConfigOverrides, features, }: BootstrapArgs): Promise<void>;
 
-// @public
-export interface CallAPIOptions {
-    signal?: AbortSignal;
-    wrap401Errors?: boolean;
-}
-
 // @public
 export interface Capabilities {
     [key: string]: Record<string, boolean | Record<string, boolean>>;
@@ -530,14 +280,6 @@ export interface CapabilitiesStart {
 // @public
 export type CapabilitiesSwitcher = (request: KibanaRequest, uiCapabilities: Capabilities) => Partial<Capabilities> | Promise<Partial<Capabilities>>;
 
-// @public
-export class ClusterClient implements IClusterClient {
-    constructor(config: ElasticsearchClientConfig, log: Logger, getAuthHeaders?: GetAuthHeaders);
-    asScoped(request?: ScopeableRequest): IScopedClusterClient;
-    callAsInternalUser: APICaller;
-    close(): void;
-    }
-
 // @alpha
 export const config: {
     elasticsearch: {
@@ -851,14 +593,6 @@ export interface DiscoveredPlugin {
     readonly requiredPlugins: readonly PluginName[];
 }
 
-// @public (undocumented)
-export type ElasticsearchClientConfig = 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'];
-    sniffInterval?: ElasticsearchConfig['sniffInterval'] | ConfigOptions['sniffInterval'];
-    ssl?: Partial<ElasticsearchConfig['ssl']>;
-};
-
 // @public
 export class ElasticsearchConfig {
     constructor(rawConfig: ElasticsearchConfigType);
@@ -884,26 +618,12 @@ export class ElasticsearchConfig {
     readonly username?: string;
 }
 
-// @public (undocumented)
-export interface ElasticsearchError extends Boom {
-    // (undocumented)
-    [code]?: string;
-}
-
-// @public
-export class ElasticsearchErrorHelpers {
-    // (undocumented)
-    static decorateNotAuthorizedError(error: Error, reason?: string): ElasticsearchError;
-    // (undocumented)
-    static isNotAuthorizedError(error: any): error is ElasticsearchError;
-}
-
 // @public (undocumented)
 export interface ElasticsearchServiceSetup {
     // @deprecated (undocumented)
     legacy: {
-        readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ICustomClusterClient;
-        readonly client: IClusterClient;
+        readonly createClient: (type: string, clientConfig?: Partial<LegacyElasticsearchClientConfig>) => ILegacyCustomClusterClient;
+        readonly client: ILegacyClusterClient;
     };
 }
 
@@ -911,8 +631,8 @@ export interface ElasticsearchServiceSetup {
 export interface ElasticsearchServiceStart {
     // @deprecated (undocumented)
     legacy: {
-        readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ICustomClusterClient;
-        readonly client: IClusterClient;
+        readonly createClient: (type: string, clientConfig?: Partial<LegacyElasticsearchClientConfig>) => ILegacyCustomClusterClient;
+        readonly client: ILegacyClusterClient;
     };
 }
 
@@ -1056,9 +776,6 @@ export interface HttpServiceStart {
 // @public
 export type IBasePath = Pick<BasePath, keyof BasePath>;
 
-// @public
-export type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
-
 // @public
 export interface IContextContainer<THandler extends HandlerFunction<any>> {
     createHandler(pluginOpaqueId: PluginOpaqueId, handler: THandler): (...rest: HandlerParameters<THandler>) => ShallowPromise<ReturnType<THandler>>;
@@ -1078,9 +795,6 @@ export interface ICspConfig {
     readonly warnLegacyBrowsers: boolean;
 }
 
-// @public
-export type ICustomClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
-
 // @public
 export interface IKibanaResponse<T extends HttpResponsePayload | ResponseError = any> {
     // (undocumented)
@@ -1102,6 +816,15 @@ export interface IKibanaSocket {
     getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate | null;
 }
 
+// @public
+export type ILegacyClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'asScoped'>;
+
+// @public
+export type ILegacyCustomClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+
+// @public
+export type ILegacyScopedClusterClient = Pick<LegacyScopedClusterClient, 'callAsCurrentUser' | 'callAsInternalUser'>;
+
 // @public (undocumented)
 export interface ImageValidation {
     // (undocumented)
@@ -1155,9 +878,6 @@ export type ISavedObjectsRepository = Pick<SavedObjectsRepository, keyof SavedOb
 // @public
 export type ISavedObjectTypeRegistry = Omit<SavedObjectTypeRegistry, 'registerType'>;
 
-// @public
-export type IScopedClusterClient = Pick<ScopedClusterClient, 'callAsCurrentUser' | 'callAsInternalUser'>;
-
 // @public
 export function isRelativeUrl(candidatePath: string): boolean;
 
@@ -1247,6 +967,266 @@ export const kibanaResponseFactory: {
 // @public
 export type KnownHeaders = KnownKeys<IncomingHttpHeaders>;
 
+// @public (undocumented)
+export interface LegacyAPICaller {
+    // (undocumented)
+    (endpoint: 'bulk', params: BulkIndexDocumentsParams, options?: LegacyCallAPIOptions): ReturnType<Client['bulk']>;
+    // (undocumented)
+    (endpoint: 'clearScroll', params: ClearScrollParams, options?: LegacyCallAPIOptions): ReturnType<Client['clearScroll']>;
+    // (undocumented)
+    (endpoint: 'count', params: CountParams, options?: LegacyCallAPIOptions): ReturnType<Client['count']>;
+    // (undocumented)
+    (endpoint: 'create', params: CreateDocumentParams, options?: LegacyCallAPIOptions): ReturnType<Client['create']>;
+    // (undocumented)
+    (endpoint: 'delete', params: DeleteDocumentParams, options?: LegacyCallAPIOptions): ReturnType<Client['delete']>;
+    // (undocumented)
+    (endpoint: 'deleteByQuery', params: DeleteDocumentByQueryParams, options?: LegacyCallAPIOptions): ReturnType<Client['deleteByQuery']>;
+    // (undocumented)
+    (endpoint: 'deleteScript', params: DeleteScriptParams, options?: LegacyCallAPIOptions): ReturnType<Client['deleteScript']>;
+    // (undocumented)
+    (endpoint: 'deleteTemplate', params: DeleteTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['deleteTemplate']>;
+    // (undocumented)
+    (endpoint: 'exists', params: ExistsParams, options?: LegacyCallAPIOptions): ReturnType<Client['exists']>;
+    // (undocumented)
+    (endpoint: 'explain', params: ExplainParams, options?: LegacyCallAPIOptions): ReturnType<Client['explain']>;
+    // (undocumented)
+    (endpoint: 'fieldStats', params: FieldStatsParams, options?: LegacyCallAPIOptions): ReturnType<Client['fieldStats']>;
+    // (undocumented)
+    <T>(endpoint: 'get', params: GetParams, options?: LegacyCallAPIOptions): Promise<GetResponse<T>>;
+    // (undocumented)
+    (endpoint: 'getScript', params: GetScriptParams, options?: LegacyCallAPIOptions): ReturnType<Client['getScript']>;
+    // (undocumented)
+    (endpoint: 'getSource', params: GetSourceParams, options?: LegacyCallAPIOptions): ReturnType<Client['getSource']>;
+    // (undocumented)
+    (endpoint: 'getTemplate', params: GetTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['getTemplate']>;
+    // (undocumented)
+    <T>(endpoint: 'index', params: IndexDocumentParams<T>, options?: LegacyCallAPIOptions): ReturnType<Client['index']>;
+    // (undocumented)
+    (endpoint: 'info', params: InfoParams, options?: LegacyCallAPIOptions): ReturnType<Client['info']>;
+    // (undocumented)
+    <T>(endpoint: 'mget', params: MGetParams, options?: LegacyCallAPIOptions): Promise<MGetResponse<T>>;
+    // (undocumented)
+    <T>(endpoint: 'msearch', params: MSearchParams, options?: LegacyCallAPIOptions): Promise<MSearchResponse<T>>;
+    // (undocumented)
+    <T>(endpoint: 'msearchTemplate', params: MSearchTemplateParams, options?: LegacyCallAPIOptions): Promise<MSearchResponse<T>>;
+    // (undocumented)
+    (endpoint: 'mtermvectors', params: MTermVectorsParams, options?: LegacyCallAPIOptions): ReturnType<Client['mtermvectors']>;
+    // (undocumented)
+    (endpoint: 'ping', params: PingParams, options?: LegacyCallAPIOptions): ReturnType<Client['ping']>;
+    // (undocumented)
+    (endpoint: 'putScript', params: PutScriptParams, options?: LegacyCallAPIOptions): ReturnType<Client['putScript']>;
+    // (undocumented)
+    (endpoint: 'putTemplate', params: PutTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['putTemplate']>;
+    // (undocumented)
+    (endpoint: 'reindex', params: ReindexParams, options?: LegacyCallAPIOptions): ReturnType<Client['reindex']>;
+    // (undocumented)
+    (endpoint: 'reindexRethrottle', params: ReindexRethrottleParams, options?: LegacyCallAPIOptions): ReturnType<Client['reindexRethrottle']>;
+    // (undocumented)
+    (endpoint: 'renderSearchTemplate', params: RenderSearchTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['renderSearchTemplate']>;
+    // (undocumented)
+    <T>(endpoint: 'scroll', params: ScrollParams, options?: LegacyCallAPIOptions): Promise<SearchResponse<T>>;
+    // (undocumented)
+    <T>(endpoint: 'search', params: SearchParams, options?: LegacyCallAPIOptions): Promise<SearchResponse<T>>;
+    // (undocumented)
+    (endpoint: 'searchShards', params: SearchShardsParams, options?: LegacyCallAPIOptions): ReturnType<Client['searchShards']>;
+    // (undocumented)
+    (endpoint: 'searchTemplate', params: SearchTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['searchTemplate']>;
+    // (undocumented)
+    (endpoint: 'suggest', params: SuggestParams, options?: LegacyCallAPIOptions): ReturnType<Client['suggest']>;
+    // (undocumented)
+    (endpoint: 'termvectors', params: TermvectorsParams, options?: LegacyCallAPIOptions): ReturnType<Client['termvectors']>;
+    // (undocumented)
+    (endpoint: 'update', params: UpdateDocumentParams, options?: LegacyCallAPIOptions): ReturnType<Client['update']>;
+    // (undocumented)
+    (endpoint: 'updateByQuery', params: UpdateDocumentByQueryParams, options?: LegacyCallAPIOptions): ReturnType<Client['updateByQuery']>;
+    // (undocumented)
+    (endpoint: 'cat.aliases', params: CatAliasesParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['aliases']>;
+    // (undocumented)
+    (endpoint: 'cat.allocation', params: CatAllocationParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['allocation']>;
+    // (undocumented)
+    (endpoint: 'cat.count', params: CatAllocationParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['count']>;
+    // (undocumented)
+    (endpoint: 'cat.fielddata', params: CatFielddataParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['fielddata']>;
+    // (undocumented)
+    (endpoint: 'cat.health', params: CatHealthParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['health']>;
+    // (undocumented)
+    (endpoint: 'cat.help', params: CatHelpParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['help']>;
+    // (undocumented)
+    (endpoint: 'cat.indices', params: CatIndicesParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['indices']>;
+    // (undocumented)
+    (endpoint: 'cat.master', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['master']>;
+    // (undocumented)
+    (endpoint: 'cat.nodeattrs', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['nodeattrs']>;
+    // (undocumented)
+    (endpoint: 'cat.nodes', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['nodes']>;
+    // (undocumented)
+    (endpoint: 'cat.pendingTasks', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['pendingTasks']>;
+    // (undocumented)
+    (endpoint: 'cat.plugins', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['plugins']>;
+    // (undocumented)
+    (endpoint: 'cat.recovery', params: CatRecoveryParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['recovery']>;
+    // (undocumented)
+    (endpoint: 'cat.repositories', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['repositories']>;
+    // (undocumented)
+    (endpoint: 'cat.segments', params: CatSegmentsParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['segments']>;
+    // (undocumented)
+    (endpoint: 'cat.shards', params: CatShardsParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['shards']>;
+    // (undocumented)
+    (endpoint: 'cat.snapshots', params: CatSnapshotsParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['snapshots']>;
+    // (undocumented)
+    (endpoint: 'cat.tasks', params: CatTasksParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['tasks']>;
+    // (undocumented)
+    (endpoint: 'cat.threadPool', params: CatThreadPoolParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['threadPool']>;
+    // (undocumented)
+    (endpoint: 'cluster.allocationExplain', params: ClusterAllocationExplainParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['allocationExplain']>;
+    // (undocumented)
+    (endpoint: 'cluster.getSettings', params: ClusterGetSettingsParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['getSettings']>;
+    // (undocumented)
+    (endpoint: 'cluster.health', params: ClusterHealthParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['health']>;
+    // (undocumented)
+    (endpoint: 'cluster.pendingTasks', params: ClusterPendingTasksParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['pendingTasks']>;
+    // (undocumented)
+    (endpoint: 'cluster.putSettings', params: ClusterPutSettingsParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['putSettings']>;
+    // (undocumented)
+    (endpoint: 'cluster.reroute', params: ClusterRerouteParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['reroute']>;
+    // (undocumented)
+    (endpoint: 'cluster.state', params: ClusterStateParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['state']>;
+    // (undocumented)
+    (endpoint: 'cluster.stats', params: ClusterStatsParams, options?: LegacyCallAPIOptions): ReturnType<Client['cluster']['stats']>;
+    // (undocumented)
+    (endpoint: 'indices.analyze', params: IndicesAnalyzeParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['analyze']>;
+    // (undocumented)
+    (endpoint: 'indices.clearCache', params: IndicesClearCacheParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['clearCache']>;
+    // (undocumented)
+    (endpoint: 'indices.close', params: IndicesCloseParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['close']>;
+    // (undocumented)
+    (endpoint: 'indices.create', params: IndicesCreateParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['create']>;
+    // (undocumented)
+    (endpoint: 'indices.delete', params: IndicesDeleteParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['delete']>;
+    // (undocumented)
+    (endpoint: 'indices.deleteAlias', params: IndicesDeleteAliasParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['deleteAlias']>;
+    // (undocumented)
+    (endpoint: 'indices.deleteTemplate', params: IndicesDeleteTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['deleteTemplate']>;
+    // (undocumented)
+    (endpoint: 'indices.exists', params: IndicesExistsParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['exists']>;
+    // (undocumented)
+    (endpoint: 'indices.existsAlias', params: IndicesExistsAliasParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['existsAlias']>;
+    // (undocumented)
+    (endpoint: 'indices.existsTemplate', params: IndicesExistsTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['existsTemplate']>;
+    // (undocumented)
+    (endpoint: 'indices.existsType', params: IndicesExistsTypeParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['existsType']>;
+    // (undocumented)
+    (endpoint: 'indices.flush', params: IndicesFlushParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['flush']>;
+    // (undocumented)
+    (endpoint: 'indices.flushSynced', params: IndicesFlushSyncedParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['flushSynced']>;
+    // (undocumented)
+    (endpoint: 'indices.forcemerge', params: IndicesForcemergeParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['forcemerge']>;
+    // (undocumented)
+    (endpoint: 'indices.get', params: IndicesGetParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['get']>;
+    // (undocumented)
+    (endpoint: 'indices.getAlias', params: IndicesGetAliasParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['getAlias']>;
+    // (undocumented)
+    (endpoint: 'indices.getFieldMapping', params: IndicesGetFieldMappingParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['getFieldMapping']>;
+    // (undocumented)
+    (endpoint: 'indices.getMapping', params: IndicesGetMappingParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['getMapping']>;
+    // (undocumented)
+    (endpoint: 'indices.getSettings', params: IndicesGetSettingsParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['getSettings']>;
+    // (undocumented)
+    (endpoint: 'indices.getTemplate', params: IndicesGetTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['getTemplate']>;
+    // (undocumented)
+    (endpoint: 'indices.getUpgrade', params: IndicesGetUpgradeParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['getUpgrade']>;
+    // (undocumented)
+    (endpoint: 'indices.open', params: IndicesOpenParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['open']>;
+    // (undocumented)
+    (endpoint: 'indices.putAlias', params: IndicesPutAliasParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['putAlias']>;
+    // (undocumented)
+    (endpoint: 'indices.putMapping', params: IndicesPutMappingParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['putMapping']>;
+    // (undocumented)
+    (endpoint: 'indices.putSettings', params: IndicesPutSettingsParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['putSettings']>;
+    // (undocumented)
+    (endpoint: 'indices.putTemplate', params: IndicesPutTemplateParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['putTemplate']>;
+    // (undocumented)
+    (endpoint: 'indices.recovery', params: IndicesRecoveryParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['recovery']>;
+    // (undocumented)
+    (endpoint: 'indices.refresh', params: IndicesRefreshParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['refresh']>;
+    // (undocumented)
+    (endpoint: 'indices.rollover', params: IndicesRolloverParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['rollover']>;
+    // (undocumented)
+    (endpoint: 'indices.segments', params: IndicesSegmentsParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['segments']>;
+    // (undocumented)
+    (endpoint: 'indices.shardStores', params: IndicesShardStoresParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['shardStores']>;
+    // (undocumented)
+    (endpoint: 'indices.shrink', params: IndicesShrinkParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['shrink']>;
+    // (undocumented)
+    (endpoint: 'indices.stats', params: IndicesStatsParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['stats']>;
+    // (undocumented)
+    (endpoint: 'indices.updateAliases', params: IndicesUpdateAliasesParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['updateAliases']>;
+    // (undocumented)
+    (endpoint: 'indices.upgrade', params: IndicesUpgradeParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['upgrade']>;
+    // (undocumented)
+    (endpoint: 'indices.validateQuery', params: IndicesValidateQueryParams, options?: LegacyCallAPIOptions): ReturnType<Client['indices']['validateQuery']>;
+    // (undocumented)
+    (endpoint: 'ingest.deletePipeline', params: IngestDeletePipelineParams, options?: LegacyCallAPIOptions): ReturnType<Client['ingest']['deletePipeline']>;
+    // (undocumented)
+    (endpoint: 'ingest.getPipeline', params: IngestGetPipelineParams, options?: LegacyCallAPIOptions): ReturnType<Client['ingest']['getPipeline']>;
+    // (undocumented)
+    (endpoint: 'ingest.putPipeline', params: IngestPutPipelineParams, options?: LegacyCallAPIOptions): ReturnType<Client['ingest']['putPipeline']>;
+    // (undocumented)
+    (endpoint: 'ingest.simulate', params: IngestSimulateParams, options?: LegacyCallAPIOptions): ReturnType<Client['ingest']['simulate']>;
+    // (undocumented)
+    (endpoint: 'nodes.hotThreads', params: NodesHotThreadsParams, options?: LegacyCallAPIOptions): ReturnType<Client['nodes']['hotThreads']>;
+    // (undocumented)
+    (endpoint: 'nodes.info', params: NodesInfoParams, options?: LegacyCallAPIOptions): ReturnType<Client['nodes']['info']>;
+    // (undocumented)
+    (endpoint: 'nodes.stats', params: NodesStatsParams, options?: LegacyCallAPIOptions): ReturnType<Client['nodes']['stats']>;
+    // (undocumented)
+    (endpoint: 'snapshot.create', params: SnapshotCreateParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['create']>;
+    // (undocumented)
+    (endpoint: 'snapshot.createRepository', params: SnapshotCreateRepositoryParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['createRepository']>;
+    // (undocumented)
+    (endpoint: 'snapshot.delete', params: SnapshotDeleteParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['delete']>;
+    // (undocumented)
+    (endpoint: 'snapshot.deleteRepository', params: SnapshotDeleteRepositoryParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['deleteRepository']>;
+    // (undocumented)
+    (endpoint: 'snapshot.get', params: SnapshotGetParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['get']>;
+    // (undocumented)
+    (endpoint: 'snapshot.getRepository', params: SnapshotGetRepositoryParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['getRepository']>;
+    // (undocumented)
+    (endpoint: 'snapshot.restore', params: SnapshotRestoreParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['restore']>;
+    // (undocumented)
+    (endpoint: 'snapshot.status', params: SnapshotStatusParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['status']>;
+    // (undocumented)
+    (endpoint: 'snapshot.verifyRepository', params: SnapshotVerifyRepositoryParams, options?: LegacyCallAPIOptions): ReturnType<Client['snapshot']['verifyRepository']>;
+    // (undocumented)
+    (endpoint: 'tasks.cancel', params: TasksCancelParams, options?: LegacyCallAPIOptions): ReturnType<Client['tasks']['cancel']>;
+    // (undocumented)
+    (endpoint: 'tasks.get', params: TasksGetParams, options?: LegacyCallAPIOptions): ReturnType<Client['tasks']['get']>;
+    // (undocumented)
+    (endpoint: 'tasks.list', params: TasksListParams, options?: LegacyCallAPIOptions): ReturnType<Client['tasks']['list']>;
+    // (undocumented)
+    (endpoint: 'transport.request', clientParams: AssistantAPIClientParams, options?: LegacyCallAPIOptions): Promise<AssistanceAPIResponse>;
+    // (undocumented)
+    (endpoint: 'transport.request', clientParams: DeprecationAPIClientParams, options?: LegacyCallAPIOptions): Promise<DeprecationAPIResponse>;
+    // (undocumented)
+    <T = any>(endpoint: string, clientParams?: Record<string, any>, options?: LegacyCallAPIOptions): Promise<T>;
+}
+
+// @public
+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)
+export class LegacyClusterClient implements ILegacyClusterClient {
+    constructor(config: LegacyElasticsearchClientConfig, log: Logger, getAuthHeaders?: GetAuthHeaders);
+    asScoped(request?: ScopeableRequest): ILegacyScopedClusterClient;
+    callAsInternalUser: LegacyAPICaller;
+    close(): void;
+    }
+
 // @internal @deprecated
 export interface LegacyConfig {
     // (undocumented)
@@ -1261,6 +1241,28 @@ export interface LegacyConfig {
     set(config: LegacyVars): void;
 }
 
+// @public (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'];
+    sniffInterval?: ElasticsearchConfig['sniffInterval'] | ConfigOptions['sniffInterval'];
+    ssl?: Partial<ElasticsearchConfig['ssl']>;
+};
+
+// @public (undocumented)
+export interface LegacyElasticsearchError extends Boom {
+    // (undocumented)
+    [code]?: string;
+}
+
+// @public
+export class LegacyElasticsearchErrorHelpers {
+    // (undocumented)
+    static decorateNotAuthorizedError(error: Error, reason?: string): LegacyElasticsearchError;
+    // (undocumented)
+    static isNotAuthorizedError(error: any): error is LegacyElasticsearchError;
+}
+
 // Warning: (ae-forgotten-export) The symbol "ILegacyInternals" needs to be exported by the entry point index.d.ts
 //
 // @internal @deprecated (undocumented)
@@ -1280,6 +1282,15 @@ 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)
+export class LegacyScopedClusterClient implements ILegacyScopedClusterClient {
+    constructor(internalAPICaller: LegacyAPICaller, scopedAPICaller: LegacyAPICaller, headers?: Headers | undefined);
+    callAsCurrentUser(endpoint: string, clientParams?: Record<string, any>, options?: LegacyCallAPIOptions): Promise<any>;
+    callAsInternalUser(endpoint: string, clientParams?: Record<string, any>, options?: LegacyCallAPIOptions): Promise<any>;
+    }
+
 // Warning: (ae-forgotten-export) The symbol "LegacyPlugins" needs to be exported by the entry point index.d.ts
 //
 // @internal @deprecated (undocumented)
@@ -1679,7 +1690,7 @@ export interface RequestHandlerContext {
         };
         elasticsearch: {
             legacy: {
-                client: IScopedClusterClient;
+                client: ILegacyScopedClusterClient;
             };
         };
         uiSettings: {
@@ -2323,7 +2334,7 @@ export class SavedObjectsRepository {
     // Warning: (ae-forgotten-export) The symbol "KibanaMigrator" needs to be exported by the entry point index.d.ts
     //
     // @internal
-    static createRepository(migrator: KibanaMigrator, typeRegistry: SavedObjectTypeRegistry, indexName: string, callCluster: APICaller, includedHiddenTypes?: string[], injectedConstructor?: any): ISavedObjectsRepository;
+    static createRepository(migrator: KibanaMigrator, typeRegistry: SavedObjectTypeRegistry, indexName: string, callCluster: LegacyAPICaller, includedHiddenTypes?: string[], injectedConstructor?: any): ISavedObjectsRepository;
     delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
     deleteByNamespace(namespace: string, options?: SavedObjectsDeleteByNamespaceOptions): Promise<any>;
     deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<{}>;
@@ -2478,13 +2489,6 @@ export type SavedObjectUnsanitizedDoc<T = unknown> = SavedObjectDoc<T> & Partial
 // @public
 export type ScopeableRequest = KibanaRequest | LegacyRequest | FakeRequest;
 
-// @public
-export class ScopedClusterClient implements IScopedClusterClient {
-    constructor(internalAPICaller: APICaller, scopedAPICaller: APICaller, headers?: Headers | undefined);
-    callAsCurrentUser(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<any>;
-    callAsInternalUser(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<any>;
-    }
-
 // @public
 export interface ServiceStatus<Meta extends Record<string, any> | unknown = unknown> {
     detail?: string;
diff --git a/src/core/server/ui_settings/integration_tests/lib/servers.ts b/src/core/server/ui_settings/integration_tests/lib/servers.ts
index 486abd5a0c7908..ea462291059a51 100644
--- a/src/core/server/ui_settings/integration_tests/lib/servers.ts
+++ b/src/core/server/ui_settings/integration_tests/lib/servers.ts
@@ -25,7 +25,7 @@ import {
   TestKibanaUtils,
   TestUtils,
 } from '../../../../../test_utils/kbn_server';
-import { APICaller } from '../../../elasticsearch/';
+import { LegacyAPICaller } from '../../../elasticsearch/';
 import { httpServerMock } from '../../../http/http_server.mocks';
 
 let servers: TestUtils;
@@ -37,7 +37,7 @@ let kbnServer: TestKibanaUtils['kbnServer'];
 interface AllServices {
   kbnServer: TestKibanaUtils['kbnServer'];
   savedObjectsClient: SavedObjectsClientContract;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   uiSettings: IUiSettingsClient;
   deleteKibanaIndex: typeof deleteKibanaIndex;
 }
@@ -62,7 +62,7 @@ export async function startServers() {
   kbnServer = kbn.kbnServer;
 }
 
-async function deleteKibanaIndex(callCluster: APICaller) {
+async function deleteKibanaIndex(callCluster: LegacyAPICaller) {
   const kibanaIndices = await callCluster('cat.indices', { index: '.kibana*', format: 'json' });
   const indexNames = kibanaIndices.map((x: any) => x.index);
   if (!indexNames.length) {
diff --git a/src/dev/jest/config.js b/src/dev/jest/config.js
index 18fc7ebaa2af44..da343aa0f0672d 100644
--- a/src/dev/jest/config.js
+++ b/src/dev/jest/config.js
@@ -43,6 +43,7 @@ export default {
     'src/plugins/**/*.{ts,tsx}',
     '!src/plugins/**/{__test__,__snapshots__,__examples__,mocks,tests}/**/*',
     '!src/plugins/**/*.d.ts',
+    '!src/plugins/**/test_helpers/**',
     'packages/kbn-ui-framework/src/components/**/*.js',
     '!packages/kbn-ui-framework/src/components/index.js',
     '!packages/kbn-ui-framework/src/components/**/*/index.js',
@@ -51,6 +52,7 @@ export default {
     '!packages/kbn-ui-framework/src/services/**/*/index.js',
     'src/legacy/core_plugins/**/*.{js,jsx,ts,tsx}',
     '!src/legacy/core_plugins/**/{__test__,__snapshots__}/**/*',
+    '!src/legacy/core_plugins/tests_bundle/**',
   ],
   moduleNameMapper: {
     '@elastic/eui$': '<rootDir>/node_modules/@elastic/eui/test-env',
diff --git a/src/fixtures/telemetry_collectors/.telemetryrc.json b/src/fixtures/telemetry_collectors/.telemetryrc.json
new file mode 100644
index 00000000000000..31203149c9b579
--- /dev/null
+++ b/src/fixtures/telemetry_collectors/.telemetryrc.json
@@ -0,0 +1,7 @@
+{
+  "root": ".",
+  "output": ".",
+  "exclude": [
+    "./unmapped_collector.ts"
+  ]
+}
diff --git a/src/fixtures/telemetry_collectors/constants.ts b/src/fixtures/telemetry_collectors/constants.ts
new file mode 100644
index 00000000000000..4aac9e66cdbdb3
--- /dev/null
+++ b/src/fixtures/telemetry_collectors/constants.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 moment, { Moment } from 'moment';
+import { MakeSchemaFrom } from '../../plugins/usage_collection/server';
+
+export interface Usage {
+  locale: string;
+}
+
+export interface WithUnion {
+  prop1: string | null;
+  prop2: string | null | undefined;
+  prop3?: string | null;
+  prop4: 'opt1' | 'opt2';
+  prop5: 123 | 431;
+}
+
+export interface WithMoment {
+  prop1: Moment;
+  prop2: moment.Moment;
+  prop3: Moment[];
+  prop4: Date[];
+}
+
+export interface WithConflictingUnion {
+  prop1: 123 | 'str';
+}
+
+export interface WithUnsupportedUnion {
+  prop1: 123 | Moment;
+}
+
+export const externallyDefinedSchema: MakeSchemaFrom<{ locale: string }> = {
+  locale: {
+    type: 'keyword',
+  },
+};
diff --git a/src/fixtures/telemetry_collectors/externally_defined_collector.ts b/src/fixtures/telemetry_collectors/externally_defined_collector.ts
new file mode 100644
index 00000000000000..00a8d643e27b33
--- /dev/null
+++ b/src/fixtures/telemetry_collectors/externally_defined_collector.ts
@@ -0,0 +1,71 @@
+/*
+ * 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 { CollectorSet, CollectorOptions } from '../../plugins/usage_collection/server/collector';
+import { loggerMock } from '../../core/server/logging/logger.mock';
+
+const collectorSet = new CollectorSet({
+  logger: loggerMock.create(),
+  maximumWaitTimeForAllCollectorsInS: 0,
+});
+
+interface Usage {
+  locale: string;
+}
+
+function createCollector(): CollectorOptions<Usage> {
+  return {
+    type: 'from_fn_collector',
+    isReady: () => true,
+    fetch(): Usage {
+      return {
+        locale: 'en',
+      };
+    },
+    schema: {
+      locale: {
+        type: 'keyword',
+      },
+    },
+  };
+}
+
+export function defineCollectorFromVariable() {
+  const fromVarCollector: CollectorOptions<Usage> = {
+    type: 'from_variable_collector',
+    isReady: () => true,
+    fetch(): Usage {
+      return {
+        locale: 'en',
+      };
+    },
+    schema: {
+      locale: {
+        type: 'keyword',
+      },
+    },
+  };
+
+  collectorSet.makeUsageCollector<Usage>(fromVarCollector);
+}
+
+export function defineCollectorFromFn() {
+  const fromFnCollector = createCollector();
+
+  collectorSet.makeUsageCollector<Usage>(fromFnCollector);
+}
diff --git a/src/plugins/data/common/timefilter/index.ts b/src/fixtures/telemetry_collectors/file_with_no_collector.ts
similarity index 94%
rename from src/plugins/data/common/timefilter/index.ts
rename to src/fixtures/telemetry_collectors/file_with_no_collector.ts
index e0c509e119fda1..2e1870e486269d 100644
--- a/src/plugins/data/common/timefilter/index.ts
+++ b/src/fixtures/telemetry_collectors/file_with_no_collector.ts
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { isTimeRange } from './is_time_range';
+export const SOME_CONST: number = 123;
diff --git a/src/fixtures/telemetry_collectors/imported_schema.ts b/src/fixtures/telemetry_collectors/imported_schema.ts
new file mode 100644
index 00000000000000..66d04700642d17
--- /dev/null
+++ b/src/fixtures/telemetry_collectors/imported_schema.ts
@@ -0,0 +1,41 @@
+/*
+ * 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 { CollectorSet } from '../../plugins/usage_collection/server/collector';
+import { loggerMock } from '../../core/server/logging/logger.mock';
+import { externallyDefinedSchema } from './constants';
+
+const { makeUsageCollector } = new CollectorSet({
+  logger: loggerMock.create(),
+  maximumWaitTimeForAllCollectorsInS: 0,
+});
+
+interface Usage {
+  locale?: string;
+}
+
+export const myCollector = makeUsageCollector<Usage>({
+  type: 'with_imported_schema',
+  isReady: () => true,
+  schema: externallyDefinedSchema,
+  fetch(): Usage {
+    return {
+      locale: 'en',
+    };
+  },
+});
diff --git a/src/fixtures/telemetry_collectors/imported_usage_interface.ts b/src/fixtures/telemetry_collectors/imported_usage_interface.ts
new file mode 100644
index 00000000000000..a4a0f4ae1b3c4a
--- /dev/null
+++ b/src/fixtures/telemetry_collectors/imported_usage_interface.ts
@@ -0,0 +1,41 @@
+/*
+ * 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 { CollectorSet } from '../../plugins/usage_collection/server/collector';
+import { loggerMock } from '../../core/server/logging/logger.mock';
+import { Usage } from './constants';
+
+const { makeUsageCollector } = new CollectorSet({
+  logger: loggerMock.create(),
+  maximumWaitTimeForAllCollectorsInS: 0,
+});
+
+export const myCollector = makeUsageCollector<Usage>({
+  type: 'imported_usage_interface_collector',
+  isReady: () => true,
+  fetch() {
+    return {
+      locale: 'en',
+    };
+  },
+  schema: {
+    locale: {
+      type: 'keyword',
+    },
+  },
+});
diff --git a/src/fixtures/telemetry_collectors/nested_collector.ts b/src/fixtures/telemetry_collectors/nested_collector.ts
new file mode 100644
index 00000000000000..bde89fe4a70603
--- /dev/null
+++ b/src/fixtures/telemetry_collectors/nested_collector.ts
@@ -0,0 +1,49 @@
+/*
+ * 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 { CollectorSet, UsageCollector } from '../../plugins/usage_collection/server/collector';
+import { loggerMock } from '../../core/server/logging/logger.mock';
+
+const collectorSet = new CollectorSet({
+  logger: loggerMock.create(),
+  maximumWaitTimeForAllCollectorsInS: 0,
+});
+
+interface Usage {
+  locale?: string;
+}
+
+export class NestedInside {
+  collector?: UsageCollector<Usage, Usage>;
+  createMyCollector() {
+    this.collector = collectorSet.makeUsageCollector<Usage>({
+      type: 'my_nested_collector',
+      isReady: () => true,
+      fetch: async () => {
+        return {
+          locale: 'en',
+        };
+      },
+      schema: {
+        locale: {
+          type: 'keyword',
+        },
+      },
+    });
+  }
+}
diff --git a/src/plugins/visualize/public/application/help_menu/help_menu_util.js b/src/fixtures/telemetry_collectors/unmapped_collector.ts
similarity index 62%
rename from src/plugins/visualize/public/application/help_menu/help_menu_util.js
rename to src/fixtures/telemetry_collectors/unmapped_collector.ts
index c297326f2e264e..1ea360fcd9e960 100644
--- a/src/plugins/visualize/public/application/help_menu/help_menu_util.js
+++ b/src/fixtures/telemetry_collectors/unmapped_collector.ts
@@ -16,19 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { CollectorSet } from '../../plugins/usage_collection/server/collector';
+import { loggerMock } from '../../core/server/logging/logger.mock';
 
-import { i18n } from '@kbn/i18n';
+const { makeUsageCollector } = new CollectorSet({
+  logger: loggerMock.create(),
+  maximumWaitTimeForAllCollectorsInS: 0,
+});
 
-export function addHelpMenuToAppChrome(chrome, docLinks) {
-  chrome.setHelpExtension({
-    appName: i18n.translate('visualize.helpMenu.appName', {
-      defaultMessage: 'Visualize',
-    }),
-    links: [
-      {
-        linkType: 'documentation',
-        href: `${docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${docLinks.DOC_LINK_VERSION}/visualize.html`,
-      },
-    ],
-  });
+interface Usage {
+  locale: string;
 }
+
+export const myCollector = makeUsageCollector<Usage>({
+  type: 'unmapped_collector',
+  isReady: () => true,
+  fetch(): Usage {
+    return {
+      locale: 'en',
+    };
+  },
+});
diff --git a/src/fixtures/telemetry_collectors/working_collector.ts b/src/fixtures/telemetry_collectors/working_collector.ts
new file mode 100644
index 00000000000000..d70a247c61e70a
--- /dev/null
+++ b/src/fixtures/telemetry_collectors/working_collector.ts
@@ -0,0 +1,81 @@
+/*
+ * 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 { CollectorSet } from '../../plugins/usage_collection/server/collector';
+import { loggerMock } from '../../core/server/logging/logger.mock';
+
+const { makeUsageCollector } = new CollectorSet({
+  logger: loggerMock.create(),
+  maximumWaitTimeForAllCollectorsInS: 0,
+});
+
+interface MyObject {
+  total: number;
+  type: boolean;
+}
+
+interface Usage {
+  flat?: string;
+  my_str?: string;
+  my_objects: MyObject;
+}
+
+const SOME_NUMBER: number = 123;
+
+export const myCollector = makeUsageCollector<Usage>({
+  type: 'my_working_collector',
+  isReady: () => true,
+  fetch() {
+    const testString = '123';
+    // query ES and get some data
+
+    // summarize the data into a model
+    // return the modeled object that includes whatever you want to track
+    try {
+      return {
+        flat: 'hello',
+        my_str: testString,
+        my_objects: {
+          total: SOME_NUMBER,
+          type: true,
+        },
+      };
+    } catch (err) {
+      return {
+        my_objects: {
+          total: 0,
+          type: true,
+        },
+      };
+    }
+  },
+  schema: {
+    flat: {
+      type: 'keyword',
+    },
+    my_str: {
+      type: 'text',
+    },
+    my_objects: {
+      total: {
+        type: 'number',
+      },
+      type: { type: 'boolean' },
+    },
+  },
+});
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/cluster.ts b/src/legacy/core_plugins/elasticsearch/server/lib/cluster.ts
index a595fffb3c2350..0e7692f6be7555 100644
--- a/src/legacy/core_plugins/elasticsearch/server/lib/cluster.ts
+++ b/src/legacy/core_plugins/elasticsearch/server/lib/cluster.ts
@@ -19,18 +19,18 @@
 
 import { Request } from 'hapi';
 import { errors } from 'elasticsearch';
-import { CallAPIOptions, ClusterClient, FakeRequest } from 'kibana/server';
+import { LegacyCallAPIOptions, LegacyClusterClient, FakeRequest } from 'kibana/server';
 
 export class Cluster {
   public readonly errors = errors;
 
-  constructor(private readonly clusterClient: ClusterClient) {}
+  constructor(private readonly clusterClient: LegacyClusterClient) {}
 
   public callWithRequest = async (
     req: Request | FakeRequest,
     endpoint: string,
     clientParams?: Record<string, unknown>,
-    options?: CallAPIOptions
+    options?: LegacyCallAPIOptions
   ) => {
     return await this.clusterClient
       .asScoped(req)
@@ -40,7 +40,7 @@ export class Cluster {
   public callWithInternalUser = async (
     endpoint: string,
     clientParams?: Record<string, unknown>,
-    options?: CallAPIOptions
+    options?: LegacyCallAPIOptions
   ) => {
     return await this.clusterClient.callAsInternalUser(endpoint, clientParams, options);
   };
diff --git a/src/legacy/core_plugins/kibana/server/lib/csp_usage_collector/csp_collector.test.ts b/src/legacy/core_plugins/kibana/server/lib/csp_usage_collector/csp_collector.test.ts
index 395cb605878328..63c2cbec21b579 100644
--- a/src/legacy/core_plugins/kibana/server/lib/csp_usage_collector/csp_collector.test.ts
+++ b/src/legacy/core_plugins/kibana/server/lib/csp_usage_collector/csp_collector.test.ts
@@ -34,6 +34,7 @@ const createMockKbnServer = () => ({
 
 describe('csp collector', () => {
   let kbnServer: ReturnType<typeof createMockKbnServer>;
+  const mockCallCluster = null as any;
 
   function updateCsp(config: Partial<ICspConfig>) {
     kbnServer.newPlatform.setup.core.http.csp = new CspConfig(config);
@@ -46,28 +47,28 @@ describe('csp collector', () => {
   test('fetches whether strict mode is enabled', async () => {
     const collector = createCspCollector(kbnServer as any);
 
-    expect((await collector.fetch()).strict).toEqual(true);
+    expect((await collector.fetch(mockCallCluster)).strict).toEqual(true);
 
     updateCsp({ strict: false });
-    expect((await collector.fetch()).strict).toEqual(false);
+    expect((await collector.fetch(mockCallCluster)).strict).toEqual(false);
   });
 
   test('fetches whether the legacy browser warning is enabled', async () => {
     const collector = createCspCollector(kbnServer as any);
 
-    expect((await collector.fetch()).warnLegacyBrowsers).toEqual(true);
+    expect((await collector.fetch(mockCallCluster)).warnLegacyBrowsers).toEqual(true);
 
     updateCsp({ warnLegacyBrowsers: false });
-    expect((await collector.fetch()).warnLegacyBrowsers).toEqual(false);
+    expect((await collector.fetch(mockCallCluster)).warnLegacyBrowsers).toEqual(false);
   });
 
   test('fetches whether the csp rules have been changed or not', async () => {
     const collector = createCspCollector(kbnServer as any);
 
-    expect((await collector.fetch()).rulesChangedFromDefault).toEqual(false);
+    expect((await collector.fetch(mockCallCluster)).rulesChangedFromDefault).toEqual(false);
 
     updateCsp({ rules: ['not', 'default'] });
-    expect((await collector.fetch()).rulesChangedFromDefault).toEqual(true);
+    expect((await collector.fetch(mockCallCluster)).rulesChangedFromDefault).toEqual(true);
   });
 
   test('does not include raw csp rules under any property names', async () => {
@@ -79,7 +80,7 @@ describe('csp collector', () => {
     //
     // We use a snapshot here to ensure csp.rules isn't finding its way into the
     // payload under some new and unexpected variable name (e.g. cspRules).
-    expect(await collector.fetch()).toMatchInlineSnapshot(`
+    expect(await collector.fetch(mockCallCluster)).toMatchInlineSnapshot(`
       Object {
         "rulesChangedFromDefault": false,
         "strict": true,
diff --git a/src/legacy/core_plugins/kibana/server/lib/csp_usage_collector/csp_collector.ts b/src/legacy/core_plugins/kibana/server/lib/csp_usage_collector/csp_collector.ts
index 6622ed4bef478e..9c124a90e66eb4 100644
--- a/src/legacy/core_plugins/kibana/server/lib/csp_usage_collector/csp_collector.ts
+++ b/src/legacy/core_plugins/kibana/server/lib/csp_usage_collector/csp_collector.ts
@@ -19,9 +19,18 @@
 
 import { Server } from 'hapi';
 import { CspConfig } from '../../../../../../core/server';
-import { UsageCollectionSetup } from '../../../../../../plugins/usage_collection/server';
+import {
+  UsageCollectionSetup,
+  CollectorOptions,
+} from '../../../../../../plugins/usage_collection/server';
 
-export function createCspCollector(server: Server) {
+interface Usage {
+  strict: boolean;
+  warnLegacyBrowsers: boolean;
+  rulesChangedFromDefault: boolean;
+}
+
+export function createCspCollector(server: Server): CollectorOptions<Usage> {
   return {
     type: 'csp',
     isReady: () => true,
@@ -37,10 +46,22 @@ export function createCspCollector(server: Server) {
         rulesChangedFromDefault: header !== CspConfig.DEFAULT.header,
       };
     },
+    schema: {
+      strict: {
+        type: 'boolean',
+      },
+      warnLegacyBrowsers: {
+        type: 'boolean',
+      },
+      rulesChangedFromDefault: {
+        type: 'boolean',
+      },
+    },
   };
 }
 
 export function registerCspCollector(usageCollection: UsageCollectionSetup, server: Server): void {
-  const collector = usageCollection.makeUsageCollector(createCspCollector(server));
+  const collectorConfig = createCspCollector(server);
+  const collector = usageCollection.makeUsageCollector<Usage>(collectorConfig);
   usageCollection.registerCollector(collector);
 }
diff --git a/src/plugins/advanced_settings/public/plugin.ts b/src/plugins/advanced_settings/public/plugin.ts
index 2784b74ab726cf..8b3347f8d88f0e 100644
--- a/src/plugins/advanced_settings/public/plugin.ts
+++ b/src/plugins/advanced_settings/public/plugin.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { ManagementApp, ManagementSectionId } from '../../management/public';
+import { CoreSetup, Plugin } from 'kibana/public';
+import { ManagementSectionId } from '../../management/public';
 import { ComponentRegistry } from './component_registry';
 import { AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup } from './types';
 
@@ -30,11 +30,10 @@ const title = i18n.translate('advancedSettings.advancedSettingsLabel', {
 
 export class AdvancedSettingsPlugin
   implements Plugin<AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup> {
-  private managementApp?: ManagementApp;
   public setup(core: CoreSetup, { management }: AdvancedSettingsPluginSetup) {
     const kibanaSection = management.sections.getSection(ManagementSectionId.Kibana);
 
-    this.managementApp = kibanaSection.registerApp({
+    kibanaSection.registerApp({
       id: 'settings',
       title,
       order: 3,
@@ -51,11 +50,7 @@ export class AdvancedSettingsPlugin
     };
   }
 
-  public start(core: CoreStart) {
-    if (!core.application.capabilities.management.kibana.settings) {
-      this.managementApp!.disable();
-    }
-
+  public start() {
     return {
       component: component.start,
     };
diff --git a/src/plugins/data/common/field_formats/mocks.ts b/src/plugins/data/common/field_formats/mocks.ts
index 394d4c383032fb..9bbaefe2d146a8 100644
--- a/src/plugins/data/common/field_formats/mocks.ts
+++ b/src/plugins/data/common/field_formats/mocks.ts
@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import { IFieldFormatsRegistry } from '.';
+import { identity } from 'lodash';
+import { FieldFormat, IFieldFormatsRegistry } from '.';
 
 export const fieldFormatsMock: IFieldFormatsRegistry = {
   getByFieldType: jest.fn(),
@@ -35,6 +36,9 @@ export const fieldFormatsMock: IFieldFormatsRegistry = {
   init: jest.fn(),
   register: jest.fn(),
   parseDefaultTypeMap: jest.fn(),
-  deserialize: jest.fn(),
+  deserialize: jest.fn().mockImplementation(() => {
+    const DefaultFieldFormat = FieldFormat.from(identity);
+    return new DefaultFieldFormat();
+  }),
   getTypeWithoutMetaParams: jest.fn(),
 };
diff --git a/src/plugins/data/common/index.ts b/src/plugins/data/common/index.ts
index b40e02b709d301..0fb45fcc739d45 100644
--- a/src/plugins/data/common/index.ts
+++ b/src/plugins/data/common/index.ts
@@ -26,6 +26,5 @@ export * from './kbn_field_types';
 export * from './query';
 export * from './search';
 export * from './search/aggs';
-export * from './timefilter';
 export * from './types';
 export * from './utils';
diff --git a/src/plugins/data/common/query/index.ts b/src/plugins/data/common/query/index.ts
index 4e90f6f8bb83ec..b0dfbbb82355e0 100644
--- a/src/plugins/data/common/query/index.ts
+++ b/src/plugins/data/common/query/index.ts
@@ -18,5 +18,6 @@
  */
 
 export * from './filter_manager';
+export * from './timefilter';
 export * from './types';
 export * from './is_query';
diff --git a/src/plugins/data/public/query/timefilter/get_time.test.ts b/src/plugins/data/common/query/timefilter/get_time.test.ts
similarity index 100%
rename from src/plugins/data/public/query/timefilter/get_time.test.ts
rename to src/plugins/data/common/query/timefilter/get_time.test.ts
diff --git a/src/plugins/data/public/query/timefilter/get_time.ts b/src/plugins/data/common/query/timefilter/get_time.ts
similarity index 90%
rename from src/plugins/data/public/query/timefilter/get_time.ts
rename to src/plugins/data/common/query/timefilter/get_time.ts
index 3706972ce4a2ef..6e4eda95accc73 100644
--- a/src/plugins/data/public/query/timefilter/get_time.ts
+++ b/src/plugins/data/common/query/timefilter/get_time.ts
@@ -18,14 +18,16 @@
  */
 
 import dateMath from '@elastic/datemath';
-import { IIndexPattern } from '../..';
-import { TimeRange, buildRangeFilter } from '../../../common';
+import { buildRangeFilter, IIndexPattern, TimeRange, TimeRangeBounds } from '../..';
 
 interface CalculateBoundsOptions {
   forceNow?: Date;
 }
 
-export function calculateBounds(timeRange: TimeRange, options: CalculateBoundsOptions = {}) {
+export function calculateBounds(
+  timeRange: TimeRange,
+  options: CalculateBoundsOptions = {}
+): TimeRangeBounds {
   return {
     min: dateMath.parse(timeRange.from, { forceNow: options.forceNow }),
     max: dateMath.parse(timeRange.to, { roundUp: true, forceNow: options.forceNow }),
diff --git a/src/plugins/data/common/query/timefilter/index.ts b/src/plugins/data/common/query/timefilter/index.ts
new file mode 100644
index 00000000000000..55739511a0ef54
--- /dev/null
+++ b/src/plugins/data/common/query/timefilter/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.
+ */
+
+export * from './get_time';
+export * from './is_time_range';
diff --git a/src/plugins/data/common/timefilter/is_time_range.ts b/src/plugins/data/common/query/timefilter/is_time_range.ts
similarity index 100%
rename from src/plugins/data/common/timefilter/is_time_range.ts
rename to src/plugins/data/common/query/timefilter/is_time_range.ts
diff --git a/src/plugins/data/common/timefilter/types.ts b/src/plugins/data/common/query/timefilter/types.ts
similarity index 88%
rename from src/plugins/data/common/timefilter/types.ts
rename to src/plugins/data/common/query/timefilter/types.ts
index b197b16e67dd11..60008ce6054e1b 100644
--- a/src/plugins/data/common/timefilter/types.ts
+++ b/src/plugins/data/common/query/timefilter/types.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { Moment } from 'moment';
+
 export interface RefreshInterval {
   pause: boolean;
   value: number;
@@ -27,3 +29,8 @@ export interface TimeRange {
   to: string;
   mode?: 'absolute' | 'relative';
 }
+
+export interface TimeRangeBounds {
+  min: Moment | undefined;
+  max: Moment | undefined;
+}
diff --git a/src/plugins/data/common/query/types.ts b/src/plugins/data/common/query/types.ts
index 61b5d5b2b7b4ad..6b34a1baf293bc 100644
--- a/src/plugins/data/common/query/types.ts
+++ b/src/plugins/data/common/query/types.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+export * from './timefilter/types';
+
 export interface Query {
   query: string | { [key: string]: any };
   language: string;
diff --git a/src/plugins/data/common/types.ts b/src/plugins/data/common/types.ts
index 93629c3dbaf626..e2ec1a031b0ca7 100644
--- a/src/plugins/data/common/types.ts
+++ b/src/plugins/data/common/types.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-export * from './timefilter/types';
 export * from './query/types';
 export * from './kbn_field_types/types';
 export * from './index_patterns/types';
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index efce8d2c021c99..89b0d7e0303b98 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -421,7 +421,6 @@ export {
   connectToQueryState,
   syncQueryStateWithUrl,
   QueryState,
-  getTime,
   getQueryLog,
   getDefaultQuery,
   FilterManager,
@@ -435,6 +434,7 @@ export {
 } from './query';
 
 export {
+  getTime,
   // kbn field types
   castEsToKbnFieldTypeName,
   getKbnTypeNames,
diff --git a/src/plugins/data/public/index_patterns/index_patterns/redirect_no_index_pattern.tsx b/src/plugins/data/public/index_patterns/index_patterns/redirect_no_index_pattern.tsx
index e32a8e023cf402..7ed6525db6350e 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/redirect_no_index_pattern.tsx
+++ b/src/plugins/data/public/index_patterns/index_patterns/redirect_no_index_pattern.tsx
@@ -30,7 +30,7 @@ export const onRedirectNoIndexPattern = (
   navigateToApp: CoreStart['application']['navigateToApp'],
   overlays: CoreStart['overlays']
 ) => () => {
-  const canManageIndexPatterns = capabilities.management.kibana.index_patterns;
+  const canManageIndexPatterns = capabilities.management.kibana.indexPatterns;
   const redirectTarget = canManageIndexPatterns ? '/management/kibana/indexPatterns' : '/home';
   let timeoutId: NodeJS.Timeout | undefined;
 
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index 493733daf261b2..51f96f10aa7c72 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -146,7 +146,6 @@ export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPubli
         expressions,
         getInternalStartServices,
         packageInfo: this.packageInfo,
-        query: queryService,
       }),
       fieldFormats: this.fieldFormatsService.setup(core),
       query: queryService,
@@ -184,10 +183,7 @@ export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPubli
     const query = this.queryService.start(savedObjects);
     setQueryService(query);
 
-    const search = this.searchService.start(core, {
-      indexPatterns,
-      fieldFormats,
-    });
+    const search = this.searchService.start(core, { indexPatterns });
     setSearchService(search);
 
     uiActions.addTriggerAction(
diff --git a/src/plugins/data/public/query/timefilter/index.ts b/src/plugins/data/public/query/timefilter/index.ts
index a5885a59f60ede..f71061677ceb78 100644
--- a/src/plugins/data/public/query/timefilter/index.ts
+++ b/src/plugins/data/public/query/timefilter/index.ts
@@ -22,6 +22,5 @@ export { TimefilterService, TimefilterSetup } from './timefilter_service';
 export * from './types';
 export { Timefilter, TimefilterContract } from './timefilter';
 export { TimeHistory, TimeHistoryContract } from './time_history';
-export { getTime, calculateBounds } from './get_time';
 export { changeTimeFilter, convertRangeFilterToTimeRangeString } from './lib/change_time_filter';
 export { extractTimeFilter } from './lib/extract_time_filter';
diff --git a/src/plugins/data/public/query/timefilter/lib/get_force_now.ts b/src/plugins/data/public/query/timefilter/lib/get_force_now.ts
new file mode 100644
index 00000000000000..fe68656f0c3aaf
--- /dev/null
+++ b/src/plugins/data/public/query/timefilter/lib/get_force_now.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 { parseQueryString } from './parse_querystring';
+
+/** @internal */
+export function getForceNow() {
+  const forceNow = parseQueryString().forceNow as string;
+  if (!forceNow) {
+    return;
+  }
+
+  const ticks = Date.parse(forceNow);
+  if (isNaN(ticks)) {
+    throw new Error(`forceNow query parameter, ${forceNow}, can't be parsed by Date.parse`);
+  }
+  return new Date(ticks);
+}
diff --git a/src/plugins/data/public/query/timefilter/lib/parse_querystring.ts b/src/plugins/data/public/query/timefilter/lib/parse_querystring.ts
index 2220ad4eef1b7f..5982bfd0bd276d 100644
--- a/src/plugins/data/public/query/timefilter/lib/parse_querystring.ts
+++ b/src/plugins/data/public/query/timefilter/lib/parse_querystring.ts
@@ -18,6 +18,7 @@
  */
 import { parse } from 'query-string';
 
+/** @internal */
 export function parseQueryString() {
   // window.location.search is an empty string
   // get search from href
diff --git a/src/plugins/data/public/query/timefilter/timefilter.ts b/src/plugins/data/public/query/timefilter/timefilter.ts
index 86ef69be572a9c..5eb1546fa015f0 100644
--- a/src/plugins/data/public/query/timefilter/timefilter.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter.ts
@@ -21,10 +21,9 @@ import _ from 'lodash';
 import { Subject, BehaviorSubject } from 'rxjs';
 import moment from 'moment';
 import { areRefreshIntervalsDifferent, areTimeRangesDifferent } from './lib/diff_time_picker_vals';
-import { parseQueryString } from './lib/parse_querystring';
-import { calculateBounds, getTime } from './get_time';
+import { getForceNow } from './lib/get_force_now';
 import { TimefilterConfig, InputTimeRange, TimeRangeBounds } from './types';
-import { RefreshInterval, TimeRange } from '../../../common';
+import { calculateBounds, getTime, RefreshInterval, TimeRange } from '../../../common';
 import { TimeHistoryContract } from './time_history';
 import { IndexPattern } from '../../index_patterns';
 
@@ -224,16 +223,7 @@ export class Timefilter {
   }
 
   private getForceNow = () => {
-    const forceNow = parseQueryString().forceNow as string;
-    if (!forceNow) {
-      return;
-    }
-
-    const ticks = Date.parse(forceNow);
-    if (isNaN(ticks)) {
-      throw new Error(`forceNow query parameter, ${forceNow}, can't be parsed by Date.parse`);
-    }
-    return new Date(ticks);
+    return getForceNow();
   };
 }
 
diff --git a/src/plugins/data/public/query/timefilter/types.ts b/src/plugins/data/public/query/timefilter/types.ts
index 8b8deea43f808e..d47a9cbb3bd609 100644
--- a/src/plugins/data/public/query/timefilter/types.ts
+++ b/src/plugins/data/public/query/timefilter/types.ts
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import { Moment } from 'moment';
+
 import { TimeRange, RefreshInterval } from '../../../common';
 
 export interface TimefilterConfig {
@@ -32,7 +34,4 @@ export type InputTimeRange =
       to: Moment;
     };
 
-export interface TimeRangeBounds {
-  min: Moment | undefined;
-  max: Moment | undefined;
-}
+export { TimeRangeBounds } from '../../../common';
diff --git a/src/plugins/data/public/search/aggs/agg_config.test.ts b/src/plugins/data/public/search/aggs/agg_config.test.ts
index 95e0b2cd27186b..18a86d767c2de2 100644
--- a/src/plugins/data/public/search/aggs/agg_config.test.ts
+++ b/src/plugins/data/public/search/aggs/agg_config.test.ts
@@ -25,31 +25,23 @@ import { AggType } from './agg_type';
 import { AggTypesRegistryStart } from './agg_types_registry';
 import { mockDataServices, mockAggTypesRegistry } from './test_helpers';
 import { MetricAggType } from './metrics/metric_agg_type';
-import {
-  Field as IndexPatternField,
-  IndexPattern,
-  IIndexPatternFieldList,
-} from '../../index_patterns';
+import { IndexPattern, IIndexPatternFieldList } from '../../index_patterns';
 import { stubIndexPatternWithFields } from '../../../public/stubs';
-import { FieldFormatsStart } from '../../field_formats';
-import { fieldFormatsServiceMock } from '../../field_formats/mocks';
 
 describe('AggConfig', () => {
   let indexPattern: IndexPattern;
   let typesRegistry: AggTypesRegistryStart;
-  let fieldFormats: FieldFormatsStart;
 
   beforeEach(() => {
     jest.restoreAllMocks();
     mockDataServices();
-    fieldFormats = fieldFormatsServiceMock.createStartContract();
     indexPattern = stubIndexPatternWithFields as IndexPattern;
     typesRegistry = mockAggTypesRegistry();
   });
 
   describe('#toDsl', () => {
     it('calls #write()', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
       const configStates = {
         enabled: true,
         type: 'date_histogram',
@@ -64,7 +56,7 @@ describe('AggConfig', () => {
     });
 
     it('uses the type name as the agg name', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
       const configStates = {
         enabled: true,
         type: 'date_histogram',
@@ -79,7 +71,7 @@ describe('AggConfig', () => {
     });
 
     it('uses the params from #write() output as the agg params', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
       const configStates = {
         enabled: true,
         type: 'date_histogram',
@@ -109,7 +101,7 @@ describe('AggConfig', () => {
           params: {},
         },
       ];
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
 
       const histoConfig = ac.byName('date_histogram')[0];
       const avgConfig = ac.byName('avg')[0];
@@ -219,8 +211,8 @@ describe('AggConfig', () => {
 
     testsIdentical.forEach((configState, index) => {
       it(`identical aggregations (${index})`, () => {
-        const ac1 = new AggConfigs(indexPattern, configState, { typesRegistry, fieldFormats });
-        const ac2 = new AggConfigs(indexPattern, configState, { typesRegistry, fieldFormats });
+        const ac1 = new AggConfigs(indexPattern, configState, { typesRegistry });
+        const ac2 = new AggConfigs(indexPattern, configState, { typesRegistry });
         expect(ac1.jsonDataEquals(ac2.aggs)).toBe(true);
       });
     });
@@ -260,8 +252,8 @@ describe('AggConfig', () => {
 
     testsIdenticalDifferentOrder.forEach((test, index) => {
       it(`identical aggregations (${index}) - init json is in different order`, () => {
-        const ac1 = new AggConfigs(indexPattern, test.config1, { typesRegistry, fieldFormats });
-        const ac2 = new AggConfigs(indexPattern, test.config2, { typesRegistry, fieldFormats });
+        const ac1 = new AggConfigs(indexPattern, test.config1, { typesRegistry });
+        const ac2 = new AggConfigs(indexPattern, test.config2, { typesRegistry });
         expect(ac1.jsonDataEquals(ac2.aggs)).toBe(true);
       });
     });
@@ -325,8 +317,8 @@ describe('AggConfig', () => {
 
     testsDifferent.forEach((test, index) => {
       it(`different aggregations (${index})`, () => {
-        const ac1 = new AggConfigs(indexPattern, test.config1, { typesRegistry, fieldFormats });
-        const ac2 = new AggConfigs(indexPattern, test.config2, { typesRegistry, fieldFormats });
+        const ac1 = new AggConfigs(indexPattern, test.config1, { typesRegistry });
+        const ac2 = new AggConfigs(indexPattern, test.config2, { typesRegistry });
         expect(ac1.jsonDataEquals(ac2.aggs)).toBe(false);
       });
     });
@@ -334,7 +326,7 @@ describe('AggConfig', () => {
 
   describe('#serialize', () => {
     it('includes the aggs id, params, type and schema', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
       const configStates = {
         enabled: true,
         type: 'date_histogram',
@@ -365,8 +357,8 @@ describe('AggConfig', () => {
           params: {},
         },
       ];
-      const ac1 = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
-      const ac2 = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac1 = new AggConfigs(indexPattern, configStates, { typesRegistry });
+      const ac2 = new AggConfigs(indexPattern, configStates, { typesRegistry });
 
       // this relies on the assumption that js-engines consistently loop over properties in insertion order.
       // most likely the case, but strictly speaking not guaranteed by the JS and JSON specifications.
@@ -394,7 +386,7 @@ describe('AggConfig', () => {
           params: { field: 'machine.os.keyword' },
         },
       ];
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
 
       expect(ac.aggs.map((agg) => agg.toSerializedFieldFormat())).toMatchInlineSnapshot(`
         Array [
@@ -456,7 +448,7 @@ describe('AggConfig', () => {
           },
         },
       ];
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
 
       expect(ac.aggs.map((agg) => agg.toSerializedFieldFormat())).toMatchInlineSnapshot(`
         Array [
@@ -478,20 +470,8 @@ describe('AggConfig', () => {
   });
 
   describe('#toExpressionAst', () => {
-    beforeEach(() => {
-      fieldFormats.getDefaultInstance = (() => ({
-        getConverterFor: (t?: string) => t || identity,
-      })) as any;
-      indexPattern.fields.getByName = (name) =>
-        ({
-          format: {
-            getConverterFor: (t?: string) => t || identity,
-          },
-        } as IndexPatternField);
-    });
-
     it('works with primitive param types', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
       const configStates = {
         enabled: true,
         type: 'terms',
@@ -540,7 +520,7 @@ describe('AggConfig', () => {
     });
 
     it('creates a subexpression for params of type "agg"', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
       const configStates = {
         type: 'terms',
         params: {
@@ -616,7 +596,7 @@ describe('AggConfig', () => {
         },
       });
 
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
       const configStates = {
         type: 'range',
         params: {
@@ -647,7 +627,7 @@ describe('AggConfig', () => {
     });
 
     it('stringifies any other params which are an object', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
       const configStates = {
         type: 'terms',
         params: {
@@ -662,7 +642,7 @@ describe('AggConfig', () => {
     });
 
     it(`returns undefined if an expressionName doesn't exist on the agg type`, () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
       const configStates = {
         type: 'unknown type',
         params: {},
@@ -676,7 +656,7 @@ describe('AggConfig', () => {
     let aggConfig: AggConfig;
 
     beforeEach(() => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
       aggConfig = ac.createAggConfig({ type: 'count' } as CreateAggConfigParams);
     });
 
@@ -702,85 +682,4 @@ describe('AggConfig', () => {
       expect(label).toBe('');
     });
   });
-
-  describe('#fieldFormatter - custom getFormat handler', () => {
-    it('returns formatter from getFormat handler', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry, fieldFormats });
-      const configStates = {
-        enabled: true,
-        type: 'count',
-        schema: 'metric',
-        params: { field: '@timestamp' },
-      };
-      const aggConfig = ac.createAggConfig(configStates);
-
-      const fieldFormatter = aggConfig.fieldFormatter();
-      expect(fieldFormatter).toBeDefined();
-      expect(fieldFormatter('text')).toBe('text');
-    });
-  });
-
-  // TODO: Converting these field formatter tests from browser tests to unit
-  // tests makes them much less helpful due to the extensive use of mocking.
-  // We should revisit these and rewrite them into something more useful.
-  describe('#fieldFormatter - no custom getFormat handler', () => {
-    let aggConfig: AggConfig;
-
-    beforeEach(() => {
-      fieldFormats.getDefaultInstance = (() => ({
-        getConverterFor: (t?: string) => t || identity,
-      })) as any;
-      indexPattern.fields.getByName = (name) =>
-        ({
-          format: {
-            getConverterFor: (t?: string) => t || identity,
-          },
-        } as IndexPatternField);
-
-      const configStates = {
-        enabled: true,
-        type: 'histogram',
-        schema: 'bucket',
-        params: {
-          field: 'bytes',
-        },
-      };
-      const ac = new AggConfigs(indexPattern, [configStates], { typesRegistry, fieldFormats });
-      aggConfig = ac.createAggConfig(configStates);
-    });
-
-    it("returns the field's formatter", () => {
-      aggConfig.params.field = {
-        format: {
-          getConverterFor: (t?: string) => t || identity,
-        },
-      };
-      expect(aggConfig.fieldFormatter().toString()).toBe(
-        aggConfig.getField().format.getConverterFor().toString()
-      );
-    });
-
-    it('returns the string format if the field does not have a format', () => {
-      const agg = aggConfig;
-      agg.params.field = { type: 'number', format: null };
-      const fieldFormatter = agg.fieldFormatter();
-      expect(fieldFormatter).toBeDefined();
-      expect(fieldFormatter('text')).toBe('text');
-    });
-
-    it('returns the string format if there is no field', () => {
-      const agg = aggConfig;
-      delete agg.params.field;
-      const fieldFormatter = agg.fieldFormatter();
-      expect(fieldFormatter).toBeDefined();
-      expect(fieldFormatter('text')).toBe('text');
-    });
-
-    it('returns the html converter if "html" is passed in', () => {
-      const field = indexPattern.fields.getByName('bytes');
-      expect(aggConfig.fieldFormatter('html').toString()).toBe(
-        field!.format.getConverterFor('html').toString()
-      );
-    });
-  });
 });
diff --git a/src/plugins/data/public/search/aggs/agg_config.ts b/src/plugins/data/public/search/aggs/agg_config.ts
index a2b74eca584766..8650f5920e5202 100644
--- a/src/plugins/data/public/search/aggs/agg_config.ts
+++ b/src/plugins/data/public/search/aggs/agg_config.ts
@@ -30,8 +30,6 @@ import { writeParams } from './agg_params';
 import { IAggConfigs } from './agg_configs';
 import { FetchOptions } from '../fetch';
 import { ISearchSource } from '../search_source';
-import { FieldFormatsContentType, KBN_FIELD_TYPES } from '../../../common';
-import { FieldFormatsStart } from '../../field_formats';
 
 type State = string | number | boolean | null | undefined | SerializableState;
 
@@ -52,10 +50,6 @@ export type AggConfigSerialized = Ensure<
   SerializableState
 >;
 
-export interface AggConfigDependencies {
-  fieldFormats: FieldFormatsStart;
-}
-
 export type AggConfigOptions = Assign<AggConfigSerialized, { type: IAggType }>;
 
 /**
@@ -116,13 +110,8 @@ export class AggConfig {
   private __type: IAggType;
   private __typeDecorations: any;
   private subAggs: AggConfig[] = [];
-  private readonly fieldFormats: FieldFormatsStart;
 
-  constructor(
-    aggConfigs: IAggConfigs,
-    opts: AggConfigOptions,
-    { fieldFormats }: AggConfigDependencies
-  ) {
+  constructor(aggConfigs: IAggConfigs, opts: AggConfigOptions) {
     this.aggConfigs = aggConfigs;
     this.id = String(opts.id || AggConfig.nextId(aggConfigs.aggs as any));
     this.enabled = typeof opts.enabled === 'boolean' ? opts.enabled : true;
@@ -143,8 +132,6 @@ export class AggConfig {
 
     // @ts-ignore
     this.__type = this.__type;
-
-    this.fieldFormats = fieldFormats;
   }
 
   /**
@@ -433,24 +420,6 @@ export class AggConfig {
     return this.aggConfigs.timeRange;
   }
 
-  fieldFormatter(contentType?: FieldFormatsContentType, defaultFormat?: any) {
-    const format = this.type && this.type.getFormat(this);
-
-    if (format) {
-      return format.getConverterFor(contentType);
-    }
-
-    return this.fieldOwnFormatter(contentType, defaultFormat);
-  }
-
-  fieldOwnFormatter(contentType?: FieldFormatsContentType, defaultFormat?: any) {
-    const field = this.getField();
-    let format = field && field.format;
-    if (!format) format = defaultFormat;
-    if (!format) format = this.fieldFormats.getDefaultInstance(KBN_FIELD_TYPES.STRING);
-    return format.getConverterFor(contentType);
-  }
-
   fieldName() {
     const field = this.getField();
     return field ? field.name : '';
diff --git a/src/plugins/data/public/search/aggs/agg_configs.test.ts b/src/plugins/data/public/search/aggs/agg_configs.test.ts
index 6e6fb3350d901f..121bb29f6f8edb 100644
--- a/src/plugins/data/public/search/aggs/agg_configs.test.ts
+++ b/src/plugins/data/public/search/aggs/agg_configs.test.ts
@@ -24,12 +24,10 @@ import { AggTypesRegistryStart } from './agg_types_registry';
 import { mockDataServices, mockAggTypesRegistry } from './test_helpers';
 import { Field as IndexPatternField, IndexPattern } from '../../index_patterns';
 import { stubIndexPattern, stubIndexPatternWithFields } from '../../../public/stubs';
-import { fieldFormatsServiceMock } from '../../field_formats/mocks';
 
 describe('AggConfigs', () => {
   let indexPattern: IndexPattern;
   let typesRegistry: AggTypesRegistryStart;
-  const fieldFormats = fieldFormatsServiceMock.createStartContract();
 
   beforeEach(() => {
     mockDataServices();
@@ -47,7 +45,7 @@ describe('AggConfigs', () => {
         },
       ];
 
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
       expect(ac.aggs).toHaveLength(1);
     });
 
@@ -72,7 +70,7 @@ describe('AggConfigs', () => {
       ];
 
       const spy = jest.spyOn(AggConfig, 'ensureIds');
-      new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      new AggConfigs(indexPattern, configStates, { typesRegistry });
       expect(spy).toHaveBeenCalledTimes(1);
       expect(spy.mock.calls[0]).toEqual([configStates]);
       spy.mockRestore();
@@ -94,20 +92,16 @@ describe('AggConfigs', () => {
         },
       ];
 
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
       expect(ac.aggs).toHaveLength(2);
 
       ac.createAggConfig(
-        new AggConfig(
-          ac,
-          {
-            enabled: true,
-            type: typesRegistry.get('terms'),
-            params: {},
-            schema: 'split',
-          },
-          { fieldFormats }
-        )
+        new AggConfig(ac, {
+          enabled: true,
+          type: typesRegistry.get('terms'),
+          params: {},
+          schema: 'split',
+        })
       );
       expect(ac.aggs).toHaveLength(3);
     });
@@ -121,7 +115,7 @@ describe('AggConfigs', () => {
         },
       ];
 
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
       expect(ac.aggs).toHaveLength(1);
 
       ac.createAggConfig({
@@ -142,7 +136,7 @@ describe('AggConfigs', () => {
         },
       ];
 
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
       expect(ac.aggs).toHaveLength(1);
 
       ac.createAggConfig(
@@ -170,7 +164,7 @@ describe('AggConfigs', () => {
         { type: 'percentiles', enabled: true, params: {}, schema: 'metric' },
       ];
 
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
       const sorted = ac.getRequestAggs();
       const aggs = indexBy(ac.aggs, (agg) => agg.type.name);
 
@@ -193,7 +187,7 @@ describe('AggConfigs', () => {
         { type: 'count', enabled: true, params: {}, schema: 'metric' },
       ];
 
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
       const sorted = ac.getResponseAggs();
       const aggs = indexBy(ac.aggs, (agg) => agg.type.name);
 
@@ -210,7 +204,7 @@ describe('AggConfigs', () => {
         { type: 'percentiles', enabled: true, params: { percents: [1, 2, 3] }, schema: 'metric' },
       ];
 
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
       const sorted = ac.getResponseAggs();
       const aggs = indexBy(ac.aggs, (agg) => agg.type.name);
 
@@ -231,7 +225,7 @@ describe('AggConfigs', () => {
 
     it('uses the sorted aggs', () => {
       const configStates = [{ enabled: true, type: 'avg', params: { field: 'bytes' } }];
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
       const spy = jest.spyOn(AggConfigs.prototype, 'getRequestAggs');
       ac.toDsl();
       expect(spy).toHaveBeenCalledTimes(1);
@@ -245,10 +239,7 @@ describe('AggConfigs', () => {
         { enabled: true, type: 'count', params: {} },
       ];
 
-      const ac = new AggConfigs(indexPattern, configStates, {
-        typesRegistry,
-        fieldFormats,
-      });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
 
       const aggInfos = ac.aggs.map((aggConfig) => {
         const football = {};
@@ -291,7 +282,7 @@ describe('AggConfigs', () => {
         },
       ];
 
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
       const dsl = ac.toDsl();
       const histo = ac.byName('date_histogram')[0];
       const count = ac.byName('count')[0];
@@ -316,10 +307,7 @@ describe('AggConfigs', () => {
         { enabled: true, type: 'max', schema: 'metric', params: { field: 'bytes' } },
       ];
 
-      const ac = new AggConfigs(indexPattern, configStates, {
-        typesRegistry,
-        fieldFormats,
-      });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
       const dsl = ac.toDsl();
       const histo = ac.byName('date_histogram')[0];
       const metrics = ac.bySchemaName('metrics');
@@ -344,7 +332,7 @@ describe('AggConfigs', () => {
         { enabled: true, type: 'max', schema: 'metric', params: { field: 'bytes' } },
       ];
 
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
       const topLevelDsl = ac.toDsl(true);
       const buckets = ac.bySchemaName('buckets');
       const metrics = ac.bySchemaName('metrics');
@@ -414,7 +402,7 @@ describe('AggConfigs', () => {
         },
       ];
 
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry, fieldFormats });
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
       const topLevelDsl = ac.toDsl(true)['2'];
 
       expect(Object.keys(topLevelDsl.aggs)).toContain('1');
diff --git a/src/plugins/data/public/search/aggs/agg_configs.ts b/src/plugins/data/public/search/aggs/agg_configs.ts
index 6cc03be292d7b5..b272dfd3c7468e 100644
--- a/src/plugins/data/public/search/aggs/agg_configs.ts
+++ b/src/plugins/data/public/search/aggs/agg_configs.ts
@@ -28,7 +28,6 @@ import { IndexPattern } from '../../index_patterns';
 import { ISearchSource } from '../search_source';
 import { FetchOptions } from '../fetch';
 import { TimeRange } from '../../../common';
-import { FieldFormatsStart } from '../../field_formats';
 
 function removeParentAggs(obj: any) {
   for (const prop in obj) {
@@ -48,7 +47,6 @@ function parseParentAggs(dslLvlCursor: any, dsl: any) {
 
 export interface AggConfigsOptions {
   typesRegistry: AggTypesRegistryStart;
-  fieldFormats: FieldFormatsStart;
 }
 
 export type CreateAggConfigParams = Assign<AggConfigSerialized, { type: string | IAggType }>;
@@ -70,7 +68,6 @@ export type IAggConfigs = AggConfigs;
 export class AggConfigs {
   public indexPattern: IndexPattern;
   public timeRange?: TimeRange;
-  private readonly fieldFormats: FieldFormatsStart;
   private readonly typesRegistry: AggTypesRegistryStart;
 
   aggs: IAggConfig[];
@@ -86,7 +83,6 @@ export class AggConfigs {
 
     this.aggs = [];
     this.indexPattern = indexPattern;
-    this.fieldFormats = opts.fieldFormats;
 
     configStates.forEach((params: any) => this.createAggConfig(params));
   }
@@ -117,7 +113,6 @@ export class AggConfigs {
 
     const aggConfigs = new AggConfigs(this.indexPattern, this.aggs.filter(filterAggs), {
       typesRegistry: this.typesRegistry,
-      fieldFormats: this.fieldFormats,
     });
 
     return aggConfigs;
@@ -134,14 +129,10 @@ export class AggConfigs {
       aggConfig = params;
       params.parent = this;
     } else {
-      aggConfig = new AggConfig(
-        this,
-        {
-          ...params,
-          type: typeof type === 'string' ? this.typesRegistry.get(type) : type,
-        },
-        { fieldFormats: this.fieldFormats }
-      );
+      aggConfig = new AggConfig(this, {
+        ...params,
+        type: typeof type === 'string' ? this.typesRegistry.get(type) : type,
+      });
     }
 
     if (addToAggConfigs) {
diff --git a/src/plugins/data/public/search/aggs/agg_type.test.ts b/src/plugins/data/public/search/aggs/agg_type.test.ts
index cc45b935d45b54..99b1c4d8612192 100644
--- a/src/plugins/data/public/search/aggs/agg_type.test.ts
+++ b/src/plugins/data/public/search/aggs/agg_type.test.ts
@@ -159,47 +159,6 @@ describe('AggType Class', () => {
       });
     });
 
-    describe('getFormat', function () {
-      let aggConfig: IAggConfig;
-      let field: any;
-
-      beforeEach(() => {
-        aggConfig = ({
-          getField: jest.fn(() => field),
-        } as unknown) as IAggConfig;
-      });
-
-      test('returns the formatter for the aggConfig', () => {
-        const aggType = new AggType(
-          {
-            name: 'name',
-            title: 'title',
-          },
-          dependencies
-        );
-
-        field = {
-          format: 'format',
-        };
-
-        expect(aggType.getFormat(aggConfig)).toBe('format');
-      });
-
-      test('returns default formatter', () => {
-        const aggType = new AggType(
-          {
-            name: 'name',
-            title: 'title',
-          },
-          dependencies
-        );
-
-        field = undefined;
-
-        expect(aggType.getFormat(aggConfig)).toBe('default');
-      });
-    });
-
     describe('getSerializedFormat', () => {
       test('returns the default serialized field format if it exists', () => {
         const aggConfig = ({
diff --git a/src/plugins/data/public/search/aggs/agg_type.ts b/src/plugins/data/public/search/aggs/agg_type.ts
index e909cd8134e83f..13655afdf469ea 100644
--- a/src/plugins/data/public/search/aggs/agg_type.ts
+++ b/src/plugins/data/public/search/aggs/agg_type.ts
@@ -28,7 +28,6 @@ import { IAggConfigs } from './agg_configs';
 import { Adapters } from '../../../../../plugins/inspector/public';
 import { BaseParamType } from './param_types/base';
 import { AggParamType } from './param_types/agg';
-import { KBN_FIELD_TYPES, IFieldFormat } from '../../../common';
 import { ISearchSource } from '../search_source';
 import { GetInternalStartServicesFn } from '../../types';
 
@@ -58,7 +57,6 @@ export interface AggTypeConfig<
     inspectorAdapters: Adapters,
     abortSignal?: AbortSignal
   ) => Promise<any>;
-  getFormat?: (agg: TAggConfig) => IFieldFormat;
   getSerializedFormat?: (agg: TAggConfig) => SerializedFieldFormat;
   getValue?: (agg: TAggConfig, bucket: any) => any;
   getKey?: (bucket: any, key: any, agg: TAggConfig) => any;
@@ -197,16 +195,6 @@ export class AggType<
     inspectorAdapters: Adapters,
     abortSignal?: AbortSignal
   ) => Promise<any>;
-  /**
-   * Pick a format for the values produced by this agg type,
-   * overridden by several metrics that always output a simple
-   * number
-   *
-   * @param  {agg} agg - the agg to pick a format for
-   * @return {FieldFormat}
-   */
-  getFormat: (agg: TAggConfig) => IFieldFormat;
-
   /**
    * Get the serialized format for the values produced by this agg type,
    * overridden by several metrics that always output a simple number.
@@ -283,15 +271,6 @@ export class AggType<
     this.decorateAggConfig = config.decorateAggConfig || (() => ({}));
     this.postFlightRequest = config.postFlightRequest || identity;
 
-    this.getFormat =
-      config.getFormat ||
-      ((agg: TAggConfig) => {
-        const field = agg.getField();
-        const { fieldFormats } = getInternalStartServices();
-
-        return field ? field.format : fieldFormats.getDefaultInstance(KBN_FIELD_TYPES.STRING);
-      });
-
     this.getSerializedFormat =
       config.getSerializedFormat ||
       ((agg: TAggConfig) => {
diff --git a/src/plugins/data/public/search/aggs/agg_types.ts b/src/plugins/data/public/search/aggs/agg_types.ts
index 2af29d36002460..68542b66e6c358 100644
--- a/src/plugins/data/public/search/aggs/agg_types.ts
+++ b/src/plugins/data/public/search/aggs/agg_types.ts
@@ -18,7 +18,8 @@
  */
 
 import { IUiSettingsClient } from 'src/core/public';
-import { QuerySetup } from '../../query/query_service';
+import { TimeRange, TimeRangeBounds } from '../../../common';
+import { GetInternalStartServicesFn } from '../../types';
 
 import { getCountMetricAgg } from './metrics/count';
 import { getAvgMetricAgg } from './metrics/avg';
@@ -54,18 +55,16 @@ import { getBucketAvgMetricAgg } from './metrics/bucket_avg';
 import { getBucketMinMetricAgg } from './metrics/bucket_min';
 import { getBucketMaxMetricAgg } from './metrics/bucket_max';
 
-import { GetInternalStartServicesFn } from '../../types';
-
 export interface AggTypesDependencies {
-  uiSettings: IUiSettingsClient;
-  query: QuerySetup;
+  calculateBounds: (timeRange: TimeRange) => TimeRangeBounds;
   getInternalStartServices: GetInternalStartServicesFn;
+  uiSettings: IUiSettingsClient;
 }
 
 export const getAggTypes = ({
-  uiSettings,
-  query,
+  calculateBounds,
   getInternalStartServices,
+  uiSettings,
 }: AggTypesDependencies) => ({
   metrics: [
     getCountMetricAgg({ getInternalStartServices }),
@@ -91,7 +90,7 @@ export const getAggTypes = ({
     getGeoCentroidMetricAgg({ getInternalStartServices }),
   ],
   buckets: [
-    getDateHistogramBucketAgg({ uiSettings, query, getInternalStartServices }),
+    getDateHistogramBucketAgg({ calculateBounds, uiSettings, getInternalStartServices }),
     getHistogramBucketAgg({ uiSettings, getInternalStartServices }),
     getRangeBucketAgg({ getInternalStartServices }),
     getDateRangeBucketAgg({ uiSettings, getInternalStartServices }),
diff --git a/src/plugins/data/public/search/aggs/buckets/_terms_other_bucket_helper.test.ts b/src/plugins/data/public/search/aggs/buckets/_terms_other_bucket_helper.test.ts
index 44d99375bbd302..8e862b5692ca39 100644
--- a/src/plugins/data/public/search/aggs/buckets/_terms_other_bucket_helper.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/_terms_other_bucket_helper.test.ts
@@ -26,7 +26,6 @@ import { AggConfigs, CreateAggConfigParams } from '../agg_configs';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { IBucketAggConfig } from './bucket_agg_type';
 import { mockAggTypesRegistry } from '../test_helpers';
-import { fieldFormatsServiceMock } from '../../../field_formats/mocks';
 
 const indexPattern = {
   id: '1234',
@@ -220,10 +219,9 @@ const nestedOtherResponse = {
 
 describe('Terms Agg Other bucket helper', () => {
   const typesRegistry = mockAggTypesRegistry();
-  const fieldFormats = fieldFormatsServiceMock.createStartContract();
 
   const getAggConfigs = (aggs: CreateAggConfigParams[] = []) => {
-    return new AggConfigs(indexPattern, [...aggs], { typesRegistry, fieldFormats });
+    return new AggConfigs(indexPattern, [...aggs], { typesRegistry });
   };
 
   describe('buildOtherBucketAgg', () => {
diff --git a/src/plugins/data/public/search/aggs/buckets/create_filter/date_histogram.test.ts b/src/plugins/data/public/search/aggs/buckets/create_filter/date_histogram.test.ts
index 2f03b8ec671123..518bdbfe0c1352 100644
--- a/src/plugins/data/public/search/aggs/buckets/create_filter/date_histogram.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/create_filter/date_histogram.test.ts
@@ -30,7 +30,6 @@ import {
 import { BUCKET_TYPES } from '../bucket_agg_types';
 import { RangeFilter } from '../../../../../common';
 import { coreMock, notificationServiceMock } from '../../../../../../../core/public/mocks';
-import { queryServiceMock } from '../../../../query/mocks';
 import { fieldFormatsServiceMock } from '../../../../field_formats/mocks';
 import { InternalStartServices } from '../../../../types';
 
@@ -46,13 +45,13 @@ describe('AggConfig Filters', () => {
       const { uiSettings } = coreMock.createSetup();
 
       aggTypesDependencies = {
-        uiSettings,
-        query: queryServiceMock.createSetupContract(),
+        calculateBounds: jest.fn(),
         getInternalStartServices: () =>
           (({
             fieldFormats: fieldFormatsServiceMock.createStartContract(),
             notifications: notificationServiceMock.createStartContract(),
           } as unknown) as InternalStartServices),
+        uiSettings,
       };
 
       mockDataServices();
@@ -82,7 +81,6 @@ describe('AggConfig Filters', () => {
         ],
         {
           typesRegistry: mockAggTypesRegistry([getDateHistogramBucketAgg(aggTypesDependencies)]),
-          fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats,
         }
       );
       const bucketKey = 1422579600000;
diff --git a/src/plugins/data/public/search/aggs/buckets/create_filter/date_range.test.ts b/src/plugins/data/public/search/aggs/buckets/create_filter/date_range.test.ts
index 0d66d9cfcdca2c..08f39e10b6006f 100644
--- a/src/plugins/data/public/search/aggs/buckets/create_filter/date_range.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/create_filter/date_range.test.ts
@@ -76,7 +76,6 @@ describe('AggConfig Filters', () => {
         ],
         {
           typesRegistry: mockAggTypesRegistry([getDateRangeBucketAgg(aggTypesDependencies)]),
-          fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats,
         }
       );
     };
diff --git a/src/plugins/data/public/search/aggs/buckets/create_filter/filters.test.ts b/src/plugins/data/public/search/aggs/buckets/create_filter/filters.test.ts
index 0fdb07cc4198a5..c5ad1a61e6676f 100644
--- a/src/plugins/data/public/search/aggs/buckets/create_filter/filters.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/create_filter/filters.test.ts
@@ -73,7 +73,6 @@ describe('AggConfig Filters', () => {
         ],
         {
           typesRegistry: mockAggTypesRegistry([getFiltersBucketAgg(aggTypesDependencies)]),
-          fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats,
         }
       );
     };
diff --git a/src/plugins/data/public/search/aggs/buckets/create_filter/histogram.test.ts b/src/plugins/data/public/search/aggs/buckets/create_filter/histogram.test.ts
index 396d515f3b5809..3f9f5dd5672f0a 100644
--- a/src/plugins/data/public/search/aggs/buckets/create_filter/histogram.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/create_filter/histogram.test.ts
@@ -23,12 +23,21 @@ import { mockAggTypesRegistry } from '../../test_helpers';
 import { BUCKET_TYPES } from '../bucket_agg_types';
 import { IBucketAggConfig } from '../bucket_agg_type';
 import { BytesFormat, FieldFormatsGetConfigFn } from '../../../../../common';
+import { GetInternalStartServicesFn, InternalStartServices } from '../../../../types';
+import { FieldFormatsStart } from '../../../../field_formats';
 import { fieldFormatsServiceMock } from '../../../../field_formats/mocks';
 
 describe('AggConfig Filters', () => {
+  let getInternalStartServices: GetInternalStartServicesFn;
+  let fieldFormats: FieldFormatsStart;
+
+  beforeEach(() => {
+    fieldFormats = fieldFormatsServiceMock.createStartContract();
+    getInternalStartServices = () => (({ fieldFormats } as unknown) as InternalStartServices);
+  });
+
   describe('histogram', () => {
     const getConfig = (() => {}) as FieldFormatsGetConfigFn;
-    const fieldFormats = fieldFormatsServiceMock.createStartContract();
     const getAggConfigs = () => {
       const field = {
         name: 'bytes',
@@ -57,21 +66,25 @@ describe('AggConfig Filters', () => {
             },
           },
         ],
-        { typesRegistry: mockAggTypesRegistry(), fieldFormats }
+        { typesRegistry: mockAggTypesRegistry() }
       );
     };
 
     test('should return an range filter for histogram', () => {
       const aggConfigs = getAggConfigs();
-      const filter = createFilterHistogram(aggConfigs.aggs[0] as IBucketAggConfig, '2048');
+      const filter = createFilterHistogram(getInternalStartServices)(
+        aggConfigs.aggs[0] as IBucketAggConfig,
+        '2048'
+      );
 
+      expect(fieldFormats.deserialize).toHaveBeenCalledTimes(1);
       expect(filter).toHaveProperty('meta');
       expect(filter.meta).toHaveProperty('index', '1234');
       expect(filter).toHaveProperty('range');
       expect(filter.range).toHaveProperty('bytes');
       expect(filter.range.bytes).toHaveProperty('gte', 2048);
       expect(filter.range.bytes).toHaveProperty('lt', 3072);
-      expect(filter.meta).toHaveProperty('formattedValue', '2,048');
+      expect(filter.meta).toHaveProperty('formattedValue');
     });
   });
 });
diff --git a/src/plugins/data/public/search/aggs/buckets/create_filter/histogram.ts b/src/plugins/data/public/search/aggs/buckets/create_filter/histogram.ts
index f8e7747d49147c..f3626bc9130ad3 100644
--- a/src/plugins/data/public/search/aggs/buckets/create_filter/histogram.ts
+++ b/src/plugins/data/public/search/aggs/buckets/create_filter/histogram.ts
@@ -19,15 +19,20 @@
 
 import { IBucketAggConfig } from '../bucket_agg_type';
 import { buildRangeFilter, RangeFilterParams } from '../../../../../common';
+import { GetInternalStartServicesFn } from '../../../../types';
 
-export const createFilterHistogram = (aggConfig: IBucketAggConfig, key: string) => {
-  const value = parseInt(key, 10);
-  const params: RangeFilterParams = { gte: value, lt: value + aggConfig.params.interval };
+/** @internal */
+export const createFilterHistogram = (getInternalStartServices: GetInternalStartServicesFn) => {
+  return (aggConfig: IBucketAggConfig, key: string) => {
+    const { fieldFormats } = getInternalStartServices();
+    const value = parseInt(key, 10);
+    const params: RangeFilterParams = { gte: value, lt: value + aggConfig.params.interval };
 
-  return buildRangeFilter(
-    aggConfig.params.field,
-    params,
-    aggConfig.getIndexPattern(),
-    aggConfig.fieldFormatter()(key)
-  );
+    return buildRangeFilter(
+      aggConfig.params.field,
+      params,
+      aggConfig.getIndexPattern(),
+      fieldFormats.deserialize(aggConfig.toSerializedFieldFormat()).convert(key)
+    );
+  };
 };
diff --git a/src/plugins/data/public/search/aggs/buckets/create_filter/ip_range.test.ts b/src/plugins/data/public/search/aggs/buckets/create_filter/ip_range.test.ts
index 990adde5f8a0bd..89a5fd65778912 100644
--- a/src/plugins/data/public/search/aggs/buckets/create_filter/ip_range.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/create_filter/ip_range.test.ts
@@ -55,7 +55,7 @@ describe('AggConfig Filters', () => {
         },
       } as any;
 
-      return new AggConfigs(indexPattern, aggs, { typesRegistry, fieldFormats });
+      return new AggConfigs(indexPattern, aggs, { typesRegistry });
     };
 
     test('should return a range filter for ip_range agg', () => {
diff --git a/src/plugins/data/public/search/aggs/buckets/create_filter/range.test.ts b/src/plugins/data/public/search/aggs/buckets/create_filter/range.test.ts
index 564e7b4763c8d5..238e5737d8f474 100644
--- a/src/plugins/data/public/search/aggs/buckets/create_filter/range.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/create_filter/range.test.ts
@@ -24,19 +24,29 @@ import { AggConfigs } from '../../agg_configs';
 import { mockDataServices, mockAggTypesRegistry } from '../../test_helpers';
 import { BUCKET_TYPES } from '../bucket_agg_types';
 import { IBucketAggConfig } from '../bucket_agg_type';
+import { FieldFormatsStart } from '../../../../field_formats';
 import { fieldFormatsServiceMock } from '../../../../field_formats/mocks';
 import { notificationServiceMock } from '../../../../../../../core/public/mocks';
-import { InternalStartServices } from '../../../../types';
+import { GetInternalStartServicesFn, InternalStartServices } from '../../../../types';
 
 describe('AggConfig Filters', () => {
   describe('range', () => {
     let aggTypesDependencies: RangeBucketAggDependencies;
+    let getInternalStartServices: GetInternalStartServicesFn;
+    let fieldFormats: FieldFormatsStart;
 
     beforeEach(() => {
+      fieldFormats = fieldFormatsServiceMock.createStartContract();
+
+      getInternalStartServices = () =>
+        (({
+          fieldFormats,
+          notifications: notificationServiceMock.createStartContract(),
+        } as unknown) as InternalStartServices);
+
       aggTypesDependencies = {
         getInternalStartServices: () =>
           (({
-            fieldFormats: fieldFormatsServiceMock.createStartContract(),
             notifications: notificationServiceMock.createStartContract(),
           } as unknown) as InternalStartServices),
       };
@@ -75,25 +85,28 @@ describe('AggConfig Filters', () => {
         ],
         {
           typesRegistry: mockAggTypesRegistry([getRangeBucketAgg(aggTypesDependencies)]),
-          fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats,
         }
       );
     };
 
     test('should return a range filter for range agg', () => {
       const aggConfigs = getAggConfigs();
-      const filter = createFilterRange(aggConfigs.aggs[0] as IBucketAggConfig, {
-        gte: 1024,
-        lt: 2048.0,
-      });
+      const filter = createFilterRange(getInternalStartServices)(
+        aggConfigs.aggs[0] as IBucketAggConfig,
+        {
+          gte: 1024,
+          lt: 2048.0,
+        }
+      );
 
+      expect(fieldFormats.deserialize).toHaveBeenCalledTimes(1);
       expect(filter).toHaveProperty('range');
       expect(filter).toHaveProperty('meta');
       expect(filter.meta).toHaveProperty('index', '1234');
       expect(filter.range).toHaveProperty('bytes');
       expect(filter.range.bytes).toHaveProperty('gte', 1024.0);
       expect(filter.range.bytes).toHaveProperty('lt', 2048.0);
-      expect(filter.meta).toHaveProperty('formattedValue', '≥ 1,024 and < 2,048');
+      expect(filter.meta).toHaveProperty('formattedValue');
     });
   });
 });
diff --git a/src/plugins/data/public/search/aggs/buckets/create_filter/range.ts b/src/plugins/data/public/search/aggs/buckets/create_filter/range.ts
index cbad8742bfab60..f9db2973af1369 100644
--- a/src/plugins/data/public/search/aggs/buckets/create_filter/range.ts
+++ b/src/plugins/data/public/search/aggs/buckets/create_filter/range.ts
@@ -19,12 +19,17 @@
 
 import { IBucketAggConfig } from '../bucket_agg_type';
 import { buildRangeFilter } from '../../../../../common';
+import { GetInternalStartServicesFn } from '../../../../types';
 
-export const createFilterRange = (aggConfig: IBucketAggConfig, params: any) => {
-  return buildRangeFilter(
-    aggConfig.params.field,
-    params,
-    aggConfig.getIndexPattern(),
-    aggConfig.fieldFormatter()(params)
-  );
+/** @internal */
+export const createFilterRange = (getInternalStartServices: GetInternalStartServicesFn) => {
+  return (aggConfig: IBucketAggConfig, params: any) => {
+    const { fieldFormats } = getInternalStartServices();
+    return buildRangeFilter(
+      aggConfig.params.field,
+      params,
+      aggConfig.getIndexPattern(),
+      fieldFormats.deserialize(aggConfig.toSerializedFieldFormat()).convert(params)
+    );
+  };
 };
diff --git a/src/plugins/data/public/search/aggs/buckets/create_filter/terms.test.ts b/src/plugins/data/public/search/aggs/buckets/create_filter/terms.test.ts
index 36e4bef025ef9b..a45087916a395c 100644
--- a/src/plugins/data/public/search/aggs/buckets/create_filter/terms.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/create_filter/terms.test.ts
@@ -60,7 +60,6 @@ describe('AggConfig Filters', () => {
 
       return new AggConfigs(indexPattern, aggs, {
         typesRegistry: mockAggTypesRegistry([getTermsBucketAgg(aggTypesDependencies)]),
-        fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats,
       });
     };
 
diff --git a/src/plugins/data/public/search/aggs/buckets/date_histogram.ts b/src/plugins/data/public/search/aggs/buckets/date_histogram.ts
index fc42d43b2fea81..e4c4bc0cedc3c4 100644
--- a/src/plugins/data/public/search/aggs/buckets/date_histogram.ts
+++ b/src/plugins/data/public/search/aggs/buckets/date_histogram.ts
@@ -27,28 +27,30 @@ import { BucketAggType, IBucketAggConfig } from './bucket_agg_type';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { createFilterDateHistogram } from './create_filter/date_histogram';
 import { intervalOptions } from './_interval_options';
-import { dateHistogramInterval, TimeRange } from '../../../../common';
 import { writeParams } from '../agg_params';
 import { isMetricAggType } from '../metrics/metric_agg_type';
 
-import { FIELD_FORMAT_IDS, KBN_FIELD_TYPES, UI_SETTINGS } from '../../../../common';
-import { TimefilterContract } from '../../../query';
-import { QuerySetup } from '../../../query/query_service';
+import {
+  dateHistogramInterval,
+  KBN_FIELD_TYPES,
+  TimeRange,
+  TimeRangeBounds,
+  UI_SETTINGS,
+} from '../../../../common';
 import { GetInternalStartServicesFn } from '../../../types';
 import { BaseAggParams } from '../types';
 import { ExtendedBounds } from './lib/extended_bounds';
 
-const detectedTimezone = moment.tz.guess();
-const tzOffset = moment().format('Z');
+type CalculateBoundsFn = (timeRange: TimeRange) => TimeRangeBounds;
 
 const updateTimeBuckets = (
   agg: IBucketDateHistogramAggConfig,
-  timefilter: TimefilterContract,
+  calculateBounds: CalculateBoundsFn,
   customBuckets?: IBucketDateHistogramAggConfig['buckets']
 ) => {
   const bounds =
     agg.params.timeRange && (agg.fieldIsTimeField() || agg.params.interval === 'auto')
-      ? timefilter.calculateBounds(agg.params.timeRange)
+      ? calculateBounds(agg.params.timeRange)
       : undefined;
   const buckets = customBuckets || agg.buckets;
   buckets.setBounds(bounds);
@@ -56,9 +58,9 @@ const updateTimeBuckets = (
 };
 
 export interface DateHistogramBucketAggDependencies {
-  uiSettings: IUiSettingsClient;
-  query: QuerySetup;
+  calculateBounds: CalculateBoundsFn;
   getInternalStartServices: GetInternalStartServicesFn;
+  uiSettings: IUiSettingsClient;
 }
 
 export interface IBucketDateHistogramAggConfig extends IBucketAggConfig {
@@ -83,9 +85,9 @@ export interface AggParamsDateHistogram extends BaseAggParams {
 }
 
 export const getDateHistogramBucketAgg = ({
-  uiSettings,
-  query,
+  calculateBounds,
   getInternalStartServices,
+  uiSettings,
 }: DateHistogramBucketAggDependencies) =>
   new BucketAggType<IBucketDateHistogramAggConfig>(
     {
@@ -123,35 +125,19 @@ export const getDateHistogramBucketAgg = ({
             get() {
               if (buckets) return buckets;
 
-              const { timefilter } = query.timefilter;
               buckets = new TimeBuckets({
                 'histogram:maxBars': uiSettings.get(UI_SETTINGS.HISTOGRAM_MAX_BARS),
                 'histogram:barTarget': uiSettings.get(UI_SETTINGS.HISTOGRAM_BAR_TARGET),
                 dateFormat: uiSettings.get('dateFormat'),
                 'dateFormat:scaled': uiSettings.get('dateFormat:scaled'),
               });
-              updateTimeBuckets(this, timefilter, buckets);
+              updateTimeBuckets(this, calculateBounds, buckets);
 
               return buckets;
             },
           } as any,
         };
       },
-      getFormat(agg) {
-        const { fieldFormats } = getInternalStartServices();
-        const DateFieldFormat = fieldFormats.getType(FIELD_FORMAT_IDS.DATE);
-
-        if (!DateFieldFormat) {
-          throw new Error('Unable to retrieve Date Field Format');
-        }
-
-        return new DateFieldFormat(
-          {
-            pattern: agg.buckets.getScaledDateFormat(),
-          },
-          (key: string) => uiSettings.get(key)
-        );
-      },
       getSerializedFormat(agg) {
         return {
           id: 'date',
@@ -210,8 +196,7 @@ export const getDateHistogramBucketAgg = ({
           default: 'auto',
           options: intervalOptions,
           write(agg, output, aggs) {
-            const { timefilter } = query.timefilter;
-            updateTimeBuckets(agg, timefilter);
+            updateTimeBuckets(agg, calculateBounds);
 
             const { useNormalizedEsInterval, scaleMetricValues } = agg.params;
             const interval = agg.buckets.getInterval(useNormalizedEsInterval);
@@ -272,6 +257,8 @@ export const getDateHistogramBucketAgg = ({
             if (!tz) {
               // If the index pattern typeMeta data, didn't had a time zone assigned for the selected field use the configured tz
               const isDefaultTimezone = uiSettings.isDefault('dateFormat:tz');
+              const detectedTimezone = moment.tz.guess();
+              const tzOffset = moment().format('Z');
               tz = isDefaultTimezone
                 ? detectedTimezone || tzOffset
                 : uiSettings.get('dateFormat:tz');
diff --git a/src/plugins/data/public/search/aggs/buckets/date_range.test.ts b/src/plugins/data/public/search/aggs/buckets/date_range.test.ts
index e1881c3bbc7f4c..0829d6e9cdc9f7 100644
--- a/src/plugins/data/public/search/aggs/buckets/date_range.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/date_range.test.ts
@@ -78,7 +78,6 @@ describe('date_range params', () => {
       ],
       {
         typesRegistry: mockAggTypesRegistry([getDateRangeBucketAgg(aggTypesDependencies)]),
-        fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats,
       }
     );
   };
diff --git a/src/plugins/data/public/search/aggs/buckets/date_range.ts b/src/plugins/data/public/search/aggs/buckets/date_range.ts
index 3e14ab422ccbee..dbcf5517fb08fd 100644
--- a/src/plugins/data/public/search/aggs/buckets/date_range.ts
+++ b/src/plugins/data/public/search/aggs/buckets/date_range.ts
@@ -25,9 +25,9 @@ import { IUiSettingsClient } from 'src/core/public';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { BucketAggType, IBucketAggConfig } from './bucket_agg_type';
 import { createFilterDateRange } from './create_filter/date_range';
-import { convertDateRangeToString, DateRangeKey } from './lib/date_range';
+import { DateRangeKey } from './lib/date_range';
 
-import { KBN_FIELD_TYPES, FieldFormat, TEXT_CONTEXT_TYPE } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../../../common';
 import { GetInternalStartServicesFn } from '../../../types';
 import { BaseAggParams } from '../types';
 
@@ -58,18 +58,6 @@ export const getDateRangeBucketAgg = ({
       getKey({ from, to }): DateRangeKey {
         return { from, to };
       },
-      getFormat(agg) {
-        const { fieldFormats } = getInternalStartServices();
-
-        const formatter = agg.fieldOwnFormatter(
-          TEXT_CONTEXT_TYPE,
-          fieldFormats.getDefaultInstance(KBN_FIELD_TYPES.DATE)
-        );
-        const DateRangeFormat = FieldFormat.from(function (range: DateRangeKey) {
-          return convertDateRangeToString(range, formatter);
-        });
-        return new DateRangeFormat();
-      },
       getSerializedFormat(agg) {
         return {
           id: 'date_range',
diff --git a/src/plugins/data/public/search/aggs/buckets/filter.ts b/src/plugins/data/public/search/aggs/buckets/filter.ts
index 69157edad4f680..d048df9f0e43e8 100644
--- a/src/plugins/data/public/search/aggs/buckets/filter.ts
+++ b/src/plugins/data/public/search/aggs/buckets/filter.ts
@@ -41,6 +41,7 @@ export const getFilterBucketAgg = ({ getInternalStartServices }: FilterBucketAgg
     {
       name: BUCKET_TYPES.FILTER,
       title: filterTitle,
+      makeLabel: () => filterTitle,
       params: [
         {
           name: 'geo_bounding_box',
diff --git a/src/plugins/data/public/search/aggs/buckets/filters.test.ts b/src/plugins/data/public/search/aggs/buckets/filters.test.ts
index 295e740a2a7809..7554e4081726cc 100644
--- a/src/plugins/data/public/search/aggs/buckets/filters.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/filters.test.ts
@@ -71,7 +71,6 @@ describe('Filters Agg', () => {
         ],
         {
           typesRegistry: mockAggTypesRegistry([getFiltersBucketAgg(aggTypesDependencies)]),
-          fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats,
         }
       );
     };
diff --git a/src/plugins/data/public/search/aggs/buckets/geo_hash.test.ts b/src/plugins/data/public/search/aggs/buckets/geo_hash.test.ts
index 877a817984dc6f..d4c0a5b3288445 100644
--- a/src/plugins/data/public/search/aggs/buckets/geo_hash.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/geo_hash.test.ts
@@ -81,7 +81,6 @@ describe('Geohash Agg', () => {
       ],
       {
         typesRegistry: mockAggTypesRegistry(),
-        fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats,
       }
     );
   };
diff --git a/src/plugins/data/public/search/aggs/buckets/geo_hash.ts b/src/plugins/data/public/search/aggs/buckets/geo_hash.ts
index be339de5d7faea..fbe7c76681f816 100644
--- a/src/plugins/data/public/search/aggs/buckets/geo_hash.ts
+++ b/src/plugins/data/public/search/aggs/buckets/geo_hash.ts
@@ -54,6 +54,7 @@ export const getGeoHashBucketAgg = ({ getInternalStartServices }: GeoHashBucketA
     {
       name: BUCKET_TYPES.GEOHASH_GRID,
       title: geohashGridTitle,
+      makeLabel: () => geohashGridTitle,
       params: [
         {
           name: 'field',
diff --git a/src/plugins/data/public/search/aggs/buckets/histogram.test.ts b/src/plugins/data/public/search/aggs/buckets/histogram.test.ts
index 4756669f5b4b31..787603ee143613 100644
--- a/src/plugins/data/public/search/aggs/buckets/histogram.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/histogram.test.ts
@@ -74,7 +74,6 @@ describe('Histogram Agg', () => {
       ],
       {
         typesRegistry: mockAggTypesRegistry([getHistogramBucketAgg(aggTypesDependencies)]),
-        fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats,
       }
     );
   };
diff --git a/src/plugins/data/public/search/aggs/buckets/histogram.ts b/src/plugins/data/public/search/aggs/buckets/histogram.ts
index c1fad17f488db2..ce275e2dc1639a 100644
--- a/src/plugins/data/public/search/aggs/buckets/histogram.ts
+++ b/src/plugins/data/public/search/aggs/buckets/histogram.ts
@@ -67,7 +67,7 @@ export const getHistogramBucketAgg = ({
       makeLabel(aggConfig) {
         return aggConfig.getFieldDisplayName();
       },
-      createFilter: createFilterHistogram,
+      createFilter: createFilterHistogram(getInternalStartServices),
       decorateAggConfig() {
         let autoBounds: AutoBounds;
 
diff --git a/src/plugins/data/public/search/aggs/buckets/ip_range.ts b/src/plugins/data/public/search/aggs/buckets/ip_range.ts
index b3e90bdf9b56a1..018fcb365b5850 100644
--- a/src/plugins/data/public/search/aggs/buckets/ip_range.ts
+++ b/src/plugins/data/public/search/aggs/buckets/ip_range.ts
@@ -23,13 +23,8 @@ import { BucketAggType } from './bucket_agg_type';
 import { BUCKET_TYPES } from './bucket_agg_types';
 
 import { createFilterIpRange } from './create_filter/ip_range';
-import {
-  convertIPRangeToString,
-  IpRangeKey,
-  RangeIpRangeAggKey,
-  CidrMaskIpRangeAggKey,
-} from './lib/ip_range';
-import { KBN_FIELD_TYPES, FieldFormat, TEXT_CONTEXT_TYPE } from '../../../../common';
+import { IpRangeKey, RangeIpRangeAggKey, CidrMaskIpRangeAggKey } from './lib/ip_range';
+import { KBN_FIELD_TYPES } from '../../../../common';
 import { GetInternalStartServicesFn } from '../../../types';
 import { BaseAggParams } from '../types';
 
@@ -67,17 +62,6 @@ export const getIpRangeBucketAgg = ({ getInternalStartServices }: IpRangeBucketA
         }
         return { type: 'range', from: bucket.from, to: bucket.to };
       },
-      getFormat(agg) {
-        const { fieldFormats } = getInternalStartServices();
-        const formatter = agg.fieldOwnFormatter(
-          TEXT_CONTEXT_TYPE,
-          fieldFormats.getDefaultInstance(KBN_FIELD_TYPES.IP)
-        );
-        const IpRangeFormat = FieldFormat.from(function (range: IpRangeKey) {
-          return convertIPRangeToString(range, formatter);
-        });
-        return new IpRangeFormat();
-      },
       getSerializedFormat(agg) {
         return {
           id: 'ip_range',
diff --git a/src/plugins/data/public/search/aggs/buckets/range.test.ts b/src/plugins/data/public/search/aggs/buckets/range.test.ts
index 2b8a36f2fbdbcb..fea5572b75795c 100644
--- a/src/plugins/data/public/search/aggs/buckets/range.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/range.test.ts
@@ -22,30 +22,9 @@ import { AggConfigs } from '../agg_configs';
 import { mockDataServices, mockAggTypesRegistry } from '../test_helpers';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { FieldFormatsGetConfigFn, NumberFormat } from '../../../../common';
-import { fieldFormatsServiceMock } from '../../../field_formats/mocks';
 import { notificationServiceMock } from '../../../../../../../src/core/public/mocks';
 import { InternalStartServices } from '../../../types';
 
-const buckets = [
-  {
-    to: 1024,
-    to_as_string: '1024.0',
-    doc_count: 20904,
-  },
-  {
-    from: 1024,
-    from_as_string: '1024.0',
-    to: 2560,
-    to_as_string: '2560.0',
-    doc_count: 23358,
-  },
-  {
-    from: 2560,
-    from_as_string: '2560.0',
-    doc_count: 174250,
-  },
-];
-
 describe('Range Agg', () => {
   let aggTypesDependencies: RangeBucketAggDependencies;
 
@@ -53,7 +32,6 @@ describe('Range Agg', () => {
     aggTypesDependencies = {
       getInternalStartServices: () =>
         (({
-          fieldFormats: fieldFormatsServiceMock.createStartContract(),
           notifications: notificationServiceMock.createStartContract(),
         } as unknown) as InternalStartServices),
     };
@@ -99,23 +77,10 @@ describe('Range Agg', () => {
       ],
       {
         typesRegistry: mockAggTypesRegistry([getRangeBucketAgg(aggTypesDependencies)]),
-        fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats,
       }
     );
   };
 
-  describe('formatting', () => {
-    test('formats bucket keys properly', () => {
-      const aggConfigs = getAggConfigs();
-      const agg = aggConfigs.aggs[0];
-      const format = (val: any) => agg.fieldFormatter()(agg.getKey(val));
-
-      expect(format(buckets[0])).toBe('≥ -∞ and < 1 KB');
-      expect(format(buckets[1])).toBe('≥ 1 KB and < 2.5 KB');
-      expect(format(buckets[2])).toBe('≥ 2.5 KB and < +∞');
-    });
-  });
-
   describe('getSerializedFormat', () => {
     test('generates a serialized field format in the expected shape', () => {
       const aggConfigs = getAggConfigs();
diff --git a/src/plugins/data/public/search/aggs/buckets/range.ts b/src/plugins/data/public/search/aggs/buckets/range.ts
index 543e5d66b9fa81..92c5193d55a209 100644
--- a/src/plugins/data/public/search/aggs/buckets/range.ts
+++ b/src/plugins/data/public/search/aggs/buckets/range.ts
@@ -19,16 +19,13 @@
 
 import { i18n } from '@kbn/i18n';
 import { BucketAggType } from './bucket_agg_type';
-import { FieldFormat, KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../../../common';
 import { RangeKey } from './range_key';
 import { createFilterRange } from './create_filter/range';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { GetInternalStartServicesFn } from '../../../types';
 import { BaseAggParams } from '../types';
 
-const keyCaches = new WeakMap();
-const formats = new WeakMap();
-
 const rangeTitle = i18n.translate('data.search.aggs.buckets.rangeTitle', {
   defaultMessage: 'Range',
 });
@@ -45,12 +42,14 @@ export interface AggParamsRange extends BaseAggParams {
   }>;
 }
 
-export const getRangeBucketAgg = ({ getInternalStartServices }: RangeBucketAggDependencies) =>
-  new BucketAggType(
+export const getRangeBucketAgg = ({ getInternalStartServices }: RangeBucketAggDependencies) => {
+  const keyCaches = new WeakMap();
+
+  return new BucketAggType(
     {
       name: BUCKET_TYPES.RANGE,
       title: rangeTitle,
-      createFilter: createFilterRange,
+      createFilter: createFilterRange(getInternalStartServices),
       makeLabel(aggConfig) {
         return i18n.translate('data.search.aggs.aggTypesLabel', {
           defaultMessage: '{fieldName} ranges',
@@ -77,30 +76,6 @@ export const getRangeBucketAgg = ({ getInternalStartServices }: RangeBucketAggDe
 
         return key;
       },
-      getFormat(agg) {
-        let aggFormat = formats.get(agg);
-        if (aggFormat) return aggFormat;
-
-        const RangeFormat = FieldFormat.from((range: any) => {
-          const format = agg.fieldOwnFormatter();
-          const gte = '\u2265';
-          const lt = '\u003c';
-          return i18n.translate('data.search.aggs.aggTypes.rangesFormatMessage', {
-            defaultMessage: '{gte} {from} and {lt} {to}',
-            values: {
-              gte,
-              from: format(range.gte),
-              lt,
-              to: format(range.lt),
-            },
-          });
-        });
-
-        aggFormat = new RangeFormat();
-
-        formats.set(agg, aggFormat);
-        return aggFormat;
-      },
       getSerializedFormat(agg) {
         const format = agg.params.field ? agg.params.field.format.toJSON() : {};
         return {
@@ -132,3 +107,4 @@ export const getRangeBucketAgg = ({ getInternalStartServices }: RangeBucketAggDe
     },
     { getInternalStartServices }
   );
+};
diff --git a/src/plugins/data/public/search/aggs/buckets/significant_terms.test.ts b/src/plugins/data/public/search/aggs/buckets/significant_terms.test.ts
index 156f7f8108482c..8fe833aa99cb2e 100644
--- a/src/plugins/data/public/search/aggs/buckets/significant_terms.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/significant_terms.test.ts
@@ -72,7 +72,6 @@ describe('Significant Terms Agg', () => {
             typesRegistry: mockAggTypesRegistry([
               getSignificantTermsBucketAgg(aggTypesDependencies),
             ]),
-            fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats,
           }
         );
       };
diff --git a/src/plugins/data/public/search/aggs/buckets/terms.test.ts b/src/plugins/data/public/search/aggs/buckets/terms.test.ts
index 9769efb6da7494..2c5be00c8afea5 100644
--- a/src/plugins/data/public/search/aggs/buckets/terms.test.ts
+++ b/src/plugins/data/public/search/aggs/buckets/terms.test.ts
@@ -20,11 +20,9 @@
 import { AggConfigs } from '../agg_configs';
 import { mockAggTypesRegistry } from '../test_helpers';
 import { BUCKET_TYPES } from './bucket_agg_types';
-import { fieldFormatsServiceMock } from '../../../field_formats/mocks';
 
 describe('Terms Agg', () => {
   describe('order agg editor UI', () => {
-    const fieldFormats = fieldFormatsServiceMock.createStartContract();
     const getAggConfigs = (params: Record<string, any> = {}) => {
       const indexPattern = {
         id: '1234',
@@ -49,7 +47,7 @@ describe('Terms Agg', () => {
             type: BUCKET_TYPES.TERMS,
           },
         ],
-        { typesRegistry: mockAggTypesRegistry(), fieldFormats }
+        { typesRegistry: mockAggTypesRegistry() }
       );
     };
 
diff --git a/src/plugins/data/public/search/aggs/buckets/terms.ts b/src/plugins/data/public/search/aggs/buckets/terms.ts
index 1e8e9ab4ef9d09..57a5ebf72316c6 100644
--- a/src/plugins/data/public/search/aggs/buckets/terms.ts
+++ b/src/plugins/data/public/search/aggs/buckets/terms.ts
@@ -30,7 +30,7 @@ import { AggConfigSerialized, BaseAggParams, IAggConfigs } from '../types';
 
 import { Adapters } from '../../../../../inspector/public';
 import { ISearchSource } from '../../search_source';
-import { IFieldFormat, FieldFormatsContentType, KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../../../common';
 import { getRequestInspectorStats, getResponseInspectorStats } from '../../expressions';
 
 import {
@@ -88,22 +88,6 @@ export const getTermsBucketAgg = ({ getInternalStartServices }: TermsBucketAggDe
         const params = agg.params;
         return agg.getFieldDisplayName() + ': ' + params.order.text;
       },
-      getFormat(bucket): IFieldFormat {
-        return {
-          getConverterFor: (type: FieldFormatsContentType) => {
-            return (val: any) => {
-              if (val === '__other__') {
-                return bucket.params.otherBucketLabel;
-              }
-              if (val === '__missing__') {
-                return bucket.params.missingBucketLabel;
-              }
-
-              return bucket.params.field.format.convert(val, type);
-            };
-          },
-        } as IFieldFormat;
-      },
       getSerializedFormat(agg) {
         const format = agg.params.field ? agg.params.field.format.toJSON() : {};
         return {
diff --git a/src/plugins/data/public/search/aggs/index.test.ts b/src/plugins/data/public/search/aggs/index.test.ts
index 4864a8b9d013bb..73068326ca97ee 100644
--- a/src/plugins/data/public/search/aggs/index.test.ts
+++ b/src/plugins/data/public/search/aggs/index.test.ts
@@ -22,7 +22,6 @@ import { getAggTypes } from './index';
 
 import { isBucketAggType } from './buckets/bucket_agg_type';
 import { isMetricAggType } from './metrics/metric_agg_type';
-import { QueryStart } from '../../query';
 import { FieldFormatsStart } from '../../field_formats';
 import { InternalStartServices } from '../../types';
 
@@ -31,13 +30,13 @@ describe('AggTypesComponent', () => {
   const coreStart = coreMock.createSetup();
 
   const aggTypes = getAggTypes({
-    uiSettings: coreSetup.uiSettings,
-    query: {} as QueryStart,
+    calculateBounds: jest.fn(),
     getInternalStartServices: () =>
       (({
         notifications: coreStart.notifications,
         fieldFormats: {} as FieldFormatsStart,
       } as unknown) as InternalStartServices),
+    uiSettings: coreSetup.uiSettings,
   });
 
   const { buckets, metrics } = aggTypes;
diff --git a/src/plugins/data/public/search/aggs/metrics/bucket_avg.ts b/src/plugins/data/public/search/aggs/metrics/bucket_avg.ts
index 38312ec5cfa81c..a30e426dd23901 100644
--- a/src/plugins/data/public/search/aggs/metrics/bucket_avg.ts
+++ b/src/plugins/data/public/search/aggs/metrics/bucket_avg.ts
@@ -46,7 +46,7 @@ const averageBucketTitle = i18n.translate('data.search.aggs.metrics.averageBucke
 export const getBucketAvgMetricAgg = ({
   getInternalStartServices,
 }: BucketAvgMetricAggDependencies) => {
-  const { subtype, params, getFormat, getSerializedFormat } = siblingPipelineAggHelper;
+  const { subtype, params, getSerializedFormat } = siblingPipelineAggHelper;
 
   return new MetricAggType(
     {
@@ -55,7 +55,6 @@ export const getBucketAvgMetricAgg = ({
       makeLabel: (agg) => makeNestedLabel(agg, overallAverageLabel),
       subtype,
       params: [...params()],
-      getFormat,
       getSerializedFormat,
       getValue(agg, bucket) {
         const customMetric = agg.getParam('customMetric');
diff --git a/src/plugins/data/public/search/aggs/metrics/bucket_max.ts b/src/plugins/data/public/search/aggs/metrics/bucket_max.ts
index e2c6a5105bac66..307c7ed3f9d386 100644
--- a/src/plugins/data/public/search/aggs/metrics/bucket_max.ts
+++ b/src/plugins/data/public/search/aggs/metrics/bucket_max.ts
@@ -45,7 +45,7 @@ const maxBucketTitle = i18n.translate('data.search.aggs.metrics.maxBucketTitle',
 export const getBucketMaxMetricAgg = ({
   getInternalStartServices,
 }: BucketMaxMetricAggDependencies) => {
-  const { subtype, params, getFormat, getSerializedFormat } = siblingPipelineAggHelper;
+  const { subtype, params, getSerializedFormat } = siblingPipelineAggHelper;
 
   return new MetricAggType(
     {
@@ -54,7 +54,6 @@ export const getBucketMaxMetricAgg = ({
       makeLabel: (agg) => makeNestedLabel(agg, overallMaxLabel),
       subtype,
       params: [...params()],
-      getFormat,
       getSerializedFormat,
     },
     {
diff --git a/src/plugins/data/public/search/aggs/metrics/bucket_min.ts b/src/plugins/data/public/search/aggs/metrics/bucket_min.ts
index c46a3eb9425d1f..bb4ed9d44b0b33 100644
--- a/src/plugins/data/public/search/aggs/metrics/bucket_min.ts
+++ b/src/plugins/data/public/search/aggs/metrics/bucket_min.ts
@@ -45,7 +45,7 @@ const minBucketTitle = i18n.translate('data.search.aggs.metrics.minBucketTitle',
 export const getBucketMinMetricAgg = ({
   getInternalStartServices,
 }: BucketMinMetricAggDependencies) => {
-  const { subtype, params, getFormat, getSerializedFormat } = siblingPipelineAggHelper;
+  const { subtype, params, getSerializedFormat } = siblingPipelineAggHelper;
 
   return new MetricAggType(
     {
@@ -54,7 +54,6 @@ export const getBucketMinMetricAgg = ({
       makeLabel: (agg) => makeNestedLabel(agg, overallMinLabel),
       subtype,
       params: [...params()],
-      getFormat,
       getSerializedFormat,
     },
     {
diff --git a/src/plugins/data/public/search/aggs/metrics/bucket_sum.ts b/src/plugins/data/public/search/aggs/metrics/bucket_sum.ts
index 57212ec9ff91b2..dd065b52acd129 100644
--- a/src/plugins/data/public/search/aggs/metrics/bucket_sum.ts
+++ b/src/plugins/data/public/search/aggs/metrics/bucket_sum.ts
@@ -45,7 +45,7 @@ const sumBucketTitle = i18n.translate('data.search.aggs.metrics.sumBucketTitle',
 export const getBucketSumMetricAgg = ({
   getInternalStartServices,
 }: BucketSumMetricAggDependencies) => {
-  const { subtype, params, getFormat, getSerializedFormat } = siblingPipelineAggHelper;
+  const { subtype, params, getSerializedFormat } = siblingPipelineAggHelper;
 
   return new MetricAggType(
     {
@@ -54,7 +54,6 @@ export const getBucketSumMetricAgg = ({
       makeLabel: (agg) => makeNestedLabel(agg, overallSumLabel),
       subtype,
       params: [...params()],
-      getFormat,
       getSerializedFormat,
     },
     {
diff --git a/src/plugins/data/public/search/aggs/metrics/cardinality.ts b/src/plugins/data/public/search/aggs/metrics/cardinality.ts
index 2855cc1b6b16eb..efc79a85595661 100644
--- a/src/plugins/data/public/search/aggs/metrics/cardinality.ts
+++ b/src/plugins/data/public/search/aggs/metrics/cardinality.ts
@@ -49,11 +49,6 @@ export const getCardinalityMetricAgg = ({
           values: { field: aggConfig.getFieldDisplayName() },
         });
       },
-      getFormat() {
-        const { fieldFormats } = getInternalStartServices();
-
-        return fieldFormats.getDefaultInstance(KBN_FIELD_TYPES.NUMBER);
-      },
       getSerializedFormat(agg) {
         return {
           id: 'number',
diff --git a/src/plugins/data/public/search/aggs/metrics/count.ts b/src/plugins/data/public/search/aggs/metrics/count.ts
index 4c7b8139b01628..86faca053a9cf7 100644
--- a/src/plugins/data/public/search/aggs/metrics/count.ts
+++ b/src/plugins/data/public/search/aggs/metrics/count.ts
@@ -20,7 +20,6 @@
 import { i18n } from '@kbn/i18n';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
 import { GetInternalStartServicesFn } from '../../../types';
 
 export interface CountMetricAggDependencies {
@@ -40,11 +39,6 @@ export const getCountMetricAgg = ({ getInternalStartServices }: CountMetricAggDe
           defaultMessage: 'Count',
         });
       },
-      getFormat() {
-        const { fieldFormats } = getInternalStartServices();
-
-        return fieldFormats.getDefaultInstance(KBN_FIELD_TYPES.NUMBER);
-      },
       getSerializedFormat(agg) {
         return {
           id: 'number',
diff --git a/src/plugins/data/public/search/aggs/metrics/cumulative_sum.ts b/src/plugins/data/public/search/aggs/metrics/cumulative_sum.ts
index c392f44a7961ed..3de88bb71740f1 100644
--- a/src/plugins/data/public/search/aggs/metrics/cumulative_sum.ts
+++ b/src/plugins/data/public/search/aggs/metrics/cumulative_sum.ts
@@ -46,7 +46,7 @@ const cumulativeSumTitle = i18n.translate('data.search.aggs.metrics.cumulativeSu
 export const getCumulativeSumMetricAgg = ({
   getInternalStartServices,
 }: CumulativeSumMetricAggDependencies) => {
-  const { subtype, params, getFormat, getSerializedFormat } = parentPipelineAggHelper;
+  const { subtype, params, getSerializedFormat } = parentPipelineAggHelper;
 
   return new MetricAggType(
     {
@@ -55,7 +55,6 @@ export const getCumulativeSumMetricAgg = ({
       makeLabel: (agg) => makeNestedLabel(agg, cumulativeSumLabel),
       subtype,
       params: [...params()],
-      getFormat,
       getSerializedFormat,
     },
     {
diff --git a/src/plugins/data/public/search/aggs/metrics/derivative.ts b/src/plugins/data/public/search/aggs/metrics/derivative.ts
index f3c1cc9bc29773..c9507029080e61 100644
--- a/src/plugins/data/public/search/aggs/metrics/derivative.ts
+++ b/src/plugins/data/public/search/aggs/metrics/derivative.ts
@@ -46,7 +46,7 @@ const derivativeTitle = i18n.translate('data.search.aggs.metrics.derivativeTitle
 export const getDerivativeMetricAgg = ({
   getInternalStartServices,
 }: DerivativeMetricAggDependencies) => {
-  const { subtype, params, getFormat, getSerializedFormat } = parentPipelineAggHelper;
+  const { subtype, params, getSerializedFormat } = parentPipelineAggHelper;
 
   return new MetricAggType(
     {
@@ -57,7 +57,6 @@ export const getDerivativeMetricAgg = ({
       },
       subtype,
       params: [...params()],
-      getFormat,
       getSerializedFormat,
     },
     {
diff --git a/src/plugins/data/public/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts b/src/plugins/data/public/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts
index 2a74a446ce84e0..73acd268600763 100644
--- a/src/plugins/data/public/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts
+++ b/src/plugins/data/public/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts
@@ -18,14 +18,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { noop, identity } from 'lodash';
+import { noop } from 'lodash';
 
 import { forwardModifyAggConfigOnSearchRequestStart } from './nested_agg_helpers';
 import { IMetricAggConfig, MetricAggParam } from '../metric_agg_type';
 import { parentPipelineAggWriter } from './parent_pipeline_agg_writer';
 
-import { FieldFormat } from '../../../../../common';
-
 const metricAggFilter = [
   '!top_hits',
   '!percentiles',
@@ -73,18 +71,6 @@ export const parentPipelineAggHelper = {
     ] as Array<MetricAggParam<IMetricAggConfig>>;
   },
 
-  getFormat(agg: IMetricAggConfig) {
-    let subAgg;
-    const customMetric = agg.getParam('customMetric');
-
-    if (customMetric) {
-      subAgg = customMetric;
-    } else {
-      subAgg = agg.aggConfigs.byId(agg.getParam('metricAgg'));
-    }
-    return subAgg ? subAgg.type.getFormat(subAgg) : new (FieldFormat.from(identity))();
-  },
-
   getSerializedFormat(agg: IMetricAggConfig) {
     let subAgg;
     const customMetric = agg.getParam('customMetric');
diff --git a/src/plugins/data/public/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts b/src/plugins/data/public/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts
index 8e3e0143bf9154..347ac76b8e27b9 100644
--- a/src/plugins/data/public/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts
+++ b/src/plugins/data/public/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts
@@ -17,12 +17,10 @@
  * under the License.
  */
 
-import { identity } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { siblingPipelineAggWriter } from './sibling_pipeline_agg_writer';
 import { forwardModifyAggConfigOnSearchRequestStart } from './nested_agg_helpers';
 import { IMetricAggConfig, MetricAggParam } from '../metric_agg_type';
-import { FieldFormat } from '../../../../../common';
 
 const metricAggFilter: string[] = [
   '!top_hits',
@@ -87,13 +85,6 @@ export const siblingPipelineAggHelper = {
     ] as Array<MetricAggParam<IMetricAggConfig>>;
   },
 
-  getFormat(agg: IMetricAggConfig) {
-    const customMetric = agg.getParam('customMetric');
-    return customMetric
-      ? customMetric.type.getFormat(customMetric)
-      : new (FieldFormat.from(identity))();
-  },
-
   getSerializedFormat(agg: IMetricAggConfig) {
     const customMetric = agg.getParam('customMetric');
     return customMetric ? customMetric.type.getSerializedFormat(customMetric) : {};
diff --git a/src/plugins/data/public/search/aggs/metrics/median.test.ts b/src/plugins/data/public/search/aggs/metrics/median.test.ts
index 71c48f04a3ca8a..b3721e2c1e679b 100644
--- a/src/plugins/data/public/search/aggs/metrics/median.test.ts
+++ b/src/plugins/data/public/search/aggs/metrics/median.test.ts
@@ -63,7 +63,6 @@ describe('AggTypeMetricMedianProvider class', () => {
       ],
       {
         typesRegistry,
-        fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats,
       }
     );
   });
diff --git a/src/plugins/data/public/search/aggs/metrics/metric_agg_type.ts b/src/plugins/data/public/search/aggs/metrics/metric_agg_type.ts
index 83656db4ac5474..5c4ff91258fb00 100644
--- a/src/plugins/data/public/search/aggs/metrics/metric_agg_type.ts
+++ b/src/plugins/data/public/search/aggs/metrics/metric_agg_type.ts
@@ -22,7 +22,6 @@ import { AggType, AggTypeConfig } from '../agg_type';
 import { AggParamType } from '../param_types/agg';
 import { AggConfig } from '../agg_config';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
 import { FieldTypes } from '../param_types';
 import { GetInternalStartServicesFn } from '../../../types';
 
@@ -82,14 +81,6 @@ export class MetricAggType<TMetricAggConfig extends AggConfig = IMetricAggConfig
         return bucket[agg.id] && bucket[agg.id].value;
       });
 
-    this.getFormat =
-      config.getFormat ||
-      ((agg) => {
-        const { fieldFormats } = dependencies.getInternalStartServices();
-        const field = agg.getField();
-        return field ? field.format : fieldFormats.getDefaultInstance(KBN_FIELD_TYPES.NUMBER);
-      });
-
     this.subtype =
       config.subtype ||
       i18n.translate('data.search.aggs.metrics.metricAggregationsSubtypeTitle', {
diff --git a/src/plugins/data/public/search/aggs/metrics/moving_avg.ts b/src/plugins/data/public/search/aggs/metrics/moving_avg.ts
index abad2782f9d201..61384ef1dc1066 100644
--- a/src/plugins/data/public/search/aggs/metrics/moving_avg.ts
+++ b/src/plugins/data/public/search/aggs/metrics/moving_avg.ts
@@ -48,7 +48,7 @@ const movingAvgLabel = i18n.translate('data.search.aggs.metrics.movingAvgLabel',
 export const getMovingAvgMetricAgg = ({
   getInternalStartServices,
 }: MovingAvgMetricAggDependencies) => {
-  const { subtype, params, getFormat, getSerializedFormat } = parentPipelineAggHelper;
+  const { subtype, params, getSerializedFormat } = parentPipelineAggHelper;
 
   return new MetricAggType(
     {
@@ -57,7 +57,6 @@ export const getMovingAvgMetricAgg = ({
       title: movingAvgTitle,
       makeLabel: (agg) => makeNestedLabel(agg, movingAvgLabel),
       subtype,
-      getFormat,
       getSerializedFormat,
       params: [
         ...params(),
diff --git a/src/plugins/data/public/search/aggs/metrics/parent_pipeline.test.ts b/src/plugins/data/public/search/aggs/metrics/parent_pipeline.test.ts
index 2201366cdf78b5..91149a3f29f94a 100644
--- a/src/plugins/data/public/search/aggs/metrics/parent_pipeline.test.ts
+++ b/src/plugins/data/public/search/aggs/metrics/parent_pipeline.test.ts
@@ -24,14 +24,12 @@ import { getSerialDiffMetricAgg } from './serial_diff';
 import { AggConfigs } from '../agg_configs';
 import { mockAggTypesRegistry } from '../test_helpers';
 import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
-import { fieldFormatsServiceMock } from '../../../field_formats/mocks';
 import { GetInternalStartServicesFn, InternalStartServices } from '../../../types';
 import { notificationServiceMock } from '../../../../../../../src/core/public/mocks';
 
 describe('parent pipeline aggs', function () {
   const getInternalStartServices: GetInternalStartServicesFn = () =>
     (({
-      fieldFormats: fieldFormatsServiceMock.createStartContract(),
       notifications: notificationServiceMock.createStartContract(),
     } as unknown) as InternalStartServices);
 
@@ -76,9 +74,7 @@ describe('parent pipeline aggs', function () {
         const field = {
           name: 'field',
           format: {
-            type: {
-              id: 'bytes',
-            },
+            toJSON: () => ({ id: 'bytes' }),
           },
         };
         const indexPattern = {
@@ -111,7 +107,7 @@ describe('parent pipeline aggs', function () {
               schema: 'metric',
             },
           ],
-          { typesRegistry, fieldFormats: getInternalStartServices().fieldFormats }
+          { typesRegistry }
         );
 
         // Grab the aggConfig off the vis (we don't actually use the vis for anything else)
@@ -197,14 +193,14 @@ describe('parent pipeline aggs', function () {
         );
       });
 
-      it('should have correct formatter', () => {
+      it('should have correct serialized format', () => {
         init({
           metricAgg: '3',
         });
-        expect(metricAgg.getFormat(aggConfig).type.id).toBe('bytes');
+        expect(metricAgg.getSerializedFormat(aggConfig).id).toBe('bytes');
       });
 
-      it('should have correct customMetric nested formatter', () => {
+      it('should have correct customMetric nested serialized format', () => {
         init({
           metricAgg: 'custom',
           customMetric: {
@@ -222,7 +218,7 @@ describe('parent pipeline aggs', function () {
             schema: 'orderAgg',
           },
         });
-        expect(metricAgg.getFormat(aggConfig).type.id).toBe('bytes');
+        expect(metricAgg.getSerializedFormat(aggConfig).id).toBe('bytes');
       });
 
       it("should call modifyAggConfigOnSearchRequestStart for its customMetric's parameters", () => {
diff --git a/src/plugins/data/public/search/aggs/metrics/percentile_ranks.test.ts b/src/plugins/data/public/search/aggs/metrics/percentile_ranks.test.ts
index df52c10a82495b..39e371763ed4b1 100644
--- a/src/plugins/data/public/search/aggs/metrics/percentile_ranks.test.ts
+++ b/src/plugins/data/public/search/aggs/metrics/percentile_ranks.test.ts
@@ -74,7 +74,7 @@ describe('AggTypesMetricsPercentileRanksProvider class', function () {
           },
         },
       ],
-      { typesRegistry, fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats }
+      { typesRegistry }
     );
   });
 
diff --git a/src/plugins/data/public/search/aggs/metrics/percentile_ranks.ts b/src/plugins/data/public/search/aggs/metrics/percentile_ranks.ts
index c5aee380b97762..1953c81a998740 100644
--- a/src/plugins/data/public/search/aggs/metrics/percentile_ranks.ts
+++ b/src/plugins/data/public/search/aggs/metrics/percentile_ranks.ts
@@ -22,7 +22,7 @@ import { MetricAggType } from './metric_agg_type';
 import { getResponseAggConfigClass, IResponseAggConfig } from './lib/get_response_agg_config_class';
 import { getPercentileValue } from './percentiles_get_value';
 import { METRIC_TYPES } from './metric_agg_types';
-import { FIELD_FORMAT_IDS, KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../../../common';
 import { GetInternalStartServicesFn } from '../../../types';
 import { BaseAggParams } from '../types';
 
@@ -96,13 +96,6 @@ export const getPercentileRanksMetricAgg = ({
 
         return values.map((value: any) => new ValueAggConfig(value));
       },
-      getFormat() {
-        const { fieldFormats } = getInternalStartServices();
-        return (
-          fieldFormats.getInstance(FIELD_FORMAT_IDS.PERCENT) ||
-          fieldFormats.getDefaultInstance(KBN_FIELD_TYPES.NUMBER)
-        );
-      },
       getSerializedFormat(agg) {
         return {
           id: 'percent',
diff --git a/src/plugins/data/public/search/aggs/metrics/percentiles.test.ts b/src/plugins/data/public/search/aggs/metrics/percentiles.test.ts
index 76382c01bcc108..52ab325ac5806b 100644
--- a/src/plugins/data/public/search/aggs/metrics/percentiles.test.ts
+++ b/src/plugins/data/public/search/aggs/metrics/percentiles.test.ts
@@ -67,7 +67,7 @@ describe('AggTypesMetricsPercentilesProvider class', () => {
           },
         },
       ],
-      { typesRegistry, fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats }
+      { typesRegistry }
     );
   });
 
diff --git a/src/plugins/data/public/search/aggs/metrics/serial_diff.ts b/src/plugins/data/public/search/aggs/metrics/serial_diff.ts
index 7cb1b194fed1c1..9ea01be11fe8f8 100644
--- a/src/plugins/data/public/search/aggs/metrics/serial_diff.ts
+++ b/src/plugins/data/public/search/aggs/metrics/serial_diff.ts
@@ -46,7 +46,7 @@ const serialDiffLabel = i18n.translate('data.search.aggs.metrics.serialDiffLabel
 export const getSerialDiffMetricAgg = ({
   getInternalStartServices,
 }: SerialDiffMetricAggDependencies) => {
-  const { subtype, params, getFormat, getSerializedFormat } = parentPipelineAggHelper;
+  const { subtype, params, getSerializedFormat } = parentPipelineAggHelper;
 
   return new MetricAggType(
     {
@@ -55,7 +55,6 @@ export const getSerialDiffMetricAgg = ({
       makeLabel: (agg) => makeNestedLabel(agg, serialDiffLabel),
       subtype,
       params: [...params()],
-      getFormat,
       getSerializedFormat,
     },
     {
diff --git a/src/plugins/data/public/search/aggs/metrics/sibling_pipeline.test.ts b/src/plugins/data/public/search/aggs/metrics/sibling_pipeline.test.ts
index 56bd33b2b6345b..f08e850caadcec 100644
--- a/src/plugins/data/public/search/aggs/metrics/sibling_pipeline.test.ts
+++ b/src/plugins/data/public/search/aggs/metrics/sibling_pipeline.test.ts
@@ -25,14 +25,12 @@ import { getBucketMaxMetricAgg } from './bucket_max';
 import { AggConfigs } from '../agg_configs';
 import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
 import { mockAggTypesRegistry } from '../test_helpers';
-import { fieldFormatsServiceMock } from '../../../field_formats/mocks';
 import { GetInternalStartServicesFn, InternalStartServices } from '../../../types';
 import { notificationServiceMock } from '../../../../../../../src/core/public/mocks';
 
 describe('sibling pipeline aggs', () => {
   const getInternalStartServices: GetInternalStartServicesFn = () =>
     (({
-      fieldFormats: fieldFormatsServiceMock.createStartContract(),
       notifications: notificationServiceMock.createStartContract(),
     } as unknown) as InternalStartServices);
 
@@ -71,9 +69,7 @@ describe('sibling pipeline aggs', () => {
         const field = {
           name: 'field',
           format: {
-            type: {
-              id: 'bytes',
-            },
+            toJSON: () => ({ id: 'bytes' }),
           },
         };
         const indexPattern = {
@@ -112,7 +108,7 @@ describe('sibling pipeline aggs', () => {
               },
             },
           ],
-          { typesRegistry, fieldFormats: getInternalStartServices().fieldFormats }
+          { typesRegistry }
         );
 
         // Grab the aggConfig off the vis (we don't actually use the vis for anything else)
@@ -155,7 +151,7 @@ describe('sibling pipeline aggs', () => {
         expect(aggDsl.parentAggs['2-bucket'].aggs['2-metric'].avg.field).toEqual('field');
       });
 
-      it('should have correct formatter', () => {
+      it('should have correct serialized field format', () => {
         init({
           customMetric: {
             id: '5',
@@ -171,7 +167,7 @@ describe('sibling pipeline aggs', () => {
           },
         });
 
-        expect(metricAgg.getFormat(aggConfig).type.id).toBe('bytes');
+        expect(metricAgg.getSerializedFormat(aggConfig).id).toBe('bytes');
       });
 
       it("should call modifyAggConfigOnSearchRequestStart for nested aggs' parameters", () => {
diff --git a/src/plugins/data/public/search/aggs/metrics/std_deviation.test.ts b/src/plugins/data/public/search/aggs/metrics/std_deviation.test.ts
index 536764b2bcf0b8..2fa207e62771e3 100644
--- a/src/plugins/data/public/search/aggs/metrics/std_deviation.test.ts
+++ b/src/plugins/data/public/search/aggs/metrics/std_deviation.test.ts
@@ -66,7 +66,7 @@ describe('AggTypeMetricStandardDeviationProvider class', () => {
           },
         },
       ],
-      { typesRegistry, fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats }
+      { typesRegistry }
     );
   };
 
diff --git a/src/plugins/data/public/search/aggs/metrics/top_hit.test.ts b/src/plugins/data/public/search/aggs/metrics/top_hit.test.ts
index 49e0a3e4b349ab..94a970a72a46f5 100644
--- a/src/plugins/data/public/search/aggs/metrics/top_hit.test.ts
+++ b/src/plugins/data/public/search/aggs/metrics/top_hit.test.ts
@@ -91,7 +91,7 @@ describe('Top hit metric', () => {
           params,
         },
       ],
-      { typesRegistry, fieldFormats: aggTypesDependencies.getInternalStartServices().fieldFormats }
+      { typesRegistry }
     );
 
     // Grab the aggConfig off the vis (we don't actually use the vis for anything else)
diff --git a/src/plugins/data/public/search/aggs/mocks.ts b/src/plugins/data/public/search/aggs/mocks.ts
index 16544fd8f46b08..7a5dcc9be45929 100644
--- a/src/plugins/data/public/search/aggs/mocks.ts
+++ b/src/plugins/data/public/search/aggs/mocks.ts
@@ -27,7 +27,6 @@ import {
 } from './';
 import { SearchAggsSetup, SearchAggsStart } from './types';
 import { mockAggTypesRegistry } from './test_helpers';
-import { fieldFormatsServiceMock } from '../../field_formats/mocks';
 
 const aggTypeBaseParamMock = () => ({
   name: 'some_param',
@@ -73,7 +72,6 @@ export const searchAggsStartMock = (): SearchAggsStart => ({
   createAggConfigs: jest.fn().mockImplementation((indexPattern, configStates = [], schemas) => {
     return new AggConfigs(indexPattern, configStates, {
       typesRegistry: mockAggTypesRegistry(),
-      fieldFormats: fieldFormatsServiceMock.createStartContract(),
     });
   }),
   types: mockAggTypesRegistry(),
diff --git a/src/plugins/data/public/search/aggs/test_helpers/mock_agg_types_registry.ts b/src/plugins/data/public/search/aggs/test_helpers/mock_agg_types_registry.ts
index 836aaad2cda0c3..385d0cd6c6b396 100644
--- a/src/plugins/data/public/search/aggs/test_helpers/mock_agg_types_registry.ts
+++ b/src/plugins/data/public/search/aggs/test_helpers/mock_agg_types_registry.ts
@@ -22,7 +22,6 @@ import { AggTypesRegistry, AggTypesRegistryStart } from '../agg_types_registry';
 import { getAggTypes } from '../agg_types';
 import { BucketAggType } from '../buckets/bucket_agg_type';
 import { MetricAggType } from '../metrics/metric_agg_type';
-import { queryServiceMock } from '../../../query/mocks';
 import { fieldFormatsServiceMock } from '../../../field_formats/mocks';
 import { InternalStartServices } from '../../../types';
 import { TimeBucketsConfig } from '../buckets/lib/time_buckets/time_buckets';
@@ -79,8 +78,7 @@ export function mockAggTypesRegistry<T extends BucketAggType<any> | MetricAggTyp
     coreSetup.uiSettings.get = mockUiSettings;
 
     const aggTypes = getAggTypes({
-      uiSettings: coreSetup.uiSettings,
-      query: queryServiceMock.createSetupContract(),
+      calculateBounds: jest.fn(),
       getInternalStartServices: () =>
         (({
           fieldFormats: fieldFormatsServiceMock.createStartContract(),
@@ -88,6 +86,7 @@ export function mockAggTypesRegistry<T extends BucketAggType<any> | MetricAggTyp
           uiSettings: coreStart.uiSettings,
           injectedMetadata: coreStart.injectedMetadata,
         } as unknown) as InternalStartServices),
+      uiSettings: coreSetup.uiSettings,
     });
 
     aggTypes.buckets.forEach((type) => registrySetup.registerBucket(type));
diff --git a/src/plugins/data/public/search/expressions/build_tabular_inspector_data.ts b/src/plugins/data/public/search/expressions/build_tabular_inspector_data.ts
index 906b8862d00aab..c4846a98f124fd 100644
--- a/src/plugins/data/public/search/expressions/build_tabular_inspector_data.ts
+++ b/src/plugins/data/public/search/expressions/build_tabular_inspector_data.ts
@@ -19,6 +19,7 @@
 
 import { set } from 'lodash';
 import { FormattedData } from '../../../../../plugins/inspector/public';
+import { FormatFactory } from '../../../common/field_formats/utils';
 import { TabbedTable } from '../tabify';
 import { createFilter } from './create_filter';
 
@@ -38,14 +39,30 @@ import { createFilter } from './create_filter';
  */
 export async function buildTabularInspectorData(
   table: TabbedTable,
-  queryFilter: { addFilters: (filter: any) => void }
+  {
+    queryFilter,
+    deserializeFieldFormat,
+  }: {
+    queryFilter: { addFilters: (filter: any) => void };
+    deserializeFieldFormat: FormatFactory;
+  }
 ) {
   const aggConfigs = table.columns.map((column) => column.aggConfig);
   const rows = table.rows.map((row) => {
     return table.columns.reduce<Record<string, FormattedData>>((prev, cur, colIndex) => {
       const value = row[cur.id];
-      const fieldFormatter = cur.aggConfig.fieldFormatter('text');
-      prev[`col-${colIndex}-${cur.aggConfig.id}`] = new FormattedData(value, fieldFormatter(value));
+
+      let format = cur.aggConfig.toSerializedFieldFormat();
+      if (Object.keys(format).length < 1) {
+        // If no format exists, fall back to string as a default
+        format = { id: 'string' };
+      }
+      const fieldFormatter = deserializeFieldFormat(format);
+
+      prev[`col-${colIndex}-${cur.aggConfig.id}`] = new FormattedData(
+        value,
+        fieldFormatter.convert(value)
+      );
       return prev;
     }, {});
   });
diff --git a/src/plugins/data/public/search/expressions/create_filter.test.ts b/src/plugins/data/public/search/expressions/create_filter.test.ts
index 51b5e175761bd7..23da060cba2032 100644
--- a/src/plugins/data/public/search/expressions/create_filter.test.ts
+++ b/src/plugins/data/public/search/expressions/create_filter.test.ts
@@ -22,12 +22,10 @@ import { AggConfigs, IAggConfig } from '../aggs';
 import { TabbedTable } from '../tabify';
 import { isRangeFilter, BytesFormat, FieldFormatsGetConfigFn } from '../../../common';
 import { mockDataServices, mockAggTypesRegistry } from '../aggs/test_helpers';
-import { fieldFormatsServiceMock } from '../../field_formats/mocks';
 
 describe('createFilter', () => {
   let table: TabbedTable;
   let aggConfig: IAggConfig;
-  const fieldFormats = fieldFormatsServiceMock.createStartContract();
 
   const typesRegistry = mockAggTypesRegistry();
 
@@ -60,7 +58,7 @@ describe('createFilter', () => {
           params,
         },
       ],
-      { typesRegistry, fieldFormats }
+      { typesRegistry }
     );
   };
 
diff --git a/src/plugins/data/public/search/expressions/esaggs.ts b/src/plugins/data/public/search/expressions/esaggs.ts
index 77475cd3ce88b9..e9daec0b4191b6 100644
--- a/src/plugins/data/public/search/expressions/esaggs.ts
+++ b/src/plugins/data/public/search/expressions/esaggs.ts
@@ -32,9 +32,22 @@ import { Adapters } from '../../../../../plugins/inspector/public';
 import { IAggConfigs } from '../aggs';
 import { ISearchSource } from '../search_source';
 import { tabifyAggResponse } from '../tabify';
-import { Filter, Query, TimeRange, IIndexPattern, isRangeFilter } from '../../../common';
-import { FilterManager, calculateBounds, getTime } from '../../query';
-import { getSearchService, getQueryService, getIndexPatterns } from '../../services';
+import {
+  calculateBounds,
+  Filter,
+  getTime,
+  IIndexPattern,
+  isRangeFilter,
+  Query,
+  TimeRange,
+} from '../../../common';
+import { FilterManager } from '../../query';
+import {
+  getFieldFormats,
+  getIndexPatterns,
+  getQueryService,
+  getSearchService,
+} from '../../services';
 import { buildTabularInspectorData } from './build_tabular_inspector_data';
 import { getRequestInspectorStats, getResponseInspectorStats, serializeAggConfig } from './utils';
 
@@ -220,7 +233,11 @@ const handleCourierRequest = async ({
   }
 
   inspectorAdapters.data.setTabularLoader(
-    () => buildTabularInspectorData((searchSource as any).tabifiedResponse, filterManager),
+    () =>
+      buildTabularInspectorData((searchSource as any).tabifiedResponse, {
+        queryFilter: filterManager,
+        deserializeFieldFormat: getFieldFormats().deserialize,
+      }),
     { returnsFormattedValues: true }
   );
 
diff --git a/src/plugins/data/public/search/search_service.ts b/src/plugins/data/public/search/search_service.ts
index d5997c15817f69..134dc89c2421a0 100644
--- a/src/plugins/data/public/search/search_service.ts
+++ b/src/plugins/data/public/search/search_service.ts
@@ -25,10 +25,11 @@ import { ExpressionsSetup } from '../../../../plugins/expressions/public';
 import { createSearchSource, SearchSource, SearchSourceDependencies } from './search_source';
 import { TStrategyTypes } from './strategy_types';
 import { getEsClient, LegacyApiCaller } from './legacy';
+import { getForceNow } from '../query/timefilter/lib/get_force_now';
+import { calculateBounds, TimeRange } from '../../common/query';
 import { ES_SEARCH_STRATEGY, DEFAULT_SEARCH_STRATEGY } from '../../common/search';
 import { esSearchStrategyProvider } from './es_search';
 import { IndexPatternsContract } from '../index_patterns/index_patterns';
-import { QuerySetup } from '../query';
 import { GetInternalStartServicesFn } from '../types';
 import { SearchInterceptor } from './search_interceptor';
 import {
@@ -38,19 +39,16 @@ import {
   AggConfigs,
   getCalculateAutoTimeExpression,
 } from './aggs';
-import { FieldFormatsStart } from '../field_formats';
 import { ISearchGeneric } from './i_search';
 
 interface SearchServiceSetupDependencies {
   expressions: ExpressionsSetup;
   getInternalStartServices: GetInternalStartServicesFn;
   packageInfo: PackageInfo;
-  query: QuerySetup;
 }
 
 interface SearchServiceStartDependencies {
   indexPatterns: IndexPatternsContract;
-  fieldFormats: FieldFormatsStart;
 }
 
 /**
@@ -85,9 +83,16 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
     return strategy;
   };
 
+  /**
+   * getForceNow uses window.location, so we must have a separate implementation
+   * of calculateBounds on the client and the server.
+   */
+  private calculateBounds = (timeRange: TimeRange) =>
+    calculateBounds(timeRange, { forceNow: getForceNow() });
+
   public setup(
     core: CoreSetup,
-    { expressions, packageInfo, query, getInternalStartServices }: SearchServiceSetupDependencies
+    { expressions, packageInfo, getInternalStartServices }: SearchServiceSetupDependencies
   ): ISearchSetup {
     this.esClient = getEsClient(core.injectedMetadata, core.http, packageInfo);
 
@@ -100,9 +105,9 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
 
     // register each agg type
     const aggTypes = getAggTypes({
-      query,
-      uiSettings: core.uiSettings,
+      calculateBounds: this.calculateBounds,
       getInternalStartServices,
+      uiSettings: core.uiSettings,
     });
     aggTypes.buckets.forEach((b) => aggTypesSetup.registerBucket(b));
     aggTypes.metrics.forEach((m) => aggTypesSetup.registerMetric(m));
@@ -158,7 +163,6 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
         calculateAutoTimeExpression: getCalculateAutoTimeExpression(core.uiSettings),
         createAggConfigs: (indexPattern, configStates = [], schemas) => {
           return new AggConfigs(indexPattern, configStates, {
-            fieldFormats: dependencies.fieldFormats,
             typesRegistry: aggTypesStart,
           });
         },
diff --git a/src/plugins/data/public/search/tabify/get_columns.test.ts b/src/plugins/data/public/search/tabify/get_columns.test.ts
index b4498aca4079cf..0c5551d95690f2 100644
--- a/src/plugins/data/public/search/tabify/get_columns.test.ts
+++ b/src/plugins/data/public/search/tabify/get_columns.test.ts
@@ -21,7 +21,6 @@ import { tabifyGetColumns } from './get_columns';
 import { TabbedAggColumn } from './types';
 import { AggConfigs } from '../aggs';
 import { mockAggTypesRegistry, mockDataServices } from '../aggs/test_helpers';
-import { fieldFormatsServiceMock } from '../../field_formats/mocks';
 
 describe('get columns', () => {
   beforeEach(() => {
@@ -29,7 +28,6 @@ describe('get columns', () => {
   });
 
   const typesRegistry = mockAggTypesRegistry();
-  const fieldFormats = fieldFormatsServiceMock.createStartContract();
 
   const createAggConfigs = (aggs: any[] = []) => {
     const field = {
@@ -45,10 +43,7 @@ describe('get columns', () => {
       },
     } as any;
 
-    return new AggConfigs(indexPattern, aggs, {
-      typesRegistry,
-      fieldFormats,
-    });
+    return new AggConfigs(indexPattern, aggs, { typesRegistry });
   };
 
   test('should inject the metric after each bucket if the vis is hierarchical', () => {
diff --git a/src/plugins/data/public/search/tabify/response_writer.test.ts b/src/plugins/data/public/search/tabify/response_writer.test.ts
index 3334d858ce54e9..94473d23ccc398 100644
--- a/src/plugins/data/public/search/tabify/response_writer.test.ts
+++ b/src/plugins/data/public/search/tabify/response_writer.test.ts
@@ -21,7 +21,6 @@ import { TabbedAggResponseWriter } from './response_writer';
 import { AggConfigs, BUCKET_TYPES } from '../aggs';
 import { mockDataServices, mockAggTypesRegistry } from '../aggs/test_helpers';
 import { TabbedResponseWriterOptions } from './types';
-import { fieldFormatsServiceMock } from '../../field_formats/mocks';
 
 describe('TabbedAggResponseWriter class', () => {
   beforeEach(() => {
@@ -31,7 +30,6 @@ describe('TabbedAggResponseWriter class', () => {
   let responseWriter: TabbedAggResponseWriter;
 
   const typesRegistry = mockAggTypesRegistry();
-  const fieldFormats = fieldFormatsServiceMock.createStartContract();
 
   const splitAggConfig = [
     {
@@ -73,17 +71,11 @@ describe('TabbedAggResponseWriter class', () => {
       },
     } as any;
 
-    return new TabbedAggResponseWriter(
-      new AggConfigs(indexPattern, aggs, {
-        typesRegistry,
-        fieldFormats,
-      }),
-      {
-        metricsAtAllLevels: false,
-        partialRows: false,
-        ...opts,
-      }
-    );
+    return new TabbedAggResponseWriter(new AggConfigs(indexPattern, aggs, { typesRegistry }), {
+      metricsAtAllLevels: false,
+      partialRows: false,
+      ...opts,
+    });
   };
 
   describe('Constructor', () => {
diff --git a/src/plugins/data/public/search/tabify/tabify.test.ts b/src/plugins/data/public/search/tabify/tabify.test.ts
index f6691360cec312..0a1e99c8bb2001 100644
--- a/src/plugins/data/public/search/tabify/tabify.test.ts
+++ b/src/plugins/data/public/search/tabify/tabify.test.ts
@@ -22,11 +22,9 @@ import { IndexPattern } from '../../index_patterns';
 import { AggConfigs, IAggConfig, IAggConfigs } from '../aggs';
 import { mockAggTypesRegistry } from '../aggs/test_helpers';
 import { metricOnly, threeTermBuckets } from 'fixtures/fake_hierarchical_data';
-import { fieldFormatsServiceMock } from '../../field_formats/mocks';
 
 describe('tabifyAggResponse Integration', () => {
   const typesRegistry = mockAggTypesRegistry();
-  const fieldFormats = fieldFormatsServiceMock.createStartContract();
 
   const createAggConfigs = (aggs: IAggConfig[] = []) => {
     const field = {
@@ -42,10 +40,7 @@ describe('tabifyAggResponse Integration', () => {
       },
     } as unknown) as IndexPattern;
 
-    return new AggConfigs(indexPattern, aggs, {
-      typesRegistry,
-      fieldFormats,
-    });
+    return new AggConfigs(indexPattern, aggs, { typesRegistry });
   };
 
   const mockAggConfig = (agg: any): IAggConfig => (agg as unknown) as IAggConfig;
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index 19d028c1d41e1b..6a4eb38b552ffb 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -202,6 +202,7 @@ export {
   castEsToKbnFieldTypeName,
   // query
   Filter,
+  getTime,
   Query,
   // timefilter
   RefreshInterval,
diff --git a/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts
index f563976cae9b82..ff9d67152e268d 100644
--- a/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { getFieldCapabilities, resolveTimePattern, createNoMatchingIndicesError } from './lib';
 
@@ -37,9 +37,9 @@ interface FieldSubType {
 }
 
 export class IndexPatternsFetcher {
-  private _callDataCluster: APICaller;
+  private _callDataCluster: LegacyAPICaller;
 
-  constructor(callDataCluster: APICaller) {
+  constructor(callDataCluster: LegacyAPICaller) {
     this._callDataCluster = callDataCluster;
   }
 
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts
index 734e845e857693..0738a16034d467 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { convertEsError } from './errors';
 import { FieldCapsResponse } from './field_capabilities';
 
@@ -46,7 +46,7 @@ export interface IndexAliasResponse {
  *  @return {Promise<IndexAliasResponse>}
  */
 export async function callIndexAliasApi(
-  callCluster: APICaller,
+  callCluster: LegacyAPICaller,
   indices: string[] | string
 ): Promise<IndicesAliasResponse> {
   try {
@@ -71,7 +71,7 @@ export async function callIndexAliasApi(
  *  @param  {Array<String>|String} indices
  *  @return {Promise<FieldCapsResponse>}
  */
-export async function callFieldCapsApi(callCluster: APICaller, indices: string[] | string) {
+export async function callFieldCapsApi(callCluster: LegacyAPICaller, indices: string[] | string) {
   try {
     return (await callCluster('fieldCaps', {
       index: indices,
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
index d8c94664322049..502364cdcba327 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
@@ -19,7 +19,7 @@
 
 import { defaults, indexBy, sortBy } from 'lodash';
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { callFieldCapsApi } from '../es_api';
 import { FieldCapsResponse, readFieldCapsResponse } from './field_caps_response';
 import { mergeOverrides } from './overrides';
@@ -39,7 +39,7 @@ export function concatIfUniq<T>(arr: T[], value: T) {
  *  @return {Promise<Array<FieldDescriptor>>}
  */
 export async function getFieldCapabilities(
-  callCluster: APICaller,
+  callCluster: LegacyAPICaller,
   indices: string | string[] = [],
   metaFields: string[] = []
 ) {
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
index 764307bef0ba64..a01d34dbe9df6c 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
@@ -20,7 +20,7 @@
 import { chain } from 'lodash';
 import moment from 'moment';
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { timePatternToWildcard } from './time_pattern_to_wildcard';
 import { callIndexAliasApi, IndicesAliasResponse } from './es_api';
@@ -36,7 +36,7 @@ import { callIndexAliasApi, IndicesAliasResponse } from './es_api';
  *                            and the indices that actually match the time
  *                            pattern (matches);
  */
-export async function resolveTimePattern(callCluster: APICaller, timePattern: string) {
+export async function resolveTimePattern(callCluster: LegacyAPICaller, timePattern: string) {
   const aliases = await callIndexAliasApi(callCluster, timePatternToWildcard(timePattern));
 
   const allIndexDetails = chain<IndicesAliasResponse>(aliases)
diff --git a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
index 81e352fea51b26..35cee799ddb6aa 100644
--- a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { fetchProvider } from './fetch';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 jest.mock('../../../common', () => ({
   DEFAULT_QUERY_LANGUAGE: 'lucene',
@@ -28,7 +28,7 @@ jest.mock('../../../common', () => ({
 }));
 
 let fetch: ReturnType<typeof fetchProvider>;
-let callCluster: APICaller;
+let callCluster: LegacyAPICaller;
 
 function setupMockCallCluster(
   optCount: { optInCount?: number; optOutCount?: number } | null,
@@ -78,7 +78,7 @@ function setupMockCallCluster(
     }
 
     throw new Error('invalid call');
-  }) as unknown) as APICaller;
+  }) as unknown) as LegacyAPICaller;
 }
 
 describe('makeKQLUsageCollector', () => {
diff --git a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts
index 157716b38f5234..109d6f812334df 100644
--- a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts
@@ -18,13 +18,19 @@
  */
 
 import { get } from 'lodash';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { DEFAULT_QUERY_LANGUAGE, UI_SETTINGS } from '../../../common';
 
 const defaultSearchQueryLanguageSetting = DEFAULT_QUERY_LANGUAGE;
 
+export interface Usage {
+  optInCount: number;
+  optOutCount: number;
+  defaultQueryLanguage: string;
+}
+
 export function fetchProvider(index: string) {
-  return async (callCluster: APICaller) => {
+  return async (callCluster: LegacyAPICaller): Promise<Usage> => {
     const [response, config] = await Promise.all([
       callCluster('get', {
         index,
@@ -38,7 +44,7 @@ export function fetchProvider(index: string) {
       }),
     ]);
 
-    const queryLanguageConfigValue = get(
+    const queryLanguageConfigValue: string | null | undefined = get(
       config,
       `hits.hits[0]._source.config.${UI_SETTINGS.SEARCH_QUERY_LANGUAGE}`
     );
diff --git a/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts
index db4c9a8f0b4c79..6d0ca00122018f 100644
--- a/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts
@@ -17,18 +17,22 @@
  * under the License.
  */
 
-import { fetchProvider } from './fetch';
+import { fetchProvider, Usage } from './fetch';
 import { UsageCollectionSetup } from '../../../../usage_collection/server';
 
 export async function makeKQLUsageCollector(
   usageCollection: UsageCollectionSetup,
   kibanaIndex: string
 ) {
-  const fetch = fetchProvider(kibanaIndex);
-  const kqlUsageCollector = usageCollection.makeUsageCollector({
+  const kqlUsageCollector = usageCollection.makeUsageCollector<Usage>({
     type: 'kql',
-    fetch,
+    fetch: fetchProvider(kibanaIndex),
     isReady: () => true,
+    schema: {
+      optInCount: { type: 'long' },
+      optOutCount: { type: 'long' },
+      defaultQueryLanguage: { type: 'keyword' },
+    },
   });
 
   usageCollection.registerCollector(kqlUsageCollector);
diff --git a/src/plugins/data/server/saved_objects/index_patterns.ts b/src/plugins/data/server/saved_objects/index_patterns.ts
index ee02f38427914f..902cf2988f429f 100644
--- a/src/plugins/data/server/saved_objects/index_patterns.ts
+++ b/src/plugins/data/server/saved_objects/index_patterns.ts
@@ -37,7 +37,7 @@ export const indexPatternSavedObjectType: SavedObjectsType = {
     getInAppUrl(obj) {
       return {
         path: `/app/management/kibana/indexPatterns/patterns/${encodeURIComponent(obj.id)}`,
-        uiCapabilitiesPath: 'management.kibana.index_patterns',
+        uiCapabilitiesPath: 'management.kibana.indexPatterns',
       };
     },
   },
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 136d960b52c347..1eaab2550645f8 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -4,7 +4,6 @@
 
 ```ts
 
-import { APICaller as APICaller_2 } from 'kibana/server';
 import Boom from 'boom';
 import { BulkIndexDocumentsParams } from 'elasticsearch';
 import { CatAliasesParams } from 'elasticsearch';
@@ -92,6 +91,7 @@ import { IngestGetPipelineParams } from 'elasticsearch';
 import { IngestPutPipelineParams } from 'elasticsearch';
 import { IngestSimulateParams } from 'elasticsearch';
 import { KibanaConfigType as KibanaConfigType_2 } from 'src/core/server/kibana_config';
+import { LegacyAPICaller as LegacyAPICaller_2 } from 'kibana/server';
 import { Logger as Logger_2 } from 'kibana/server';
 import { MGetParams } from 'elasticsearch';
 import { MGetResponse } from 'elasticsearch';
@@ -335,6 +335,14 @@ export function getDefaultSearchParams(config: SharedGlobalConfig): {
     restTotalHitsAsInt: boolean;
 };
 
+// Warning: (ae-missing-release-tag) "getTime" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export function getTime(indexPattern: IIndexPattern | undefined, timeRange: TimeRange, options?: {
+    forceNow?: Date;
+    fieldName?: string;
+}): import("../..").RangeFilter | undefined;
+
 // @internal
 export function getTotalLoaded({ total, failed, successful }: ShardsResponse): {
     total: number;
@@ -477,7 +485,7 @@ export const indexPatterns: {
 //
 // @public (undocumented)
 export class IndexPatternsFetcher {
-    constructor(callDataCluster: APICaller_2);
+    constructor(callDataCluster: LegacyAPICaller_2);
     getFieldsForTimePattern(options: {
         pattern: string;
         metaFields: string[];
diff --git a/src/plugins/expressions/server/legacy.ts b/src/plugins/expressions/server/legacy.ts
index 4dd9419e59e2dd..8ff08542f18f85 100644
--- a/src/plugins/expressions/server/legacy.ts
+++ b/src/plugins/expressions/server/legacy.ts
@@ -26,7 +26,7 @@ import { register, registryFactory, Registry, Fn } from '@kbn/interpreter/common
 
 import Boom from 'boom';
 import { schema } from '@kbn/config-schema';
-import { CoreSetup, Logger, APICaller } from 'src/core/server';
+import { CoreSetup, Logger, LegacyAPICaller } from 'src/core/server';
 import { ExpressionsServerSetupDependencies } from './plugin';
 import { typeSpecs, ExpressionType } from '../common';
 import { serializeProvider } from '../common';
@@ -98,7 +98,7 @@ export const createLegacyServerEndpoints = (
    * @param {*} fnCall - Describes the function being run `{ functionName, args, context }`
    */
   async function runFunction(
-    handlers: { environment: string; elasticsearchClient: APICaller },
+    handlers: { environment: string; elasticsearchClient: LegacyAPICaller },
     fnCall: any
   ) {
     const { functionName, args, context } = fnCall;
diff --git a/src/plugins/home/server/capabilities_provider.ts b/src/plugins/home/server/capabilities_provider.ts
index 1c662e2301e16c..5e86e0ca54bf79 100644
--- a/src/plugins/home/server/capabilities_provider.ts
+++ b/src/plugins/home/server/capabilities_provider.ts
@@ -24,6 +24,6 @@ export const capabilitiesProvider = () => ({
     visualize: true,
     console: true,
     advanced_settings: true,
-    index_patterns: true,
+    indexPatterns: true,
   },
 });
diff --git a/src/plugins/home/server/services/sample_data/usage/collector.ts b/src/plugins/home/server/services/sample_data/usage/collector.ts
index 19ceceb4cba143..d819d67a8d4324 100644
--- a/src/plugins/home/server/services/sample_data/usage/collector.ts
+++ b/src/plugins/home/server/services/sample_data/usage/collector.ts
@@ -19,7 +19,7 @@
 
 import { PluginInitializerContext } from 'kibana/server';
 import { first } from 'rxjs/operators';
-import { fetchProvider } from './collector_fetch';
+import { fetchProvider, TelemetryResponse } from './collector_fetch';
 import { UsageCollectionSetup } from '../../../../../usage_collection/server';
 
 export async function makeSampleDataUsageCollector(
@@ -33,10 +33,18 @@ export async function makeSampleDataUsageCollector(
   } catch (err) {
     return; // kibana plugin is not enabled (test environment)
   }
-  const collector = usageCollection.makeUsageCollector({
+  const collector = usageCollection.makeUsageCollector<TelemetryResponse>({
     type: 'sample-data',
     fetch: fetchProvider(index),
     isReady: () => true,
+    schema: {
+      installed: { type: 'keyword' },
+      last_install_date: { type: 'date' },
+      last_install_set: { type: 'keyword' },
+      last_uninstall_date: { type: 'date' },
+      last_uninstall_set: { type: 'keyword' },
+      uninstalled: { type: 'keyword' },
+    },
   });
 
   usageCollection.registerCollector(collector);
diff --git a/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts b/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
index 4c7316c8530181..d43458cfc64db8 100644
--- a/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
+++ b/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
@@ -31,7 +31,7 @@ interface SearchHit {
   };
 }
 
-interface TelemetryResponse {
+export interface TelemetryResponse {
   installed: string[];
   uninstalled: string[];
   last_install_date: moment.Moment | null;
diff --git a/src/plugins/index_pattern_management/public/plugin.ts b/src/plugins/index_pattern_management/public/plugin.ts
index a98cc05a0a80af..6e93d23f8469ca 100644
--- a/src/plugins/index_pattern_management/public/plugin.ts
+++ b/src/plugins/index_pattern_management/public/plugin.ts
@@ -27,7 +27,7 @@ import {
   IndexPatternManagementServiceStart,
 } from './service';
 
-import { ManagementSetup, ManagementApp, ManagementSectionId } from '../../management/public';
+import { ManagementSetup, ManagementSectionId } from '../../management/public';
 
 export interface IndexPatternManagementSetupDependencies {
   management: ManagementSetup;
@@ -57,7 +57,6 @@ export class IndexPatternManagementPlugin
       IndexPatternManagementStartDependencies
     > {
   private readonly indexPatternManagementService = new IndexPatternManagementService();
-  private managementApp?: ManagementApp;
 
   constructor(initializerContext: PluginInitializerContext) {}
 
@@ -80,7 +79,7 @@ export class IndexPatternManagementPlugin
       return pathInApp && `/patterns${pathInApp}`;
     });
 
-    this.managementApp = kibanaSection.registerApp({
+    kibanaSection.registerApp({
       id: IPM_APP_ID,
       title: sectionsHeader,
       order: 0,
@@ -95,10 +94,6 @@ export class IndexPatternManagementPlugin
   }
 
   public start(core: CoreStart, plugins: IndexPatternManagementStartDependencies) {
-    if (!core.application.capabilities.management.kibana.index_patterns) {
-      this.managementApp!.disable();
-    }
-
     return this.indexPatternManagementService.start();
   }
 
diff --git a/src/plugins/input_control_vis/public/input_control_vis_type.ts b/src/plugins/input_control_vis/public/input_control_vis_type.ts
index 8114dbf110f8b3..2af53ea4d28e83 100644
--- a/src/plugins/input_control_vis/public/input_control_vis_type.ts
+++ b/src/plugins/input_control_vis/public/input_control_vis_type.ts
@@ -23,7 +23,6 @@ import { createInputControlVisController } from './vis_controller';
 import { getControlsTab } from './components/editor/controls_tab';
 import { OptionsTab } from './components/editor/options_tab';
 import { InputControlVisDependencies } from './plugin';
-import { defaultFeedbackMessage } from '../../kibana_utils/public';
 
 export function createInputControlVisTypeDefinition(deps: InputControlVisDependencies) {
   const InputControlVisController = createInputControlVisController(deps);
@@ -39,7 +38,6 @@ export function createInputControlVisTypeDefinition(deps: InputControlVisDepende
       defaultMessage: 'Create interactive controls for easy dashboard manipulation.',
     }),
     stage: 'experimental',
-    feedbackMessage: defaultFeedbackMessage,
     visualization: InputControlVisController,
     visConfig: {
       defaults: {
diff --git a/src/plugins/kibana_react/public/validated_range/validated_dual_range.tsx b/src/plugins/kibana_react/public/validated_range/validated_dual_range.tsx
index 8187e70b1bbd1a..63b9b48ec809eb 100644
--- a/src/plugins/kibana_react/public/validated_range/validated_dual_range.tsx
+++ b/src/plugins/kibana_react/public/validated_range/validated_dual_range.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { i18n } from '@kbn/i18n';
-import React, { Component, createRef } from 'react';
+import React, { Component } from 'react';
 import { EuiFormRow, EuiDualRange } from '@elastic/eui';
 import { EuiFormRowDisplayKeys } from '@elastic/eui/src/components/form/form_row/form_row';
 import { EuiDualRangeProps } from '@elastic/eui/src/components/form/range/dual_range';
@@ -72,18 +72,6 @@ export class ValidatedDualRange extends Component<Props> {
     return null;
   }
 
-  // Can remove after eui#3412 is resolved
-  componentDidMount() {
-    if (this.trackRef.current) {
-      const track = this.trackRef.current.querySelector('.euiRangeTrack');
-      if (track) {
-        track.setAttribute('aria-hidden', 'true');
-      }
-    }
-  }
-
-  trackRef = createRef<HTMLDivElement>();
-
   // @ts-ignore state populated by getDerivedStateFromProps
   state: State = {};
 
@@ -119,34 +107,32 @@ export class ValidatedDualRange extends Component<Props> {
     } = this.props;
 
     return (
-      <div ref={this.trackRef}>
-        <EuiFormRow
+      <EuiFormRow
+        compressed={compressed}
+        fullWidth={fullWidth}
+        isInvalid={!this.state.isValid}
+        error={this.state.errorMessage ? [this.state.errorMessage] : []}
+        label={label}
+        display={formRowDisplay}
+      >
+        <EuiDualRange
           compressed={compressed}
           fullWidth={fullWidth}
-          isInvalid={!this.state.isValid}
-          error={this.state.errorMessage ? [this.state.errorMessage] : []}
-          label={label}
-          display={formRowDisplay}
-        >
-          <EuiDualRange
-            compressed={compressed}
-            fullWidth={fullWidth}
-            value={this.state.value}
-            onChange={this._onChange}
-            minInputProps={{
-              'aria-label': i18n.translate('kibana-react.dualRangeControl.minInputAriaLabel', {
-                defaultMessage: 'Range minimum',
-              }),
-            }}
-            maxInputProps={{
-              'aria-label': i18n.translate('kibana-react.dualRangeControl.maxInputAriaLabel', {
-                defaultMessage: 'Range maximum',
-              }),
-            }}
-            {...rest}
-          />
-        </EuiFormRow>
-      </div>
+          value={this.state.value}
+          onChange={this._onChange}
+          minInputProps={{
+            'aria-label': i18n.translate('kibana-react.dualRangeControl.minInputAriaLabel', {
+              defaultMessage: 'Range minimum',
+            }),
+          }}
+          maxInputProps={{
+            'aria-label': i18n.translate('kibana-react.dualRangeControl.maxInputAriaLabel', {
+              defaultMessage: 'Range maximum',
+            }),
+          }}
+          {...rest}
+        />
+      </EuiFormRow>
     );
   }
 }
diff --git a/src/plugins/kibana_usage_collection/common/constants.ts b/src/plugins/kibana_usage_collection/common/constants.ts
index df0adfc52184b5..c4e7eaac51cf46 100644
--- a/src/plugins/kibana_usage_collection/common/constants.ts
+++ b/src/plugins/kibana_usage_collection/common/constants.ts
@@ -20,27 +20,6 @@
 export const PLUGIN_ID = 'kibanaUsageCollection';
 export const PLUGIN_NAME = 'kibana_usage_collection';
 
-/**
- * UI metric usage type
- */
-export const UI_METRIC_USAGE_TYPE = 'ui_metric';
-
-/**
- * Application Usage type
- */
-export const APPLICATION_USAGE_TYPE = 'application_usage';
-
-/**
- * The type name used within the Monitoring index to publish management stats.
- */
-export const KIBANA_STACK_MANAGEMENT_STATS_TYPE = 'stack_management';
-
-/**
- * The type name used to publish Kibana usage stats.
- * NOTE: this string shows as-is in the stats API as a field name for the kibana usage stats
- */
-export const KIBANA_USAGE_TYPE = 'kibana';
-
 /**
  * The type name used to publish Kibana usage stats in the formatted as bulk.
  */
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts
index f52687038bbbca..1f22ab01001010 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts
@@ -20,7 +20,6 @@
 import moment from 'moment';
 import { ISavedObjectsRepository, SavedObjectsServiceSetup } from 'kibana/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { APPLICATION_USAGE_TYPE } from '../../../common/constants';
 import { findAll } from '../find_all';
 import {
   ApplicationUsageTotal,
@@ -62,7 +61,7 @@ export function registerApplicationUsageCollector(
   registerMappings(registerType);
 
   const collector = usageCollection.makeUsageCollector({
-    type: APPLICATION_USAGE_TYPE,
+    type: 'application_usage',
     isReady: () => typeof getSavedObjectsClient() !== 'undefined',
     fetch: async () => {
       const savedObjectsClient = getSavedObjectsClient();
diff --git a/src/plugins/kibana_usage_collection/server/collectors/kibana/get_saved_object_counts.ts b/src/plugins/kibana_usage_collection/server/collectors/kibana/get_saved_object_counts.ts
index 804c8b0ed2026e..1adc0dc6896fda 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/kibana/get_saved_object_counts.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/kibana/get_saved_object_counts.ts
@@ -27,7 +27,7 @@
  */
 
 import { snakeCase } from 'lodash';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 const TYPES = [
   'dashboard',
@@ -45,7 +45,7 @@ export interface KibanaSavedObjectCounts {
 }
 
 export async function getSavedObjectsCounts(
-  callCluster: APICaller,
+  callCluster: LegacyAPICaller,
   kibanaIndex: string // Typically '.kibana'. We might need a way to obtain it from the SavedObjects client (or the SavedObjects client to provide a way to run aggregations?)
 ): Promise<KibanaSavedObjectCounts> {
   const savedObjectCountSearchParams = {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/kibana/kibana_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/kibana/kibana_usage_collector.ts
index d0da6fcc523cc4..9cc079a9325d53 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/kibana/kibana_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/kibana/kibana_usage_collector.ts
@@ -21,7 +21,7 @@ import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { SharedGlobalConfig } from 'kibana/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { KIBANA_STATS_TYPE, KIBANA_USAGE_TYPE } from '../../../common/constants';
+import { KIBANA_STATS_TYPE } from '../../../common/constants';
 import { getSavedObjectsCounts } from './get_saved_object_counts';
 
 export function getKibanaUsageCollector(
@@ -29,7 +29,7 @@ export function getKibanaUsageCollector(
   legacyConfig$: Observable<SharedGlobalConfig>
 ) {
   return usageCollection.makeUsageCollector({
-    type: KIBANA_USAGE_TYPE,
+    type: 'kibana',
     isReady: () => true,
     async fetch(callCluster) {
       const {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts
index 39cd3518849550..3a777beebd90a7 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts
@@ -19,7 +19,6 @@
 
 import { IUiSettingsClient } from 'kibana/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { KIBANA_STACK_MANAGEMENT_STATS_TYPE } from '../../../common/constants';
 
 export type UsageStats = Record<string, any>;
 
@@ -47,7 +46,7 @@ export function registerManagementUsageCollector(
   getUiSettingsClient: () => IUiSettingsClient | undefined
 ) {
   const collector = usageCollection.makeUsageCollector({
-    type: KIBANA_STACK_MANAGEMENT_STATS_TYPE,
+    type: 'stack_management',
     isReady: () => typeof getUiSettingsClient() !== 'undefined',
     fetch: createCollectorFetch(getUiSettingsClient),
   });
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
index 603742f612a6bd..ec2f1bfdfc25f9 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
@@ -23,7 +23,6 @@ import {
   SavedObjectsServiceSetup,
 } from 'kibana/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { UI_METRIC_USAGE_TYPE } from '../../../common/constants';
 import { findAll } from '../find_all';
 
 interface UIMetricsSavedObjects extends SavedObjectAttributes {
@@ -49,7 +48,7 @@ export function registerUiMetricUsageCollector(
   });
 
   const collector = usageCollection.makeUsageCollector({
-    type: UI_METRIC_USAGE_TYPE,
+    type: 'ui_metric',
     fetch: async () => {
       const savedObjectsClient = getSavedObjectsClient();
       if (typeof savedObjectsClient === 'undefined') {
diff --git a/src/plugins/kibana_utils/common/index.ts b/src/plugins/kibana_utils/common/index.ts
index 99daed98dbe640..c94021872b4e10 100644
--- a/src/plugins/kibana_utils/common/index.ts
+++ b/src/plugins/kibana_utils/common/index.ts
@@ -28,4 +28,3 @@ export { distinctUntilChangedWithInitialValue } from './distinct_until_changed_w
 export { url } from './url';
 export { now } from './now';
 export { calculateObjectHash } from './calculate_object_hash';
-export { defaultFeedbackMessage } from './default_feedback_message';
diff --git a/src/plugins/kibana_utils/public/index.ts b/src/plugins/kibana_utils/public/index.ts
index 6f61e2c228970d..2911a9ae75689d 100644
--- a/src/plugins/kibana_utils/public/index.ts
+++ b/src/plugins/kibana_utils/public/index.ts
@@ -31,7 +31,6 @@ export {
   UiComponentInstance,
   url,
   createGetterSetter,
-  defaultFeedbackMessage,
 } from '../common';
 export * from './core';
 export * from '../common/errors';
diff --git a/src/plugins/management/public/management_sections_service.test.ts b/src/plugins/management/public/management_sections_service.test.ts
index 2c5d04883235c7..fd56dd8a6ee274 100644
--- a/src/plugins/management/public/management_sections_service.test.ts
+++ b/src/plugins/management/public/management_sections_service.test.ts
@@ -27,9 +27,15 @@ describe('ManagementService', () => {
     managementService = new ManagementSectionsService();
   });
 
+  const capabilities = {
+    navLinks: {},
+    catalogue: {},
+    management: {},
+  };
+
   test('Provides default sections', () => {
     managementService.setup();
-    const start = managementService.start();
+    const start = managementService.start({ capabilities });
 
     expect(start.getAllSections().length).toEqual(6);
     expect(start.getSection(ManagementSectionId.Ingest)).toBeDefined();
@@ -48,7 +54,7 @@ describe('ManagementService', () => {
     expect(setup.getSection('test-section')).not.toBeUndefined();
 
     // Start phase:
-    const start = managementService.start();
+    const start = managementService.start({ capabilities });
 
     expect(start.getSectionsEnabled().length).toEqual(7);
 
@@ -56,4 +62,38 @@ describe('ManagementService', () => {
 
     expect(start.getSectionsEnabled().length).toEqual(6);
   });
+
+  test('Disables items that are not allowed by Capabilities', () => {
+    // Setup phase:
+    const setup = managementService.setup();
+    const testSection = setup.register({ id: 'test-section', title: 'Test Section' });
+    testSection.registerApp({ id: 'test-app-1', title: 'Test App 1', mount: jest.fn() });
+    testSection.registerApp({ id: 'test-app-2', title: 'Test App 2', mount: jest.fn() });
+    testSection.registerApp({ id: 'test-app-3', title: 'Test App 3', mount: jest.fn() });
+
+    expect(setup.getSection('test-section')).not.toBeUndefined();
+
+    // Start phase:
+    managementService.start({
+      capabilities: {
+        navLinks: {},
+        catalogue: {},
+        management: {
+          ['test-section']: {
+            'test-app-1': true,
+            'test-app-2': false,
+            // test-app-3 intentionally left undefined. Should be enabled by default
+          },
+        },
+      },
+    });
+
+    expect(testSection.apps).toHaveLength(3);
+    expect(testSection.getAppsEnabled().map((app) => app.id)).toMatchInlineSnapshot(`
+      Array [
+        "test-app-1",
+        "test-app-3",
+      ]
+    `);
+  });
 });
diff --git a/src/plugins/management/public/management_sections_service.ts b/src/plugins/management/public/management_sections_service.ts
index 08a87b3e89f2ba..d8d148a9247fff 100644
--- a/src/plugins/management/public/management_sections_service.ts
+++ b/src/plugins/management/public/management_sections_service.ts
@@ -21,7 +21,12 @@ import { ReactElement } from 'react';
 import { ManagementSection, RegisterManagementSectionArgs } from './utils';
 import { managementSections } from './components/management_sections';
 
-import { ManagementSectionId, SectionsServiceSetup, SectionsServiceStart } from './types';
+import {
+  ManagementSectionId,
+  SectionsServiceSetup,
+  SectionsServiceStart,
+  SectionsServiceStartDeps,
+} from './types';
 
 export class ManagementSectionsService {
   private sections: Map<ManagementSectionId | string, ManagementSection> = new Map();
@@ -55,7 +60,18 @@ export class ManagementSectionsService {
     };
   }
 
-  start(): SectionsServiceStart {
+  start({ capabilities }: SectionsServiceStartDeps): SectionsServiceStart {
+    this.getAllSections().forEach((section) => {
+      if (capabilities.management.hasOwnProperty(section.id)) {
+        const sectionCapabilities = capabilities.management[section.id];
+        section.apps.forEach((app) => {
+          if (sectionCapabilities.hasOwnProperty(app.id) && sectionCapabilities[app.id] !== true) {
+            app.disable();
+          }
+        });
+      }
+    });
+
     return {
       getSection: this.getSection,
       getAllSections: this.getAllSections,
diff --git a/src/plugins/management/public/plugin.ts b/src/plugins/management/public/plugin.ts
index 71656d7c0b83ba..dada4636e6add9 100644
--- a/src/plugins/management/public/plugin.ts
+++ b/src/plugins/management/public/plugin.ts
@@ -82,7 +82,7 @@ export class ManagementPlugin implements Plugin<ManagementSetup, ManagementStart
 
   public start(core: CoreStart) {
     return {
-      sections: this.managementSections.start(),
+      sections: this.managementSections.start({ capabilities: core.application.capabilities }),
     };
   }
 }
diff --git a/src/plugins/management/public/types.ts b/src/plugins/management/public/types.ts
index 54ed598ae57d9a..9cfbd74a548a8f 100644
--- a/src/plugins/management/public/types.ts
+++ b/src/plugins/management/public/types.ts
@@ -18,7 +18,7 @@
  */
 
 import { ReactElement } from 'react';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory, Capabilities } from 'kibana/public';
 import { ManagementSection, RegisterManagementSectionArgs } from './utils';
 import { ChromeBreadcrumb } from '../../../core/public/';
 
@@ -30,8 +30,12 @@ export interface ManagementStart {
   sections: SectionsServiceStart;
 }
 
+export interface SectionsServiceStartDeps {
+  capabilities: Capabilities;
+}
+
 export interface SectionsServiceSetup {
-  register: (args: RegisterManagementSectionArgs) => ManagementSection;
+  register: (args: Omit<RegisterManagementSectionArgs, 'capabilities'>) => ManagementSection;
   getSection: (sectionId: ManagementSectionId | string) => ManagementSection;
 }
 
diff --git a/src/plugins/management/server/capabilities_provider.ts b/src/plugins/management/server/capabilities_provider.ts
index 9a69749c8233b4..254ac3ed04dd73 100644
--- a/src/plugins/management/server/capabilities_provider.ts
+++ b/src/plugins/management/server/capabilities_provider.ts
@@ -25,7 +25,7 @@ export const capabilitiesProvider = () => ({
      */
     kibana: {
       settings: true,
-      index_patterns: true,
+      indexPatterns: true,
       objects: true,
     },
   },
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx
index 2b7466ffd6ab37..a1653c52892554 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx
@@ -19,7 +19,7 @@
 
 import { ButtonIconSide } from '@elastic/eui';
 
-export type TopNavMenuAction = (anchorElement: EventTarget) => void;
+export type TopNavMenuAction = (anchorElement: HTMLElement) => void;
 
 export interface TopNavMenuData {
   id?: string;
@@ -29,7 +29,7 @@ export interface TopNavMenuData {
   testId?: string;
   className?: string;
   disableButton?: boolean | (() => boolean);
-  tooltip?: string | (() => string);
+  tooltip?: string | (() => string | undefined);
   emphasize?: boolean;
   iconType?: string;
   iconSide?: ButtonIconSide;
diff --git a/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts b/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts
index 53ef1f3f04ad9b..9e7346f3b673cd 100644
--- a/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts
+++ b/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts
@@ -51,14 +51,17 @@ export class SavedObjectLoader {
   }
 
   /**
-   * Retrieve a saved object by id. Returns a promise that completes when the object finishes
+   * Retrieve a saved object by id or create new one.
+   * Returns a promise that completes when the object finishes
    * initializing.
-   * @param id
+   * @param opts
    * @returns {Promise<SavedObject>}
    */
-  async get(id?: string) {
+  async get(opts?: Record<string, unknown> | string) {
+    // can accept object as argument in accordance to SavedVis class
+    // see src/plugins/saved_objects/public/saved_object/saved_object_loader.ts
     // @ts-ignore
-    const obj = new this.Class(id);
+    const obj = new this.Class(opts);
     return obj.init();
   }
 
diff --git a/src/plugins/saved_objects/public/types.ts b/src/plugins/saved_objects/public/types.ts
index 973a493c0a15e9..6db72b396a86ae 100644
--- a/src/plugins/saved_objects/public/types.ts
+++ b/src/plugins/saved_objects/public/types.ts
@@ -63,6 +63,7 @@ export interface SavedObjectSaveOpts {
   confirmOverwrite?: boolean;
   isTitleDuplicateConfirmed?: boolean;
   onTitleDuplicate?: () => void;
+  returnToOrigin?: boolean;
 }
 
 export interface SavedObjectCreationOpts {
diff --git a/src/plugins/saved_objects_management/public/lib/in_app_url.test.ts b/src/plugins/saved_objects_management/public/lib/in_app_url.test.ts
index 09e08e6ec333b0..e83952e82c953e 100644
--- a/src/plugins/saved_objects_management/public/lib/in_app_url.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/in_app_url.test.ts
@@ -70,7 +70,7 @@ describe('canViewInApp', () => {
     let uiCapabilities = createCapabilities({
       management: {
         kibana: {
-          index_patterns: true,
+          indexPatterns: true,
         },
       },
     });
@@ -81,7 +81,7 @@ describe('canViewInApp', () => {
     uiCapabilities = createCapabilities({
       management: {
         kibana: {
-          index_patterns: false,
+          indexPatterns: false,
         },
       },
     });
diff --git a/src/plugins/saved_objects_management/public/lib/in_app_url.ts b/src/plugins/saved_objects_management/public/lib/in_app_url.ts
index 82146554afa6ff..0fcf52cba254b5 100644
--- a/src/plugins/saved_objects_management/public/lib/in_app_url.ts
+++ b/src/plugins/saved_objects_management/public/lib/in_app_url.ts
@@ -30,7 +30,7 @@ export function canViewInApp(uiCapabilities: Capabilities, type: string): boolea
     case 'index-pattern':
     case 'index-patterns':
     case 'indexPatterns':
-      return uiCapabilities.management.kibana.index_patterns as boolean;
+      return uiCapabilities.management.kibana.indexPatterns as boolean;
     case 'dashboard':
     case 'dashboards':
       return uiCapabilities.dashboard.show as boolean;
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
index 884f39b97e2335..7d43158ad8878e 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
@@ -304,7 +304,7 @@ exports[`SavedObjectsTable should render normally 1`] = `
               "icon": "indexPatternApp",
               "inAppUrl": Object {
                 "path": "/management/kibana/indexPatterns/patterns/1",
-                "uiCapabilitiesPath": "management.kibana.index_patterns",
+                "uiCapabilitiesPath": "management.kibana.indexPatterns",
               },
               "title": "MyIndexPattern*",
             },
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
index 6eb9e36394ee31..15e5cb89b622c6 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
@@ -456,7 +456,7 @@ exports[`Relationships should render searches normally 1`] = `
                 "icon": "indexPatternApp",
                 "inAppUrl": Object {
                   "path": "/app/management/kibana/indexPatterns/patterns/1",
-                  "uiCapabilitiesPath": "management.kibana.index_patterns",
+                  "uiCapabilitiesPath": "management.kibana.indexPatterns",
                 },
                 "title": "My Index Pattern",
               },
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
index 92e4e637e0d3fe..56fddc075a50c9 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
@@ -178,7 +178,7 @@ exports[`Table prevents saved objects from being deleted 1`] = `
               "icon": "indexPatternApp",
               "inAppUrl": Object {
                 "path": "/management/kibana/indexPatterns/patterns/1",
-                "uiCapabilitiesPath": "management.kibana.index_patterns",
+                "uiCapabilitiesPath": "management.kibana.indexPatterns",
               },
               "title": "MyIndexPattern*",
             },
@@ -393,7 +393,7 @@ exports[`Table should render normally 1`] = `
               "icon": "indexPatternApp",
               "inAppUrl": Object {
                 "path": "/management/kibana/indexPatterns/patterns/1",
-                "uiCapabilitiesPath": "management.kibana.index_patterns",
+                "uiCapabilitiesPath": "management.kibana.indexPatterns",
               },
               "title": "MyIndexPattern*",
             },
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
index 9277d9b00305b1..2e545b372f781b 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
@@ -77,7 +77,7 @@ describe('Relationships', () => {
           editUrl: '#/management/kibana/indexPatterns/patterns/1',
           inAppUrl: {
             path: '/management/kibana/indexPatterns/patterns/1',
-            uiCapabilitiesPath: 'management.kibana.index_patterns',
+            uiCapabilitiesPath: 'management.kibana.indexPatterns',
           },
         },
       },
@@ -113,7 +113,7 @@ describe('Relationships', () => {
             icon: 'indexPatternApp',
             inAppUrl: {
               path: '/app/management/kibana/indexPatterns/patterns/1',
-              uiCapabilitiesPath: 'management.kibana.index_patterns',
+              uiCapabilitiesPath: 'management.kibana.indexPatterns',
             },
             title: 'My Index Pattern',
           },
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
index b9dad983cb42d4..6b25a1b0c1f256 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
@@ -41,7 +41,7 @@ const defaultProps: TableProps = {
         editUrl: '#/management/kibana/indexPatterns/patterns/1',
         inAppUrl: {
           path: '/management/kibana/indexPatterns/patterns/1',
-          uiCapabilitiesPath: 'management.kibana.index_patterns',
+          uiCapabilitiesPath: 'management.kibana.indexPatterns',
         },
       },
     },
@@ -68,7 +68,7 @@ const defaultProps: TableProps = {
         editUrl: '#/management/kibana/indexPatterns/patterns/1',
         inAppUrl: {
           path: '/management/kibana/indexPatterns/patterns/1',
-          uiCapabilitiesPath: 'management.kibana.index_patterns',
+          uiCapabilitiesPath: 'management.kibana.indexPatterns',
         },
       },
     },
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
index e3456240dc340f..3719dac24e6e70 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
@@ -158,7 +158,7 @@ describe('SavedObjectsTable', () => {
             editUrl: '#/management/kibana/indexPatterns/patterns/1',
             inAppUrl: {
               path: '/management/kibana/indexPatterns/patterns/1',
-              uiCapabilitiesPath: 'management.kibana.index_patterns',
+              uiCapabilitiesPath: 'management.kibana.indexPatterns',
             },
           },
         },
diff --git a/src/plugins/telemetry/common/constants.ts b/src/plugins/telemetry/common/constants.ts
index 53c79b738f750e..fc77332c18fc90 100644
--- a/src/plugins/telemetry/common/constants.ts
+++ b/src/plugins/telemetry/common/constants.ts
@@ -56,11 +56,6 @@ export const PATH_TO_ADVANCED_SETTINGS = 'management/kibana/settings';
  */
 export const PRIVACY_STATEMENT_URL = `https://www.elastic.co/legal/privacy-statement`;
 
-/**
- * The type name used to publish telemetry plugin stats.
- */
-export const TELEMETRY_STATS_TYPE = 'telemetry';
-
 /**
  * The endpoint version when hitting the remote telemetry service
  */
diff --git a/src/plugins/telemetry/schema/legacy_oss_plugins.json b/src/plugins/telemetry/schema/legacy_oss_plugins.json
new file mode 100644
index 00000000000000..e660ccac9dc36b
--- /dev/null
+++ b/src/plugins/telemetry/schema/legacy_oss_plugins.json
@@ -0,0 +1,17 @@
+{
+  "properties": {
+    "csp": {
+      "properties": {
+        "strict": {
+          "type": "boolean"
+        },
+        "warnLegacyBrowsers": {
+          "type": "boolean"
+        },
+        "rulesChangedFromDefault": {
+          "type": "boolean"
+        }
+      }
+    }
+  }
+}
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
new file mode 100644
index 00000000000000..a5172c01b1dad2
--- /dev/null
+++ b/src/plugins/telemetry/schema/oss_plugins.json
@@ -0,0 +1,59 @@
+{
+  "properties": {
+    "kql": {
+      "properties": {
+        "optInCount": {
+          "type": "long"
+        },
+        "optOutCount": {
+          "type": "long"
+        },
+        "defaultQueryLanguage": {
+          "type": "keyword"
+        }
+      }
+    },
+    "sample-data": {
+      "properties": {
+        "installed": {
+          "type": "keyword"
+        },
+        "last_install_date": {
+          "type": "date"
+        },
+        "last_install_set": {
+          "type": "keyword"
+        },
+        "last_uninstall_date": {
+          "type": "date"
+        },
+        "last_uninstall_set": {
+          "type": "keyword"
+        },
+        "uninstalled": {
+          "type": "keyword"
+        }
+      }
+    },
+    "telemetry": {
+      "properties": {
+        "opt_in_status": {
+          "type": "boolean"
+        },
+        "usage_fetcher": {
+          "type": "keyword"
+        },
+        "last_reported": {
+          "type": "long"
+        }
+      }
+    },
+    "tsvb-validation": {
+      "properties": {
+        "failed_validations": {
+          "type": "long"
+        }
+      }
+    }
+  }
+}
diff --git a/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts b/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
index ab90935266d69e..05836b8448a688 100644
--- a/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
+++ b/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
@@ -20,7 +20,6 @@
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { ISavedObjectsRepository, SavedObjectsClient } from '../../../../../core/server';
-import { TELEMETRY_STATS_TYPE } from '../../../common/constants';
 import { getTelemetrySavedObject, TelemetrySavedObject } from '../../telemetry_repository';
 import { getTelemetryOptIn, getTelemetrySendUsageFrom } from '../../../common/telemetry_config';
 import { UsageCollectionSetup } from '../../../../usage_collection/server';
@@ -81,10 +80,15 @@ export function registerTelemetryPluginUsageCollector(
   usageCollection: UsageCollectionSetup,
   options: TelemetryPluginUsageCollectorOptions
 ) {
-  const collector = usageCollection.makeUsageCollector({
-    type: TELEMETRY_STATS_TYPE,
+  const collector = usageCollection.makeUsageCollector<TelemetryUsageStats>({
+    type: 'telemetry',
     isReady: () => typeof options.getSavedObjectsClient() !== 'undefined',
     fetch: createCollectorFetch(options),
+    schema: {
+      opt_in_status: { type: 'boolean' },
+      usage_fetcher: { type: 'keyword' },
+      last_reported: { type: 'long' },
+    },
   });
 
   usageCollection.registerCollector(collector);
diff --git a/src/plugins/telemetry/server/fetcher.ts b/src/plugins/telemetry/server/fetcher.ts
index 9422df60305184..75cfac721bcd3b 100644
--- a/src/plugins/telemetry/server/fetcher.ts
+++ b/src/plugins/telemetry/server/fetcher.ts
@@ -29,7 +29,7 @@ import {
   SavedObjectsClientContract,
   SavedObjectsClient,
   CoreStart,
-  ICustomClusterClient,
+  ILegacyCustomClusterClient,
 } from '../../../core/server';
 import {
   getTelemetryOptIn,
@@ -63,7 +63,7 @@ export class FetcherTask {
   private isSending = false;
   private internalRepository?: SavedObjectsClientContract;
   private telemetryCollectionManager?: TelemetryCollectionManagerPluginStart;
-  private elasticsearchClient?: ICustomClusterClient;
+  private elasticsearchClient?: ILegacyCustomClusterClient;
 
   constructor(initializerContext: PluginInitializerContext<TelemetryConfigType>) {
     this.config$ = initializerContext.config.create();
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts b/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
index d5f0d2d8c9598d..4a33356ee97614 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 // This can be removed when the ES client improves the types
 export interface ESClusterInfo {
@@ -43,6 +43,6 @@ export interface ESClusterInfo {
  *
  * @param {function} callCluster The callWithInternalUser handler (exposed for testing)
  */
-export function getClusterInfo(callCluster: APICaller) {
+export function getClusterInfo(callCluster: LegacyAPICaller) {
   return callCluster<ESClusterInfo>('info');
 }
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts b/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
index 89e2cae7779856..d7c0110a99c6fd 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
@@ -18,14 +18,14 @@
  */
 
 import { ClusterDetailsGetter } from 'src/plugins/telemetry_collection_manager/server';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { TIMEOUT } from './constants';
 /**
  * Get the cluster stats from the connected cluster.
  *
  * This is the equivalent to GET /_cluster/stats?timeout=30s.
  */
-export async function getClusterStats(callCluster: APICaller) {
+export async function getClusterStats(callCluster: LegacyAPICaller) {
   return await callCluster('cluster.stats', {
     timeout: TIMEOUT,
   });
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
index 645c5a4be8a6cb..5d27774a630a59 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
@@ -19,7 +19,7 @@
 
 import { omit } from 'lodash';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { StatsCollectionContext } from 'src/plugins/telemetry_collection_manager/server';
 
 export interface KibanaUsageStats {
@@ -83,7 +83,7 @@ export function handleKibanaStats(
 
 export async function getKibana(
   usageCollection: UsageCollectionSetup,
-  callWithInternalUser: APICaller
+  callWithInternalUser: LegacyAPICaller
 ): Promise<KibanaUsageStats> {
   const usage = await usageCollection.bulkFetch(callWithInternalUser);
   return usageCollection.toObject(usage);
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_local_license.ts b/src/plugins/telemetry/server/telemetry_collection/get_local_license.ts
index 0ba6fcc154d8bd..d41904c6d8e0e8 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_local_license.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_local_license.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { ESLicense, LicenseGetter } from 'src/plugins/telemetry_collection_manager/server';
 
 let cachedLicense: ESLicense | undefined;
 
-function fetchLicense(callCluster: APICaller, local: boolean) {
+function fetchLicense(callCluster: LegacyAPICaller, local: boolean) {
   return callCluster<{ license: ESLicense }>('transport.request', {
     method: 'GET',
     path: '/_license',
@@ -41,7 +41,7 @@ function fetchLicense(callCluster: APICaller, local: boolean) {
  *
  * Like any X-Pack related API, X-Pack must installed for this to work.
  */
-async function getLicenseFromLocalOrMaster(callCluster: APICaller) {
+async function getLicenseFromLocalOrMaster(callCluster: LegacyAPICaller) {
   // Fetching the local license is cheaper than getting it from the master and good enough
   const { license } = await fetchLicense(callCluster, true).catch(async (err) => {
     if (cachedLicense) {
diff --git a/src/plugins/telemetry/server/telemetry_collection/register_collection.ts b/src/plugins/telemetry/server/telemetry_collection/register_collection.ts
index 833fd9f7fd5bca..438fcadad92555 100644
--- a/src/plugins/telemetry/server/telemetry_collection/register_collection.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/register_collection.ts
@@ -36,7 +36,7 @@
  * under the License.
  */
 
-import { IClusterClient } from 'kibana/server';
+import { ILegacyClusterClient } from 'kibana/server';
 import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
 import { getLocalStats } from './get_local_stats';
 import { getClusterUuids } from './get_cluster_stats';
@@ -44,7 +44,7 @@ import { getLocalLicense } from './get_local_license';
 
 export function registerCollection(
   telemetryCollectionManager: TelemetryCollectionManagerPluginSetup,
-  esCluster: IClusterClient
+  esCluster: ILegacyClusterClient
 ) {
   telemetryCollectionManager.setCollection({
     esCluster,
diff --git a/src/plugins/telemetry_collection_manager/server/types.ts b/src/plugins/telemetry_collection_manager/server/types.ts
index d3a47694d38a76..16f96c07fd8ead 100644
--- a/src/plugins/telemetry_collection_manager/server/types.ts
+++ b/src/plugins/telemetry_collection_manager/server/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { APICaller, Logger, KibanaRequest, IClusterClient } from 'kibana/server';
+import { LegacyAPICaller, Logger, KibanaRequest, ILegacyClusterClient } from 'kibana/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { TelemetryCollectionManagerPlugin } from './plugin';
 
@@ -64,7 +64,7 @@ export interface ClusterDetails {
 
 export interface StatsCollectionConfig {
   usageCollection: UsageCollectionSetup;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   start: string | number;
   end: string | number;
 }
@@ -129,7 +129,7 @@ export interface CollectionConfig<
 > {
   title: string;
   priority: number;
-  esCluster: IClusterClient;
+  esCluster: ILegacyClusterClient;
   statsGetter: StatsGetter<CustomContext, T>;
   clusterDetailsGetter: ClusterDetailsGetter<CustomContext>;
   licenseGetter: LicenseGetter<CustomContext>;
@@ -144,6 +144,6 @@ export interface Collection<
   statsGetter: StatsGetter<CustomContext, T>;
   licenseGetter: LicenseGetter<CustomContext>;
   clusterDetailsGetter: ClusterDetailsGetter<CustomContext>;
-  esCluster: IClusterClient;
+  esCluster: ILegacyClusterClient;
   title: string;
 }
diff --git a/src/plugins/usage_collection/README.md b/src/plugins/usage_collection/README.md
index 99075d5d48f596..9520dfc03cfa47 100644
--- a/src/plugins/usage_collection/README.md
+++ b/src/plugins/usage_collection/README.md
@@ -8,7 +8,7 @@ To integrate with the telemetry services for usage collection of your feature, t
 
 ## Creating and Registering Usage Collector
 
-All you need to provide is a `type` for organizing your fields, and a `fetch` method for returning your usage data. Then you need to make the Telemetry service aware of the collector by registering it.
+All you need to provide is a `type` for organizing your fields, `schema` field to define the expected types of usage fields reported, and a `fetch` method for returning your usage data. Then you need to make the Telemetry service aware of the collector by registering it.
 
 ### New Platform
 
@@ -45,6 +45,12 @@ All you need to provide is a `type` for organizing your fields, and a `fetch` me
     import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
     import { APICluster } from 'kibana/server';
 
+    interface Usage {
+      my_objects: {
+        total: number,
+      },
+    }
+
     export function registerMyPluginUsageCollector(usageCollection?: UsageCollectionSetup): void {
       // usageCollection is an optional dependency, so make sure to return if it is not registered.
       if (!usageCollection) {
@@ -52,8 +58,13 @@ All you need to provide is a `type` for organizing your fields, and a `fetch` me
       }
 
       // create usage collector
-      const myCollector = usageCollection.makeUsageCollector({
+      const myCollector = usageCollection.makeUsageCollector<Usage>({
         type: MY_USAGE_TYPE,
+        schema: {
+          my_objects: {
+            total: 'long',
+          },
+        },
         fetch: async (callCluster: APICluster) => {
 
         // query ES and get some data
@@ -98,10 +109,8 @@ class Plugin {
 ```ts
 // server/collectors/register.ts
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { ISavedObjectsRepository } from 'kibana/server';
 
 export function registerMyPluginUsageCollector(
-  getSavedObjectsRepository: () => ISavedObjectsRepository | undefined,
   usageCollection?: UsageCollectionSetup
   ): void {
   // usageCollection is an optional dependency, so make sure to return if it is not registered.
@@ -110,22 +119,52 @@ export function registerMyPluginUsageCollector(
   }
 
   // create usage collector
-  const myCollector = usageCollection.makeUsageCollector({
-    type: MY_USAGE_TYPE,
-    isReady: () => typeof getSavedObjectsRepository() !== 'undefined',
-    fetch: async () => {
-      const savedObjectsRepository = getSavedObjectsRepository()!;
-      // get something from the savedObjects
-
-      return { my_objects };
-    },
-  });
+  const myCollector = usageCollection.makeUsageCollector<Usage>(...)
 
   // register usage collector
   usageCollection.registerCollector(myCollector);
 }
 ```
 
+## Schema Field
+
+The `schema` field is a proscribed data model assists with detecting changes in usage collector payloads. To define the collector schema add a schema field that specifies every possible field reported when registering the collector. Whenever the `schema` field is set or changed please run `node scripts/telemetry_check.js --fix` to update the stored schema json files.
+
+### Allowed Schema Types
+
+The `AllowedSchemaTypes` is the list of allowed schema types for the usage fields getting reported:
+
+```
+'keyword', 'text', 'number', 'boolean', 'long', 'date', 'float'
+```
+
+### Example
+
+```ts
+export const myCollector = makeUsageCollector<Usage>({
+  type: 'my_working_collector',
+  isReady: () => true,
+  fetch() {
+    return {
+      my_greeting: 'hello',
+      some_obj: {
+        total: 123,
+      },
+    };
+  },
+  schema: {
+    my_greeting: {
+      type: 'keyword',
+    },
+    some_obj: {
+      total: {
+        type: 'number',
+      },
+    },
+  },
+});
+```
+
 ## Update the telemetry payload and telemetry cluster field mappings
 
 There is a module in the telemetry service that creates the payload of data that gets sent up to the telemetry cluster.
diff --git a/src/plugins/usage_collection/server/collector/collector.ts b/src/plugins/usage_collection/server/collector/collector.ts
index b4f86f67e798d0..9ae63b9f50e429 100644
--- a/src/plugins/usage_collection/server/collector/collector.ts
+++ b/src/plugins/usage_collection/server/collector/collector.ts
@@ -17,14 +17,38 @@
  * under the License.
  */
 
-import { Logger, APICaller } from 'kibana/server';
+import { Logger, LegacyAPICaller } from 'kibana/server';
 
 export type CollectorFormatForBulkUpload<T, U> = (result: T) => { type: string; payload: U };
 
+export type AllowedSchemaTypes =
+  | 'keyword'
+  | 'text'
+  | 'number'
+  | 'boolean'
+  | 'long'
+  | 'date'
+  | 'float';
+
+export interface SchemaField {
+  type: string;
+}
+
+type Purify<T extends string> = { [P in T]: T }[T];
+
+export type MakeSchemaFrom<Base> = {
+  [Key in Purify<Extract<keyof Base, string>>]: Base[Key] extends Array<infer U>
+    ? { type: AllowedSchemaTypes }
+    : Base[Key] extends object
+    ? MakeSchemaFrom<Base[Key]>
+    : { type: AllowedSchemaTypes };
+};
+
 export interface CollectorOptions<T = unknown, U = T> {
   type: string;
   init?: Function;
-  fetch: (callCluster: APICaller) => Promise<T> | T;
+  schema?: MakeSchemaFrom<T>;
+  fetch: (callCluster: LegacyAPICaller) => Promise<T> | T;
   /*
    * A hook for allowing the fetched data payload to be organized into a typed
    * data model for internal bulk upload. See defaultFormatterForBulkUpload for
diff --git a/src/plugins/usage_collection/server/collector/collector_set.ts b/src/plugins/usage_collection/server/collector/collector_set.ts
index e8791138c5e265..b6308d66033885 100644
--- a/src/plugins/usage_collection/server/collector/collector_set.ts
+++ b/src/plugins/usage_collection/server/collector/collector_set.ts
@@ -18,7 +18,7 @@
  */
 
 import { snakeCase } from 'lodash';
-import { Logger, APICaller } from 'kibana/server';
+import { Logger, LegacyAPICaller } from 'kibana/server';
 import { Collector, CollectorOptions } from './collector';
 import { UsageCollector } from './usage_collector';
 
@@ -42,7 +42,7 @@ export class CollectorSet {
   public makeStatsCollector = <T, U>(options: CollectorOptions<T, U>) => {
     return new Collector(this.logger, options);
   };
-  public makeUsageCollector = <T, U>(options: CollectorOptions<T, U>) => {
+  public makeUsageCollector = <T, U = T>(options: CollectorOptions<T, U>) => {
     return new UsageCollector(this.logger, options);
   };
 
@@ -112,7 +112,7 @@ export class CollectorSet {
   };
 
   public bulkFetch = async (
-    callCluster: APICaller,
+    callCluster: LegacyAPICaller,
     collectors: Array<Collector<any, any>> = this.collectors
   ) => {
     const responses = [];
@@ -140,7 +140,7 @@ export class CollectorSet {
     return this.makeCollectorSetFromArray(filtered);
   };
 
-  public bulkFetchUsage = async (callCluster: APICaller) => {
+  public bulkFetchUsage = async (callCluster: LegacyAPICaller) => {
     const usageCollectors = this.getFilteredCollectorSet((c) => c instanceof UsageCollector);
     return await this.bulkFetch(callCluster, usageCollectors.collectors);
   };
diff --git a/src/plugins/usage_collection/server/collector/index.ts b/src/plugins/usage_collection/server/collector/index.ts
index 0d3939e1dc681b..1816e845b4d666 100644
--- a/src/plugins/usage_collection/server/collector/index.ts
+++ b/src/plugins/usage_collection/server/collector/index.ts
@@ -18,5 +18,11 @@
  */
 
 export { CollectorSet } from './collector_set';
-export { Collector } from './collector';
+export {
+  Collector,
+  AllowedSchemaTypes,
+  SchemaField,
+  MakeSchemaFrom,
+  CollectorOptions,
+} from './collector';
 export { UsageCollector } from './usage_collector';
diff --git a/src/plugins/usage_collection/server/index.ts b/src/plugins/usage_collection/server/index.ts
index a2769c8b4b405f..87761bca9a507a 100644
--- a/src/plugins/usage_collection/server/index.ts
+++ b/src/plugins/usage_collection/server/index.ts
@@ -20,6 +20,13 @@
 import { PluginInitializerContext } from 'kibana/server';
 import { UsageCollectionPlugin } from './plugin';
 
+export {
+  AllowedSchemaTypes,
+  MakeSchemaFrom,
+  SchemaField,
+  CollectorOptions,
+  Collector,
+} from './collector';
 export { UsageCollectionSetup } from './plugin';
 export { config } from './config';
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx b/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
index 837dd9bff2c6de..c41315e7bc0dca 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
@@ -23,9 +23,13 @@ import { i18n } from '@kbn/i18n';
 import { keyCodes, EuiButtonIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { EventEmitter } from 'events';
 
-import { Vis, PersistedState } from 'src/plugins/visualizations/public';
-import { SavedSearch } from 'src/plugins/discover/public';
+import {
+  Vis,
+  PersistedState,
+  VisualizeEmbeddableContract,
+} from 'src/plugins/visualizations/public';
 import { TimeRange } from 'src/plugins/data/public';
+import { SavedObject } from 'src/plugins/saved_objects/public';
 import { DefaultEditorNavBar, OptionTab } from './navbar';
 import { DefaultEditorControls } from './controls';
 import { setStateParamValue, useEditorReducer, useEditorFormState, discardChanges } from './state';
@@ -34,6 +38,7 @@ import { SidebarTitle } from './sidebar_title';
 import { Schema } from '../../schemas';
 
 interface DefaultEditorSideBarProps {
+  embeddableHandler: VisualizeEmbeddableContract;
   isCollapsed: boolean;
   onClickCollapse: () => void;
   optionTabs: OptionTab[];
@@ -41,11 +46,12 @@ interface DefaultEditorSideBarProps {
   vis: Vis;
   isLinkedSearch: boolean;
   eventEmitter: EventEmitter;
-  savedSearch?: SavedSearch;
+  savedSearch?: SavedObject;
   timeRange: TimeRange;
 }
 
 function DefaultEditorSideBar({
+  embeddableHandler,
   isCollapsed,
   onClickCollapse,
   optionTabs,
@@ -104,12 +110,12 @@ function DefaultEditorSideBar({
         aggs: state.data.aggs ? (state.data.aggs.aggs.map((agg) => agg.toJSON()) as any) : [],
       },
     });
-    eventEmitter.emit('updateVis');
+    embeddableHandler.reload();
     eventEmitter.emit('dirtyStateChange', {
       isDirty: false,
     });
     setTouched(false);
-  }, [vis, state, formState.invalid, setTouched, isDirty, eventEmitter]);
+  }, [vis, state, formState.invalid, setTouched, isDirty, eventEmitter, embeddableHandler]);
 
   const onSubmit: KeyboardEventHandler<HTMLFormElement> = useCallback(
     (event) => {
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx b/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
index ebc92170c87350..6713c2ce2391be 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
@@ -36,17 +36,17 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 
 import { Vis } from 'src/plugins/visualizations/public';
-import { SavedSearch } from 'src/plugins/discover/public';
+import { SavedObject } from 'src/plugins/saved_objects/public';
 import { useKibana } from '../../../../kibana_react/public';
 
 interface LinkedSearchProps {
-  savedSearch: SavedSearch;
+  savedSearch: SavedObject;
   eventEmitter: EventEmitter;
 }
 
 interface SidebarTitleProps {
   isLinkedSearch: boolean;
-  savedSearch?: SavedSearch;
+  savedSearch?: SavedObject;
   vis: Vis;
   eventEmitter: EventEmitter;
 }
diff --git a/src/plugins/vis_default_editor/public/default_editor.tsx b/src/plugins/vis_default_editor/public/default_editor.tsx
index 731358bdcbdec2..60b6ebab5ad8eb 100644
--- a/src/plugins/vis_default_editor/public/default_editor.tsx
+++ b/src/plugins/vis_default_editor/public/default_editor.tsx
@@ -59,7 +59,7 @@ function DefaultEditor({
 
     embeddableHandler.render(visRef.current);
     setTimeout(() => {
-      eventEmitter.emit('apply');
+      eventEmitter.emit('embeddableRendered');
     });
 
     return () => embeddableHandler.destroy();
@@ -102,6 +102,7 @@ function DefaultEditor({
             initialWidth={editorInitialWidth}
           >
             <DefaultEditorSideBar
+              embeddableHandler={embeddableHandler}
               isCollapsed={isCollapsed}
               onClickCollapse={onClickCollapse}
               optionTabs={optionTabs}
diff --git a/src/plugins/vis_type_table/public/components/table_vis_options.tsx b/src/plugins/vis_type_table/public/components/table_vis_options.tsx
index d220a6b2db8423..c4d333134237a6 100644
--- a/src/plugins/vis_type_table/public/components/table_vis_options.tsx
+++ b/src/plugins/vis_type_table/public/components/table_vis_options.tsx
@@ -46,7 +46,7 @@ function TableOptions({
         }),
       },
       ...tabifyGetColumns(aggs.getResponseAggs(), true)
-        .filter((col) => get(col.aggConfig.type.getFormat(col.aggConfig), 'type.id') === 'number')
+        .filter((col) => get(col.aggConfig.toSerializedFieldFormat(), 'id') === 'number')
         .map(({ name }) => ({ value: name, text: name })),
     ],
     [aggs]
diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js b/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js
index a96890d4d15029..300e70f3ae0c00 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js
@@ -80,7 +80,7 @@ export class VisEditor extends Component {
 
   updateVisState = debounce(() => {
     this.props.vis.params = this.state.model;
-    this.props.eventEmitter.emit('updateVis');
+    this.props.embeddableHandler.reload();
     this.props.eventEmitter.emit('dirtyStateChange', {
       isDirty: false,
     });
@@ -187,6 +187,7 @@ export class VisEditor extends Component {
               autoApply={this.state.autoApply}
               model={model}
               embeddableHandler={this.props.embeddableHandler}
+              eventEmitter={this.props.eventEmitter}
               vis={this.props.vis}
               timeRange={this.props.timeRange}
               uiState={this.uiState}
diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js b/src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js
index 0ae1c86ae31175..23a9555da2452c 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js
@@ -73,6 +73,7 @@ class VisEditorVisualizationUI extends Component {
 
     this._handler = embeddableHandler;
     await this._handler.render(this._visEl.current);
+    this.props.eventEmitter.emit('embeddableRendered');
 
     this._subscription = this._handler.handler.data$.subscribe((data) => {
       this.setPanelInterval(data.value.visData);
@@ -279,6 +280,7 @@ VisEditorVisualizationUI.propTypes = {
   uiState: PropTypes.object,
   onToggleAutoApply: PropTypes.func,
   embeddableHandler: PropTypes.object,
+  eventEmitter: PropTypes.object,
   timeRange: PropTypes.object,
   dirty: PropTypes.bool,
   autoApply: PropTypes.bool,
diff --git a/src/plugins/vis_type_timeseries/public/metrics_type.ts b/src/plugins/vis_type_timeseries/public/metrics_type.ts
index c06f94efb3c493..649ee765cc6428 100644
--- a/src/plugins/vis_type_timeseries/public/metrics_type.ts
+++ b/src/plugins/vis_type_timeseries/public/metrics_type.ts
@@ -24,7 +24,6 @@ import { metricsRequestHandler } from './request_handler';
 import { EditorController } from './application';
 // @ts-ignore
 import { PANEL_TYPES } from '../common/panel_types';
-import { defaultFeedbackMessage } from '../../kibana_utils/public';
 import { VisEditor } from './application/components/vis_editor_lazy';
 
 export const metricsVisDefinition = {
@@ -34,7 +33,6 @@ export const metricsVisDefinition = {
     defaultMessage: 'Build time-series using a visual pipeline interface',
   }),
   icon: 'visVisualBuilder',
-  feedbackMessage: defaultFeedbackMessage,
   visConfig: {
     defaults: {
       id: '61ca57f0-469d-11e7-af02-69e470af7417',
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
index a2146e493d4edf..0b1c6e6e204141 100644
--- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
@@ -18,7 +18,7 @@
  */
 
 import {
-  APICaller,
+  LegacyAPICaller,
   FakeRequest,
   IUiSettingsClient,
   SavedObjectsClientContract,
@@ -53,12 +53,12 @@ export type ReqFacade = FakeRequest & {
 };
 
 export class AbstractSearchStrategy {
-  public getCallWithRequestInstance: (req: ReqFacade) => APICaller;
+  public getCallWithRequestInstance: (req: ReqFacade) => LegacyAPICaller;
   public getSearchRequest: (req: ReqFacade) => any;
 
   constructor(
     server: any,
-    callWithRequestFactory: (server: any, req: ReqFacade) => APICaller,
+    callWithRequestFactory: (server: any, req: ReqFacade) => LegacyAPICaller,
     SearchRequest: any
   ) {
     this.getCallWithRequestInstance = (req) => callWithRequestFactory(server, req);
diff --git a/src/plugins/vis_type_timeseries/server/validation_telemetry/validation_telemetry_service.ts b/src/plugins/vis_type_timeseries/server/validation_telemetry/validation_telemetry_service.ts
index 505816d48af528..a5f095a4c4f3d1 100644
--- a/src/plugins/vis_type_timeseries/server/validation_telemetry/validation_telemetry_service.ts
+++ b/src/plugins/vis_type_timeseries/server/validation_telemetry/validation_telemetry_service.ts
@@ -17,13 +17,16 @@
  * under the License.
  */
 
-import { APICaller, CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import { LegacyAPICaller, CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
 import { UsageCollectionSetup } from '../../../usage_collection/server';
 import { tsvbTelemetrySavedObjectType } from '../saved_objects';
 
 export interface ValidationTelemetryServiceSetup {
   logFailedValidation: () => void;
 }
+export interface Usage {
+  failed_validations: number;
+}
 
 export class ValidationTelemetryService implements Plugin<ValidationTelemetryServiceSetup> {
   private kibanaIndex: string = '';
@@ -43,10 +46,10 @@ export class ValidationTelemetryService implements Plugin<ValidationTelemetrySer
     });
     if (usageCollection) {
       usageCollection.registerCollector(
-        usageCollection.makeUsageCollector({
+        usageCollection.makeUsageCollector<Usage>({
           type: 'tsvb-validation',
           isReady: () => this.kibanaIndex !== '',
-          fetch: async (callCluster: APICaller) => {
+          fetch: async (callCluster: LegacyAPICaller) => {
             try {
               const response = await callCluster('get', {
                 index: this.kibanaIndex,
@@ -63,6 +66,9 @@ export class ValidationTelemetryService implements Plugin<ValidationTelemetrySer
               };
             }
           },
+          schema: {
+            failed_validations: { type: 'long' },
+          },
         })
       );
     }
diff --git a/src/plugins/vis_type_vega/public/vega_type.ts b/src/plugins/vis_type_vega/public/vega_type.ts
index c864553c118b93..55ad134c053015 100644
--- a/src/plugins/vis_type_vega/public/vega_type.ts
+++ b/src/plugins/vis_type_vega/public/vega_type.ts
@@ -21,7 +21,6 @@ import { i18n } from '@kbn/i18n';
 import { DefaultEditorSize } from '../../vis_default_editor/public';
 import { VegaVisualizationDependencies } from './plugin';
 import { VegaVisEditor } from './components';
-import { defaultFeedbackMessage } from '../../kibana_utils/public';
 
 import { createVegaRequestHandler } from './vega_request_handler';
 // @ts-ignore
@@ -56,6 +55,5 @@ export const createVegaTypeDefinition = (dependencies: VegaVisualizationDependen
       showFilterBar: true,
     },
     stage: 'experimental',
-    feedbackMessage: defaultFeedbackMessage,
   };
 };
diff --git a/src/plugins/visualizations/public/index.ts b/src/plugins/visualizations/public/index.ts
index 0bbf862216ed5b..2ac53c2c81acc9 100644
--- a/src/plugins/visualizations/public/index.ts
+++ b/src/plugins/visualizations/public/index.ts
@@ -51,4 +51,5 @@ export {
   VisSavedObject,
   VisResponseValue,
 } from './types';
+export { VisualizationListItem } from './vis_types/vis_type_alias_registry';
 export { VISUALIZE_ENABLE_LABS_SETTING } from '../common/constants';
diff --git a/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts b/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts
index eb00dce8aba2fd..8edf494ddc0ece 100644
--- a/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts
+++ b/src/plugins/visualizations/public/saved_visualizations/_saved_vis.ts
@@ -62,6 +62,7 @@ export const convertFromSerializedVis = (vis: SerializedVis): ISavedVis => {
     title: vis.title,
     description: vis.description,
     visState: {
+      title: vis.title,
       type: vis.type,
       aggs: vis.data.aggs,
       params: vis.params,
diff --git a/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts b/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts
index c6a25df7615a2b..d44fc2f4a75af0 100644
--- a/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts
+++ b/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts
@@ -56,7 +56,7 @@ export function createSavedVisLoader(services: SavedObjectKibanaServicesWithVisu
       source.icon = source.type.icon;
       source.image = source.type.image;
       source.typeTitle = source.type.title;
-      source.editUrl = `#/edit/${id}`;
+      source.editUrl = `/edit/${id}`;
 
       return source;
     };
diff --git a/src/plugins/visualizations/public/types.ts b/src/plugins/visualizations/public/types.ts
index 3455d88b6ce9e1..daf275297fb822 100644
--- a/src/plugins/visualizations/public/types.ts
+++ b/src/plugins/visualizations/public/types.ts
@@ -35,6 +35,7 @@ export type VisualizationControllerConstructor = new (
 ) => VisualizationController;
 
 export interface SavedVisState {
+  title: string;
   type: string;
   params: VisParams;
   aggs: AggConfigOptions[];
diff --git a/src/plugins/visualizations/public/vis.ts b/src/plugins/visualizations/public/vis.ts
index aaab0566af65e6..e8ae48cdce1452 100644
--- a/src/plugins/visualizations/public/vis.ts
+++ b/src/plugins/visualizations/public/vis.ts
@@ -29,6 +29,7 @@
 
 import { isFunction, defaults, cloneDeep } from 'lodash';
 import { Assign } from '@kbn/utility-types';
+import { i18n } from '@kbn/i18n';
 import { PersistedState } from './persisted_state';
 import { getTypes, getAggs, getSearch, getSavedSearchLoader } from './services';
 import { VisType } from './vis_types';
@@ -105,7 +106,13 @@ export class Vis {
   private getType(visType: string) {
     const type = getTypes().get(visType);
     if (!type) {
-      throw new Error(`Invalid type "${visType}"`);
+      const errorMessage = i18n.translate('visualizations.visualizationTypeInvalidMessage', {
+        defaultMessage: 'Invalid visualization type "{visType}"',
+        values: {
+          visType,
+        },
+      });
+      throw new Error(errorMessage);
     }
     return type;
   }
@@ -150,7 +157,13 @@ export class Vis {
       const configStates = this.initializeDefaultsFromSchemas(aggs, this.type.schemas.all || []);
       if (!this.data.indexPattern) {
         if (aggs.length) {
-          throw new Error('trying to initialize aggs without index pattern');
+          const errorMessage = i18n.translate(
+            'visualizations.initializeWithoutIndexPatternErrorMessage',
+            {
+              defaultMessage: 'Trying to initialize aggs without index pattern',
+            }
+          );
+          throw new Error(errorMessage);
         }
         return;
       }
diff --git a/src/plugins/visualizations/public/vis_types/base_vis_type.ts b/src/plugins/visualizations/public/vis_types/base_vis_type.ts
index 2464bb72d26957..44b76a52b34fef 100644
--- a/src/plugins/visualizations/public/vis_types/base_vis_type.ts
+++ b/src/plugins/visualizations/public/vis_types/base_vis_type.ts
@@ -27,7 +27,6 @@ export interface BaseVisTypeOptions {
   icon?: string;
   image?: string;
   stage?: 'experimental' | 'beta' | 'production';
-  feedbackMessage?: string;
   options?: Record<string, any>;
   visualization: VisualizationControllerConstructor;
   visConfig?: Record<string, any>;
@@ -48,7 +47,7 @@ export class BaseVisType {
   icon?: string;
   image?: string;
   stage: 'experimental' | 'beta' | 'production';
-  feedbackMessage: string;
+  isExperimental: boolean;
   options: Record<string, any>;
   visualization: VisualizationControllerConstructor;
   visConfig: Record<string, any>;
@@ -87,7 +86,7 @@ export class BaseVisType {
     this.editorConfig = _.defaultsDeep({}, opts.editorConfig, { collections: {} });
     this.options = _.defaultsDeep({}, opts.options, defaultOptions);
     this.stage = opts.stage || 'production';
-    this.feedbackMessage = opts.feedbackMessage || '';
+    this.isExperimental = opts.stage === 'experimental';
     this.hidden = opts.hidden || false;
     this.requestHandler = opts.requestHandler || 'courier';
     this.responseHandler = opts.responseHandler || 'none';
@@ -97,10 +96,6 @@ export class BaseVisType {
     this.useCustomNoDataScreen = opts.useCustomNoDataScreen || false;
   }
 
-  shouldMarkAsExperimentalInUI() {
-    return this.stage === 'experimental';
-  }
-
   public get schemas() {
     if (this.editorConfig && this.editorConfig.schemas) {
       return this.editorConfig.schemas;
diff --git a/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts b/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
index 73e3360004e5a7..bc80d549c81e6f 100644
--- a/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
+++ b/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
@@ -27,6 +27,7 @@ export interface VisualizationListItem {
   title: string;
   description?: string;
   typeTitle: string;
+  image?: string;
 }
 
 export interface VisualizationsAppExtension {
diff --git a/src/plugins/visualize/kibana.json b/src/plugins/visualize/kibana.json
index cda45f3acc102d..c27cfec24b332d 100644
--- a/src/plugins/visualize/kibana.json
+++ b/src/plugins/visualize/kibana.json
@@ -9,7 +9,6 @@
     "navigation",
     "savedObjects",
     "visualizations",
-    "dashboard",
     "embeddable"
   ],
   "optionalPlugins": ["home", "share"]
diff --git a/src/plugins/visualize/public/application/_app.scss b/src/plugins/visualize/public/application/_app.scss
deleted file mode 100644
index 8a52ebf4cc0883..00000000000000
--- a/src/plugins/visualize/public/application/_app.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.visAppWrapper {
-  display: flex;
-  flex-direction: column;
-  flex-grow: 1;
-}
diff --git a/src/plugins/visualize/public/application/index.scss b/src/plugins/visualize/public/application/app.scss
similarity index 67%
rename from src/plugins/visualize/public/application/index.scss
rename to src/plugins/visualize/public/application/app.scss
index 620380a77ba46c..f7f68fbc2c3597 100644
--- a/src/plugins/visualize/public/application/index.scss
+++ b/src/plugins/visualize/public/application/app.scss
@@ -5,6 +5,8 @@
 //   visChart__legend--small
 //   visChart__legend-isLoading
 
-@import 'app';
-@import 'editor/index';
-@import 'listing/index';
+.visAppWrapper {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+}
diff --git a/src/plugins/visualize/public/application/app.tsx b/src/plugins/visualize/public/application/app.tsx
new file mode 100644
index 00000000000000..0e71d72a3d4c72
--- /dev/null
+++ b/src/plugins/visualize/public/application/app.tsx
@@ -0,0 +1,63 @@
+/*
+ * 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 './app.scss';
+import React, { useEffect } from 'react';
+import { Route, Switch, useLocation } from 'react-router-dom';
+
+import { syncQueryStateWithUrl } from '../../../data/public';
+import { useKibana } from '../../../kibana_react/public';
+import { VisualizeServices } from './types';
+import { VisualizeEditor, VisualizeListing, VisualizeNoMatch } from './components';
+import { VisualizeConstants } from './visualize_constants';
+
+export const VisualizeApp = () => {
+  const {
+    services: {
+      data: { query },
+      kbnUrlStateStorage,
+    },
+  } = useKibana<VisualizeServices>();
+  const { pathname } = useLocation();
+
+  useEffect(() => {
+    // syncs `_g` portion of url with query services
+    const { stop } = syncQueryStateWithUrl(query, kbnUrlStateStorage);
+
+    return () => stop();
+
+    // this effect should re-run when pathname is changed to preserve querystring part,
+    // so the global state is always preserved
+  }, [query, kbnUrlStateStorage, pathname]);
+
+  return (
+    <Switch>
+      <Route path={[VisualizeConstants.CREATE_PATH, `${VisualizeConstants.EDIT_PATH}/:id`]}>
+        <VisualizeEditor />
+      </Route>
+      <Route
+        exact
+        path={[VisualizeConstants.LANDING_PAGE_PATH, VisualizeConstants.WIZARD_STEP_1_PAGE_PATH]}
+      >
+        <VisualizeListing />
+      </Route>
+      <VisualizeNoMatch />
+    </Switch>
+  );
+};
diff --git a/src/plugins/visualize/public/application/application.ts b/src/plugins/visualize/public/application/application.ts
deleted file mode 100644
index 60bb73d6de2ccb..00000000000000
--- a/src/plugins/visualize/public/application/application.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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 './index.scss';
-
-import angular, { IModule } from 'angular';
-
-// required for i18nIdDirective
-import 'angular-sanitize';
-// required for ngRoute
-import 'angular-route';
-
-import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
-
-import { AppMountContext } from 'kibana/public';
-import { NavigationPublicPluginStart as NavigationStart } from 'src/plugins/navigation/public';
-import {
-  configureAppAngularModule,
-  createTopNavDirective,
-  createTopNavHelper,
-} from '../../../kibana_legacy/public';
-
-// @ts-ignore
-import { initVisualizeApp } from './legacy_app';
-import { VisualizeKibanaServices } from '../kibana_services';
-
-let angularModuleInstance: IModule | null = null;
-
-export const renderApp = (
-  element: HTMLElement,
-  appBasePath: string,
-  deps: VisualizeKibanaServices
-) => {
-  if (!angularModuleInstance) {
-    angularModuleInstance = createLocalAngularModule(deps.core, deps.navigation);
-    // global routing stuff
-    configureAppAngularModule(
-      angularModuleInstance,
-      { core: deps.core, env: deps.pluginInitializerContext.env },
-      true,
-      deps.scopedHistory
-    );
-    initVisualizeApp(angularModuleInstance, deps);
-  }
-  const $injector = mountVisualizeApp(appBasePath, element);
-  return () => $injector.get('$rootScope').$destroy();
-};
-
-const mainTemplate = (basePath: string) => `<div ng-view class="visAppWrapper">
-  <base href="${basePath}" />
-</div>
-`;
-
-const moduleName = 'app/visualize';
-
-const thirdPartyAngularDependencies = ['ngSanitize', 'ngRoute', 'react'];
-
-function mountVisualizeApp(appBasePath: string, element: HTMLElement) {
-  const mountpoint = document.createElement('div');
-  mountpoint.setAttribute('class', 'visAppWrapper');
-  mountpoint.innerHTML = mainTemplate(appBasePath);
-  // bootstrap angular into detached element and attach it later to
-  // make angular-within-angular possible
-  const $injector = angular.bootstrap(mountpoint, [moduleName]);
-  // initialize global state handler
-  element.appendChild(mountpoint);
-  return $injector;
-}
-
-function createLocalAngularModule(core: AppMountContext['core'], navigation: NavigationStart) {
-  createLocalI18nModule();
-  createLocalTopNavModule(navigation);
-
-  const visualizeAngularModule: IModule = angular.module(moduleName, [
-    ...thirdPartyAngularDependencies,
-    'app/visualize/I18n',
-    'app/visualize/TopNav',
-  ]);
-  return visualizeAngularModule;
-}
-
-function createLocalTopNavModule(navigation: NavigationStart) {
-  angular
-    .module('app/visualize/TopNav', ['react'])
-    .directive('kbnTopNav', createTopNavDirective)
-    .directive('kbnTopNavHelper', createTopNavHelper(navigation.ui));
-}
-
-function createLocalI18nModule() {
-  angular
-    .module('app/visualize/I18n', [])
-    .provider('i18n', I18nProvider)
-    .filter('i18n', i18nFilter)
-    .directive('i18nId', i18nDirective);
-}
diff --git a/src/plugins/visualize/public/application/components/experimental_vis_info.tsx b/src/plugins/visualize/public/application/components/experimental_vis_info.tsx
new file mode 100644
index 00000000000000..51abb3ca530a4c
--- /dev/null
+++ b/src/plugins/visualize/public/application/components/experimental_vis_info.tsx
@@ -0,0 +1,49 @@
+/*
+ * 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 React, { memo } from 'react';
+import { EuiCallOut, EuiLink } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+export const InfoComponent = () => {
+  const title = (
+    <>
+      <FormattedMessage
+        id="visualize.experimentalVisInfoText"
+        defaultMessage="This visualization is marked as experimental. Have feedback? Please create an issue in"
+      />{' '}
+      <EuiLink external href="https://github.com/elastic/kibana/issues/new/choose" target="_blank">
+        GitHub
+      </EuiLink>
+      {'.'}
+    </>
+  );
+
+  return (
+    <EuiCallOut
+      className="hide-for-sharing"
+      data-test-subj="experimentalVisInfo"
+      size="s"
+      title={title}
+      iconType="beaker"
+    />
+  );
+};
+
+export const ExperimentalVisInfo = memo(InfoComponent);
diff --git a/src/plugins/visualize/public/application/components/index.ts b/src/plugins/visualize/public/application/components/index.ts
new file mode 100644
index 00000000000000..a3a7fde1d6569f
--- /dev/null
+++ b/src/plugins/visualize/public/application/components/index.ts
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+export { VisualizeListing } from './visualize_listing';
+export { VisualizeEditor } from './visualize_editor';
+export { VisualizeNoMatch } from './visualize_no_match';
diff --git a/src/plugins/visualize/public/application/editor/_editor.scss b/src/plugins/visualize/public/application/components/visualize_editor.scss
similarity index 100%
rename from src/plugins/visualize/public/application/editor/_editor.scss
rename to src/plugins/visualize/public/application/components/visualize_editor.scss
diff --git a/src/plugins/visualize/public/application/components/visualize_editor.tsx b/src/plugins/visualize/public/application/components/visualize_editor.tsx
new file mode 100644
index 00000000000000..c571a5fb078bc5
--- /dev/null
+++ b/src/plugins/visualize/public/application/components/visualize_editor.tsx
@@ -0,0 +1,115 @@
+/*
+ * 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 './visualize_editor.scss';
+import React, { useEffect, useState } from 'react';
+import { useParams } from 'react-router-dom';
+import { EventEmitter } from 'events';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiScreenReaderOnly } from '@elastic/eui';
+
+import { useKibana } from '../../../../kibana_react/public';
+import {
+  useChromeVisibility,
+  useSavedVisInstance,
+  useVisualizeAppState,
+  useEditorUpdates,
+  useLinkedSearchUpdates,
+} from '../utils';
+import { VisualizeServices } from '../types';
+import { ExperimentalVisInfo } from './experimental_vis_info';
+import { VisualizeTopNav } from './visualize_top_nav';
+
+export const VisualizeEditor = () => {
+  const { id: visualizationIdFromUrl } = useParams();
+  const [originatingApp, setOriginatingApp] = useState<string>();
+  const { services } = useKibana<VisualizeServices>();
+  const [eventEmitter] = useState(new EventEmitter());
+  const [hasUnsavedChanges, setHasUnsavedChanges] = useState(!visualizationIdFromUrl);
+
+  const isChromeVisible = useChromeVisibility(services.chrome);
+  const { savedVisInstance, visEditorRef, visEditorController } = useSavedVisInstance(
+    services,
+    eventEmitter,
+    isChromeVisible,
+    visualizationIdFromUrl
+  );
+  const { appState, hasUnappliedChanges } = useVisualizeAppState(
+    services,
+    eventEmitter,
+    savedVisInstance
+  );
+  const { isEmbeddableRendered, currentAppState } = useEditorUpdates(
+    services,
+    eventEmitter,
+    setHasUnsavedChanges,
+    appState,
+    savedVisInstance,
+    visEditorController
+  );
+  useLinkedSearchUpdates(services, eventEmitter, appState, savedVisInstance);
+
+  useEffect(() => {
+    const { originatingApp: value } =
+      services.embeddable.getStateTransfer(services.scopedHistory).getIncomingEditorState() || {};
+    setOriginatingApp(value);
+  }, [services]);
+
+  useEffect(() => {
+    // clean up all registered listeners if any is left
+    return () => {
+      eventEmitter.removeAllListeners();
+    };
+  }, [eventEmitter]);
+
+  return (
+    <div className={`app-container visEditor visEditor--${savedVisInstance?.vis.type.name}`}>
+      {savedVisInstance && appState && currentAppState && (
+        <VisualizeTopNav
+          currentAppState={currentAppState}
+          hasUnsavedChanges={hasUnsavedChanges}
+          setHasUnsavedChanges={setHasUnsavedChanges}
+          isChromeVisible={isChromeVisible}
+          isEmbeddableRendered={isEmbeddableRendered}
+          hasUnappliedChanges={hasUnappliedChanges}
+          originatingApp={originatingApp}
+          savedVisInstance={savedVisInstance}
+          stateContainer={appState}
+          visualizationIdFromUrl={visualizationIdFromUrl}
+        />
+      )}
+      {savedVisInstance?.vis?.type?.isExperimental && <ExperimentalVisInfo />}
+      {savedVisInstance && (
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="visualize.pageHeading"
+              defaultMessage="{chartName} {chartType} visualization"
+              values={{
+                chartName: savedVisInstance.savedVis.title,
+                chartType: savedVisInstance.vis.type.title,
+              }}
+            />
+          </h1>
+        </EuiScreenReaderOnly>
+      )}
+      <div className={isChromeVisible ? 'visEditor__content' : 'visualize'} ref={visEditorRef} />
+    </div>
+  );
+};
diff --git a/src/plugins/visualize/public/application/listing/_listing.scss b/src/plugins/visualize/public/application/components/visualize_listing.scss
similarity index 100%
rename from src/plugins/visualize/public/application/listing/_listing.scss
rename to src/plugins/visualize/public/application/components/visualize_listing.scss
diff --git a/src/plugins/visualize/public/application/components/visualize_listing.tsx b/src/plugins/visualize/public/application/components/visualize_listing.tsx
new file mode 100644
index 00000000000000..cbfbd6e0e3ab6b
--- /dev/null
+++ b/src/plugins/visualize/public/application/components/visualize_listing.tsx
@@ -0,0 +1,154 @@
+/*
+ * 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 './visualize_listing.scss';
+
+import React, { useCallback, useRef, useMemo, useEffect } from 'react';
+import { i18n } from '@kbn/i18n';
+import { useUnmount, useMount } from 'react-use';
+import { useLocation } from 'react-router-dom';
+
+import { useKibana, TableListView } from '../../../../kibana_react/public';
+import { VISUALIZE_ENABLE_LABS_SETTING } from '../../../../visualizations/public';
+import { VisualizeServices } from '../types';
+import { VisualizeConstants } from '../visualize_constants';
+import { getTableColumns, getNoItemsMessage } from '../utils';
+
+export const VisualizeListing = () => {
+  const {
+    services: {
+      application,
+      chrome,
+      history,
+      savedVisualizations,
+      toastNotifications,
+      visualizations,
+      savedObjects,
+      savedObjectsPublic,
+      uiSettings,
+      visualizeCapabilities,
+    },
+  } = useKibana<VisualizeServices>();
+  const { pathname } = useLocation();
+  const closeNewVisModal = useRef(() => {});
+  const listingLimit = savedObjectsPublic.settings.getListingLimit();
+
+  useEffect(() => {
+    if (pathname === '/new') {
+      // In case the user navigated to the page via the /visualize/new URL we start the dialog immediately
+      closeNewVisModal.current = visualizations.showNewVisModal({
+        onClose: () => {
+          // In case the user came via a URL to this page, change the URL to the regular landing page URL after closing the modal
+          history.push(VisualizeConstants.LANDING_PAGE_PATH);
+        },
+      });
+    } else {
+      // close modal window if exists
+      closeNewVisModal.current();
+    }
+  }, [history, pathname, visualizations]);
+
+  useMount(() => {
+    chrome.setBreadcrumbs([
+      {
+        text: i18n.translate('visualize.visualizeListingBreadcrumbsTitle', {
+          defaultMessage: 'Visualize',
+        }),
+      },
+    ]);
+    chrome.docTitle.change(
+      i18n.translate('visualize.listingPageTitle', { defaultMessage: 'Visualize' })
+    );
+  });
+  useUnmount(() => closeNewVisModal.current());
+
+  const createNewVis = useCallback(() => {
+    closeNewVisModal.current = visualizations.showNewVisModal();
+  }, [visualizations]);
+
+  const editItem = useCallback(
+    ({ editUrl, editApp }) => {
+      if (editApp) {
+        application.navigateToApp(editApp, { path: editUrl });
+        return;
+      }
+      // for visualizations the edit and view URLs are the same
+      history.push(editUrl);
+    },
+    [application, history]
+  );
+
+  const noItemsFragment = useMemo(() => getNoItemsMessage(createNewVis), [createNewVis]);
+  const tableColumns = useMemo(() => getTableColumns(application, history), [application, history]);
+
+  const fetchItems = useCallback(
+    (filter) => {
+      const isLabsEnabled = uiSettings.get(VISUALIZE_ENABLE_LABS_SETTING);
+      return savedVisualizations
+        .findListItems(filter, listingLimit)
+        .then(({ total, hits }: { total: number; hits: object[] }) => ({
+          total,
+          hits: hits.filter((result: any) => isLabsEnabled || result.type.stage !== 'experimental'),
+        }));
+    },
+    [listingLimit, savedVisualizations, uiSettings]
+  );
+
+  const deleteItems = useCallback(
+    async (selectedItems: object[]) => {
+      await Promise.all(
+        selectedItems.map((item: any) => savedObjects.client.delete(item.savedObjectType, item.id))
+      ).catch((error) => {
+        toastNotifications.addError(error, {
+          title: i18n.translate('visualize.visualizeListingDeleteErrorTitle', {
+            defaultMessage: 'Error deleting visualization',
+          }),
+        });
+      });
+    },
+    [savedObjects.client, toastNotifications]
+  );
+
+  return (
+    <TableListView
+      headingId="visualizeListingHeading"
+      // we allow users to create visualizations even if they can't save them
+      // for data exploration purposes
+      createItem={createNewVis}
+      findItems={fetchItems}
+      deleteItems={visualizeCapabilities.delete ? deleteItems : undefined}
+      editItem={visualizeCapabilities.save ? editItem : undefined}
+      tableColumns={tableColumns}
+      listingLimit={listingLimit}
+      initialPageSize={savedObjectsPublic.settings.getPerPage()}
+      initialFilter={''}
+      noItemsFragment={noItemsFragment}
+      entityName={i18n.translate('visualize.listing.table.entityName', {
+        defaultMessage: 'visualization',
+      })}
+      entityNamePlural={i18n.translate('visualize.listing.table.entityNamePlural', {
+        defaultMessage: 'visualizations',
+      })}
+      tableListTitle={i18n.translate('visualize.listing.table.listTitle', {
+        defaultMessage: 'Visualizations',
+      })}
+      toastNotifications={toastNotifications}
+    />
+  );
+};
diff --git a/src/plugins/visualize/public/application/components/visualize_no_match.tsx b/src/plugins/visualize/public/application/components/visualize_no_match.tsx
new file mode 100644
index 00000000000000..7776c5e8ce4866
--- /dev/null
+++ b/src/plugins/visualize/public/application/components/visualize_no_match.tsx
@@ -0,0 +1,77 @@
+/*
+ * 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 React, { useEffect } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiCallOut, EuiLink } from '@elastic/eui';
+
+import { useKibana, toMountPoint } from '../../../../kibana_react/public';
+import { VisualizeServices } from '../types';
+import { VisualizeConstants } from '../visualize_constants';
+
+let bannerId: string;
+
+export const VisualizeNoMatch = () => {
+  const { services } = useKibana<VisualizeServices>();
+
+  useEffect(() => {
+    services.restorePreviousUrl();
+
+    const { navigated } = services.kibanaLegacy.navigateToLegacyKibanaUrl(
+      services.history.location.pathname
+    );
+
+    if (!navigated) {
+      const bannerMessage = i18n.translate('visualize.noMatchRoute.bannerTitleText', {
+        defaultMessage: 'Page not found',
+      });
+
+      bannerId = services.overlays.banners.replace(
+        bannerId,
+        toMountPoint(
+          <EuiCallOut color="warning" iconType="iInCircle" title={bannerMessage}>
+            <p>
+              <FormattedMessage
+                id="visualize.noMatchRoute.bannerText"
+                defaultMessage="Visualize application doesn't recognize this route: {route}."
+                values={{
+                  route: (
+                    <EuiLink href={window.location.href}>
+                      {services.history.location.pathname}
+                    </EuiLink>
+                  ),
+                }}
+              />
+            </p>
+          </EuiCallOut>
+        )
+      );
+
+      // hide the message after the user has had a chance to acknowledge it -- so it doesn't permanently stick around
+      setTimeout(() => {
+        services.overlays.banners.remove(bannerId);
+      }, 15000);
+
+      services.history.replace(VisualizeConstants.LANDING_PAGE_PATH);
+    }
+  }, [services]);
+
+  return null;
+};
diff --git a/src/plugins/visualize/public/application/components/visualize_top_nav.tsx b/src/plugins/visualize/public/application/components/visualize_top_nav.tsx
new file mode 100644
index 00000000000000..2e7dba46487ad0
--- /dev/null
+++ b/src/plugins/visualize/public/application/components/visualize_top_nav.tsx
@@ -0,0 +1,178 @@
+/*
+ * 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 React, { memo, useCallback, useMemo, useState, useEffect } from 'react';
+import { isEqual } from 'lodash';
+
+import { OverlayRef } from 'kibana/public';
+import { Query } from 'src/plugins/data/public';
+import { useKibana } from '../../../../kibana_react/public';
+import {
+  VisualizeServices,
+  VisualizeAppState,
+  VisualizeAppStateContainer,
+  SavedVisInstance,
+} from '../types';
+import { APP_NAME } from '../visualize_constants';
+import { getTopNavConfig } from '../utils';
+
+interface VisualizeTopNavProps {
+  currentAppState: VisualizeAppState;
+  isChromeVisible?: boolean;
+  isEmbeddableRendered: boolean;
+  hasUnsavedChanges: boolean;
+  setHasUnsavedChanges: (value: boolean) => void;
+  hasUnappliedChanges: boolean;
+  originatingApp?: string;
+  savedVisInstance: SavedVisInstance;
+  stateContainer: VisualizeAppStateContainer;
+  visualizationIdFromUrl?: string;
+}
+
+const TopNav = ({
+  currentAppState,
+  isChromeVisible,
+  isEmbeddableRendered,
+  hasUnsavedChanges,
+  setHasUnsavedChanges,
+  hasUnappliedChanges,
+  originatingApp,
+  savedVisInstance,
+  stateContainer,
+  visualizationIdFromUrl,
+}: VisualizeTopNavProps) => {
+  const { services } = useKibana<VisualizeServices>();
+  const { TopNavMenu } = services.navigation.ui;
+  const { embeddableHandler, vis } = savedVisInstance;
+  const [inspectorSession, setInspectorSession] = useState<OverlayRef>();
+  const openInspector = useCallback(() => {
+    const session = embeddableHandler.openInspector();
+    setInspectorSession(session);
+  }, [embeddableHandler]);
+
+  const updateQuery = useCallback(
+    ({ query }: { query?: Query }) => {
+      if (!isEqual(currentAppState.query, query)) {
+        stateContainer.transitions.set('query', query || currentAppState.query);
+      } else {
+        savedVisInstance.embeddableHandler.reload();
+      }
+    },
+    [currentAppState.query, savedVisInstance.embeddableHandler, stateContainer.transitions]
+  );
+
+  const config = useMemo(() => {
+    if (isEmbeddableRendered) {
+      return getTopNavConfig(
+        {
+          hasUnsavedChanges,
+          setHasUnsavedChanges,
+          hasUnappliedChanges,
+          openInspector,
+          originatingApp,
+          savedVisInstance,
+          stateContainer,
+          visualizationIdFromUrl,
+        },
+        services
+      );
+    }
+  }, [
+    isEmbeddableRendered,
+    hasUnsavedChanges,
+    setHasUnsavedChanges,
+    hasUnappliedChanges,
+    openInspector,
+    originatingApp,
+    savedVisInstance,
+    stateContainer,
+    visualizationIdFromUrl,
+    services,
+  ]);
+  const [indexPattern, setIndexPattern] = useState(vis.data.indexPattern);
+  const showDatePicker = () => {
+    // tsvb loads without an indexPattern initially (TODO investigate).
+    // hide timefilter only if timeFieldName is explicitly undefined.
+    const hasTimeField = vis.data.indexPattern ? !!vis.data.indexPattern.timeFieldName : true;
+    return vis.type.options.showTimePicker && hasTimeField;
+  };
+  const showFilterBar = vis.type.options.showFilterBar;
+  const showQueryInput = vis.type.requiresSearch && vis.type.options.showQueryBar;
+
+  useEffect(() => {
+    return () => {
+      if (inspectorSession) {
+        // Close the inspector if this scope is destroyed (e.g. because the user navigates away).
+        inspectorSession.close();
+      }
+    };
+  }, [inspectorSession]);
+
+  useEffect(() => {
+    if (!vis.data.indexPattern) {
+      services.data.indexPatterns.getDefault().then((index) => {
+        if (index) {
+          setIndexPattern(index);
+        }
+      });
+    }
+  }, [services.data.indexPatterns, vis.data.indexPattern]);
+
+  return isChromeVisible ? (
+    /**
+     * Most visualizations have all search bar components enabled.
+     * Some visualizations have fewer options, but all visualizations have the search bar.
+     * That's is why the showSearchBar prop is set.
+     * All visualizations also have the timepicker\autorefresh component,
+     * it is enabled by default in the TopNavMenu component.
+     */
+    <TopNavMenu
+      appName={APP_NAME}
+      config={config}
+      query={currentAppState.query}
+      onQuerySubmit={updateQuery}
+      savedQueryId={currentAppState.savedQuery}
+      onSavedQueryIdChange={stateContainer.transitions.updateSavedQuery}
+      indexPatterns={indexPattern ? [indexPattern] : undefined}
+      screenTitle={vis.title}
+      showAutoRefreshOnly={!showDatePicker()}
+      showDatePicker={showDatePicker()}
+      showFilterBar={showFilterBar}
+      showQueryInput={showQueryInput}
+      showSaveQuery={services.visualizeCapabilities.saveQuery}
+      showSearchBar
+      useDefaultBehaviors
+    />
+  ) : showFilterBar ? (
+    /**
+     * The top nav is hidden in embed mode, but the filter bar must still be present so
+     * we show the filter bar on its own here if the chrome is not visible.
+     */
+    <TopNavMenu
+      appName={APP_NAME}
+      indexPatterns={indexPattern ? [indexPattern] : undefined}
+      showSearchBar
+      showSaveQuery={false}
+      showDatePicker={false}
+      showQueryInput={false}
+    />
+  ) : null;
+};
+
+export const VisualizeTopNav = memo(TopNav);
diff --git a/src/plugins/visualize/public/application/editor/_index.scss b/src/plugins/visualize/public/application/editor/_index.scss
deleted file mode 100644
index 9d3ca4b5399472..00000000000000
--- a/src/plugins/visualize/public/application/editor/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'editor';
diff --git a/src/plugins/visualize/public/application/editor/editor.html b/src/plugins/visualize/public/application/editor/editor.html
deleted file mode 100644
index 3c3455fb34f18c..00000000000000
--- a/src/plugins/visualize/public/application/editor/editor.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<visualize-app class="app-container visEditor visEditor--{{ vis.type.name }}">
-
-  <!--
-    Local nav.
-    Most visualizations have all search bar components enabled
-    Some visualizations have fewer options but all visualizations have a search bar
-    which is why show-search-baris set to "true".
-    All visualizaions also have least a timepicker \ autorefresh component, which is why
-    show-query-bar is set to "true".
-  -->
-  <kbn-top-nav
-    ng-if="isVisible"
-    app-name="'visualize'"
-    config="topNavMenu"
-    show-search-bar="true"
-    show-query-bar="true"
-    show-query-input="showQueryInput()"
-    show-filter-bar="showFilterBar() && isVisible"
-    show-date-picker="showQueryBarTimePicker()"
-    show-auto-refresh-only="!showQueryBarTimePicker()"
-    query="query"
-    saved-query="savedQuery"
-    screen-title="vis.title"
-    on-query-submit="updateQueryAndFetch"
-    index-patterns="[indexPattern]"
-    filters="filters"
-    on-filters-updated="onFiltersUpdated"
-    date-range-from="timeRange.from"
-    date-range-to="timeRange.to"
-    is-refresh-paused="refreshInterval.pause"
-    refresh-interval="refreshInterval.value"
-    on-refresh-change="onRefreshChange"
-    show-save-query="showSaveQuery"
-    on-saved="updateSavedQuery"
-    on-saved-query-updated="updateSavedQuery"
-    on-clear-saved-query="onClearSavedQuery"
-  >
-  </kbn-top-nav>
-
-  <!--
-    The top nav is hidden in embed mode but the filter bar must still be present so
-    we show the filter bar on its own here if the chrome is not visible.
-  -->
-  <kbn-top-nav
-    ng-if="showFilterBar() && !isVisible"
-
-    app-name="'visualize'"
-    show-search-bar="true"
-    show-filter-bar="true"
-    show-save-query="false"
-    show-date-picker="false"
-
-    filters="filters"
-    on-filters-updated="onFiltersUpdated"
-    index-patterns="[indexPattern]"
-  >
-  </kbn-top-nav>
-
-  <div
-    class="euiCallOut euiCallOut--primary euiCallOut--small hide-for-sharing"
-    ng-if="vis.type.shouldMarkAsExperimentalInUI()"
-    data-test-subj="experimentalVisInfo"
-  >
-    <div class="euiText">
-      <p ng-bind-html="getAdditionalMessage()"></p>
-    </div>
-  </div>
-
-  <visualization-embedded
-    ng-if="!isVisible"
-    class="visualize"
-    vis="vis"
-    embeddable-handler="embeddableHandler"
-    ui-state="uiState"
-    time-range="timeRange"
-    filters="filters"
-    query="query"
-    app-state="appState"
-  ></visualization-embedded>
-
-  <h1
-    class="euiScreenReaderOnly"
-    i18n-id="visualize.pageHeading"
-    i18n-default-message="{chartName} {chartType} visualization"
-    i18n-values="{
-      chartName: savedVis.title,
-      chartType: vis.type.title
-    }"
-  >
-  </h1>
-  <visualization-editor
-    ng-if="isVisible"
-    vis="vis"
-    saved-search="savedSearch"
-    embeddable-handler="embeddableHandler"
-    event-emitter="eventEmitter"
-    ui-state="uiState"
-    time-range="timeRange"
-    filters="filters"
-    query="query"
-    class="visEditor__content"
-  ></visualization-editor>
-
-</visualize-app>
diff --git a/src/plugins/visualize/public/application/editor/editor.js b/src/plugins/visualize/public/application/editor/editor.js
deleted file mode 100644
index d7c7828c58f23f..00000000000000
--- a/src/plugins/visualize/public/application/editor/editor.js
+++ /dev/null
@@ -1,763 +0,0 @@
-/*
- * 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 angular from 'angular';
-import _ from 'lodash';
-import { Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { i18n } from '@kbn/i18n';
-import { EventEmitter } from 'events';
-
-import React from 'react';
-import { makeStateful, useVisualizeAppState } from './lib';
-import { VisualizeConstants } from '../visualize_constants';
-import { getEditBreadcrumbs } from '../breadcrumbs';
-
-import { addHelpMenuToAppChrome } from '../help_menu/help_menu_util';
-import { unhashUrl } from '../../../../kibana_utils/public';
-import { MarkdownSimple, toMountPoint } from '../../../../kibana_react/public';
-import {
-  addFatalError,
-  subscribeWithScope,
-  migrateLegacyQuery,
-} from '../../../../kibana_legacy/public';
-import { showSaveModal, SavedObjectSaveModalOrigin } from '../../../../saved_objects/public';
-import {
-  esFilters,
-  connectToQueryState,
-  syncQueryStateWithUrl,
-  UI_SETTINGS,
-} from '../../../../data/public';
-
-import { initVisEditorDirective } from './visualization_editor';
-import { initVisualizationDirective } from './visualization';
-
-import { getServices } from '../../kibana_services';
-import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../visualizations/public';
-
-export function initEditorDirective(app, deps) {
-  app.directive('visualizeApp', function () {
-    return {
-      restrict: 'E',
-      controllerAs: 'visualizeApp',
-      controller: VisualizeAppController,
-    };
-  });
-
-  initVisEditorDirective(app, deps);
-  initVisualizationDirective(app, deps);
-}
-
-function VisualizeAppController($scope, $route, $injector, $timeout, kbnUrlStateStorage, history) {
-  const {
-    localStorage,
-    visualizeCapabilities,
-    share,
-    data: { query: queryService, indexPatterns },
-    toastNotifications,
-    chrome,
-    core: { docLinks, fatalErrors, uiSettings, application },
-    I18nContext,
-    setActiveUrl,
-    visualizations,
-    embeddable,
-    scopedHistory,
-  } = getServices();
-
-  const {
-    filterManager,
-    timefilter: { timefilter },
-  } = queryService;
-
-  // starts syncing `_g` portion of url with query services
-  const { stop: stopSyncingQueryServiceStateWithUrl } = syncQueryStateWithUrl(
-    queryService,
-    kbnUrlStateStorage
-  );
-
-  // Retrieve the resolved SavedVis instance.
-  const { vis, savedVis, savedSearch, embeddableHandler } = $route.current.locals.resolved;
-  $scope.eventEmitter = new EventEmitter();
-  const _applyVis = () => {
-    $scope.$apply();
-  };
-  // This will trigger a digest cycle. This is needed when vis is updated from a global angular like in visualize_embeddable.js.
-  $scope.eventEmitter.on('apply', _applyVis);
-  // vis is instance of src/legacy/ui/public/vis/vis.js.
-  // SearchSource is a promise-based stream of search results that can inherit from other search sources.
-  const searchSource = vis.data.searchSource;
-
-  $scope.vis = vis;
-  $scope.savedSearch = savedSearch;
-
-  const $appStatus = {
-    dirty: !savedVis.id,
-  };
-
-  const defaultQuery = {
-    query: '',
-    language:
-      localStorage.get('kibana.userQueryLanguage') ||
-      uiSettings.get(UI_SETTINGS.SEARCH_QUERY_LANGUAGE),
-  };
-
-  const { originatingApp } =
-    embeddable.getStateTransfer(scopedHistory()).getIncomingEditorState() || {};
-  $scope.getOriginatingApp = () => originatingApp;
-
-  const visStateToEditorState = () => {
-    const savedVisState = visualizations.convertFromSerializedVis(vis.serialize());
-    return {
-      uiState: vis.uiState.toJSON(),
-      query: vis.data.searchSource.getOwnField('query') || defaultQuery,
-      filters: vis.data.searchSource.getOwnField('filter') || [],
-      vis: { ...savedVisState.visState, title: vis.title },
-      linked: !!savedVis.savedSearchId,
-    };
-  };
-
-  const stateDefaults = visStateToEditorState();
-
-  const { stateContainer, stopStateSync } = useVisualizeAppState({
-    stateDefaults,
-    kbnUrlStateStorage,
-  });
-
-  $scope.eventEmitter.on('dirtyStateChange', ({ isDirty }) => {
-    if (!isDirty) {
-      stateContainer.transitions.updateVisState(visStateToEditorState().vis);
-    }
-    $timeout(() => {
-      $scope.dirty = isDirty;
-    });
-  });
-
-  $scope.eventEmitter.on('updateVis', () => {
-    embeddableHandler.reload();
-  });
-
-  $scope.embeddableHandler = embeddableHandler;
-
-  $scope.topNavMenu = [
-    ...($scope.getOriginatingApp() && savedVis.id
-      ? [
-          {
-            id: 'saveAndReturn',
-            label: i18n.translate('visualize.topNavMenu.saveAndReturnVisualizationButtonLabel', {
-              defaultMessage: 'Save and return',
-            }),
-            emphasize: true,
-            iconType: 'check',
-            description: i18n.translate(
-              'visualize.topNavMenu.saveAndReturnVisualizationButtonAriaLabel',
-              {
-                defaultMessage: 'Finish editing visualization and return to the last app',
-              }
-            ),
-            testId: 'visualizesaveAndReturnButton',
-            disableButton() {
-              return Boolean($scope.dirty);
-            },
-            tooltip() {
-              if ($scope.dirty) {
-                return i18n.translate(
-                  'visualize.topNavMenu.saveAndReturnVisualizationDisabledButtonTooltip',
-                  {
-                    defaultMessage: 'Apply or Discard your changes before finishing',
-                  }
-                );
-              }
-            },
-            run: async () => {
-              const saveOptions = {
-                confirmOverwrite: false,
-                returnToOrigin: true,
-              };
-              return doSave(saveOptions);
-            },
-          },
-        ]
-      : []),
-    ...(visualizeCapabilities.save
-      ? [
-          {
-            id: 'save',
-            label:
-              savedVis.id && $scope.getOriginatingApp()
-                ? i18n.translate('visualize.topNavMenu.saveVisualizationAsButtonLabel', {
-                    defaultMessage: 'save as',
-                  })
-                : i18n.translate('visualize.topNavMenu.saveVisualizationButtonLabel', {
-                    defaultMessage: 'save',
-                  }),
-            emphasize: !savedVis.id || !$scope.getOriginatingApp(),
-            description: i18n.translate('visualize.topNavMenu.saveVisualizationButtonAriaLabel', {
-              defaultMessage: 'Save Visualization',
-            }),
-            testId: 'visualizeSaveButton',
-            disableButton() {
-              return Boolean($scope.dirty);
-            },
-            tooltip() {
-              if ($scope.dirty) {
-                return i18n.translate(
-                  'visualize.topNavMenu.saveVisualizationDisabledButtonTooltip',
-                  {
-                    defaultMessage: 'Apply or Discard your changes before saving',
-                  }
-                );
-              }
-            },
-            run: async () => {
-              const onSave = ({
-                newTitle,
-                newCopyOnSave,
-                isTitleDuplicateConfirmed,
-                onTitleDuplicate,
-                newDescription,
-                returnToOrigin,
-              }) => {
-                const currentTitle = savedVis.title;
-                savedVis.title = newTitle;
-                savedVis.copyOnSave = newCopyOnSave;
-                savedVis.description = newDescription;
-                const saveOptions = {
-                  confirmOverwrite: false,
-                  isTitleDuplicateConfirmed,
-                  onTitleDuplicate,
-                  returnToOrigin,
-                };
-                return doSave(saveOptions).then((response) => {
-                  // If the save wasn't successful, put the original values back.
-                  if (!response.id || response.error) {
-                    savedVis.title = currentTitle;
-                  }
-                  return response;
-                });
-              };
-
-              const saveModal = (
-                <SavedObjectSaveModalOrigin
-                  documentInfo={savedVis}
-                  onSave={onSave}
-                  objectType={'visualization'}
-                  onClose={() => {}}
-                  originatingApp={$scope.getOriginatingApp()}
-                />
-              );
-              showSaveModal(saveModal, I18nContext);
-            },
-          },
-        ]
-      : []),
-    {
-      id: 'share',
-      label: i18n.translate('visualize.topNavMenu.shareVisualizationButtonLabel', {
-        defaultMessage: 'share',
-      }),
-      description: i18n.translate('visualize.topNavMenu.shareVisualizationButtonAriaLabel', {
-        defaultMessage: 'Share Visualization',
-      }),
-      testId: 'shareTopNavButton',
-      run: (anchorElement) => {
-        const hasUnappliedChanges = $scope.dirty;
-        const hasUnsavedChanges = $appStatus.dirty;
-        share.toggleShareContextMenu({
-          anchorElement,
-          allowEmbed: true,
-          allowShortUrl: visualizeCapabilities.createShortUrl,
-          shareableUrl: unhashUrl(window.location.href),
-          objectId: savedVis.id,
-          objectType: 'visualization',
-          sharingData: {
-            title: savedVis.title,
-          },
-          isDirty: hasUnappliedChanges || hasUnsavedChanges,
-        });
-      },
-      // disable the Share button if no action specified
-      disableButton: !share,
-    },
-    {
-      id: 'inspector',
-      label: i18n.translate('visualize.topNavMenu.openInspectorButtonLabel', {
-        defaultMessage: 'inspect',
-      }),
-      description: i18n.translate('visualize.topNavMenu.openInspectorButtonAriaLabel', {
-        defaultMessage: 'Open Inspector for visualization',
-      }),
-      testId: 'openInspectorButton',
-      disableButton() {
-        return !embeddableHandler.hasInspector || !embeddableHandler.hasInspector();
-      },
-      run() {
-        const inspectorSession = embeddableHandler.openInspector();
-
-        if (inspectorSession) {
-          // Close the inspector if this scope is destroyed (e.g. because the user navigates away).
-          const removeWatch = $scope.$on('$destroy', () => inspectorSession.close());
-          // Remove that watch in case the user closes the inspector session herself.
-          inspectorSession.onClose.finally(removeWatch);
-        }
-      },
-      tooltip() {
-        if (!embeddableHandler.hasInspector || !embeddableHandler.hasInspector()) {
-          return i18n.translate('visualize.topNavMenu.openInspectorDisabledButtonTooltip', {
-            defaultMessage: `This visualization doesn't support any inspectors.`,
-          });
-        }
-      },
-    },
-  ];
-
-  if (savedVis.id) {
-    chrome.docTitle.change(savedVis.title);
-  }
-
-  // sync initial app filters from state to filterManager
-  filterManager.setAppFilters(_.cloneDeep(stateContainer.getState().filters));
-  // setup syncing of app filters between appState and filterManager
-  const stopSyncingAppFilters = connectToQueryState(
-    queryService,
-    {
-      set: ({ filters }) => stateContainer.transitions.set('filters', filters),
-      get: () => ({ filters: stateContainer.getState().filters }),
-      state$: stateContainer.state$.pipe(map((state) => ({ filters: state.filters }))),
-    },
-    {
-      filters: esFilters.FilterStateStore.APP_STATE,
-    }
-  );
-
-  const stopAllSyncing = () => {
-    stopStateSync();
-    stopSyncingQueryServiceStateWithUrl();
-    stopSyncingAppFilters();
-  };
-
-  // The savedVis is pulled from elasticsearch, but the appState is pulled from the url, with the
-  // defaults applied. If the url was from a previous session which included modifications to the
-  // appState then they won't be equal.
-  if (!_.isEqual(stateContainer.getState().vis, stateDefaults.vis)) {
-    try {
-      const { aggs, ...visState } = stateContainer.getState().vis;
-      vis.setState({ ...visState, data: { aggs } });
-    } catch (error) {
-      // stop syncing url updtes with the state to prevent extra syncing
-      stopAllSyncing();
-
-      toastNotifications.addWarning({
-        title: i18n.translate('visualize.visualizationTypeInvalidNotificationMessage', {
-          defaultMessage: 'Invalid visualization type',
-        }),
-        text: toMountPoint(<MarkdownSimple>{error.message}</MarkdownSimple>),
-      });
-
-      history.replace(`${VisualizeConstants.LANDING_PAGE_PATH}?notFound=visualization`);
-
-      // prevent further controller execution
-      return;
-    }
-  }
-
-  $scope.filters = filterManager.getFilters();
-
-  $scope.onFiltersUpdated = (filters) => {
-    // The filters will automatically be set when the filterManager emits an update event (see below)
-    filterManager.setFilters(filters);
-  };
-
-  $scope.showSaveQuery = visualizeCapabilities.saveQuery;
-
-  $scope.$watch(
-    () => visualizeCapabilities.saveQuery,
-    (newCapability) => {
-      $scope.showSaveQuery = newCapability;
-    }
-  );
-
-  const updateSavedQueryFromUrl = (savedQueryId) => {
-    if (!savedQueryId) {
-      delete $scope.savedQuery;
-
-      return;
-    }
-
-    if ($scope.savedQuery && $scope.savedQuery.id === savedQueryId) {
-      return;
-    }
-
-    queryService.savedQueries.getSavedQuery(savedQueryId).then((savedQuery) => {
-      $scope.$evalAsync(() => {
-        $scope.updateSavedQuery(savedQuery);
-      });
-    });
-  };
-
-  function init() {
-    if (vis.data.indexPattern) {
-      $scope.indexPattern = vis.data.indexPattern;
-    } else {
-      indexPatterns.getDefault().then((defaultIndexPattern) => {
-        $scope.indexPattern = defaultIndexPattern;
-      });
-    }
-
-    const initialState = stateContainer.getState();
-
-    const handleLinkedSearch = (linked) => {
-      if (linked && !savedVis.savedSearchId && savedSearch) {
-        savedVis.savedSearchId = savedSearch.id;
-        vis.data.savedSearchId = savedSearch.id;
-        searchSource.setParent(savedSearch.searchSource);
-      } else if (!linked && savedVis.savedSearchId) {
-        delete savedVis.savedSearchId;
-        delete vis.data.savedSearchId;
-      }
-    };
-
-    // Create a PersistedState instance for uiState.
-    const { persistedState, unsubscribePersisted, persistOnChange } = makeStateful(
-      'uiState',
-      stateContainer
-    );
-    vis.uiState = persistedState;
-    vis.uiState.on('reload', embeddableHandler.reload);
-    $scope.uiState = persistedState;
-    $scope.savedVis = savedVis;
-    $scope.query = initialState.query;
-    $scope.searchSource = searchSource;
-    $scope.refreshInterval = timefilter.getRefreshInterval();
-    handleLinkedSearch(initialState.linked);
-
-    $scope.showFilterBar = () => {
-      return vis.type.options.showFilterBar;
-    };
-
-    $scope.showQueryInput = () => {
-      return vis.type.requiresSearch && vis.type.options.showQueryBar;
-    };
-
-    $scope.showQueryBarTimePicker = () => {
-      // tsvb loads without an indexPattern initially (TODO investigate).
-      // hide timefilter only if timeFieldName is explicitly undefined.
-      const hasTimeField = vis.data.indexPattern ? !!vis.data.indexPattern.timeFieldName : true;
-      return vis.type.options.showTimePicker && hasTimeField;
-    };
-
-    $scope.timeRange = timefilter.getTime();
-
-    const unsubscribeStateUpdates = stateContainer.subscribe((state) => {
-      const newQuery = migrateLegacyQuery(state.query);
-      if (!_.isEqual(state.query, newQuery)) {
-        stateContainer.transitions.set('query', newQuery);
-      }
-      persistOnChange(state);
-      updateSavedQueryFromUrl(state.savedQuery);
-
-      // if the browser history was changed manually we need to reflect changes in the editor
-      if (
-        !_.isEqual(
-          {
-            ...visualizations.convertFromSerializedVis(vis.serialize()).visState,
-            title: vis.title,
-          },
-          state.vis
-        )
-      ) {
-        const { aggs, ...visState } = state.vis;
-        vis.setState({
-          ...visState,
-          data: {
-            aggs,
-          },
-        });
-        embeddableHandler.reload();
-        $scope.eventEmitter.emit('updateEditor');
-      }
-
-      $appStatus.dirty = true;
-      $scope.fetch();
-    });
-
-    const updateTimeRange = () => {
-      $scope.timeRange = timefilter.getTime();
-      $scope.$broadcast('render');
-    };
-
-    // update the query if savedQuery is stored
-    updateSavedQueryFromUrl(initialState.savedQuery);
-
-    const subscriptions = new Subscription();
-
-    subscriptions.add(
-      subscribeWithScope(
-        $scope,
-        timefilter.getRefreshIntervalUpdate$(),
-        {
-          next: () => {
-            $scope.refreshInterval = timefilter.getRefreshInterval();
-          },
-        },
-        (error) => addFatalError(fatalErrors, error)
-      )
-    );
-    subscriptions.add(
-      subscribeWithScope(
-        $scope,
-        timefilter.getTimeUpdate$(),
-        {
-          next: updateTimeRange,
-        },
-        (error) => addFatalError(fatalErrors, error)
-      )
-    );
-
-    subscriptions.add(
-      chrome.getIsVisible$().subscribe((isVisible) => {
-        $scope.$evalAsync(() => {
-          $scope.isVisible = isVisible;
-        });
-      })
-    );
-
-    // update the searchSource when query updates
-    $scope.fetch = function () {
-      const { query, linked, filters } = stateContainer.getState();
-      $scope.query = query;
-      handleLinkedSearch(linked);
-      vis.data.searchSource.setField('query', query);
-      vis.data.searchSource.setField('filter', filters);
-      $scope.$broadcast('render');
-    };
-
-    // update the searchSource when filters update
-    subscriptions.add(
-      subscribeWithScope(
-        $scope,
-        filterManager.getUpdates$(),
-        {
-          next: () => {
-            $scope.filters = filterManager.getFilters();
-          },
-        },
-        (error) => addFatalError(fatalErrors, error)
-      )
-    );
-    subscriptions.add(
-      subscribeWithScope(
-        $scope,
-        filterManager.getFetches$(),
-        {
-          next: $scope.fetch,
-        },
-        (error) => addFatalError(fatalErrors, error)
-      )
-    );
-
-    $scope.$on('$destroy', () => {
-      if ($scope._handler) {
-        $scope._handler.destroy();
-      }
-      savedVis.destroy();
-      subscriptions.unsubscribe();
-      $scope.eventEmitter.off('apply', _applyVis);
-
-      unsubscribePersisted();
-      vis.uiState.off('reload', embeddableHandler.reload);
-      unsubscribeStateUpdates();
-
-      stopAllSyncing();
-    });
-
-    $timeout(() => {
-      $scope.$broadcast('render');
-    });
-  }
-
-  $scope.updateQueryAndFetch = function ({ query, dateRange }) {
-    const isUpdate =
-      (query && !_.isEqual(query, stateContainer.getState().query)) ||
-      (dateRange && !_.isEqual(dateRange, $scope.timeRange));
-
-    stateContainer.transitions.set('query', query);
-    timefilter.setTime(dateRange);
-
-    // If nothing has changed, trigger the fetch manually, otherwise it will happen as a result of the changes
-    if (!isUpdate) {
-      embeddableHandler.reload();
-    }
-  };
-
-  $scope.onRefreshChange = function ({ isPaused, refreshInterval }) {
-    timefilter.setRefreshInterval({
-      pause: isPaused,
-      value: refreshInterval ? refreshInterval : $scope.refreshInterval.value,
-    });
-  };
-
-  $scope.onClearSavedQuery = () => {
-    delete $scope.savedQuery;
-    stateContainer.transitions.removeSavedQuery(defaultQuery);
-    filterManager.setFilters(filterManager.getGlobalFilters());
-  };
-
-  const updateStateFromSavedQuery = (savedQuery) => {
-    stateContainer.transitions.updateFromSavedQuery(savedQuery);
-
-    const savedQueryFilters = savedQuery.attributes.filters || [];
-    const globalFilters = filterManager.getGlobalFilters();
-    filterManager.setFilters([...globalFilters, ...savedQueryFilters]);
-
-    if (savedQuery.attributes.timefilter) {
-      timefilter.setTime({
-        from: savedQuery.attributes.timefilter.from,
-        to: savedQuery.attributes.timefilter.to,
-      });
-      if (savedQuery.attributes.timefilter.refreshInterval) {
-        timefilter.setRefreshInterval(savedQuery.attributes.timefilter.refreshInterval);
-      }
-    }
-  };
-
-  $scope.updateSavedQuery = (savedQuery) => {
-    $scope.savedQuery = savedQuery;
-    updateStateFromSavedQuery(savedQuery);
-  };
-
-  /**
-   * Called when the user clicks "Save" button.
-   */
-  function doSave(saveOptions) {
-    // vis.title was not bound and it's needed to reflect title into visState
-    const newlyCreated = !Boolean(savedVis.id) || savedVis.copyOnSave;
-    stateContainer.transitions.setVis({
-      title: savedVis.title,
-      type: savedVis.type || stateContainer.getState().vis.type,
-    });
-    savedVis.searchSourceFields = searchSource.getSerializedFields();
-    savedVis.visState = stateContainer.getState().vis;
-    savedVis.uiStateJSON = angular.toJson($scope.uiState.toJSON());
-    $appStatus.dirty = false;
-
-    return savedVis.save(saveOptions).then(
-      function (id) {
-        $scope.$evalAsync(() => {
-          if (id) {
-            toastNotifications.addSuccess({
-              title: i18n.translate(
-                'visualize.topNavMenu.saveVisualization.successNotificationText',
-                {
-                  defaultMessage: `Saved '{visTitle}'`,
-                  values: {
-                    visTitle: savedVis.title,
-                  },
-                }
-              ),
-              'data-test-subj': 'saveVisualizationSuccess',
-            });
-
-            if ($scope.getOriginatingApp() && saveOptions.returnToOrigin) {
-              const appPath = `${VisualizeConstants.EDIT_PATH}/${encodeURIComponent(savedVis.id)}`;
-
-              // Manually insert a new url so the back button will open the saved visualization.
-              history.replace(appPath);
-              setActiveUrl(appPath);
-              if (newlyCreated && embeddable) {
-                embeddable
-                  .getStateTransfer()
-                  .navigateToWithEmbeddablePackage($scope.getOriginatingApp(), {
-                    state: { id: savedVis.id, type: VISUALIZE_EMBEDDABLE_TYPE },
-                  });
-              } else {
-                application.navigateToApp($scope.getOriginatingApp());
-              }
-            } else if (savedVis.id === $route.current.params.id) {
-              chrome.docTitle.change(savedVis.lastSavedTitle);
-              chrome.setBreadcrumbs($injector.invoke(getEditBreadcrumbs));
-              savedVis.vis.title = savedVis.title;
-              savedVis.vis.description = savedVis.description;
-            } else {
-              history.replace({
-                ...history.location,
-                pathname: `${VisualizeConstants.EDIT_PATH}/${savedVis.id}`,
-              });
-            }
-          }
-        });
-        return { id };
-      },
-      (error) => {
-        // eslint-disable-next-line
-        console.error(error);
-        toastNotifications.addDanger({
-          title: i18n.translate('visualize.topNavMenu.saveVisualization.failureNotificationText', {
-            defaultMessage: `Error on saving '{visTitle}'`,
-            values: {
-              visTitle: savedVis.title,
-            },
-          }),
-          text: error.message,
-          'data-test-subj': 'saveVisualizationError',
-        });
-        return { error };
-      }
-    );
-  }
-
-  const unlinkFromSavedSearch = () => {
-    const searchSourceParent = savedSearch.searchSource;
-    const searchSourceGrandparent = searchSourceParent.getParent();
-    const currentIndex = searchSourceParent.getField('index');
-
-    searchSource.setField('index', currentIndex);
-    searchSource.setParent(searchSourceGrandparent);
-
-    stateContainer.transitions.unlinkSavedSearch({
-      query: searchSourceParent.getField('query'),
-      parentFilters: searchSourceParent.getOwnField('filter'),
-    });
-
-    toastNotifications.addSuccess(
-      i18n.translate('visualize.linkedToSearch.unlinkSuccessNotificationText', {
-        defaultMessage: `Unlinked from saved search '{searchTitle}'`,
-        values: {
-          searchTitle: savedSearch.title,
-        },
-      })
-    );
-  };
-
-  $scope.getAdditionalMessage = () => {
-    return (
-      '<i class="kuiIcon fa-flask"></i>' +
-      i18n.translate('visualize.experimentalVisInfoText', {
-        defaultMessage: 'This visualization is marked as experimental.',
-      }) +
-      ' ' +
-      vis.type.feedbackMessage
-    );
-  };
-
-  $scope.eventEmitter.on('unlinkFromSavedSearch', unlinkFromSavedSearch);
-
-  addHelpMenuToAppChrome(chrome, docLinks);
-
-  init();
-}
diff --git a/src/plugins/visualize/public/application/editor/lib/make_stateful.ts b/src/plugins/visualize/public/application/editor/lib/make_stateful.ts
deleted file mode 100644
index c7163f9b7705d4..00000000000000
--- a/src/plugins/visualize/public/application/editor/lib/make_stateful.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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 { PersistedState } from '../../../../../visualizations/public';
-import { ReduxLikeStateContainer } from '../../../../../kibana_utils/public';
-import { VisualizeAppState, VisualizeAppStateTransitions } from '../../types';
-
-/**
- * @returns Create a PersistedState instance, initialize state changes subscriber/unsubscriber
- */
-export function makeStateful(
-  prop: keyof VisualizeAppState,
-  stateContainer: ReduxLikeStateContainer<VisualizeAppState, VisualizeAppStateTransitions>
-) {
-  // set up the persistedState state
-  const persistedState = new PersistedState();
-
-  // update the appState when the stateful instance changes
-  const updateOnChange = function () {
-    stateContainer.transitions.set(prop, persistedState.getChanges());
-  };
-
-  const handlerOnChange = (method: 'on' | 'off') =>
-    persistedState[method]('change', updateOnChange);
-
-  handlerOnChange('on');
-  const unsubscribePersisted = () => handlerOnChange('off');
-
-  // update the stateful object when the app state changes
-  const persistOnChange = function (state: VisualizeAppState) {
-    if (state[prop]) {
-      persistedState.set(state[prop]);
-    }
-  };
-
-  const appState = stateContainer.getState();
-
-  // if the thing we're making stateful has an appState value, write to persisted state
-  if (appState[prop]) persistedState.setSilent(appState[prop]);
-
-  return { persistedState, unsubscribePersisted, persistOnChange };
-}
diff --git a/src/plugins/visualize/public/application/editor/visualization.js b/src/plugins/visualize/public/application/editor/visualization.js
deleted file mode 100644
index 26f61f3f0a2c2b..00000000000000
--- a/src/plugins/visualize/public/application/editor/visualization.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.
- */
-
-export function initVisualizationDirective(app) {
-  app.directive('visualizationEmbedded', function ($timeout) {
-    return {
-      restrict: 'E',
-      scope: {
-        embeddableHandler: '=',
-        uiState: '=?',
-        timeRange: '=',
-        filters: '=',
-        query: '=',
-        appState: '=',
-      },
-      link: function ($scope, element) {
-        $scope.renderFunction = async () => {
-          if (!$scope.rendered) {
-            $scope.embeddableHandler.render(element[0]);
-            $scope.rendered = true;
-          }
-
-          $scope.embeddableHandler.updateInput({
-            timeRange: $scope.timeRange,
-            filters: $scope.filters || [],
-            query: $scope.query,
-          });
-        };
-
-        $scope.$on('render', (event) => {
-          event.preventDefault();
-          $timeout(() => {
-            $scope.renderFunction();
-          });
-        });
-
-        $scope.$on('$destroy', () => {
-          if ($scope.embeddableHandler) {
-            $scope.embeddableHandler.destroy();
-          }
-        });
-      },
-    };
-  });
-}
diff --git a/src/plugins/visualize/public/application/editor/visualization_editor.js b/src/plugins/visualize/public/application/editor/visualization_editor.js
deleted file mode 100644
index 4963d9bc5ed72e..00000000000000
--- a/src/plugins/visualize/public/application/editor/visualization_editor.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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 { DefaultEditorController } from '../../../../vis_default_editor/public';
-
-export function initVisEditorDirective(app, deps) {
-  app.directive('visualizationEditor', function ($timeout) {
-    return {
-      restrict: 'E',
-      scope: {
-        vis: '=',
-        uiState: '=?',
-        timeRange: '=',
-        filters: '=',
-        query: '=',
-        savedSearch: '=',
-        embeddableHandler: '=',
-        eventEmitter: '=',
-      },
-      link: function ($scope, element) {
-        const Editor = $scope.vis.type.editor || DefaultEditorController;
-        const editor = new Editor(
-          element[0],
-          $scope.vis,
-          $scope.eventEmitter,
-          $scope.embeddableHandler
-        );
-
-        $scope.renderFunction = () => {
-          editor.render({
-            core: deps.core,
-            data: deps.data,
-            uiState: $scope.uiState,
-            timeRange: $scope.timeRange,
-            filters: $scope.filters,
-            query: $scope.query,
-            linked: !!$scope.vis.data.savedSearchId,
-            savedSearch: $scope.savedSearch,
-          });
-        };
-
-        $scope.$on('render', (event) => {
-          event.preventDefault();
-          $timeout(() => {
-            $scope.renderFunction();
-          });
-        });
-
-        $scope.$on('$destroy', () => {
-          editor.destroy();
-        });
-      },
-    };
-  });
-}
diff --git a/src/plugins/visualize/public/application/index.tsx b/src/plugins/visualize/public/application/index.tsx
new file mode 100644
index 00000000000000..4bec244e6efc94
--- /dev/null
+++ b/src/plugins/visualize/public/application/index.tsx
@@ -0,0 +1,51 @@
+/*
+ * 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 React from 'react';
+import ReactDOM from 'react-dom';
+import { Router } from 'react-router-dom';
+
+import { AppMountParameters } from 'kibana/public';
+import { KibanaContextProvider } from '../../../kibana_react/public';
+import { VisualizeApp } from './app';
+import { VisualizeServices } from './types';
+import { addHelpMenuToAppChrome, addBadgeToAppChrome } from './utils';
+
+export const renderApp = ({ element }: AppMountParameters, services: VisualizeServices) => {
+  // add help link to visualize docs into app chrome menu
+  addHelpMenuToAppChrome(services.chrome, services.docLinks);
+  // add readonly badge if saving restricted
+  if (!services.visualizeCapabilities.save) {
+    addBadgeToAppChrome(services.chrome);
+  }
+
+  const app = (
+    <Router history={services.history}>
+      <KibanaContextProvider services={services}>
+        <services.i18n.Context>
+          <VisualizeApp />
+        </services.i18n.Context>
+      </KibanaContextProvider>
+    </Router>
+  );
+
+  ReactDOM.render(app, element);
+
+  return () => ReactDOM.unmountComponentAtNode(element);
+};
diff --git a/src/plugins/visualize/public/application/legacy_app.js b/src/plugins/visualize/public/application/legacy_app.js
deleted file mode 100644
index 452118f8097da0..00000000000000
--- a/src/plugins/visualize/public/application/legacy_app.js
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * 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 { find } from 'lodash';
-import { i18n } from '@kbn/i18n';
-import { createHashHistory } from 'history';
-
-import { createKbnUrlStateStorage, redirectWhenMissing } from '../../../kibana_utils/public';
-import { createSavedSearchesLoader } from '../../../discover/public';
-
-import editorTemplate from './editor/editor.html';
-import visualizeListingTemplate from './listing/visualize_listing.html';
-
-import { initVisualizeAppDirective } from './visualize_app';
-import { VisualizeConstants } from './visualize_constants';
-import { VisualizeListingController } from './listing/visualize_listing';
-
-import {
-  getLandingBreadcrumbs,
-  getWizardStep1Breadcrumbs,
-  getCreateBreadcrumbs,
-  getEditBreadcrumbs,
-} from './breadcrumbs';
-
-const getResolvedResults = (deps) => {
-  const { core, data, visualizations, createVisEmbeddableFromObject } = deps;
-
-  const results = {};
-
-  return (savedVis) => {
-    results.savedVis = savedVis;
-    const serializedVis = visualizations.convertToSerializedVis(savedVis);
-    return visualizations
-      .createVis(serializedVis.type, serializedVis)
-      .then((vis) => {
-        if (vis.type.setup) {
-          return vis.type.setup(vis).catch(() => vis);
-        }
-        return vis;
-      })
-      .then((vis) => {
-        results.vis = vis;
-        return createVisEmbeddableFromObject(vis, {
-          timeRange: data.query.timefilter.timefilter.getTime(),
-          filters: data.query.filterManager.getFilters(),
-        });
-      })
-      .then((embeddableHandler) => {
-        results.embeddableHandler = embeddableHandler;
-
-        embeddableHandler.getOutput$().subscribe((output) => {
-          if (output.error) {
-            core.notifications.toasts.addError(output.error, {
-              title: i18n.translate('visualize.error.title', {
-                defaultMessage: 'Visualization error',
-              }),
-            });
-          }
-        });
-
-        if (results.vis.data.savedSearchId) {
-          return createSavedSearchesLoader({
-            savedObjectsClient: core.savedObjects.client,
-            indexPatterns: data.indexPatterns,
-            search: data.search,
-            chrome: core.chrome,
-            overlays: core.overlays,
-          }).get(results.vis.data.savedSearchId);
-        }
-      })
-      .then((savedSearch) => {
-        if (savedSearch) {
-          results.savedSearch = savedSearch;
-        }
-        return results;
-      });
-  };
-};
-
-export function initVisualizeApp(app, deps) {
-  initVisualizeAppDirective(app, deps);
-
-  app.factory('history', () => createHashHistory());
-  app.factory('kbnUrlStateStorage', (history) =>
-    createKbnUrlStateStorage({
-      history,
-      useHash: deps.core.uiSettings.get('state:storeInSessionStorage'),
-    })
-  );
-
-  app.config(function ($routeProvider) {
-    const defaults = {
-      reloadOnSearch: false,
-      requireUICapability: 'visualize.show',
-      badge: () => {
-        if (deps.visualizeCapabilities.save) {
-          return undefined;
-        }
-
-        return {
-          text: i18n.translate('visualize.badge.readOnly.text', {
-            defaultMessage: 'Read only',
-          }),
-          tooltip: i18n.translate('visualize.badge.readOnly.tooltip', {
-            defaultMessage: 'Unable to save visualizations',
-          }),
-          iconType: 'glasses',
-        };
-      },
-    };
-
-    $routeProvider
-      .when(VisualizeConstants.LANDING_PAGE_PATH, {
-        ...defaults,
-        template: visualizeListingTemplate,
-        k7Breadcrumbs: getLandingBreadcrumbs,
-        controller: VisualizeListingController,
-        controllerAs: 'listingController',
-        resolve: {
-          createNewVis: () => false,
-          hasDefaultIndex: (history) => deps.data.indexPatterns.ensureDefaultIndexPattern(history),
-        },
-      })
-      .when(VisualizeConstants.WIZARD_STEP_1_PAGE_PATH, {
-        ...defaults,
-        template: visualizeListingTemplate,
-        k7Breadcrumbs: getWizardStep1Breadcrumbs,
-        controller: VisualizeListingController,
-        controllerAs: 'listingController',
-        resolve: {
-          createNewVis: () => true,
-          hasDefaultIndex: (history) => deps.data.indexPatterns.ensureDefaultIndexPattern(history),
-        },
-      })
-      .when(VisualizeConstants.CREATE_PATH, {
-        ...defaults,
-        template: editorTemplate,
-        k7Breadcrumbs: getCreateBreadcrumbs,
-        resolve: {
-          resolved: function ($route, history) {
-            const { data, savedVisualizations, visualizations, toastNotifications } = deps;
-            const visTypes = visualizations.all();
-            const visType = find(visTypes, { name: $route.current.params.type });
-            const shouldHaveIndex = visType.requiresSearch && visType.options.showIndexSelection;
-            const hasIndex =
-              $route.current.params.indexPattern || $route.current.params.savedSearchId;
-            if (shouldHaveIndex && !hasIndex) {
-              throw new Error(
-                i18n.translate(
-                  'visualize.createVisualization.noIndexPatternOrSavedSearchIdErrorMessage',
-                  {
-                    defaultMessage: 'You must provide either an indexPattern or a savedSearchId',
-                  }
-                )
-              );
-            }
-
-            // This delay is needed to prevent some navigation issues in Firefox/Safari.
-            // see https://github.com/elastic/kibana/issues/65161
-            const delay = (res) => {
-              return new Promise((resolve) => {
-                setTimeout(() => resolve(res), 0);
-              });
-            };
-
-            return data.indexPatterns
-              .ensureDefaultIndexPattern(history)
-              .then(() => savedVisualizations.get($route.current.params))
-              .then((savedVis) => {
-                savedVis.searchSourceFields = { index: $route.current.params.indexPattern };
-                return savedVis;
-              })
-              .then(getResolvedResults(deps))
-              .then(delay)
-              .catch(
-                redirectWhenMissing({
-                  history,
-                  mapping: VisualizeConstants.LANDING_PAGE_PATH,
-                  toastNotifications,
-                })
-              );
-          },
-        },
-      })
-      .when(`${VisualizeConstants.EDIT_PATH}/:id`, {
-        ...defaults,
-        template: editorTemplate,
-        k7Breadcrumbs: getEditBreadcrumbs,
-        resolve: {
-          resolved: function ($route, history) {
-            const { chrome, data, savedVisualizations, toastNotifications } = deps;
-
-            return data.indexPatterns
-              .ensureDefaultIndexPattern(history)
-              .then(() => savedVisualizations.get($route.current.params.id))
-              .then((savedVis) => {
-                chrome.recentlyAccessed.add(savedVis.getFullPath(), savedVis.title, savedVis.id);
-                return savedVis;
-              })
-              .then(getResolvedResults(deps))
-              .catch(
-                redirectWhenMissing({
-                  history,
-                  navigateToApp: deps.core.application.navigateToApp,
-                  basePath: deps.core.http.basePath,
-                  mapping: {
-                    visualization: VisualizeConstants.LANDING_PAGE_PATH,
-                    search: {
-                      app: 'management',
-                      path: 'kibana/objects/savedVisualizations/' + $route.current.params.id,
-                    },
-                    'index-pattern': {
-                      app: 'management',
-                      path: 'kibana/objects/savedVisualizations/' + $route.current.params.id,
-                    },
-                    'index-pattern-field': {
-                      app: 'management',
-                      path: 'kibana/objects/savedVisualizations/' + $route.current.params.id,
-                    },
-                  },
-                  toastNotifications,
-                  onBeforeRedirect() {
-                    deps.setActiveUrl(VisualizeConstants.LANDING_PAGE_PATH);
-                  },
-                })
-              );
-          },
-        },
-      })
-      .otherwise({
-        resolveRedirectTo: function ($rootScope) {
-          const path = window.location.hash.substr(1);
-          deps.restorePreviousUrl();
-          $rootScope.$applyAsync(() => {
-            const { navigated } = deps.kibanaLegacy.navigateToLegacyKibanaUrl(path);
-            if (!navigated) {
-              deps.kibanaLegacy.navigateToDefaultApp();
-            }
-          });
-          // prevent angular from completing the navigation
-          return new Promise(() => {});
-        },
-      });
-  });
-}
diff --git a/src/plugins/visualize/public/application/listing/_index.scss b/src/plugins/visualize/public/application/listing/_index.scss
deleted file mode 100644
index 924c164e467d88..00000000000000
--- a/src/plugins/visualize/public/application/listing/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'listing';
diff --git a/src/plugins/visualize/public/application/listing/visualize_listing.html b/src/plugins/visualize/public/application/listing/visualize_listing.html
deleted file mode 100644
index 8838348e0b6796..00000000000000
--- a/src/plugins/visualize/public/application/listing/visualize_listing.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="kuiViewContent kuiViewContent--constrainedWidth kuiViewContentItem"
-     data-test-subj="visualizeLandingPage"
->
-  <visualize-listing-table
-    find-items="listingController.fetchItems"
-    delete-items="listingController.deleteSelectedItems"
-    create-item="listingController.createNewVis"
-    get-view-element="listingController.getViewElement"
-    edit-item="listingController.editItem"
-    listing-limit="listingController.listingLimit"
-    initial-page-size="listingController.initialPageSize"
-  ></visualize-listing-table>
-</div>
diff --git a/src/plugins/visualize/public/application/listing/visualize_listing.js b/src/plugins/visualize/public/application/listing/visualize_listing.js
deleted file mode 100644
index e8e8d92034113a..00000000000000
--- a/src/plugins/visualize/public/application/listing/visualize_listing.js
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * 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 { addHelpMenuToAppChrome } from '../help_menu/help_menu_util';
-import { withI18nContext } from './visualize_listing_table';
-
-import { VisualizeConstants } from '../visualize_constants';
-import { i18n } from '@kbn/i18n';
-
-import { getServices } from '../../kibana_services';
-import { syncQueryStateWithUrl } from '../../../../data/public';
-import { VISUALIZE_ENABLE_LABS_SETTING } from '../../../../visualizations/public';
-
-import { EuiLink } from '@elastic/eui';
-import React from 'react';
-
-export function initListingDirective(app, I18nContext) {
-  app.directive('visualizeListingTable', (reactDirective) =>
-    reactDirective(withI18nContext(I18nContext))
-  );
-}
-
-export function VisualizeListingController($scope, createNewVis, kbnUrlStateStorage, history) {
-  const {
-    addBasePath,
-    chrome,
-    savedObjectsClient,
-    savedVisualizations,
-    data: { query },
-    toastNotifications,
-    visualizations,
-    core: { docLinks, savedObjects, uiSettings, application },
-    savedObjects: savedObjectsPublic,
-  } = getServices();
-
-  chrome.docTitle.change(
-    i18n.translate('visualize.listingPageTitle', { defaultMessage: 'Visualize' })
-  );
-
-  // syncs `_g` portion of url with query services
-  const { stop: stopSyncingQueryServiceStateWithUrl } = syncQueryStateWithUrl(
-    query,
-    kbnUrlStateStorage
-  );
-
-  const {
-    timefilter: { timefilter },
-  } = query;
-
-  timefilter.disableAutoRefreshSelector();
-  timefilter.disableTimeRangeSelector();
-
-  this.addBasePath = addBasePath;
-  this.uiSettings = uiSettings;
-  this.savedObjects = savedObjects;
-
-  this.createNewVis = () => {
-    this.closeNewVisModal = visualizations.showNewVisModal();
-  };
-
-  this.editItem = ({ editUrl, editApp }) => {
-    if (editApp) {
-      application.navigateToApp(editApp, { path: editUrl });
-      return;
-    }
-    // for visualizations the edit and view URLs are the same
-    window.location.href = addBasePath(editUrl);
-  };
-
-  this.getViewElement = (field, record) => {
-    const dataTestSubj = `visListingTitleLink-${record.title.split(' ').join('-')}`;
-    if (record.editApp) {
-      return (
-        <EuiLink
-          onClick={() => {
-            application.navigateToApp(record.editApp, { path: record.editUrl });
-          }}
-          data-test-subj={dataTestSubj}
-        >
-          {field}
-        </EuiLink>
-      );
-    } else if (record.editUrl) {
-      return (
-        <EuiLink href={addBasePath(record.editUrl)} data-test-subj={dataTestSubj}>
-          {field}
-        </EuiLink>
-      );
-    } else {
-      return <span>{field}</span>;
-    }
-  };
-
-  if (createNewVis) {
-    // In case the user navigated to the page via the /visualize/new URL we start the dialog immediately
-    this.closeNewVisModal = visualizations.showNewVisModal({
-      onClose: () => {
-        // In case the user came via a URL to this page, change the URL to the regular landing page URL after closing the modal
-        history.push({
-          // Should preserve querystring part so the global state is preserved.
-          ...history.location,
-          pathname: VisualizeConstants.LANDING_PAGE_PATH,
-        });
-      },
-    });
-  }
-
-  this.fetchItems = (filter) => {
-    const isLabsEnabled = uiSettings.get(VISUALIZE_ENABLE_LABS_SETTING);
-    return savedVisualizations
-      .findListItems(filter, savedObjectsPublic.settings.getListingLimit())
-      .then((result) => {
-        this.totalItems = result.total;
-
-        return {
-          total: result.total,
-          hits: result.hits.filter(
-            (result) => isLabsEnabled || result.type.stage !== 'experimental'
-          ),
-        };
-      });
-  };
-
-  this.deleteSelectedItems = function deleteSelectedItems(selectedItems) {
-    return Promise.all(
-      selectedItems.map((item) => {
-        return savedObjectsClient.delete(item.savedObjectType, item.id);
-      })
-    ).catch((error) => {
-      toastNotifications.addError(error, {
-        title: i18n.translate('visualize.visualizeListingDeleteErrorTitle', {
-          defaultMessage: 'Error deleting visualization',
-        }),
-      });
-    });
-  };
-
-  chrome.setBreadcrumbs([
-    {
-      text: i18n.translate('visualize.visualizeListingBreadcrumbsTitle', {
-        defaultMessage: 'Visualize',
-      }),
-    },
-  ]);
-
-  this.listingLimit = savedObjectsPublic.settings.getListingLimit();
-  this.initialPageSize = savedObjectsPublic.settings.getPerPage();
-
-  addHelpMenuToAppChrome(chrome, docLinks);
-
-  $scope.$on('$destroy', () => {
-    if (this.closeNewVisModal) {
-      this.closeNewVisModal();
-    }
-
-    stopSyncingQueryServiceStateWithUrl();
-  });
-}
diff --git a/src/plugins/visualize/public/application/listing/visualize_listing_table.js b/src/plugins/visualize/public/application/listing/visualize_listing_table.js
deleted file mode 100644
index fcd62d7ddee732..00000000000000
--- a/src/plugins/visualize/public/application/listing/visualize_listing_table.js
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * 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 React, { Component, Fragment } from 'react';
-import PropTypes from 'prop-types';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import { TableListView } from '../../../../kibana_react/public';
-
-import { EuiIcon, EuiBetaBadge, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
-
-import { getServices } from '../../kibana_services';
-
-class VisualizeListingTable extends Component {
-  constructor(props) {
-    super(props);
-  }
-
-  render() {
-    const { visualizeCapabilities, core, toastNotifications } = getServices();
-    return (
-      <TableListView
-        headingId="visualizeListingHeading"
-        // we allow users to create visualizations even if they can't save them
-        // for data exploration purposes
-        createItem={this.props.createItem}
-        findItems={this.props.findItems}
-        deleteItems={visualizeCapabilities.delete ? this.props.deleteItems : null}
-        editItem={visualizeCapabilities.save ? this.props.editItem : null}
-        tableColumns={this.getTableColumns()}
-        listingLimit={this.props.listingLimit}
-        initialPageSize={this.props.initialPageSize}
-        selectable={(item) => item.canDelete}
-        initialFilter={''}
-        noItemsFragment={this.getNoItemsMessage()}
-        entityName={i18n.translate('visualize.listing.table.entityName', {
-          defaultMessage: 'visualization',
-        })}
-        entityNamePlural={i18n.translate('visualize.listing.table.entityNamePlural', {
-          defaultMessage: 'visualizations',
-        })}
-        tableListTitle={i18n.translate('visualize.listing.table.listTitle', {
-          defaultMessage: 'Visualizations',
-        })}
-        toastNotifications={toastNotifications}
-        uiSettings={core.uiSettings}
-      />
-    );
-  }
-
-  getTableColumns() {
-    const tableColumns = [
-      {
-        field: 'title',
-        name: i18n.translate('visualize.listing.table.titleColumnName', {
-          defaultMessage: 'Title',
-        }),
-        sortable: true,
-        render: (field, record) => this.props.getViewElement(field, record),
-      },
-      {
-        field: 'typeTitle',
-        name: i18n.translate('visualize.listing.table.typeColumnName', {
-          defaultMessage: 'Type',
-        }),
-        sortable: true,
-        render: (field, record) => (
-          <span>
-            {this.renderItemTypeIcon(record)}
-            {record.typeTitle}
-            {this.getBadge(record)}
-          </span>
-        ),
-      },
-      {
-        field: 'description',
-        name: i18n.translate('visualize.listing.table.descriptionColumnName', {
-          defaultMessage: 'Description',
-        }),
-        sortable: true,
-        render: (field, record) => <span>{record.description}</span>,
-      },
-    ];
-
-    return tableColumns;
-  }
-
-  getNoItemsMessage() {
-    if (this.props.hideWriteControls) {
-      return (
-        <div>
-          <EuiEmptyPrompt
-            iconType="visualizeApp"
-            title={
-              <h1 id="visualizeListingHeading">
-                <FormattedMessage
-                  id="visualize.listing.noItemsMessage"
-                  defaultMessage="Looks like you don't have any visualizations."
-                />
-              </h1>
-            }
-          />
-        </div>
-      );
-    }
-
-    return (
-      <div>
-        <EuiEmptyPrompt
-          iconType="visualizeApp"
-          title={
-            <h1 id="visualizeListingHeading">
-              <FormattedMessage
-                id="visualize.listing.createNew.title"
-                defaultMessage="Create your first visualization"
-              />
-            </h1>
-          }
-          body={
-            <Fragment>
-              <p>
-                <FormattedMessage
-                  id="visualize.listing.createNew.description"
-                  defaultMessage="You can create different visualizations, based on your data."
-                />
-              </p>
-            </Fragment>
-          }
-          actions={
-            <EuiButton
-              onClick={this.props.createItem}
-              fill
-              iconType="plusInCircle"
-              data-test-subj="createVisualizationPromptButton"
-            >
-              <FormattedMessage
-                id="visualize.listing.createNew.createButtonLabel"
-                defaultMessage="Create new visualization"
-              />
-            </EuiButton>
-          }
-        />
-      </div>
-    );
-  }
-
-  renderItemTypeIcon(item) {
-    let icon;
-    if (item.image) {
-      icon = (
-        <img className="visListingTable__typeImage" aria-hidden="true" alt="" src={item.image} />
-      );
-    } else {
-      icon = (
-        <EuiIcon
-          className="visListingTable__typeIcon"
-          aria-hidden="true"
-          type={item.icon || 'empty'}
-          size="m"
-        />
-      );
-    }
-
-    return icon;
-  }
-
-  getBadge(item) {
-    if (item.stage === 'beta') {
-      return (
-        <EuiBetaBadge
-          className="visListingTable__betaIcon"
-          label="B"
-          title={i18n.translate('visualize.listing.betaTitle', {
-            defaultMessage: 'Beta',
-          })}
-          tooltipContent={i18n.translate('visualize.listing.betaTooltip', {
-            defaultMessage:
-              'This visualization is in beta and is subject to change. The design and code is less mature than official GA ' +
-              'features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA ' +
-              'features',
-          })}
-        />
-      );
-    } else if (item.stage === 'experimental') {
-      return (
-        <EuiBetaBadge
-          className="visListingTable__experimentalIcon"
-          label="E"
-          title={i18n.translate('visualize.listing.experimentalTitle', {
-            defaultMessage: 'Experimental',
-          })}
-          tooltipContent={i18n.translate('visualize.listing.experimentalTooltip', {
-            defaultMessage:
-              'This visualization might be changed or removed in a future release and is not subject to the support SLA.',
-          })}
-        />
-      );
-    }
-  }
-}
-
-VisualizeListingTable.propTypes = {
-  deleteItems: PropTypes.func.isRequired,
-  findItems: PropTypes.func.isRequired,
-  createItem: PropTypes.func.isRequired,
-  getViewElement: PropTypes.func.isRequired,
-  editItem: PropTypes.func.isRequired,
-  listingLimit: PropTypes.number.isRequired,
-};
-
-const withI18nContext = (I18nContext) => (props) => (
-  <I18nContext>
-    <VisualizeListingTable {...props} />
-  </I18nContext>
-);
-
-export { withI18nContext };
diff --git a/src/plugins/visualize/public/application/types.ts b/src/plugins/visualize/public/application/types.ts
index 6c8245ec0dc44b..20d55d1110f62b 100644
--- a/src/plugins/visualize/public/application/types.ts
+++ b/src/plugins/visualize/public/application/types.ts
@@ -17,16 +17,33 @@
  * under the License.
  */
 
+import { History } from 'history';
+import { TimeRange, Query, Filter, DataPublicPluginStart } from 'src/plugins/data/public';
 import {
-  TimeRange,
-  Query,
-  Filter,
-  DataPublicPluginStart,
-  SavedQuery,
-} from 'src/plugins/data/public';
-import { PersistedState, SavedVisState, VisSavedObject } from 'src/plugins/visualizations/public';
-import { CoreStart } from 'kibana/public';
-import { SavedSearch } from 'src/plugins/discover/public';
+  PersistedState,
+  SavedVisState,
+  VisualizationsStart,
+  Vis,
+  VisualizeEmbeddableContract,
+  VisSavedObject,
+} from 'src/plugins/visualizations/public';
+import {
+  CoreStart,
+  PluginInitializerContext,
+  ChromeStart,
+  ToastsStart,
+  ScopedHistory,
+} from 'kibana/public';
+import { NavigationPublicPluginStart as NavigationStart } from 'src/plugins/navigation/public';
+import {
+  Storage,
+  IKbnUrlStateStorage,
+  ReduxLikeStateContainer,
+} from 'src/plugins/kibana_utils/public';
+import { SharePluginStart } from 'src/plugins/share/public';
+import { SavedObjectsStart, SavedObject } from 'src/plugins/saved_objects/public';
+import { EmbeddableStart } from 'src/plugins/embeddable/public';
+import { KibanaLegacyStart } from 'src/plugins/kibana_legacy/public';
 
 export type PureVisState = SavedVisState;
 
@@ -47,21 +64,25 @@ export interface VisualizeAppStateTransitions {
     value: VisualizeAppState[T]
   ) => VisualizeAppState;
   setVis: (state: VisualizeAppState) => (vis: Partial<PureVisState>) => VisualizeAppState;
-  removeSavedQuery: (state: VisualizeAppState) => (defaultQuery: Query) => VisualizeAppState;
   unlinkSavedSearch: (
     state: VisualizeAppState
   ) => ({ query, parentFilters }: { query?: Query; parentFilters?: Filter[] }) => VisualizeAppState;
   updateVisState: (state: VisualizeAppState) => (vis: PureVisState) => VisualizeAppState;
-  updateFromSavedQuery: (state: VisualizeAppState) => (savedQuery: SavedQuery) => VisualizeAppState;
+  updateSavedQuery: (state: VisualizeAppState) => (savedQueryId?: string) => VisualizeAppState;
 }
 
+export type VisualizeAppStateContainer = ReduxLikeStateContainer<
+  VisualizeAppState,
+  VisualizeAppStateTransitions
+>;
+
 export interface EditorRenderProps {
   core: CoreStart;
   data: DataPublicPluginStart;
   filters: Filter[];
   timeRange: TimeRange;
   query?: Query;
-  savedSearch?: SavedSearch;
+  savedSearch?: SavedObject;
   uiState: PersistedState;
   /**
    * Flag to determine if visualiztion is linked to the saved search
@@ -69,7 +90,36 @@ export interface EditorRenderProps {
   linked: boolean;
 }
 
-export interface SavedVisualizations {
-  urlFor: (id: string) => string;
-  get: (id: string) => Promise<VisSavedObject>;
+export interface VisualizeServices extends CoreStart {
+  embeddable: EmbeddableStart;
+  history: History;
+  kbnUrlStateStorage: IKbnUrlStateStorage;
+  kibanaLegacy: KibanaLegacyStart;
+  pluginInitializerContext: PluginInitializerContext;
+  chrome: ChromeStart;
+  data: DataPublicPluginStart;
+  localStorage: Storage;
+  navigation: NavigationStart;
+  toastNotifications: ToastsStart;
+  share?: SharePluginStart;
+  visualizeCapabilities: any;
+  visualizations: VisualizationsStart;
+  savedObjectsPublic: SavedObjectsStart;
+  savedVisualizations: VisualizationsStart['savedVisualizationsLoader'];
+  setActiveUrl: (newUrl: string) => void;
+  createVisEmbeddableFromObject: VisualizationsStart['__LEGACY']['createVisEmbeddableFromObject'];
+  restorePreviousUrl: () => void;
+  scopedHistory: ScopedHistory;
+}
+
+export interface SavedVisInstance {
+  vis: Vis;
+  savedVis: VisSavedObject;
+  savedSearch?: SavedObject;
+  embeddableHandler: VisualizeEmbeddableContract;
+}
+
+export interface IEditorController {
+  render(props: EditorRenderProps): void;
+  destroy(): void;
 }
diff --git a/src/plugins/visualize/public/application/breadcrumbs.ts b/src/plugins/visualize/public/application/utils/breadcrumbs.ts
similarity index 69%
rename from src/plugins/visualize/public/application/breadcrumbs.ts
rename to src/plugins/visualize/public/application/utils/breadcrumbs.ts
index 972bdc1462b2c5..a1e5a9e8912e19 100644
--- a/src/plugins/visualize/public/application/breadcrumbs.ts
+++ b/src/plugins/visualize/public/application/utils/breadcrumbs.ts
@@ -19,7 +19,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { VisualizeConstants } from './visualize_constants';
+import { VisualizeConstants } from '../visualize_constants';
 
 export function getLandingBreadcrumbs() {
   return [
@@ -32,28 +32,6 @@ export function getLandingBreadcrumbs() {
   ];
 }
 
-export function getWizardStep1Breadcrumbs() {
-  return [
-    ...getLandingBreadcrumbs(),
-    {
-      text: i18n.translate('visualize.wizard.step1Breadcrumb', {
-        defaultMessage: 'Create',
-      }),
-    },
-  ];
-}
-
-export function getWizardStep2Breadcrumbs() {
-  return [
-    ...getLandingBreadcrumbs(),
-    {
-      text: i18n.translate('visualize.wizard.step2Breadcrumb', {
-        defaultMessage: 'Create',
-      }),
-    },
-  ];
-}
-
 export function getCreateBreadcrumbs() {
   return [
     ...getLandingBreadcrumbs(),
@@ -65,11 +43,11 @@ export function getCreateBreadcrumbs() {
   ];
 }
 
-export function getEditBreadcrumbs($route: any) {
+export function getEditBreadcrumbs(text: string) {
   return [
     ...getLandingBreadcrumbs(),
     {
-      text: $route.current.locals.resolved.savedVis.title,
+      text,
     },
   ];
 }
diff --git a/src/plugins/visualize/public/application/editor/lib/visualize_app_state.ts b/src/plugins/visualize/public/application/utils/create_visualize_app_state.ts
similarity index 86%
rename from src/plugins/visualize/public/application/editor/lib/visualize_app_state.ts
rename to src/plugins/visualize/public/application/utils/create_visualize_app_state.ts
index 698fe0ca8a84fe..1e05c48ba7daf1 100644
--- a/src/plugins/visualize/public/application/editor/lib/visualize_app_state.ts
+++ b/src/plugins/visualize/public/application/utils/create_visualize_app_state.ts
@@ -24,8 +24,8 @@ import {
   createStateContainer,
   syncState,
   IKbnUrlStateStorage,
-} from '../../../../../kibana_utils/public';
-import { PureVisState, VisualizeAppState, VisualizeAppStateTransitions } from '../../types';
+} from '../../../../kibana_utils/public';
+import { PureVisState, VisualizeAppState, VisualizeAppStateTransitions } from '../types';
 
 const STATE_STORAGE_KEY = '_a';
 
@@ -40,7 +40,7 @@ function toObject(state: PureVisState): PureVisState {
   });
 }
 
-export function useVisualizeAppState({ stateDefaults, kbnUrlStateStorage }: Arguments) {
+export function createVisualizeAppState({ stateDefaults, kbnUrlStateStorage }: Arguments) {
   const urlState = kbnUrlStateStorage.get<VisualizeAppState>(STATE_STORAGE_KEY);
   const initialState = migrateAppState({
     ...stateDefaults,
@@ -67,14 +67,6 @@ export function useVisualizeAppState({ stateDefaults, kbnUrlStateStorage }: Argu
           ...vis,
         },
       }),
-      removeSavedQuery: (state) => (defaultQuery) => {
-        const { savedQuery, ...rest } = state;
-
-        return {
-          ...rest,
-          query: defaultQuery,
-        };
-      },
       unlinkSavedSearch: (state) => ({ query, parentFilters = [] }) => ({
         ...state,
         query: query || state.query,
@@ -82,11 +74,18 @@ export function useVisualizeAppState({ stateDefaults, kbnUrlStateStorage }: Argu
         linked: false,
       }),
       updateVisState: (state) => (newVisState) => ({ ...state, vis: toObject(newVisState) }),
-      updateFromSavedQuery: (state) => (savedQuery) => ({
-        ...state,
-        savedQuery: savedQuery.id,
-        query: savedQuery.attributes.query,
-      }),
+      updateSavedQuery: (state) => (savedQueryId) => {
+        const updatedState = {
+          ...state,
+          savedQuery: savedQueryId,
+        };
+
+        if (!savedQueryId) {
+          delete updatedState.savedQuery;
+        }
+
+        return updatedState;
+      },
     }
   );
 
diff --git a/src/plugins/visualize/public/application/utils/get_table_columns.tsx b/src/plugins/visualize/public/application/utils/get_table_columns.tsx
new file mode 100644
index 00000000000000..805c039d9773b4
--- /dev/null
+++ b/src/plugins/visualize/public/application/utils/get_table_columns.tsx
@@ -0,0 +1,162 @@
+/*
+ * 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 React from 'react';
+import { History } from 'history';
+import { EuiBetaBadge, EuiButton, EuiEmptyPrompt, EuiIcon, EuiLink } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import { ApplicationStart } from 'kibana/public';
+import { VisualizationListItem } from 'src/plugins/visualizations/public';
+
+const getBadge = (item: VisualizationListItem) => {
+  if (item.stage === 'beta') {
+    return (
+      <EuiBetaBadge
+        className="visListingTable__betaIcon"
+        label="B"
+        title={i18n.translate('visualize.listing.betaTitle', {
+          defaultMessage: 'Beta',
+        })}
+        tooltipContent={i18n.translate('visualize.listing.betaTooltip', {
+          defaultMessage:
+            'This visualization is in beta and is subject to change. The design and code is less mature than official GA ' +
+            'features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA ' +
+            'features',
+        })}
+      />
+    );
+  } else if (item.stage === 'experimental') {
+    return (
+      <EuiBetaBadge
+        className="visListingTable__experimentalIcon"
+        label="E"
+        title={i18n.translate('visualize.listing.experimentalTitle', {
+          defaultMessage: 'Experimental',
+        })}
+        tooltipContent={i18n.translate('visualize.listing.experimentalTooltip', {
+          defaultMessage:
+            'This visualization might be changed or removed in a future release and is not subject to the support SLA.',
+        })}
+      />
+    );
+  }
+};
+
+const renderItemTypeIcon = (item: VisualizationListItem) => {
+  let icon;
+  if (item.image) {
+    icon = (
+      <img className="visListingTable__typeImage" aria-hidden="true" alt="" src={item.image} />
+    );
+  } else {
+    icon = (
+      <EuiIcon
+        className="visListingTable__typeIcon"
+        aria-hidden="true"
+        type={item.icon || 'empty'}
+        size="m"
+      />
+    );
+  }
+
+  return icon;
+};
+
+export const getTableColumns = (application: ApplicationStart, history: History) => [
+  {
+    field: 'title',
+    name: i18n.translate('visualize.listing.table.titleColumnName', {
+      defaultMessage: 'Title',
+    }),
+    sortable: true,
+    render: (field: string, { editApp, editUrl, title }: VisualizationListItem) => (
+      <EuiLink
+        onClick={() => {
+          if (editApp) {
+            application.navigateToApp(editApp, { path: editUrl });
+          } else if (editUrl) {
+            history.push(editUrl);
+          }
+        }}
+        data-test-subj={`visListingTitleLink-${title.split(' ').join('-')}`}
+      >
+        {field}
+      </EuiLink>
+    ),
+  },
+  {
+    field: 'typeTitle',
+    name: i18n.translate('visualize.listing.table.typeColumnName', {
+      defaultMessage: 'Type',
+    }),
+    sortable: true,
+    render: (field: string, record: VisualizationListItem) => (
+      <span>
+        {renderItemTypeIcon(record)}
+        {record.typeTitle}
+        {getBadge(record)}
+      </span>
+    ),
+  },
+  {
+    field: 'description',
+    name: i18n.translate('visualize.listing.table.descriptionColumnName', {
+      defaultMessage: 'Description',
+    }),
+    sortable: true,
+    render: (field: string, record: VisualizationListItem) => <span>{record.description}</span>,
+  },
+];
+
+export const getNoItemsMessage = (createItem: () => void) => (
+  <EuiEmptyPrompt
+    iconType="visualizeApp"
+    title={
+      <h1 id="visualizeListingHeading">
+        <FormattedMessage
+          id="visualize.listing.createNew.title"
+          defaultMessage="Create your first visualization"
+        />
+      </h1>
+    }
+    body={
+      <p>
+        <FormattedMessage
+          id="visualize.listing.createNew.description"
+          defaultMessage="You can create different visualizations based on your data."
+        />
+      </p>
+    }
+    actions={
+      <EuiButton
+        onClick={createItem}
+        fill
+        iconType="plusInCircle"
+        data-test-subj="createVisualizationPromptButton"
+      >
+        <FormattedMessage
+          id="visualize.listing.createNew.createButtonLabel"
+          defaultMessage="Create new visualization"
+        />
+      </EuiButton>
+    }
+  />
+);
diff --git a/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx
new file mode 100644
index 00000000000000..e04177fc619e2d
--- /dev/null
+++ b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx
@@ -0,0 +1,303 @@
+/*
+ * 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 React from 'react';
+import { i18n } from '@kbn/i18n';
+
+import { TopNavMenuData } from 'src/plugins/navigation/public';
+import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../visualizations/public';
+import {
+  showSaveModal,
+  SavedObjectSaveModalOrigin,
+  SavedObjectSaveOpts,
+  OnSaveProps,
+} from '../../../../saved_objects/public';
+import { unhashUrl } from '../../../../kibana_utils/public';
+
+import { SavedVisInstance, VisualizeServices, VisualizeAppStateContainer } from '../types';
+import { VisualizeConstants } from '../visualize_constants';
+import { getEditBreadcrumbs } from './breadcrumbs';
+
+interface TopNavConfigParams {
+  hasUnsavedChanges: boolean;
+  setHasUnsavedChanges: (value: boolean) => void;
+  openInspector: () => void;
+  originatingApp?: string;
+  hasUnappliedChanges: boolean;
+  savedVisInstance: SavedVisInstance;
+  stateContainer: VisualizeAppStateContainer;
+  visualizationIdFromUrl?: string;
+}
+
+export const getTopNavConfig = (
+  {
+    hasUnsavedChanges,
+    setHasUnsavedChanges,
+    openInspector,
+    originatingApp,
+    hasUnappliedChanges,
+    savedVisInstance: { embeddableHandler, savedVis, vis },
+    stateContainer,
+    visualizationIdFromUrl,
+  }: TopNavConfigParams,
+  {
+    application,
+    chrome,
+    embeddable,
+    history,
+    share,
+    setActiveUrl,
+    toastNotifications,
+    visualizeCapabilities,
+    i18n: { Context: I18nContext },
+  }: VisualizeServices
+) => {
+  /**
+   * Called when the user clicks "Save" button.
+   */
+  async function doSave(saveOptions: SavedObjectSaveOpts) {
+    const newlyCreated = !Boolean(savedVis.id) || savedVis.copyOnSave;
+    // vis.title was not bound and it's needed to reflect title into visState
+    stateContainer.transitions.setVis({
+      title: savedVis.title,
+    });
+    savedVis.searchSourceFields = vis.data.searchSource?.getSerializedFields();
+    savedVis.visState = stateContainer.getState().vis;
+    savedVis.uiStateJSON = vis.uiState.toString();
+    setHasUnsavedChanges(false);
+
+    try {
+      const id = await savedVis.save(saveOptions);
+
+      if (id) {
+        toastNotifications.addSuccess({
+          title: i18n.translate('visualize.topNavMenu.saveVisualization.successNotificationText', {
+            defaultMessage: `Saved '{visTitle}'`,
+            values: {
+              visTitle: savedVis.title,
+            },
+          }),
+          'data-test-subj': 'saveVisualizationSuccess',
+        });
+
+        if (originatingApp && saveOptions.returnToOrigin) {
+          const appPath = `${VisualizeConstants.EDIT_PATH}/${encodeURIComponent(id)}`;
+
+          // Manually insert a new url so the back button will open the saved visualization.
+          history.replace(appPath);
+          setActiveUrl(appPath);
+
+          if (newlyCreated && embeddable) {
+            embeddable.getStateTransfer().navigateToWithEmbeddablePackage(originatingApp, {
+              state: { id, type: VISUALIZE_EMBEDDABLE_TYPE },
+            });
+          } else {
+            application.navigateToApp(originatingApp);
+          }
+        } else {
+          chrome.docTitle.change(savedVis.lastSavedTitle);
+          chrome.setBreadcrumbs(getEditBreadcrumbs(savedVis.lastSavedTitle));
+
+          if (id !== visualizationIdFromUrl) {
+            history.replace({
+              ...history.location,
+              pathname: `${VisualizeConstants.EDIT_PATH}/${id}`,
+            });
+          }
+        }
+      }
+
+      return { id };
+    } catch (error) {
+      // eslint-disable-next-line
+      console.error(error);
+      toastNotifications.addDanger({
+        title: i18n.translate('visualize.topNavMenu.saveVisualization.failureNotificationText', {
+          defaultMessage: `Error on saving '{visTitle}'`,
+          values: {
+            visTitle: savedVis.title,
+          },
+        }),
+        text: error.message,
+        'data-test-subj': 'saveVisualizationError',
+      });
+      return { error };
+    }
+  }
+
+  const topNavMenu: TopNavMenuData[] = [
+    ...(originatingApp && savedVis.id
+      ? [
+          {
+            id: 'saveAndReturn',
+            label: i18n.translate('visualize.topNavMenu.saveAndReturnVisualizationButtonLabel', {
+              defaultMessage: 'Save and return',
+            }),
+            emphasize: true,
+            iconType: 'check',
+            description: i18n.translate(
+              'visualize.topNavMenu.saveAndReturnVisualizationButtonAriaLabel',
+              {
+                defaultMessage: 'Finish editing visualization and return to the last app',
+              }
+            ),
+            testId: 'visualizesaveAndReturnButton',
+            disableButton: hasUnappliedChanges,
+            tooltip() {
+              if (hasUnappliedChanges) {
+                return i18n.translate(
+                  'visualize.topNavMenu.saveAndReturnVisualizationDisabledButtonTooltip',
+                  {
+                    defaultMessage: 'Apply or Discard your changes before finishing',
+                  }
+                );
+              }
+            },
+            run: async () => {
+              const saveOptions = {
+                confirmOverwrite: false,
+                returnToOrigin: true,
+              };
+              return doSave(saveOptions);
+            },
+          },
+        ]
+      : []),
+    ...(visualizeCapabilities.save
+      ? [
+          {
+            id: 'save',
+            label:
+              savedVis.id && originatingApp
+                ? i18n.translate('visualize.topNavMenu.saveVisualizationAsButtonLabel', {
+                    defaultMessage: 'save as',
+                  })
+                : i18n.translate('visualize.topNavMenu.saveVisualizationButtonLabel', {
+                    defaultMessage: 'save',
+                  }),
+            emphasize: !savedVis.id || !originatingApp,
+            description: i18n.translate('visualize.topNavMenu.saveVisualizationButtonAriaLabel', {
+              defaultMessage: 'Save Visualization',
+            }),
+            testId: 'visualizeSaveButton',
+            disableButton: hasUnappliedChanges,
+            tooltip() {
+              if (hasUnappliedChanges) {
+                return i18n.translate(
+                  'visualize.topNavMenu.saveVisualizationDisabledButtonTooltip',
+                  {
+                    defaultMessage: 'Apply or Discard your changes before saving',
+                  }
+                );
+              }
+            },
+            run: () => {
+              const onSave = async ({
+                newTitle,
+                newCopyOnSave,
+                isTitleDuplicateConfirmed,
+                onTitleDuplicate,
+                newDescription,
+                returnToOrigin,
+              }: OnSaveProps & { returnToOrigin: boolean }) => {
+                const currentTitle = savedVis.title;
+                savedVis.title = newTitle;
+                savedVis.copyOnSave = newCopyOnSave;
+                savedVis.description = newDescription;
+                const saveOptions = {
+                  confirmOverwrite: false,
+                  isTitleDuplicateConfirmed,
+                  onTitleDuplicate,
+                  returnToOrigin,
+                };
+                const response = await doSave(saveOptions);
+                // If the save wasn't successful, put the original values back.
+                if (!response.id || response.error) {
+                  savedVis.title = currentTitle;
+                }
+                return response;
+              };
+
+              const saveModal = (
+                <SavedObjectSaveModalOrigin
+                  documentInfo={savedVis}
+                  onSave={onSave}
+                  objectType={'visualization'}
+                  onClose={() => {}}
+                  originatingApp={originatingApp}
+                />
+              );
+              showSaveModal(saveModal, I18nContext);
+            },
+          },
+        ]
+      : []),
+    {
+      id: 'share',
+      label: i18n.translate('visualize.topNavMenu.shareVisualizationButtonLabel', {
+        defaultMessage: 'share',
+      }),
+      description: i18n.translate('visualize.topNavMenu.shareVisualizationButtonAriaLabel', {
+        defaultMessage: 'Share Visualization',
+      }),
+      testId: 'shareTopNavButton',
+      run: (anchorElement) => {
+        if (share) {
+          share.toggleShareContextMenu({
+            anchorElement,
+            allowEmbed: true,
+            allowShortUrl: visualizeCapabilities.createShortUrl,
+            shareableUrl: unhashUrl(window.location.href),
+            objectId: savedVis.id,
+            objectType: 'visualization',
+            sharingData: {
+              title: savedVis.title,
+            },
+            isDirty: hasUnappliedChanges || hasUnsavedChanges,
+          });
+        }
+      },
+      // disable the Share button if no action specified
+      disableButton: !share,
+    },
+    {
+      id: 'inspector',
+      label: i18n.translate('visualize.topNavMenu.openInspectorButtonLabel', {
+        defaultMessage: 'inspect',
+      }),
+      description: i18n.translate('visualize.topNavMenu.openInspectorButtonAriaLabel', {
+        defaultMessage: 'Open Inspector for visualization',
+      }),
+      testId: 'openInspectorButton',
+      disableButton() {
+        return !embeddableHandler.hasInspector || !embeddableHandler.hasInspector();
+      },
+      run: openInspector,
+      tooltip() {
+        if (!embeddableHandler.hasInspector || !embeddableHandler.hasInspector()) {
+          return i18n.translate('visualize.topNavMenu.openInspectorDisabledButtonTooltip', {
+            defaultMessage: `This visualization doesn't support any inspectors.`,
+          });
+        }
+      },
+    },
+  ];
+
+  return topNavMenu;
+};
diff --git a/src/plugins/visualize/public/application/utils/get_visualization_instance.ts b/src/plugins/visualize/public/application/utils/get_visualization_instance.ts
new file mode 100644
index 00000000000000..a75c84cf0b71c7
--- /dev/null
+++ b/src/plugins/visualize/public/application/utils/get_visualization_instance.ts
@@ -0,0 +1,90 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+import { VisSavedObject, VisualizeEmbeddableContract } from 'src/plugins/visualizations/public';
+import { SearchSourceFields } from 'src/plugins/data/public';
+import { SavedObject } from 'src/plugins/saved_objects/public';
+import { createSavedSearchesLoader } from '../../../../discover/public';
+import { VisualizeServices } from '../types';
+
+export const getVisualizationInstance = async (
+  {
+    chrome,
+    data,
+    overlays,
+    visualizations,
+    createVisEmbeddableFromObject,
+    savedObjects,
+    savedVisualizations,
+    toastNotifications,
+  }: VisualizeServices,
+  /**
+   * opts can be either a saved visualization id passed as string,
+   * or an object of new visualization params.
+   * Both come from url search query
+   */
+  opts?: Record<string, unknown> | string
+) => {
+  const savedVis: VisSavedObject = await savedVisualizations.get(opts);
+
+  if (typeof opts !== 'string') {
+    savedVis.searchSourceFields = { index: opts?.indexPattern } as SearchSourceFields;
+  }
+  const serializedVis = visualizations.convertToSerializedVis(savedVis);
+  let vis = await visualizations.createVis(serializedVis.type, serializedVis);
+
+  if (vis.type.setup) {
+    try {
+      vis = await vis.type.setup(vis);
+    } catch {
+      // skip this catch block
+    }
+  }
+
+  const embeddableHandler = (await createVisEmbeddableFromObject(vis, {
+    timeRange: data.query.timefilter.timefilter.getTime(),
+    filters: data.query.filterManager.getFilters(),
+    id: '',
+  })) as VisualizeEmbeddableContract;
+
+  embeddableHandler.getOutput$().subscribe((output) => {
+    if (output.error) {
+      toastNotifications.addError(output.error, {
+        title: i18n.translate('visualize.error.title', {
+          defaultMessage: 'Visualization error',
+        }),
+      });
+    }
+  });
+
+  let savedSearch: SavedObject | undefined;
+
+  if (vis.data.savedSearchId) {
+    savedSearch = await createSavedSearchesLoader({
+      savedObjectsClient: savedObjects.client,
+      indexPatterns: data.indexPatterns,
+      search: data.search,
+      chrome,
+      overlays,
+    }).get(vis.data.savedSearchId);
+  }
+
+  return { vis, savedVis, savedSearch, embeddableHandler };
+};
diff --git a/src/plugins/visualize/public/application/utils/index.ts b/src/plugins/visualize/public/application/utils/index.ts
new file mode 100644
index 00000000000000..04843df8360042
--- /dev/null
+++ b/src/plugins/visualize/public/application/utils/index.ts
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+export * from './get_table_columns';
+export * from './get_top_nav_config';
+export * from './breadcrumbs';
+export * from './utils';
+export * from './use';
diff --git a/src/plugins/visualize/public/application/editor/lib/migrate_app_state.ts b/src/plugins/visualize/public/application/utils/migrate_app_state.ts
similarity index 94%
rename from src/plugins/visualize/public/application/editor/lib/migrate_app_state.ts
rename to src/plugins/visualize/public/application/utils/migrate_app_state.ts
index 7e09aece52e096..f5f1a1785bbdf2 100644
--- a/src/plugins/visualize/public/application/editor/lib/migrate_app_state.ts
+++ b/src/plugins/visualize/public/application/utils/migrate_app_state.ts
@@ -18,13 +18,13 @@
  */
 
 import { get, omit } from 'lodash';
-import { VisualizeAppState } from '../../types';
+import { VisualizeAppState } from '../types';
 
 /**
  * Creates a new instance of AppState based on the table vis state.
  *
  * Dashboards have a similar implementation; see
- * core_plugins/kibana/public/dashboard/lib/migrate_app_state
+ * src/plugins/dashboard/public/application/lib/migrate_app_state.ts
  *
  * @param appState {VisualizeAppState}
  */
diff --git a/src/plugins/visualize/public/application/utils/use/index.ts b/src/plugins/visualize/public/application/utils/use/index.ts
new file mode 100644
index 00000000000000..8bd9456b10572f
--- /dev/null
+++ b/src/plugins/visualize/public/application/utils/use/index.ts
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+export { useChromeVisibility } from './use_chrome_visibility';
+export { useEditorUpdates } from './use_editor_updates';
+export { useSavedVisInstance } from './use_saved_vis_instance';
+export { useVisualizeAppState } from './use_visualize_app_state';
+export { useLinkedSearchUpdates } from './use_linked_search_updates';
diff --git a/src/plugins/visualize/public/application/visualize_app.ts b/src/plugins/visualize/public/application/utils/use/use_chrome_visibility.ts
similarity index 65%
rename from src/plugins/visualize/public/application/visualize_app.ts
rename to src/plugins/visualize/public/application/utils/use/use_chrome_visibility.ts
index 1a4e1534db9e2c..e53c1ecd2474f0 100644
--- a/src/plugins/visualize/public/application/visualize_app.ts
+++ b/src/plugins/visualize/public/application/utils/use/use_chrome_visibility.ts
@@ -17,15 +17,19 @@
  * under the License.
  */
 
-import { IModule } from 'angular';
-import { VisualizeKibanaServices } from '../kibana_services';
+import { useState, useEffect } from 'react';
+import { ChromeStart } from 'kibana/public';
 
-// @ts-ignore
-import { initEditorDirective } from './editor/editor';
-// @ts-ignore
-import { initListingDirective } from './listing/visualize_listing';
+export const useChromeVisibility = (chrome: ChromeStart) => {
+  const [isVisible, setIsVisible] = useState<boolean>();
 
-export function initVisualizeAppDirective(app: IModule, deps: VisualizeKibanaServices) {
-  initEditorDirective(app, deps);
-  initListingDirective(app, deps.I18nContext);
-}
+  useEffect(() => {
+    const subscription = chrome.getIsVisible$().subscribe((value: boolean) => {
+      setIsVisible(value);
+    });
+
+    return () => subscription.unsubscribe();
+  }, [chrome]);
+
+  return isVisible;
+};
diff --git a/src/plugins/visualize/public/application/utils/use/use_editor_updates.ts b/src/plugins/visualize/public/application/utils/use/use_editor_updates.ts
new file mode 100644
index 00000000000000..360e7560b1932c
--- /dev/null
+++ b/src/plugins/visualize/public/application/utils/use/use_editor_updates.ts
@@ -0,0 +1,182 @@
+/*
+ * 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 { useEffect, useState } from 'react';
+import { isEqual } from 'lodash';
+import { EventEmitter } from 'events';
+import { merge } from 'rxjs';
+
+import { migrateLegacyQuery } from '../../../../../kibana_legacy/public';
+import {
+  VisualizeServices,
+  VisualizeAppState,
+  VisualizeAppStateContainer,
+  SavedVisInstance,
+  IEditorController,
+} from '../../types';
+
+export const useEditorUpdates = (
+  services: VisualizeServices,
+  eventEmitter: EventEmitter,
+  setHasUnsavedChanges: (value: boolean) => void,
+  appState: VisualizeAppStateContainer | null,
+  savedVisInstance: SavedVisInstance | undefined,
+  visEditorController: IEditorController | undefined
+) => {
+  const [isEmbeddableRendered, setIsEmbeddableRendered] = useState(false);
+  const [currentAppState, setCurrentAppState] = useState<VisualizeAppState>();
+
+  useEffect(() => {
+    if (appState && savedVisInstance) {
+      const {
+        timefilter: { timefilter },
+        filterManager,
+      } = services.data.query;
+      const { embeddableHandler, savedVis, savedSearch, vis } = savedVisInstance;
+      const initialState = appState.getState();
+      setCurrentAppState(initialState);
+
+      const reloadVisualization = () => {
+        if (visEditorController) {
+          visEditorController.render({
+            core: services,
+            data: services.data,
+            uiState: vis.uiState,
+            timeRange: timefilter.getTime(),
+            filters: filterManager.getFilters(),
+            query: appState.getState().query,
+            linked: !!vis.data.savedSearchId,
+            savedSearch,
+          });
+        } else {
+          embeddableHandler.updateInput({
+            timeRange: timefilter.getTime(),
+            filters: filterManager.getFilters(),
+            query: appState.getState().query,
+          });
+        }
+      };
+
+      const subscriptions = merge(
+        timefilter.getTimeUpdate$(),
+        timefilter.getAutoRefreshFetch$(),
+        timefilter.getFetch$(),
+        filterManager.getFetches$()
+      ).subscribe({
+        next: reloadVisualization,
+        error: services.fatalErrors.add,
+      });
+
+      const handleLinkedSearch = (linked: boolean) => {
+        if (linked && !savedVis.savedSearchId && savedSearch) {
+          savedVis.savedSearchId = savedSearch.id;
+          vis.data.savedSearchId = savedSearch.id;
+          if (vis.data.searchSource) {
+            vis.data.searchSource.setParent(savedSearch.searchSource);
+          }
+        } else if (!linked && savedVis.savedSearchId) {
+          delete savedVis.savedSearchId;
+          delete vis.data.savedSearchId;
+        }
+      };
+
+      // update persisted state from initial state
+      if (initialState.uiState) {
+        vis.uiState.setSilent(initialState.uiState);
+      }
+
+      // update the appState when the stateful instance changes
+      const updateOnChange = () => {
+        appState.transitions.set('uiState', vis.uiState.getChanges());
+      };
+
+      vis.uiState.on('change', updateOnChange);
+
+      const unsubscribeStateUpdates = appState.subscribe((state) => {
+        setCurrentAppState(state);
+
+        if (savedVis.id && !services.history.location.pathname.includes(savedVis.id)) {
+          // this filters out the case when manipulating the browser history back/forward
+          // and initializing different visualizations
+          return;
+        }
+        const newQuery = migrateLegacyQuery(state.query);
+        if (!isEqual(state.query, newQuery)) {
+          appState.transitions.set('query', newQuery);
+        }
+
+        if (!isEqual(state.uiState, vis.uiState.getChanges())) {
+          vis.uiState.set(state.uiState);
+        }
+
+        // if the browser history was changed manually we need to reflect changes in the editor
+        if (
+          !isEqual(
+            {
+              ...services.visualizations.convertFromSerializedVis(vis.serialize()).visState,
+              title: vis.title,
+            },
+            state.vis
+          )
+        ) {
+          const { aggs, ...visState } = state.vis;
+          vis.setState({
+            ...visState,
+            data: {
+              aggs,
+            },
+          });
+          embeddableHandler.reload();
+          eventEmitter.emit('updateEditor');
+        }
+
+        handleLinkedSearch(state.linked);
+
+        if (vis.data.searchSource) {
+          vis.data.searchSource.setField('query', state.query);
+          vis.data.searchSource.setField('filter', state.filters);
+        }
+        reloadVisualization();
+        setHasUnsavedChanges(true);
+      });
+
+      const updateOnEmbeddableRendered = () => setIsEmbeddableRendered(true);
+      eventEmitter.on('embeddableRendered', updateOnEmbeddableRendered);
+
+      reloadVisualization();
+
+      return () => {
+        setIsEmbeddableRendered(false);
+        eventEmitter.off('embeddableRendered', updateOnEmbeddableRendered);
+        subscriptions.unsubscribe();
+        vis.uiState.off('change', updateOnChange);
+        unsubscribeStateUpdates();
+      };
+    }
+  }, [
+    appState,
+    eventEmitter,
+    savedVisInstance,
+    services,
+    setHasUnsavedChanges,
+    visEditorController,
+  ]);
+
+  return { isEmbeddableRendered, currentAppState };
+};
diff --git a/src/plugins/visualize/public/application/utils/use/use_linked_search_updates.ts b/src/plugins/visualize/public/application/utils/use/use_linked_search_updates.ts
new file mode 100644
index 00000000000000..e257b72ee751b2
--- /dev/null
+++ b/src/plugins/visualize/public/application/utils/use/use_linked_search_updates.ts
@@ -0,0 +1,74 @@
+/*
+ * 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 { useEffect } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EventEmitter } from 'events';
+
+import { Filter } from 'src/plugins/data/public';
+import { VisualizeServices, VisualizeAppStateContainer, SavedVisInstance } from '../../types';
+
+export const useLinkedSearchUpdates = (
+  services: VisualizeServices,
+  eventEmitter: EventEmitter,
+  appState: VisualizeAppStateContainer | null,
+  savedVisInstance: SavedVisInstance | undefined
+) => {
+  useEffect(() => {
+    if (
+      appState &&
+      savedVisInstance &&
+      savedVisInstance.savedSearch &&
+      savedVisInstance.vis.data.searchSource
+    ) {
+      const { savedSearch } = savedVisInstance;
+      // SearchSource is a promise-based stream of search results that can inherit from other search sources.
+      const { searchSource } = savedVisInstance.vis.data;
+
+      const unlinkFromSavedSearch = () => {
+        const searchSourceParent = savedSearch.searchSource;
+        const searchSourceGrandparent = searchSourceParent?.getParent();
+        const currentIndex = searchSourceParent?.getField('index');
+
+        searchSource.setField('index', currentIndex);
+        searchSource.setParent(searchSourceGrandparent);
+
+        appState.transitions.unlinkSavedSearch({
+          query: searchSourceParent?.getField('query'),
+          parentFilters: (searchSourceParent?.getOwnField('filter') as Filter[]) || [],
+        });
+
+        services.toastNotifications.addSuccess(
+          i18n.translate('visualize.linkedToSearch.unlinkSuccessNotificationText', {
+            defaultMessage: `Unlinked from saved search '{searchTitle}'`,
+            values: {
+              searchTitle: savedSearch.title,
+            },
+          })
+        );
+      };
+
+      eventEmitter.on('unlinkFromSavedSearch', unlinkFromSavedSearch);
+
+      return () => {
+        eventEmitter.off('unlinkFromSavedSearch', unlinkFromSavedSearch);
+      };
+    }
+  }, [appState, eventEmitter, savedVisInstance, services.toastNotifications]);
+};
diff --git a/src/plugins/visualize/public/application/utils/use/use_saved_vis_instance.ts b/src/plugins/visualize/public/application/utils/use/use_saved_vis_instance.ts
new file mode 100644
index 00000000000000..764bcb4a327c08
--- /dev/null
+++ b/src/plugins/visualize/public/application/utils/use/use_saved_vis_instance.ts
@@ -0,0 +1,199 @@
+/*
+ * 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 { useEffect, useRef, useState } from 'react';
+import { EventEmitter } from 'events';
+import { parse } from 'query-string';
+import { i18n } from '@kbn/i18n';
+
+import { redirectWhenMissing } from '../../../../../kibana_utils/public';
+import { DefaultEditorController } from '../../../../../vis_default_editor/public';
+
+import { getVisualizationInstance } from '../get_visualization_instance';
+import { getEditBreadcrumbs, getCreateBreadcrumbs } from '../breadcrumbs';
+import { SavedVisInstance, IEditorController, VisualizeServices } from '../../types';
+import { VisualizeConstants } from '../../visualize_constants';
+
+/**
+ * This effect is responsible for instantiating a saved vis or creating a new one
+ * using url parameters, embedding and destroying it in DOM
+ */
+export const useSavedVisInstance = (
+  services: VisualizeServices,
+  eventEmitter: EventEmitter,
+  isChromeVisible: boolean | undefined,
+  visualizationIdFromUrl: string | undefined
+) => {
+  const [state, setState] = useState<{
+    savedVisInstance?: SavedVisInstance;
+    visEditorController?: IEditorController;
+  }>({});
+  const visEditorRef = useRef<HTMLDivElement>(null);
+  const visId = useRef('');
+
+  useEffect(() => {
+    const {
+      application: { navigateToApp },
+      chrome,
+      history,
+      http: { basePath },
+      setActiveUrl,
+      toastNotifications,
+    } = services;
+    const getSavedVisInstance = async () => {
+      try {
+        let savedVisInstance: SavedVisInstance;
+
+        if (history.location.pathname === '/create') {
+          const searchParams = parse(history.location.search);
+          const visTypes = services.visualizations.all();
+          const visType = visTypes.find(({ name }) => name === searchParams.type);
+
+          if (!visType) {
+            throw new Error(
+              i18n.translate('visualize.createVisualization.noVisTypeErrorMessage', {
+                defaultMessage: 'You must provide a valid visualization type',
+              })
+            );
+          }
+
+          const shouldHaveIndex = visType.requiresSearch && visType.options.showIndexSelection;
+          const hasIndex = searchParams.indexPattern || searchParams.savedSearchId;
+
+          if (shouldHaveIndex && !hasIndex) {
+            throw new Error(
+              i18n.translate(
+                'visualize.createVisualization.noIndexPatternOrSavedSearchIdErrorMessage',
+                {
+                  defaultMessage: 'You must provide either an indexPattern or a savedSearchId',
+                }
+              )
+            );
+          }
+
+          savedVisInstance = await getVisualizationInstance(services, searchParams);
+        } else {
+          savedVisInstance = await getVisualizationInstance(services, visualizationIdFromUrl);
+        }
+
+        const { embeddableHandler, savedVis, vis } = savedVisInstance;
+
+        if (savedVis.id) {
+          chrome.setBreadcrumbs(getEditBreadcrumbs(savedVis.title));
+          chrome.docTitle.change(savedVis.title);
+        } else {
+          chrome.setBreadcrumbs(getCreateBreadcrumbs());
+        }
+
+        let visEditorController;
+        // do not create editor in embeded mode
+        if (isChromeVisible) {
+          const Editor = vis.type.editor || DefaultEditorController;
+          visEditorController = new Editor(
+            visEditorRef.current,
+            vis,
+            eventEmitter,
+            embeddableHandler
+          );
+        } else if (visEditorRef.current) {
+          embeddableHandler.render(visEditorRef.current);
+        }
+
+        setState({
+          savedVisInstance,
+          visEditorController,
+        });
+      } catch (error) {
+        const managementRedirectTarget = {
+          app: 'management',
+          path: `kibana/objects/savedVisualizations/${visualizationIdFromUrl}`,
+        };
+
+        try {
+          redirectWhenMissing({
+            history,
+            navigateToApp,
+            toastNotifications,
+            basePath,
+            mapping: {
+              visualization: VisualizeConstants.LANDING_PAGE_PATH,
+              search: managementRedirectTarget,
+              'index-pattern': managementRedirectTarget,
+              'index-pattern-field': managementRedirectTarget,
+            },
+            onBeforeRedirect() {
+              setActiveUrl(VisualizeConstants.LANDING_PAGE_PATH);
+            },
+          })(error);
+        } catch (e) {
+          toastNotifications.addWarning({
+            title: i18n.translate('visualize.createVisualization.failedToLoadErrorMessage', {
+              defaultMessage: 'Failed to load the visualization',
+            }),
+            text: e.message,
+          });
+          history.replace(VisualizeConstants.LANDING_PAGE_PATH);
+        }
+      }
+    };
+
+    if (isChromeVisible === undefined) {
+      // wait for specifying chrome
+      return;
+    }
+
+    if (!visId.current) {
+      visId.current = visualizationIdFromUrl || 'new';
+      getSavedVisInstance();
+    } else if (
+      visualizationIdFromUrl &&
+      visId.current !== visualizationIdFromUrl &&
+      state.savedVisInstance?.savedVis.id !== visualizationIdFromUrl
+    ) {
+      visId.current = visualizationIdFromUrl;
+      setState({});
+      getSavedVisInstance();
+    }
+  }, [
+    eventEmitter,
+    isChromeVisible,
+    services,
+    state.savedVisInstance,
+    state.visEditorController,
+    visualizationIdFromUrl,
+  ]);
+
+  useEffect(() => {
+    return () => {
+      if (state.visEditorController) {
+        state.visEditorController.destroy();
+      } else if (state.savedVisInstance?.embeddableHandler) {
+        state.savedVisInstance.embeddableHandler.destroy();
+      }
+      if (state.savedVisInstance?.savedVis) {
+        state.savedVisInstance.savedVis.destroy();
+      }
+    };
+  }, [state]);
+
+  return {
+    ...state,
+    visEditorRef,
+  };
+};
diff --git a/src/plugins/visualize/public/application/utils/use/use_visualize_app_state.tsx b/src/plugins/visualize/public/application/utils/use/use_visualize_app_state.tsx
new file mode 100644
index 00000000000000..e4d891472fbfd8
--- /dev/null
+++ b/src/plugins/visualize/public/application/utils/use/use_visualize_app_state.tsx
@@ -0,0 +1,120 @@
+/*
+ * 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 React, { useEffect, useState } from 'react';
+import { cloneDeep, isEqual } from 'lodash';
+import { map } from 'rxjs/operators';
+import { EventEmitter } from 'events';
+import { i18n } from '@kbn/i18n';
+
+import { MarkdownSimple, toMountPoint } from '../../../../../kibana_react/public';
+import { esFilters, connectToQueryState } from '../../../../../data/public';
+import { VisualizeServices, VisualizeAppStateContainer, SavedVisInstance } from '../../types';
+import { visStateToEditorState } from '../utils';
+import { createVisualizeAppState } from '../create_visualize_app_state';
+import { VisualizeConstants } from '../../visualize_constants';
+
+/**
+ * This effect is responsible for instantiating the visualize app state container,
+ * which is in sync with "_a" url param
+ */
+export const useVisualizeAppState = (
+  services: VisualizeServices,
+  eventEmitter: EventEmitter,
+  instance?: SavedVisInstance
+) => {
+  const [hasUnappliedChanges, setHasUnappliedChanges] = useState(false);
+  const [appState, setAppState] = useState<VisualizeAppStateContainer | null>(null);
+
+  useEffect(() => {
+    if (instance) {
+      const stateDefaults = visStateToEditorState(instance, services);
+
+      const { stateContainer, stopStateSync } = createVisualizeAppState({
+        stateDefaults,
+        kbnUrlStateStorage: services.kbnUrlStateStorage,
+      });
+
+      const onDirtyStateChange = ({ isDirty }: { isDirty: boolean }) => {
+        if (!isDirty) {
+          // it is important to update vis state with fresh data
+          stateContainer.transitions.updateVisState(visStateToEditorState(instance, services).vis);
+        }
+        setHasUnappliedChanges(isDirty);
+      };
+
+      eventEmitter.on('dirtyStateChange', onDirtyStateChange);
+
+      const { filterManager } = services.data.query;
+      // sync initial app filters from state to filterManager
+      filterManager.setAppFilters(cloneDeep(stateContainer.getState().filters));
+      // setup syncing of app filters between appState and filterManager
+      const stopSyncingAppFilters = connectToQueryState(
+        services.data.query,
+        {
+          set: ({ filters }) => stateContainer.transitions.set('filters', filters),
+          get: () => ({ filters: stateContainer.getState().filters }),
+          state$: stateContainer.state$.pipe(map((state) => ({ filters: state.filters }))),
+        },
+        {
+          filters: esFilters.FilterStateStore.APP_STATE,
+        }
+      );
+
+      // The savedVis is pulled from elasticsearch, but the appState is pulled from the url, with the
+      // defaults applied. If the url was from a previous session which included modifications to the
+      // appState then they won't be equal.
+      if (!isEqual(stateContainer.getState().vis, stateDefaults.vis)) {
+        const { aggs, ...visState } = stateContainer.getState().vis;
+        instance.vis
+          .setState({ ...visState, data: { aggs } })
+          .then(() => {
+            // setting up the stateContainer after setState is successful will prevent loading the editor with failures
+            // otherwise the catch will take presedence
+            setAppState(stateContainer);
+          })
+          .catch((error: Error) => {
+            // if setting new vis state was failed for any reason,
+            // redirect to the listing page with error message
+            services.toastNotifications.addWarning({
+              title: i18n.translate('visualize.visualizationLoadingFailedErrorMessage', {
+                defaultMessage: 'Failed to load the visualization',
+              }),
+              text: toMountPoint(<MarkdownSimple>{error.message}</MarkdownSimple>),
+            });
+
+            services.history.replace(
+              `${VisualizeConstants.LANDING_PAGE_PATH}?notFound=visualization`
+            );
+          });
+      } else {
+        setAppState(stateContainer);
+      }
+
+      // don't forget to clean up
+      return () => {
+        eventEmitter.off('dirtyStateChange', onDirtyStateChange);
+        stopStateSync();
+        stopSyncingAppFilters();
+      };
+    }
+  }, [eventEmitter, instance, services]);
+
+  return { appState, hasUnappliedChanges };
+};
diff --git a/src/plugins/visualize/public/application/utils/utils.ts b/src/plugins/visualize/public/application/utils/utils.ts
new file mode 100644
index 00000000000000..9f32da3f785b52
--- /dev/null
+++ b/src/plugins/visualize/public/application/utils/utils.ts
@@ -0,0 +1,71 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+
+import { ChromeStart, DocLinksStart } from 'kibana/public';
+import { Filter, UI_SETTINGS } from '../../../../data/public';
+import { VisualizeServices, SavedVisInstance } from '../types';
+
+export const addHelpMenuToAppChrome = (chrome: ChromeStart, docLinks: DocLinksStart) => {
+  chrome.setHelpExtension({
+    appName: i18n.translate('visualize.helpMenu.appName', {
+      defaultMessage: 'Visualize',
+    }),
+    links: [
+      {
+        linkType: 'documentation',
+        href: `${docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${docLinks.DOC_LINK_VERSION}/visualize.html`,
+      },
+    ],
+  });
+};
+
+export const addBadgeToAppChrome = (chrome: ChromeStart) => {
+  chrome.setBadge({
+    text: i18n.translate('visualize.badge.readOnly.text', {
+      defaultMessage: 'Read only',
+    }),
+    tooltip: i18n.translate('visualize.badge.readOnly.tooltip', {
+      defaultMessage: 'Unable to save visualizations',
+    }),
+    iconType: 'glasses',
+  });
+};
+
+export const getDefaultQuery = ({ localStorage, uiSettings }: VisualizeServices) => ({
+  query: '',
+  language:
+    localStorage.get('kibana.userQueryLanguage') ||
+    uiSettings.get(UI_SETTINGS.SEARCH_QUERY_LANGUAGE),
+});
+
+export const visStateToEditorState = (
+  { vis, savedVis }: SavedVisInstance,
+  services: VisualizeServices
+) => {
+  const savedVisState = services.visualizations.convertFromSerializedVis(vis.serialize());
+  return {
+    uiState: savedVis.uiStateJSON ? JSON.parse(savedVis.uiStateJSON) : vis.uiState.toJSON(),
+    query: vis.data.searchSource?.getOwnField('query') || getDefaultQuery(services),
+    filters: (vis.data.searchSource?.getOwnField('filter') as Filter[]) || [],
+    vis: { ...savedVisState.visState, title: vis.title },
+    linked: !!savedVis.savedSearchId,
+  };
+};
diff --git a/src/plugins/visualize/public/application/visualize_constants.ts b/src/plugins/visualize/public/application/visualize_constants.ts
index 0ca61c53f26c78..adcf27f17dc257 100644
--- a/src/plugins/visualize/public/application/visualize_constants.ts
+++ b/src/plugins/visualize/public/application/visualize_constants.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+export const APP_NAME = 'visualize';
+
 export const VisualizeConstants = {
   LANDING_PAGE_PATH: '/',
   WIZARD_STEP_1_PAGE_PATH: '/new',
@@ -24,7 +26,3 @@ export const VisualizeConstants = {
   CREATE_PATH: '/create',
   EDIT_PATH: '/edit',
 };
-
-export function createVisualizeEditUrl(id: string) {
-  return `${VisualizeConstants.EDIT_PATH}/${id}`;
-}
diff --git a/src/plugins/visualize/public/index.ts b/src/plugins/visualize/public/index.ts
index f7bbcb1456da4b..d437cadad9fabb 100644
--- a/src/plugins/visualize/public/index.ts
+++ b/src/plugins/visualize/public/index.ts
@@ -21,7 +21,7 @@ import { PluginInitializerContext } from 'kibana/public';
 import { VisualizePlugin } from './plugin';
 
 export { EditorRenderProps } from './application/types';
-export { VisualizeConstants, createVisualizeEditUrl } from './application/visualize_constants';
+export { VisualizeConstants } from './application/visualize_constants';
 
 export const plugin = (context: PluginInitializerContext) => {
   return new VisualizePlugin(context);
diff --git a/src/plugins/visualize/public/kibana_services.ts b/src/plugins/visualize/public/kibana_services.ts
deleted file mode 100644
index f1e6b0b37d55b7..00000000000000
--- a/src/plugins/visualize/public/kibana_services.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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 {
-  ChromeStart,
-  CoreStart,
-  SavedObjectsClientContract,
-  ToastsStart,
-  PluginInitializerContext,
-  I18nStart,
-  ScopedHistory,
-} from 'kibana/public';
-
-import { NavigationPublicPluginStart as NavigationStart } from '../../navigation/public';
-import { Storage } from '../../kibana_utils/public';
-import { SharePluginStart } from '../../share/public';
-import { DataPublicPluginStart } from '../../data/public';
-import { VisualizationsStart } from '../../visualizations/public';
-import { SavedVisualizations } from './application/types';
-import { KibanaLegacyStart } from '../../kibana_legacy/public';
-import { SavedObjectsStart } from '../../saved_objects/public';
-import { EmbeddableStart } from '../../embeddable/public';
-
-export interface VisualizeKibanaServices {
-  pluginInitializerContext: PluginInitializerContext;
-  addBasePath: (url: string) => string;
-  chrome: ChromeStart;
-  core: CoreStart;
-  data: DataPublicPluginStart;
-  localStorage: Storage;
-  navigation: NavigationStart;
-  toastNotifications: ToastsStart;
-  savedObjectsClient: SavedObjectsClientContract;
-  savedVisualizations: SavedVisualizations;
-  share?: SharePluginStart;
-  kibanaLegacy: KibanaLegacyStart;
-  visualizeCapabilities: any;
-  visualizations: VisualizationsStart;
-  embeddable: EmbeddableStart;
-  I18nContext: I18nStart['Context'];
-  setActiveUrl: (newUrl: string) => void;
-  restorePreviousUrl: () => void;
-  createVisEmbeddableFromObject: VisualizationsStart['__LEGACY']['createVisEmbeddableFromObject'];
-  scopedHistory: () => ScopedHistory;
-  savedObjects: SavedObjectsStart;
-}
-
-let services: VisualizeKibanaServices | null = null;
-export function setServices(newServices: VisualizeKibanaServices) {
-  services = newServices;
-}
-
-export function getServices() {
-  if (!services) {
-    throw new Error(
-      'Kibana services not set - are you trying to import this module from outside of the visualize app?'
-    );
-  }
-  return services;
-}
-
-export function clearServices() {
-  services = null;
-}
diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts
index bec082642d3d46..5be560f7fb6323 100644
--- a/src/plugins/visualize/public/plugin.ts
+++ b/src/plugins/visualize/public/plugin.ts
@@ -20,7 +20,7 @@
 import { BehaviorSubject } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { filter, map } from 'rxjs/operators';
-
+import { createHashHistory } from 'history';
 import {
   AppMountParameters,
   AppUpdater,
@@ -31,15 +31,15 @@ import {
   ScopedHistory,
 } from 'kibana/public';
 
-import { Storage, createKbnUrlTracker } from '../../kibana_utils/public';
+import { Storage, createKbnUrlTracker, createKbnUrlStateStorage } from '../../kibana_utils/public';
 import { DataPublicPluginStart, DataPublicPluginSetup, esFilters } from '../../data/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../navigation/public';
 import { SharePluginStart } from '../../share/public';
 import { KibanaLegacySetup, KibanaLegacyStart } from '../../kibana_legacy/public';
 import { VisualizationsStart } from '../../visualizations/public';
 import { VisualizeConstants } from './application/visualize_constants';
-import { setServices, VisualizeKibanaServices } from './kibana_services';
 import { FeatureCatalogueCategory, HomePublicPluginSetup } from '../../home/public';
+import { VisualizeServices } from './application/types';
 import { DEFAULT_APP_CATEGORIES } from '../../../core/public';
 import { SavedObjectsStart } from '../../saved_objects/public';
 import { EmbeddableStart } from '../../embeddable/public';
@@ -118,40 +118,60 @@ export class VisualizePlugin
         const [coreStart, pluginsStart] = await core.getStartServices();
         this.currentHistory = params.history;
 
+        // make sure the index pattern list is up to date
+        pluginsStart.data.indexPatterns.clearCache();
+        // make sure a default index pattern exists
+        // if not, the page will be redirected to management and visualize won't be rendered
+        await pluginsStart.data.indexPatterns.ensureDefaultIndexPattern();
+
         appMounted();
 
-        const deps: VisualizeKibanaServices = {
-          pluginInitializerContext: this.initializerContext,
-          addBasePath: coreStart.http.basePath.prepend,
-          core: coreStart,
+        // dispatch synthetic hash change event to update hash history objects
+        // this is necessary because hash updates triggered by using popState won't trigger this event naturally.
+        const unlistenParentHistory = params.history.listen(() => {
+          window.dispatchEvent(new HashChangeEvent('hashchange'));
+        });
+
+        /**
+         * current implementation uses 2 history objects:
+         * 1. the hash history (used for the react hash router)
+         * 2. and the scoped history (used for url tracking)
+         * this should be replaced to use only scoped history after moving legacy apps to browser routing
+         */
+        const history = createHashHistory();
+
+        const services: VisualizeServices = {
+          ...coreStart,
+          history,
+          kbnUrlStateStorage: createKbnUrlStateStorage({
+            history,
+            useHash: coreStart.uiSettings.get('state:storeInSessionStorage'),
+          }),
           kibanaLegacy: pluginsStart.kibanaLegacy,
+          pluginInitializerContext: this.initializerContext,
           chrome: coreStart.chrome,
           data: pluginsStart.data,
           localStorage: new Storage(localStorage),
           navigation: pluginsStart.navigation,
-          savedObjectsClient: coreStart.savedObjects.client,
           savedVisualizations: pluginsStart.visualizations.savedVisualizationsLoader,
           share: pluginsStart.share,
           toastNotifications: coreStart.notifications.toasts,
           visualizeCapabilities: coreStart.application.capabilities.visualize,
           visualizations: pluginsStart.visualizations,
           embeddable: pluginsStart.embeddable,
-          I18nContext: coreStart.i18n.Context,
           setActiveUrl,
           createVisEmbeddableFromObject:
             pluginsStart.visualizations.__LEGACY.createVisEmbeddableFromObject,
-          scopedHistory: () => this.currentHistory!,
-          savedObjects: pluginsStart.savedObjects,
+          savedObjectsPublic: pluginsStart.savedObjects,
+          scopedHistory: params.history,
           restorePreviousUrl,
         };
-        setServices(deps);
 
-        // make sure the index pattern list is up to date
-        await pluginsStart.data.indexPatterns.clearCache();
-        const { renderApp } = await import('./application/application');
         params.element.classList.add('visAppWrapper');
-        const unmount = renderApp(params.element, params.appBasePath, deps);
+        const { renderApp } = await import('./application');
+        const unmount = renderApp(params, services);
         return () => {
+          unlistenParentHistory();
           unmount();
           appUnMounted();
         };
diff --git a/tasks/config/run.js b/tasks/config/run.js
index 22deead1d380e5..32adf4f1f87c22 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -149,6 +149,12 @@ module.exports = function (grunt) {
       args: ['scripts/i18n_check', '--ignore-missing'],
     }),
 
+    telemetryCheck: scriptWithGithubChecks({
+      title: 'Telemetry Schema check',
+      cmd: NODE,
+      args: ['scripts/telemetry_check'],
+    }),
+
     // used by the test:quick task
     //    runs all node.js/server mocha tests
     mocha: scriptWithGithubChecks({
diff --git a/tasks/jenkins.js b/tasks/jenkins.js
index 4d92ff406a3253..b40bb8156098d3 100644
--- a/tasks/jenkins.js
+++ b/tasks/jenkins.js
@@ -27,6 +27,7 @@ module.exports = function (grunt) {
     'run:checkDocApiChanges',
     'run:typeCheck',
     'run:i18nCheck',
+    'run:telemetryCheck',
     'run:checkFileCasing',
     'run:checkLockfileSymlinks',
     'run:licenses',
diff --git a/test/api_integration/apis/saved_objects_management/find.ts b/test/api_integration/apis/saved_objects_management/find.ts
index 235d789a388df2..b5154d619685aa 100644
--- a/test/api_integration/apis/saved_objects_management/find.ts
+++ b/test/api_integration/apis/saved_objects_management/find.ts
@@ -287,7 +287,7 @@ export default function ({ getService }: FtrProviderContext) {
               inAppUrl: {
                 path:
                   '/app/management/kibana/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357',
-                uiCapabilitiesPath: 'management.kibana.index_patterns',
+                uiCapabilitiesPath: 'management.kibana.indexPatterns',
               },
             });
           }));
diff --git a/test/api_integration/apis/saved_objects_management/relationships.ts b/test/api_integration/apis/saved_objects_management/relationships.ts
index 225fc5456e7436..a1ea65645c13fb 100644
--- a/test/api_integration/apis/saved_objects_management/relationships.ts
+++ b/test/api_integration/apis/saved_objects_management/relationships.ts
@@ -87,7 +87,7 @@ export default function ({ getService }: FtrProviderContext) {
               inAppUrl: {
                 path:
                   '/app/management/kibana/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357',
-                uiCapabilitiesPath: 'management.kibana.index_patterns',
+                uiCapabilitiesPath: 'management.kibana.indexPatterns',
               },
             },
           },
@@ -128,7 +128,7 @@ export default function ({ getService }: FtrProviderContext) {
               inAppUrl: {
                 path:
                   '/app/management/kibana/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357',
-                uiCapabilitiesPath: 'management.kibana.index_patterns',
+                uiCapabilitiesPath: 'management.kibana.indexPatterns',
               },
             },
             relationship: 'child',
diff --git a/test/functional/apps/visualize/_shared_item.js b/test/functional/apps/visualize/_shared_item.js
index 0efe05caf9b3b2..679f558e018b67 100644
--- a/test/functional/apps/visualize/_shared_item.js
+++ b/test/functional/apps/visualize/_shared_item.js
@@ -36,7 +36,7 @@ export default function ({ getService, getPageObjects }) {
         description: 'AreaChart',
       };
 
-      await PageObjects.visualize.clickVisualizationByName('Shared-Item Visualization AreaChart');
+      await PageObjects.visualize.openSavedVisualization('Shared-Item Visualization AreaChart');
       await retry.try(async function () {
         const { title, description } = await PageObjects.common.getSharedItemTitleAndDescription();
         expect(title).to.eql(expected.title);
diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js
index 1a9ac5000b1bac..56585ccd725d80 100644
--- a/test/functional/apps/visualize/_tile_map.js
+++ b/test/functional/apps/visualize/_tile_map.js
@@ -207,7 +207,7 @@ export default function ({ getService, getPageObjects }) {
           const vizName1 = 'Visualization TileMap';
           await PageObjects.visualize.loadSavedVisualization(vizName1);
           await inspector.open();
-          await inspector.expectTableHeaders(['filter', 'geohash_grid', 'Count', 'Geo Centroid']);
+          await inspector.expectTableHeaders(['Filter', 'Geohash', 'Count', 'Geo Centroid']);
           await inspector.close();
         });
 
@@ -216,7 +216,7 @@ export default function ({ getService, getPageObjects }) {
           await PageObjects.visEditor.setIsFilteredByCollarCheckbox(false);
           await PageObjects.visEditor.clickGo();
           await inspector.open();
-          await inspector.expectTableHeaders(['geohash_grid', 'Count', 'Geo Centroid']);
+          await inspector.expectTableHeaders(['Geohash', 'Count', 'Geo Centroid']);
           await inspector.close();
         });
 
diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
index e491cd7e4fe40a..fb40b946d7fa30 100644
--- a/test/functional/page_objects/settings_page.ts
+++ b/test/functional/page_objects/settings_page.ts
@@ -570,8 +570,10 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
     async setScriptedFieldScript(script: string) {
       log.debug('set scripted field script = ' + script);
       const aceEditorCssSelector = '[data-test-subj="editorFieldScript"] .ace_editor';
-      await find.clickByCssSelector(aceEditorCssSelector);
-      for (let i = 0; i < 1000; i++) {
+      const editor = await find.byCssSelector(aceEditorCssSelector);
+      await editor.click();
+      const existingText = await editor.getVisibleText();
+      for (let i = 0; i < existingText.length; i++) {
         await browser.pressKeys(browser.keys.BACK_SPACE);
       }
       await browser.pressKeys(...script.split(''));
diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts
index b002bbb171adb1..4a4beca9595400 100644
--- a/test/functional/page_objects/visual_builder_page.ts
+++ b/test/functional/page_objects/visual_builder_page.ts
@@ -49,6 +49,8 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
       await PageObjects.common.navigateToUrl('visualize', 'create?type=metrics', {
         useActualUrl: true,
       });
+      log.debug('Wait for initializing TSVB editor');
+      await this.checkVisualBuilderIsPresent();
       log.debug('Set absolute time range from "' + fromTime + '" to "' + toTime + '"');
       await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
       // 2 sec sleep until https://github.com/elastic/kibana/issues/46353 is fixed
diff --git a/test/functional/page_objects/visualize_page.ts b/test/functional/page_objects/visualize_page.ts
index 22142d19750009..49133d8b138368 100644
--- a/test/functional/page_objects/visualize_page.ts
+++ b/test/functional/page_objects/visualize_page.ts
@@ -248,11 +248,6 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
       await find.clickByCssSelector('[href="#/"]');
     }
 
-    public async clickVisualizationByName(vizName: string) {
-      log.debug('clickVisualizationByLinkText(' + vizName + ')');
-      await find.clickByPartialLinkText(vizName);
-    }
-
     public async loadSavedVisualization(vizName: string, { navigateToVisualize = true } = {}) {
       if (navigateToVisualize) {
         await this.clickLoadSavedVisButton();
@@ -261,7 +256,8 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
     }
 
     public async openSavedVisualization(vizName: string) {
-      await this.clickVisualizationByName(vizName);
+      const dataTestSubj = `visListingTitleLink-${vizName.split(' ').join('-')}`;
+      await testSubjects.click(dataTestSubj);
       await header.waitUntilLoadingHasFinished();
     }
 
@@ -280,7 +276,7 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
      */
     public async onLandingPage() {
       log.debug(`VisualizePage.onLandingPage`);
-      return await testSubjects.exists('visualizeLandingPage');
+      return await testSubjects.exists('visualizationLandingPage');
     }
 
     public async gotoLandingPage() {
diff --git a/test/scripts/jenkins_xpack_visual_regression.sh b/test/scripts/jenkins_xpack_visual_regression.sh
index e406bb3e6106f2..b67c1c9060a6e2 100755
--- a/test/scripts/jenkins_xpack_visual_regression.sh
+++ b/test/scripts/jenkins_xpack_visual_regression.sh
@@ -19,5 +19,5 @@ yarn percy exec -t 500 -- -- \
     --kibana-install-dir "$installDir" \
     --config test/visual_regression/config.ts;
 
-cd "$KIBANA_DIR"
-source "test/scripts/jenkins_xpack_page_load_metrics.sh"
+# cd "$KIBANA_DIR"
+# source "test/scripts/jenkins_xpack_page_load_metrics.sh"
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index 46a76bbb8d523d..f3fc5f84583c9c 100644
--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -21,6 +21,7 @@ def functionalTestProcess(String name, Closure closure) {
     def kibanaPort = "61${processNumber}1"
     def esPort = "61${processNumber}2"
     def esTransportPort = "61${processNumber}3"
+    def ingestManagementPackageRegistryPort = "61${processNumber}4"
 
     withEnv([
       "CI_PARALLEL_PROCESS_NUMBER=${processNumber}",
@@ -29,6 +30,7 @@ def functionalTestProcess(String name, Closure closure) {
       "TEST_KIBANA_URL=http://elastic:changeme@localhost:${kibanaPort}",
       "TEST_ES_URL=http://elastic:changeme@localhost:${esPort}",
       "TEST_ES_TRANSPORT_PORT=${esTransportPort}",
+      "INGEST_MANAGEMENT_PACKAGE_REGISTRY_PORT=${ingestManagementPackageRegistryPort}",
       "IS_PIPELINE_JOB=1",
       "JOB=${name}",
       "KBN_NP_PLUGINS_BUILT=true",
diff --git a/x-pack/.telemetryrc.json b/x-pack/.telemetryrc.json
new file mode 100644
index 00000000000000..2c16491c1096bf
--- /dev/null
+++ b/x-pack/.telemetryrc.json
@@ -0,0 +1,14 @@
+{
+  "output": "plugins/telemetry_collection_xpack/schema/xpack_plugins.json",
+  "root": "plugins/",
+  "exclude": [
+    "plugins/actions/server/usage/actions_usage_collector.ts",
+    "plugins/alerts/server/usage/alerts_usage_collector.ts",
+    "plugins/apm/server/lib/apm_telemetry/index.ts",
+    "plugins/canvas/server/collectors/collector.ts",
+    "plugins/infra/server/usage/usage_collector.ts",
+    "plugins/lens/server/usage/collectors.ts",
+    "plugins/reporting/server/usage/reporting_usage_collector.ts",
+    "plugins/maps/server/maps_telemetry/collectors/register.ts"
+  ]
+}
diff --git a/x-pack/dev-tools/jest/create_jest_config.js b/x-pack/dev-tools/jest/create_jest_config.js
index 5e0062fc3a6c67..9b6db8b74458b5 100644
--- a/x-pack/dev-tools/jest/create_jest_config.js
+++ b/x-pack/dev-tools/jest/create_jest_config.js
@@ -44,6 +44,7 @@ export function createJestConfig({ kibanaDirectory, rootDir, xPackKibanaDirector
       '!**/mocks/**',
       '!**/plugins/apm/e2e/**',
       '!**/plugins/siem/cypress/**',
+      '!**/plugins/**/test_helpers/**',
     ],
     coveragePathIgnorePatterns: ['.*\\.d\\.ts'],
     coverageDirectory: `${kibanaDirectory}/target/kibana-coverage/jest`,
diff --git a/x-pack/legacy/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts b/x-pack/legacy/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts
index baccbe416f3980..213b728a2c163a 100644
--- a/x-pack/legacy/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts
+++ b/x-pack/legacy/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { ElasticsearchServiceStart, IClusterClient } from 'src/core/server';
+import { ElasticsearchServiceStart, ILegacyClusterClient } from 'src/core/server';
 import { FrameworkUser } from '../framework/adapter_types';
 import { internalAuthData } from './../framework/adapter_types';
 import {
@@ -23,7 +23,7 @@ import {
 } from './adapter_types';
 
 export class KibanaDatabaseAdapter implements DatabaseAdapter {
-  private es: IClusterClient;
+  private es: ILegacyClusterClient;
 
   constructor(elasticsearch: ElasticsearchServiceStart) {
     this.es = elasticsearch.legacy.client;
diff --git a/x-pack/package.json b/x-pack/package.json
index ac5b77c4f78dbb..0a8bc6f1e6f58a 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -100,7 +100,7 @@
     "@types/react-beautiful-dnd": "^12.1.1",
     "@types/react-dom": "^16.9.8",
     "@types/react-redux": "^7.1.9",
-    "@types/react-router-dom": "^5.1.3",
+    "@types/react-router-dom": "^5.1.5",
     "@types/react-sticky": "^6.0.3",
     "@types/react-test-renderer": "^16.9.1",
     "@types/recompose": "^0.30.6",
@@ -170,6 +170,7 @@
     "pixelmatch": "^5.1.0",
     "proxyquire": "1.8.0",
     "react-docgen-typescript-loader": "^3.1.1",
+    "react-is": "^16.8.0",
     "react-test-renderer": "^16.12.0",
     "rxjs-marbles": "^5.0.6",
     "sass-loader": "^8.0.2",
@@ -328,8 +329,8 @@
     "react-portal": "^3.2.0",
     "react-redux": "^7.2.0",
     "react-reverse-portal": "^1.0.4",
-    "react-router": "^5.1.2",
-    "react-router-dom": "^5.1.2",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
     "react-shortcuts": "^2.0.0",
     "react-sticky": "^6.0.3",
     "react-syntax-highlighter": "^5.7.0",
diff --git a/x-pack/plugins/actions/server/actions_client.ts b/x-pack/plugins/actions/server/actions_client.ts
index a2feac83cba9f5..a512d314fb7e25 100644
--- a/x-pack/plugins/actions/server/actions_client.ts
+++ b/x-pack/plugins/actions/server/actions_client.ts
@@ -5,7 +5,7 @@
  */
 import Boom from 'boom';
 import {
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
   SavedObjectsClientContract,
   SavedObjectAttributes,
   SavedObject,
@@ -50,7 +50,7 @@ interface CreateOptions {
 
 interface ConstructorOptions {
   defaultKibanaIndex: string;
-  scopedClusterClient: IScopedClusterClient;
+  scopedClusterClient: ILegacyScopedClusterClient;
   actionTypeRegistry: ActionTypeRegistry;
   savedObjectsClient: SavedObjectsClientContract;
   preconfiguredActions: PreConfiguredAction[];
@@ -66,7 +66,7 @@ interface UpdateOptions {
 
 export class ActionsClient {
   private readonly defaultKibanaIndex: string;
-  private readonly scopedClusterClient: IScopedClusterClient;
+  private readonly scopedClusterClient: ILegacyScopedClusterClient;
   private readonly savedObjectsClient: SavedObjectsClientContract;
   private readonly actionTypeRegistry: ActionTypeRegistry;
   private readonly preconfiguredActions: PreConfiguredAction[];
@@ -298,7 +298,7 @@ function actionFromSavedObject(savedObject: SavedObject<RawAction>): ActionResul
 
 async function injectExtraFindData(
   defaultKibanaIndex: string,
-  scopedClusterClient: IScopedClusterClient,
+  scopedClusterClient: ILegacyScopedClusterClient,
   actionResults: ActionResult[]
 ): Promise<FindActionResult[]> {
   const aggs: Record<string, unknown> = {};
diff --git a/x-pack/plugins/actions/server/plugin.ts b/x-pack/plugins/actions/server/plugin.ts
index ad3fa97ee0c366..eae2595136627d 100644
--- a/x-pack/plugins/actions/server/plugin.ts
+++ b/x-pack/plugins/actions/server/plugin.ts
@@ -17,7 +17,7 @@ import {
   RequestHandler,
   IContextProvider,
   ElasticsearchServiceStart,
-  IClusterClient,
+  ILegacyClusterClient,
   SavedObjectsClientContract,
 } from '../../../../src/core/server';
 
@@ -307,7 +307,7 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
     return (request) => ({
       callCluster: elasticsearch.legacy.client.asScoped(request).callAsCurrentUser,
       savedObjectsClient: getScopedClient(request),
-      getScopedCallCluster(clusterClient: IClusterClient) {
+      getScopedCallCluster(clusterClient: ILegacyClusterClient) {
         return clusterClient.asScoped(request).callAsCurrentUser;
       },
     });
diff --git a/x-pack/plugins/actions/server/types.ts b/x-pack/plugins/actions/server/types.ts
index 093d22c2c1a710..ca5da2779139e9 100644
--- a/x-pack/plugins/actions/server/types.ts
+++ b/x-pack/plugins/actions/server/types.ts
@@ -9,8 +9,8 @@ import { PluginSetupContract, PluginStartContract } from './plugin';
 import { ActionsClient } from './actions_client';
 import { LicenseType } from '../../licensing/common/types';
 import {
-  IClusterClient,
-  IScopedClusterClient,
+  ILegacyClusterClient,
+  ILegacyScopedClusterClient,
   KibanaRequest,
   SavedObjectsClientContract,
   SavedObjectAttributes,
@@ -23,9 +23,11 @@ export type GetBasePathFunction = (spaceId?: string) => string;
 export type SpaceIdToNamespaceFunction = (spaceId?: string) => string | undefined;
 
 export interface Services {
-  callCluster: IScopedClusterClient['callAsCurrentUser'];
+  callCluster: ILegacyScopedClusterClient['callAsCurrentUser'];
   savedObjectsClient: SavedObjectsClientContract;
-  getScopedCallCluster(clusterClient: IClusterClient): IScopedClusterClient['callAsCurrentUser'];
+  getScopedCallCluster(
+    clusterClient: ILegacyClusterClient
+  ): ILegacyScopedClusterClient['callAsCurrentUser'];
 }
 
 declare module 'src/core/server' {
diff --git a/x-pack/plugins/actions/server/usage/actions_telemetry.ts b/x-pack/plugins/actions/server/usage/actions_telemetry.ts
index 6996ba629f8da9..2815b5fbe6a5e4 100644
--- a/x-pack/plugins/actions/server/usage/actions_telemetry.ts
+++ b/x-pack/plugins/actions/server/usage/actions_telemetry.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
-export async function getTotalCount(callCluster: APICaller, kibanaIndex: string) {
+export async function getTotalCount(callCluster: LegacyAPICaller, kibanaIndex: string) {
   const scriptedMetric = {
     scripted_metric: {
       init_script: 'state.types = [:]',
@@ -66,7 +66,7 @@ export async function getTotalCount(callCluster: APICaller, kibanaIndex: string)
   };
 }
 
-export async function getInUseTotalCount(callCluster: APICaller, kibanaIndex: string) {
+export async function getInUseTotalCount(callCluster: LegacyAPICaller, kibanaIndex: string) {
   const scriptedMetric = {
     scripted_metric: {
       init_script: 'state.connectorIds = new HashMap(); state.total = 0;',
diff --git a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
index e298b3ad9d00ce..5dff0629222005 100644
--- a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
+++ b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
@@ -13,10 +13,10 @@ export function createActionsUsageCollector(
   usageCollection: UsageCollectionSetup,
   taskManager: TaskManagerStartContract
 ) {
-  return usageCollection.makeUsageCollector({
+  return usageCollection.makeUsageCollector<ActionsUsage>({
     type: 'actions',
     isReady: () => true,
-    fetch: async (): Promise<ActionsUsage> => {
+    fetch: async () => {
       try {
         const doc = await getLatestTaskState(await taskManager);
         // get the accumulated state from the recurring task
diff --git a/x-pack/plugins/actions/server/usage/task.ts b/x-pack/plugins/actions/server/usage/task.ts
index 862a170ca13436..050f0021a32c1f 100644
--- a/x-pack/plugins/actions/server/usage/task.ts
+++ b/x-pack/plugins/actions/server/usage/task.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Logger, CoreSetup, APICaller } from 'kibana/server';
+import { Logger, CoreSetup, LegacyAPICaller } from 'kibana/server';
 import moment from 'moment';
 import {
   RunContext,
@@ -62,7 +62,7 @@ async function scheduleTasks(logger: Logger, taskManager: TaskManagerStartContra
 export function telemetryTaskRunner(logger: Logger, core: CoreSetup, kibanaIndex: string) {
   return ({ taskInstance }: RunContext) => {
     const { state } = taskInstance;
-    const callCluster = (...args: Parameters<APICaller>) => {
+    const callCluster = (...args: Parameters<LegacyAPICaller>) => {
       return core.getStartServices().then(([{ elasticsearch: { legacy: { client } } }]) =>
         client.callAsInternalUser(...args)
       );
diff --git a/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/fields.ts b/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/fields.ts
index 1ef289d74a05e8..ea1e17002c4a5c 100644
--- a/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/fields.ts
+++ b/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/fields.ts
@@ -14,7 +14,7 @@ import {
   KibanaRequest,
   IKibanaResponse,
   KibanaResponseFactory,
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
 } from 'kibana/server';
 import { Service } from '../../../types';
 
@@ -93,7 +93,7 @@ interface Field {
 }
 
 async function getRawFields(
-  dataClient: IScopedClusterClient,
+  dataClient: ILegacyScopedClusterClient,
   indexes: string[]
 ): Promise<RawFields> {
   const params = {
diff --git a/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/indices.ts b/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/indices.ts
index dcf117aafa6fb5..c94705829ec602 100644
--- a/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/indices.ts
+++ b/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/indices.ts
@@ -16,7 +16,7 @@ import {
   KibanaRequest,
   IKibanaResponse,
   KibanaResponseFactory,
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
 } from 'kibana/server';
 import { SearchResponse } from 'elasticsearch';
 import { Service } from '../../../types';
@@ -84,7 +84,7 @@ function uniqueCombined(list1: string[], list2: string[], limit: number) {
 }
 
 async function getIndicesFromPattern(
-  dataClient: IScopedClusterClient,
+  dataClient: ILegacyScopedClusterClient,
   pattern: string
 ): Promise<string[]> {
   const params = {
@@ -114,7 +114,7 @@ async function getIndicesFromPattern(
 }
 
 async function getAliasesFromPattern(
-  dataClient: IScopedClusterClient,
+  dataClient: ILegacyScopedClusterClient,
   pattern: string
 ): Promise<string[]> {
   const params = {
diff --git a/x-pack/plugins/alerting_builtins/server/types.ts b/x-pack/plugins/alerting_builtins/server/types.ts
index 95d34371a6d1e6..1fb5314ca4fd9e 100644
--- a/x-pack/plugins/alerting_builtins/server/types.ts
+++ b/x-pack/plugins/alerting_builtins/server/types.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Logger, ScopedClusterClient } from '../../../../src/core/server';
+import { Logger, LegacyScopedClusterClient } from '../../../../src/core/server';
 import { PluginSetupContract as AlertingSetup } from '../../alerts/server';
 import { getService as getServiceIndexThreshold } from './alert_types/index_threshold';
 
@@ -31,4 +31,4 @@ export interface Service extends IService {
   logger: Logger;
 }
 
-export type CallCluster = ScopedClusterClient['callAsCurrentUser'];
+export type CallCluster = LegacyScopedClusterClient['callAsCurrentUser'];
diff --git a/x-pack/plugins/alerts/server/plugin.ts b/x-pack/plugins/alerts/server/plugin.ts
index 324bc9fbfb72bf..23a5dc51d04754 100644
--- a/x-pack/plugins/alerts/server/plugin.ts
+++ b/x-pack/plugins/alerts/server/plugin.ts
@@ -29,7 +29,7 @@ import {
   RequestHandler,
   SharedGlobalConfig,
   ElasticsearchServiceStart,
-  IClusterClient,
+  ILegacyClusterClient,
 } from '../../../../src/core/server';
 
 import {
@@ -273,7 +273,7 @@ export class AlertingPlugin {
     return (request) => ({
       callCluster: elasticsearch.legacy.client.asScoped(request).callAsCurrentUser,
       savedObjectsClient: this.getScopedClientWithAlertSavedObjectType(savedObjects, request),
-      getScopedCallCluster(clusterClient: IClusterClient) {
+      getScopedCallCluster(clusterClient: ILegacyClusterClient) {
         return clusterClient.asScoped(request).callAsCurrentUser;
       },
     });
diff --git a/x-pack/plugins/alerts/server/routes/_mock_handler_arguments.ts b/x-pack/plugins/alerts/server/routes/_mock_handler_arguments.ts
index 9c98040ea09bb4..7d86d4fde7e61b 100644
--- a/x-pack/plugins/alerts/server/routes/_mock_handler_arguments.ts
+++ b/x-pack/plugins/alerts/server/routes/_mock_handler_arguments.ts
@@ -8,7 +8,7 @@ import {
   RequestHandlerContext,
   KibanaRequest,
   KibanaResponseFactory,
-  IClusterClient,
+  ILegacyClusterClient,
 } from 'kibana/server';
 import { identity } from 'lodash';
 import { httpServerMock } from '../../../../../src/core/server/mocks';
@@ -24,7 +24,7 @@ export function mockHandlerArguments(
   }: {
     alertsClient?: AlertsClientMock;
     listTypes?: AlertType[];
-    esClient?: jest.Mocked<IClusterClient>;
+    esClient?: jest.Mocked<ILegacyClusterClient>;
   },
   req: unknown,
   res?: Array<MethodKeysOf<KibanaResponseFactory>>
diff --git a/x-pack/plugins/alerts/server/types.ts b/x-pack/plugins/alerts/server/types.ts
index d0070eb9a299ef..24dfb391f0791f 100644
--- a/x-pack/plugins/alerts/server/types.ts
+++ b/x-pack/plugins/alerts/server/types.ts
@@ -11,8 +11,8 @@ import { Alert, AlertActionParams, ActionGroup } from '../common';
 import { AlertsClient } from './alerts_client';
 export * from '../common';
 import {
-  IClusterClient,
-  IScopedClusterClient,
+  ILegacyClusterClient,
+  ILegacyScopedClusterClient,
   KibanaRequest,
   SavedObjectAttributes,
   SavedObjectsClientContract,
@@ -38,9 +38,11 @@ declare module 'src/core/server' {
 }
 
 export interface Services {
-  callCluster: IScopedClusterClient['callAsCurrentUser'];
+  callCluster: ILegacyScopedClusterClient['callAsCurrentUser'];
   savedObjectsClient: SavedObjectsClientContract;
-  getScopedCallCluster(clusterClient: IClusterClient): IScopedClusterClient['callAsCurrentUser'];
+  getScopedCallCluster(
+    clusterClient: ILegacyClusterClient
+  ): ILegacyScopedClusterClient['callAsCurrentUser'];
 }
 
 export interface AlertServices extends Services {
diff --git a/x-pack/plugins/alerts/server/usage/alerts_telemetry.ts b/x-pack/plugins/alerts/server/usage/alerts_telemetry.ts
index 2edf1c10618646..389178de3e5d0d 100644
--- a/x-pack/plugins/alerts/server/usage/alerts_telemetry.ts
+++ b/x-pack/plugins/alerts/server/usage/alerts_telemetry.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { SearchResponse } from 'elasticsearch';
 
 const alertTypeMetric = {
@@ -33,7 +33,7 @@ const alertTypeMetric = {
   },
 };
 
-export async function getTotalCountAggregations(callCluster: APICaller, kibanaInex: string) {
+export async function getTotalCountAggregations(callCluster: LegacyAPICaller, kibanaInex: string) {
   const throttleTimeMetric = {
     scripted_metric: {
       init_script: 'state.min = 0; state.max = 0; state.totalSum = 0; state.totalCount = 0;',
@@ -286,7 +286,7 @@ export async function getTotalCountAggregations(callCluster: APICaller, kibanaIn
   };
 }
 
-export async function getTotalCountInUse(callCluster: APICaller, kibanaInex: string) {
+export async function getTotalCountInUse(callCluster: LegacyAPICaller, kibanaInex: string) {
   const searchResult: SearchResponse<unknown> = await callCluster('search', {
     index: kibanaInex,
     rest_total_hits_as_int: true,
diff --git a/x-pack/plugins/alerts/server/usage/alerts_usage_collector.ts b/x-pack/plugins/alerts/server/usage/alerts_usage_collector.ts
index d2cef0f717e94a..7491508ee0745a 100644
--- a/x-pack/plugins/alerts/server/usage/alerts_usage_collector.ts
+++ b/x-pack/plugins/alerts/server/usage/alerts_usage_collector.ts
@@ -13,10 +13,10 @@ export function createAlertsUsageCollector(
   usageCollection: UsageCollectionSetup,
   taskManager: TaskManagerStartContract
 ) {
-  return usageCollection.makeUsageCollector({
+  return usageCollection.makeUsageCollector<AlertsUsage>({
     type: 'alerts',
     isReady: () => true,
-    fetch: async (): Promise<AlertsUsage> => {
+    fetch: async () => {
       try {
         const doc = await getLatestTaskState(await taskManager);
         // get the accumulated state from the recurring task
diff --git a/x-pack/plugins/alerts/server/usage/task.ts b/x-pack/plugins/alerts/server/usage/task.ts
index 395f0c107c984f..5909351321385b 100644
--- a/x-pack/plugins/alerts/server/usage/task.ts
+++ b/x-pack/plugins/alerts/server/usage/task.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Logger, CoreSetup, APICaller } from 'kibana/server';
+import { Logger, CoreSetup, LegacyAPICaller } from 'kibana/server';
 import moment from 'moment';
 import {
   RunContext,
@@ -65,7 +65,7 @@ async function scheduleTasks(logger: Logger, taskManager: TaskManagerStartContra
 export function telemetryTaskRunner(logger: Logger, core: CoreSetup, kibanaIndex: string) {
   return ({ taskInstance }: RunContext) => {
     const { state } = taskInstance;
-    const callCluster = (...args: Parameters<APICaller>) => {
+    const callCluster = (...args: Parameters<LegacyAPICaller>) => {
       return core.getStartServices().then(([{ elasticsearch: { legacy: { client } } }]) =>
         client.callAsInternalUser(...args)
       );
diff --git a/x-pack/plugins/apm/e2e/cypress/integration/rum_dashboard.feature b/x-pack/plugins/apm/e2e/cypress/integration/rum_dashboard.feature
index eabfaf096731b2..bc807d596a272d 100644
--- a/x-pack/plugins/apm/e2e/cypress/integration/rum_dashboard.feature
+++ b/x-pack/plugins/apm/e2e/cypress/integration/rum_dashboard.feature
@@ -5,3 +5,35 @@ Feature: RUM Dashboard
     When the user inspects the real user monitoring tab
     Then should redirect to rum dashboard
       And should have correct client metrics
+
+  Scenario Outline: Rum page filters
+    When the user filters by "<filterName>"
+    Then it filters the client metrics
+    Examples:
+      | filterName |
+      | os         |
+      | location   |
+
+  Scenario: Page load distribution percentiles
+    Given a user browses the APM UI application for RUM Data
+    When the user inspects the real user monitoring tab
+    Then should redirect to rum dashboard
+      And should display percentile for page load chart
+
+  Scenario: Page load distribution chart tooltip
+    Given a user browses the APM UI application for RUM Data
+    When the user inspects the real user monitoring tab
+    Then should redirect to rum dashboard
+    And should display tooltip on hover
+
+  Scenario: Page load distribution chart legends
+    Given a user browses the APM UI application for RUM Data
+    When the user inspects the real user monitoring tab
+    Then should redirect to rum dashboard
+    And should display chart legend
+
+  Scenario: Breakdown filter
+    Given a user click page load breakdown filter
+    When the user selected the breakdown
+    Then breakdown series should appear in chart
+
diff --git a/x-pack/plugins/apm/e2e/cypress/integration/snapshots.js b/x-pack/plugins/apm/e2e/cypress/integration/snapshots.js
index dd96a57ef8c458..acccd86f3e4d7d 100644
--- a/x-pack/plugins/apm/e2e/cypress/integration/snapshots.js
+++ b/x-pack/plugins/apm/e2e/cypress/integration/snapshots.js
@@ -9,9 +9,28 @@ module.exports = {
   },
   "RUM Dashboard": {
     "Client metrics": {
-      "1": "62",
+      "1": "62 ",
       "2": "0.07 sec",
       "3": "0.01 sec"
+    },
+    "Rum page filters (example #1)": {
+      "1": "15 ",
+      "2": "0.07 sec",
+      "3": "0.01 sec"
+    },
+    "Rum page filters (example #2)": {
+      "1": "35 ",
+      "2": "0.07 sec",
+      "3": "0.01 sec"
+    },
+    "Page load distribution percentiles": {
+      "1": "50th",
+      "2": "75th",
+      "3": "90th",
+      "4": "95th"
+    },
+    "Page load distribution chart legends": {
+      "1": "Overall"
     }
   }
 }
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/page_load_dist.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/page_load_dist.ts
new file mode 100644
index 00000000000000..809b22490abd69
--- /dev/null
+++ b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/page_load_dist.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
+
+/** The default time in ms to wait for a Cypress command to complete */
+export const DEFAULT_TIMEOUT = 60 * 1000;
+
+Given(`a user click page load breakdown filter`, () => {
+  // wait for all loading to finish
+  cy.get('kbnLoadingIndicator').should('not.be.visible');
+  cy.get('.euiStat__title-isLoading').should('not.be.visible');
+  const breakDownBtn = cy.get('[data-cy=breakdown-popover_pageLoad]');
+  breakDownBtn.click();
+});
+
+When(`the user selected the breakdown`, () => {
+  cy.get('[data-cy=filter-breakdown-item_Browser]').click();
+  // click outside popover to close it
+  cy.get('[data-cy=pageLoadDist]').click();
+});
+
+Then(`breakdown series should appear in chart`, () => {
+  cy.get('.euiLoadingChart').should('not.be.visible');
+  cy.get('div.echLegendItem__label[title=Chrome] ')
+    .invoke('text')
+    .should('eq', 'Chrome');
+});
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum_dashboard.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_dashboard.ts
similarity index 50%
rename from x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum_dashboard.ts
rename to x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_dashboard.ts
index 38eadbf5130329..24961ceb3b3c21 100644
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum_dashboard.ts
+++ b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_dashboard.ts
@@ -5,7 +5,7 @@
  */
 
 import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
-import { loginAndWaitForPage } from '../../integration/helpers';
+import { loginAndWaitForPage } from '../../../integration/helpers';
 
 /** The default time in ms to wait for a Cypress command to complete */
 export const DEFAULT_TIMEOUT = 60 * 1000;
@@ -41,3 +41,46 @@ Then(`should have correct client metrics`, () => {
 
   cy.get(clientMetrics).eq(0).invoke('text').snapshot();
 });
+
+Then(`should display percentile for page load chart`, () => {
+  const pMarkers = '[data-cy=percentile-markers] span';
+
+  cy.get('.euiLoadingChart').should('be.visible');
+
+  // wait for all loading to finish
+  cy.get('kbnLoadingIndicator').should('not.be.visible');
+  cy.get('.euiStat__title-isLoading').should('not.be.visible');
+
+  cy.get(pMarkers).eq(0).invoke('text').snapshot();
+
+  cy.get(pMarkers).eq(1).invoke('text').snapshot();
+
+  cy.get(pMarkers).eq(2).invoke('text').snapshot();
+
+  cy.get(pMarkers).eq(3).invoke('text').snapshot();
+});
+
+Then(`should display chart legend`, () => {
+  const chartLegend = 'div.echLegendItem__label';
+
+  // wait for all loading to finish
+  cy.get('kbnLoadingIndicator').should('not.be.visible');
+  cy.get('.euiLoadingChart').should('not.be.visible');
+
+  cy.get(chartLegend).eq(0).invoke('text').snapshot();
+});
+
+Then(`should display tooltip on hover`, () => {
+  cy.get('.euiLoadingChart').should('not.be.visible');
+
+  const pMarkers = '[data-cy=percentile-markers] span.euiToolTipAnchor';
+
+  // wait for all loading to finish
+  cy.get('kbnLoadingIndicator').should('not.be.visible');
+  cy.get('.euiLoadingChart').should('not.be.visible');
+
+  const marker = cy.get(pMarkers).eq(0);
+  marker.invoke('show');
+  marker.trigger('mouseover', { force: true });
+  cy.get('span[data-cy=percentileTooltipTitle]').should('be.visible');
+});
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_filters.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_filters.ts
new file mode 100644
index 00000000000000..439003351aedbf
--- /dev/null
+++ b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_filters.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { When, Then } from 'cypress-cucumber-preprocessor/steps';
+
+When(/^the user filters by "([^"]*)"$/, (filterName) => {
+  // wait for all loading to finish
+  cy.get('kbnLoadingIndicator').should('not.be.visible');
+  cy.get('.euiStat__title-isLoading').should('not.be.visible');
+  cy.get(`#local-filter-${filterName}`).click();
+
+  if (filterName === 'os') {
+    cy.get('button.euiSelectableListItem[title="Mac OS X"]').click();
+  } else {
+    cy.get('button.euiSelectableListItem[title="DE"]').click();
+  }
+  cy.get('[data-cy=applyFilter]').click();
+});
+
+Then(`it filters the client metrics`, () => {
+  const clientMetrics = '[data-cy=client-metrics] .euiStat__title';
+
+  // wait for all loading to finish
+  cy.get('kbnLoadingIndicator').should('not.be.visible');
+  cy.get('.euiStat__title-isLoading').should('not.be.visible');
+
+  cy.get(clientMetrics).eq(2).invoke('text').snapshot();
+
+  cy.get(clientMetrics).eq(1).invoke('text').snapshot();
+
+  cy.get(clientMetrics).eq(0).invoke('text').snapshot();
+
+  cy.get('[data-cy=clearFilters]').click();
+});
diff --git a/x-pack/plugins/apm/e2e/ingest-data/replay.js b/x-pack/plugins/apm/e2e/ingest-data/replay.js
index 3478039f39b505..483cc99df74700 100644
--- a/x-pack/plugins/apm/e2e/ingest-data/replay.js
+++ b/x-pack/plugins/apm/e2e/ingest-data/replay.js
@@ -35,6 +35,8 @@ const pLimit = require('p-limit');
 const pRetry = require('p-retry');
 const { argv } = require('yargs');
 const ora = require('ora');
+const userAgents = require('./user_agents');
+const userIps = require('./rum_ips');
 
 const APM_SERVER_URL = argv.serverUrl;
 const SECRET_TOKEN = argv.secretToken;
@@ -66,7 +68,7 @@ function incrementSpinnerCount({ success }) {
 
   spinner.text = `Remaining: ${remaining}. Succeeded: ${requestProgress.succeeded}. Failed: ${requestProgress.failed}.`;
 }
-
+let iterIndex = 0;
 async function insertItem(item) {
   try {
     const url = `${APM_SERVER_URL}${item.url}`;
@@ -74,6 +76,15 @@ async function insertItem(item) {
       'content-type': 'application/x-ndjson',
     };
 
+    if (item.url === '/intake/v2/rum/events') {
+      if (iterIndex === userAgents.length) {
+        iterIndex = 0;
+      }
+      headers['User-Agent'] = userAgents[iterIndex];
+      headers['X-Forwarded-For'] = userIps[iterIndex];
+      iterIndex++;
+    }
+
     if (SECRET_TOKEN) {
       headers.Authorization = `Bearer ${SECRET_TOKEN}`;
     }
@@ -113,7 +124,9 @@ async function init() {
     items.map(async (item) => {
       try {
         // retry 5 times with exponential backoff
-        await pRetry(() => limit(() => insertItem(item)), { retries: 5 });
+        await pRetry(() => limit(() => insertItem(item)), {
+          retries: 5,
+        });
         incrementSpinnerCount({ success: true });
       } catch (e) {
         incrementSpinnerCount({ success: false });
diff --git a/x-pack/plugins/apm/e2e/ingest-data/rum_ips.js b/x-pack/plugins/apm/e2e/ingest-data/rum_ips.js
new file mode 100644
index 00000000000000..59152cd90701bb
--- /dev/null
+++ b/x-pack/plugins/apm/e2e/ingest-data/rum_ips.js
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+const IPS = [
+  '89.191.86.214', // check24.de
+  '167.40.79.24', // canada.ca
+  '151.101.130.217', // elastic.co
+  '185.143.68.17',
+  '151.101.130.217',
+  '185.143.68.17',
+  '185.143.68.17',
+  '151.101.130.217',
+  '185.143.68.17',
+];
+
+module.exports = IPS;
diff --git a/x-pack/plugins/apm/e2e/ingest-data/user_agents.js b/x-pack/plugins/apm/e2e/ingest-data/user_agents.js
new file mode 100644
index 00000000000000..923726c4736b68
--- /dev/null
+++ b/x-pack/plugins/apm/e2e/ingest-data/user_agents.js
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable no-console */
+
+/* eslint-disable import/no-extraneous-dependencies */
+
+const UserAgents = [
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.97 Safari/537.36',
+  'Mozilla/5.0 (Linux; Android 8.0.0; SM-G960F Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36',
+  'Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/69.0.3497.105 Mobile/15E148 Safari/605.1',
+  'Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1',
+  'Mozilla/5.0 (Linux; Android 7.0; Pixel C Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/52.0.2743.98 Safari/537.36',
+  'Mozilla/5.0 (X11; CrOS x86_64 8172.45.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.64 Safari/537.36',
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/601.3.9 (KHTML, like Gecko) Version/9.0.2 Safari/601.3.9',
+  'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:15.0) Gecko/20100101 Firefox/15.0.1',
+  'Mozilla/5.0 (CrKey armv7l 1.5.16041) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.0 Safari/537.36',
+];
+
+module.exports = UserAgents;
diff --git a/x-pack/plugins/apm/public/components/app/Home/index.tsx b/x-pack/plugins/apm/public/components/app/Home/index.tsx
index c325a72375359d..69699b72a96df7 100644
--- a/x-pack/plugins/apm/public/components/app/Home/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Home/index.tsx
@@ -27,7 +27,7 @@ import { ServiceOverview } from '../ServiceOverview';
 import { TraceOverview } from '../TraceOverview';
 import { RumOverview } from '../RumDashboard';
 import { RumOverviewLink } from '../../shared/Links/apm/RumOverviewLink';
-import { EndUserExperienceLabel } from '../RumDashboard/translations';
+import { I18LABELS } from '../RumDashboard/translations';
 
 function getHomeTabs({
   serviceMapEnabled = true,
@@ -111,7 +111,7 @@ export function Home({ tab }: Props) {
             <EuiTitle size="l">
               <h1>
                 {selectedTab.name === 'rum-overview'
-                  ? EndUserExperienceLabel
+                  ? I18LABELS.endUserExperience
                   : 'APM'}
               </h1>
             </EuiTitle>
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/Breakdowns/BreakdownFilter.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/Breakdowns/BreakdownFilter.tsx
new file mode 100644
index 00000000000000..332cf40a465f9b
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/Breakdowns/BreakdownFilter.tsx
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { BreakdownGroup } from './BreakdownGroup';
+import { BreakdownItem } from '../../../../../typings/ui_filters';
+import {
+  CLIENT_GEO_COUNTRY_ISO_CODE,
+  USER_AGENT_DEVICE,
+  USER_AGENT_NAME,
+  USER_AGENT_OS,
+} from '../../../../../common/elasticsearch_fieldnames';
+
+interface Props {
+  id: string;
+  selectedBreakdowns: BreakdownItem[];
+  onBreakdownChange: (values: BreakdownItem[]) => void;
+}
+
+export const BreakdownFilter = ({
+  id,
+  selectedBreakdowns,
+  onBreakdownChange,
+}: Props) => {
+  const categories: BreakdownItem[] = [
+    {
+      name: 'Browser',
+      type: 'category',
+      count: 0,
+      selected: selectedBreakdowns.some(({ name }) => name === 'Browser'),
+      fieldName: USER_AGENT_NAME,
+    },
+    {
+      name: 'OS',
+      type: 'category',
+      count: 0,
+      selected: selectedBreakdowns.some(({ name }) => name === 'OS'),
+      fieldName: USER_AGENT_OS,
+    },
+    {
+      name: 'Device',
+      type: 'category',
+      count: 0,
+      selected: selectedBreakdowns.some(({ name }) => name === 'Device'),
+      fieldName: USER_AGENT_DEVICE,
+    },
+    {
+      name: 'Location',
+      type: 'category',
+      count: 0,
+      selected: selectedBreakdowns.some(({ name }) => name === 'Location'),
+      fieldName: CLIENT_GEO_COUNTRY_ISO_CODE,
+    },
+  ];
+
+  return (
+    <BreakdownGroup
+      id={id}
+      items={categories}
+      onChange={(selValues: BreakdownItem[]) => {
+        onBreakdownChange(selValues);
+      }}
+    />
+  );
+};
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/Breakdowns/BreakdownGroup.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/Breakdowns/BreakdownGroup.tsx
new file mode 100644
index 00000000000000..007cdab0d2078c
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/Breakdowns/BreakdownGroup.tsx
@@ -0,0 +1,99 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EuiPopover,
+  EuiFilterButton,
+  EuiFilterGroup,
+  EuiPopoverTitle,
+  EuiFilterSelectItem,
+} from '@elastic/eui';
+import React, { MouseEvent, useCallback, useEffect, useState } from 'react';
+import { BreakdownItem } from '../../../../../typings/ui_filters';
+import { I18LABELS } from '../translations';
+
+export interface BreakdownGroupProps {
+  id: string;
+  disabled?: boolean;
+  items: BreakdownItem[];
+  onChange: (values: BreakdownItem[]) => void;
+}
+
+export const BreakdownGroup = ({
+  id,
+  disabled,
+  onChange,
+  items,
+}: BreakdownGroupProps) => {
+  const [isOpen, setIsOpen] = useState<boolean>(false);
+
+  const [activeItems, setActiveItems] = useState<BreakdownItem[]>(items);
+
+  useEffect(() => {
+    setActiveItems(items);
+  }, [items]);
+
+  const getSelItems = () => activeItems.filter((item) => item.selected);
+
+  const onFilterItemClick = useCallback(
+    (name: string) => (_event: MouseEvent<HTMLButtonElement>) => {
+      setActiveItems((prevItems) =>
+        prevItems.map((item) => ({
+          ...item,
+          selected: name === item.name ? !item.selected : item.selected,
+        }))
+      );
+    },
+    []
+  );
+
+  return (
+    <EuiFilterGroup>
+      <EuiPopover
+        button={
+          <EuiFilterButton
+            isDisabled={disabled && getSelItems().length === 0}
+            isSelected={getSelItems().length > 0}
+            numFilters={activeItems.length}
+            numActiveFilters={getSelItems().length}
+            hasActiveFilters={getSelItems().length !== 0}
+            iconType="arrowDown"
+            onClick={() => {
+              setIsOpen(!isOpen);
+            }}
+            size="s"
+          >
+            {I18LABELS.breakdown}
+          </EuiFilterButton>
+        }
+        closePopover={() => {
+          setIsOpen(false);
+          onChange(getSelItems());
+        }}
+        data-cy={`breakdown-popover_${id}`}
+        id={id}
+        isOpen={isOpen}
+        ownFocus={true}
+        withTitle
+        zIndex={10000}
+      >
+        <EuiPopoverTitle>{I18LABELS.selectBreakdown}</EuiPopoverTitle>
+        <div className="euiFilterSelect__items" style={{ minWidth: 200 }}>
+          {activeItems.map(({ name, count, selected }) => (
+            <EuiFilterSelectItem
+              checked={!!selected ? 'on' : undefined}
+              data-cy={`filter-breakdown-item_${name}`}
+              key={name + count}
+              onClick={onFilterItemClick(name)}
+            >
+              {name}
+            </EuiFilterSelectItem>
+          ))}
+        </div>
+      </EuiPopover>
+    </EuiFilterGroup>
+  );
+};
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageLoadDistChart.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageLoadDistChart.tsx
new file mode 100644
index 00000000000000..e17a8046b5c6ae
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageLoadDistChart.tsx
@@ -0,0 +1,139 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState } from 'react';
+import numeral from '@elastic/numeral';
+import {
+  Axis,
+  BrushEndListener,
+  Chart,
+  CurveType,
+  LineSeries,
+  ScaleType,
+  Settings,
+  TooltipValue,
+  TooltipValueFormatter,
+  DARK_THEME,
+  LIGHT_THEME,
+} from '@elastic/charts';
+import {
+  EUI_CHARTS_THEME_DARK,
+  EUI_CHARTS_THEME_LIGHT,
+} from '@elastic/eui/dist/eui_charts_theme';
+import { Position } from '@elastic/charts/dist/utils/commons';
+import styled from 'styled-components';
+import { PercentileAnnotations } from '../PageLoadDistribution/PercentileAnnotations';
+import { I18LABELS } from '../translations';
+import { ChartWrapper } from '../ChartWrapper';
+import { PercentileRange } from '../PageLoadDistribution';
+import { BreakdownItem } from '../../../../../typings/ui_filters';
+import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
+import { BreakdownSeries } from '../PageLoadDistribution/BreakdownSeries';
+
+interface PageLoadData {
+  pageLoadDistribution: Array<{ x: number; y: number }>;
+  percentiles: Record<string, number> | undefined;
+  minDuration: number;
+  maxDuration: number;
+}
+
+interface Props {
+  onPercentileChange: (min: number, max: number) => void;
+  data?: PageLoadData | null;
+  breakdowns: BreakdownItem[];
+  percentileRange: PercentileRange;
+  loading: boolean;
+}
+
+const PageLoadChart = styled(Chart)`
+  .echAnnotation {
+    pointer-events: initial;
+  }
+`;
+
+export function PageLoadDistChart({
+  onPercentileChange,
+  data,
+  breakdowns,
+  loading,
+  percentileRange,
+}: Props) {
+  const [breakdownLoading, setBreakdownLoading] = useState(false);
+  const onBrushEnd: BrushEndListener = ({ x }) => {
+    if (!x) {
+      return;
+    }
+    const [minX, maxX] = x;
+    onPercentileChange(minX, maxX);
+  };
+
+  const headerFormatter: TooltipValueFormatter = (tooltip: TooltipValue) => {
+    return (
+      <div>
+        <p>
+          {tooltip.value} {I18LABELS.seconds}
+        </p>
+      </div>
+    );
+  };
+
+  const tooltipProps = {
+    headerFormatter,
+  };
+
+  const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
+
+  return (
+    <ChartWrapper loading={loading || breakdownLoading} height="250px">
+      {(!loading || data) && (
+        <PageLoadChart>
+          <Settings
+            baseTheme={darkMode ? DARK_THEME : LIGHT_THEME}
+            theme={
+              darkMode
+                ? EUI_CHARTS_THEME_DARK.theme
+                : EUI_CHARTS_THEME_LIGHT.theme
+            }
+            onBrushEnd={onBrushEnd}
+            tooltip={tooltipProps}
+            showLegend
+          />
+          <PercentileAnnotations percentiles={data?.percentiles} />
+          <Axis
+            id="bottom"
+            title={I18LABELS.pageLoadTime}
+            position={Position.Bottom}
+          />
+          <Axis
+            id="left"
+            title={I18LABELS.percPageLoaded}
+            position={Position.Left}
+            tickFormat={(d) => numeral(d).format('0.0') + '%'}
+          />
+          <LineSeries
+            id={'PagesPercentage'}
+            name={I18LABELS.overall}
+            xScaleType={ScaleType.Linear}
+            yScaleType={ScaleType.Linear}
+            data={data?.pageLoadDistribution ?? []}
+            curve={CurveType.CURVE_NATURAL}
+          />
+          {breakdowns.map(({ name, type }) => (
+            <BreakdownSeries
+              key={`${type}-${name}`}
+              field={type}
+              value={name}
+              percentileRange={percentileRange}
+              onLoadingChange={(bLoading) => {
+                setBreakdownLoading(bLoading);
+              }}
+            />
+          ))}
+        </PageLoadChart>
+      )}
+    </ChartWrapper>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageViewsChart.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageViewsChart.tsx
new file mode 100644
index 00000000000000..934a985dd735a8
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageViewsChart.tsx
@@ -0,0 +1,120 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import numeral from '@elastic/numeral';
+import {
+  Axis,
+  BarSeries,
+  BrushEndListener,
+  Chart,
+  niceTimeFormatByDay,
+  ScaleType,
+  SeriesNameFn,
+  Settings,
+  timeFormatter,
+} from '@elastic/charts';
+import { DARK_THEME, LIGHT_THEME } from '@elastic/charts';
+
+import {
+  EUI_CHARTS_THEME_DARK,
+  EUI_CHARTS_THEME_LIGHT,
+} from '@elastic/eui/dist/eui_charts_theme';
+import moment from 'moment';
+import { Position } from '@elastic/charts/dist/utils/commons';
+import { I18LABELS } from '../translations';
+import { history } from '../../../../utils/history';
+import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
+import { ChartWrapper } from '../ChartWrapper';
+import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
+
+interface Props {
+  data?: Array<Record<string, number | null>>;
+  loading: boolean;
+}
+
+export function PageViewsChart({ data, loading }: Props) {
+  const formatter = timeFormatter(niceTimeFormatByDay(2));
+
+  const onBrushEnd: BrushEndListener = ({ x }) => {
+    if (!x) {
+      return;
+    }
+    const [minX, maxX] = x;
+
+    const rangeFrom = moment(minX).toISOString();
+    const rangeTo = moment(maxX).toISOString();
+
+    history.push({
+      ...history.location,
+      search: fromQuery({
+        ...toQuery(history.location.search),
+        rangeFrom,
+        rangeTo,
+      }),
+    });
+  };
+
+  let breakdownAccessors: Set<string> = new Set();
+  if (data && data.length > 0) {
+    data.forEach((item) => {
+      breakdownAccessors = new Set([
+        ...Array.from(breakdownAccessors),
+        ...Object.keys(item).filter((key) => key !== 'x'),
+      ]);
+    });
+  }
+
+  const customSeriesNaming: SeriesNameFn = ({ yAccessor }) => {
+    if (yAccessor === 'y') {
+      return I18LABELS.overall;
+    }
+
+    return yAccessor;
+  };
+
+  const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
+
+  return (
+    <ChartWrapper loading={loading} height="250px">
+      {(!loading || data) && (
+        <Chart>
+          <Settings
+            baseTheme={darkMode ? DARK_THEME : LIGHT_THEME}
+            theme={
+              darkMode
+                ? EUI_CHARTS_THEME_DARK.theme
+                : EUI_CHARTS_THEME_LIGHT.theme
+            }
+            showLegend
+            onBrushEnd={onBrushEnd}
+          />
+          <Axis
+            id="date_time"
+            position={Position.Bottom}
+            title={I18LABELS.dateTime}
+            tickFormat={formatter}
+          />
+          <Axis
+            id="page_views"
+            title={I18LABELS.pageViews}
+            position={Position.Left}
+            tickFormat={(d) => numeral(d).format('0.0 a')}
+          />
+          <BarSeries
+            id={I18LABELS.pageViews}
+            xScaleType={ScaleType.Time}
+            yScaleType={ScaleType.Linear}
+            xAccessor="x"
+            yAccessors={Array.from(breakdownAccessors)}
+            data={data ?? []}
+            name={customSeriesNaming}
+          />
+        </Chart>
+      )}
+    </ChartWrapper>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx
index 8c0a7c6a91f67b..776f74a1699668 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx
@@ -3,24 +3,13 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-// @flow
 import * as React from 'react';
+import numeral from '@elastic/numeral';
 import styled from 'styled-components';
-import { EuiFlexGroup, EuiFlexItem, EuiStat } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiStat, EuiToolTip } from '@elastic/eui';
 import { useFetcher } from '../../../../hooks/useFetcher';
 import { useUrlParams } from '../../../../hooks/useUrlParams';
-import { BackEndLabel, FrontEndLabel, PageViewsLabel } from '../translations';
-
-export const formatBigValue = (val?: number | null, fixed?: number): string => {
-  if (val && val >= 1000) {
-    const result = val / 1000;
-    if (fixed) {
-      return result.toFixed(fixed) + 'k';
-    }
-    return result + 'k';
-  }
-  return val + '';
-};
+import { I18LABELS } from '../translations';
 
 const ClFlexGroup = styled(EuiFlexGroup)`
   flex-direction: row;
@@ -30,7 +19,7 @@ const ClFlexGroup = styled(EuiFlexGroup)`
   }
 `;
 
-export const ClientMetrics = () => {
+export function ClientMetrics() {
   const { urlParams, uiFilters } = useUrlParams();
 
   const { start, end } = urlParams;
@@ -57,7 +46,7 @@ export const ClientMetrics = () => {
         <EuiStat
           titleSize="s"
           title={(data?.backEnd?.value?.toFixed(2) ?? '-') + ' sec'}
-          description={BackEndLabel}
+          description={I18LABELS.backEnd}
           isLoading={status !== 'success'}
         />
       </EuiFlexItem>
@@ -65,18 +54,22 @@ export const ClientMetrics = () => {
         <EuiStat
           titleSize="s"
           title={(data?.frontEnd?.value?.toFixed(2) ?? '-') + ' sec'}
-          description={FrontEndLabel}
+          description={I18LABELS.frontEnd}
           isLoading={status !== 'success'}
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false} style={STAT_STYLE}>
         <EuiStat
           titleSize="s"
-          title={formatBigValue(data?.pageViews?.value, 2) ?? '-'}
-          description={PageViewsLabel}
+          title={
+            <EuiToolTip content={data?.pageViews?.value}>
+              <>{numeral(data?.pageViews?.value).format('0 a') ?? '-'}</>
+            </EuiToolTip>
+          }
+          description={I18LABELS.pageViews}
           isLoading={status !== 'success'}
         />
       </EuiFlexItem>
     </ClFlexGroup>
   );
-};
+}
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/BreakdownSeries.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/BreakdownSeries.tsx
new file mode 100644
index 00000000000000..0c47ad24128eff
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/BreakdownSeries.tsx
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useEffect } from 'react';
+import { CurveType, LineSeries, ScaleType } from '@elastic/charts';
+import { PercentileRange } from './index';
+import { useBreakdowns } from './use_breakdowns';
+
+interface Props {
+  field: string;
+  value: string;
+  percentileRange: PercentileRange;
+  onLoadingChange: (loading: boolean) => void;
+}
+
+export const BreakdownSeries: FC<Props> = ({
+  field,
+  value,
+  percentileRange,
+  onLoadingChange,
+}) => {
+  const { data, status } = useBreakdowns({
+    field,
+    value,
+    percentileRange,
+  });
+
+  useEffect(() => {
+    onLoadingChange(status !== 'success');
+  }, [status, onLoadingChange]);
+
+  return (
+    <>
+      {data?.map(({ data: seriesData, name }) => (
+        <LineSeries
+          id={`${field}-${value}-${name}`}
+          key={`${field}-${value}-${name}`}
+          name={name}
+          xScaleType={ScaleType.Linear}
+          yScaleType={ScaleType.Linear}
+          data={seriesData ?? []}
+          curve={CurveType.CURVE_NATURAL}
+        />
+      ))}
+    </>
+  );
+};
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/PercentileAnnotations.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/PercentileAnnotations.tsx
index 9c89b8bc161b78..38d53aebd1b7f8 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/PercentileAnnotations.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/PercentileAnnotations.tsx
@@ -13,6 +13,7 @@ import {
 } from '@elastic/charts';
 import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
 import styled from 'styled-components';
+import { EuiToolTip } from '@elastic/eui';
 
 interface Props {
   percentiles?: Record<string, number>;
@@ -21,15 +22,15 @@ interface Props {
 function generateAnnotationData(
   values?: Record<string, number>
 ): LineAnnotationDatum[] {
-  return Object.entries(values ?? {}).map((value, index) => ({
-    dataValue: value[1],
+  return Object.entries(values ?? {}).map((value) => ({
+    dataValue: Math.round(value[1] / 1000),
     details: `${(+value[0]).toFixed(0)}`,
   }));
 }
 
 const PercentileMarker = styled.span`
   position: relative;
-  bottom: 140px;
+  bottom: 205px;
 `;
 
 export const PercentileAnnotations = ({ percentiles }: Props) => {
@@ -43,6 +44,18 @@ export const PercentileAnnotations = ({ percentiles }: Props) => {
     },
   };
 
+  const PercentileTooltip = ({
+    annotation,
+  }: {
+    annotation: LineAnnotationDatum;
+  }) => {
+    return (
+      <span data-cy="percentileTooltipTitle">
+        {annotation.details}th Percentile
+      </span>
+    );
+  };
+
   return (
     <>
       {dataValues.map((annotation, index) => (
@@ -52,7 +65,19 @@ export const PercentileAnnotations = ({ percentiles }: Props) => {
           domainType={AnnotationDomainTypes.XDomain}
           dataValues={[annotation]}
           style={style}
-          marker={<PercentileMarker>{annotation.details}th</PercentileMarker>}
+          hideTooltips={true}
+          marker={
+            <PercentileMarker data-cy="percentile-markers">
+              <EuiToolTip
+                title={<PercentileTooltip annotation={annotation} />}
+                content={
+                  <span>Pages loaded: {Math.round(annotation.dataValue)}</span>
+                }
+              >
+                <>{annotation.details}th</>
+              </EuiToolTip>
+            </PercentileMarker>
+          }
         />
       ))}
     </>
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/index.tsx
index c7a0b64f6a8b8c..c6b34c8b766989 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/index.tsx
@@ -6,48 +6,36 @@
 
 import React, { useState } from 'react';
 import {
-  EuiButton,
+  EuiButtonEmpty,
   EuiFlexGroup,
   EuiFlexItem,
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
-import {
-  Axis,
-  Chart,
-  ScaleType,
-  LineSeries,
-  CurveType,
-  BrushEndListener,
-  Settings,
-  TooltipValueFormatter,
-  TooltipValue,
-} from '@elastic/charts';
-import { Position } from '@elastic/charts/dist/utils/commons';
 import { useUrlParams } from '../../../../hooks/useUrlParams';
 import { useFetcher } from '../../../../hooks/useFetcher';
-import { ChartWrapper } from '../ChartWrapper';
-import { PercentileAnnotations } from './PercentileAnnotations';
-import {
-  PageLoadDistLabel,
-  PageLoadTimeLabel,
-  PercPageLoadedLabel,
-  ResetZoomLabel,
-} from '../translations';
+import { I18LABELS } from '../translations';
+import { BreakdownFilter } from '../Breakdowns/BreakdownFilter';
+import { PageLoadDistChart } from '../Charts/PageLoadDistChart';
+import { BreakdownItem } from '../../../../../typings/ui_filters';
+
+export interface PercentileRange {
+  min?: number | null;
+  max?: number | null;
+}
 
 export const PageLoadDistribution = () => {
   const { urlParams, uiFilters } = useUrlParams();
 
   const { start, end } = urlParams;
 
-  const [percentileRange, setPercentileRange] = useState<{
-    min: string | null;
-    max: string | null;
-  }>({
+  const [percentileRange, setPercentileRange] = useState<PercentileRange>({
     min: null,
     max: null,
   });
 
+  const [breakdowns, setBreakdowns] = useState<BreakdownItem[]>([]);
+
   const { data, status } = useFetcher(
     (callApmApi) => {
       if (start && end) {
@@ -60,8 +48,8 @@ export const PageLoadDistribution = () => {
               uiFilters: JSON.stringify(uiFilters),
               ...(percentileRange.min && percentileRange.max
                 ? {
-                    minPercentile: percentileRange.min,
-                    maxPercentile: percentileRange.max,
+                    minPercentile: String(percentileRange.min),
+                    maxPercentile: String(percentileRange.max),
                   }
                 : {}),
             },
@@ -72,73 +60,51 @@ export const PageLoadDistribution = () => {
     [end, start, uiFilters, percentileRange.min, percentileRange.max]
   );
 
-  const onBrushEnd: BrushEndListener = ({ x }) => {
-    if (!x) {
-      return;
-    }
-    const [minX, maxX] = x;
-    setPercentileRange({ min: String(minX), max: String(maxX) });
-  };
-
-  const headerFormatter: TooltipValueFormatter = (tooltip: TooltipValue) => {
-    return (
-      <div>
-        <p>{tooltip.value} seconds</p>
-      </div>
-    );
-  };
-
-  const tooltipProps = {
-    headerFormatter,
+  const onPercentileChange = (min: number, max: number) => {
+    setPercentileRange({ min: min * 1000, max: max * 1000 });
   };
 
   return (
-    <div>
+    <div data-cy="pageLoadDist">
       <EuiFlexGroup responsive={false}>
         <EuiFlexItem>
           <EuiTitle size="xs">
-            <h3>{PageLoadDistLabel}</h3>
+            <h3>{I18LABELS.pageLoadDistribution}</h3>
           </EuiTitle>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <EuiButton
+          <EuiButtonEmpty
             iconType="inspect"
             size="s"
             onClick={() => {
               setPercentileRange({ min: null, max: null });
             }}
-            fill={percentileRange.min !== null && percentileRange.max !== null}
+            disabled={
+              percentileRange.min === null && percentileRange.max === null
+            }
           >
-            {ResetZoomLabel}
-          </EuiButton>
+            {I18LABELS.resetZoom}
+          </EuiButtonEmpty>
         </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer size="m" />
-      <ChartWrapper loading={status !== 'success'} height="200px">
-        <Chart className="story-chart">
-          <Settings onBrushEnd={onBrushEnd} tooltip={tooltipProps} />
-          <PercentileAnnotations percentiles={data?.percentiles} />
-          <Axis
-            id="bottom"
-            title={PageLoadTimeLabel}
-            position={Position.Bottom}
-          />
-          <Axis
-            id="left"
-            title={PercPageLoadedLabel}
-            position={Position.Left}
-            tickFormat={(d) => Number(d).toFixed(1) + ' %'}
-          />
-          <LineSeries
-            id={'PagesPercentage'}
-            name={PercPageLoadedLabel}
-            xScaleType={ScaleType.Linear}
-            yScaleType={ScaleType.Linear}
-            data={data?.pageLoadDistribution ?? []}
-            curve={CurveType.CURVE_NATURAL}
+        <EuiFlexItem grow={false}>
+          <BreakdownFilter
+            id={'pageLoad'}
+            selectedBreakdowns={breakdowns}
+            onBreakdownChange={setBreakdowns}
           />
-        </Chart>
-      </ChartWrapper>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="s" />
+      <PageLoadDistChart
+        data={data}
+        onPercentileChange={onPercentileChange}
+        loading={status !== 'success'}
+        breakdowns={breakdowns}
+        percentileRange={{
+          max: percentileRange.max || data?.maxDuration,
+          min: percentileRange.min || data?.minDuration,
+        }}
+      />
     </div>
   );
 };
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/use_breakdowns.ts b/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/use_breakdowns.ts
new file mode 100644
index 00000000000000..814cf977c95699
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/use_breakdowns.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useFetcher } from '../../../../hooks/useFetcher';
+import { useUrlParams } from '../../../../hooks/useUrlParams';
+import { PercentileRange } from './index';
+
+interface Props {
+  percentileRange?: PercentileRange;
+  field: string;
+  value: string;
+}
+
+export const useBreakdowns = ({ percentileRange, field, value }: Props) => {
+  const { urlParams, uiFilters } = useUrlParams();
+
+  const { start, end } = urlParams;
+
+  const { min: minP, max: maxP } = percentileRange ?? {};
+
+  return useFetcher(
+    (callApmApi) => {
+      if (start && end && field && value) {
+        return callApmApi({
+          pathname: '/api/apm/rum-client/page-load-distribution/breakdown',
+          params: {
+            query: {
+              start,
+              end,
+              breakdown: value,
+              uiFilters: JSON.stringify(uiFilters),
+              ...(minP && maxP
+                ? {
+                    minPercentile: String(minP),
+                    maxPercentile: String(maxP),
+                  }
+                : {}),
+            },
+          },
+        });
+      }
+    },
+    [end, start, uiFilters, field, value, minP, maxP]
+  );
+};
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/PageViewsTrend/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/PageViewsTrend/index.tsx
index cc41bd4352947b..34347f3f959477 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/PageViewsTrend/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/PageViewsTrend/index.tsx
@@ -4,34 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
-import { EuiTitle } from '@elastic/eui';
-import {
-  Axis,
-  BarSeries,
-  BrushEndListener,
-  Chart,
-  niceTimeFormatByDay,
-  ScaleType,
-  Settings,
-  timeFormatter,
-} from '@elastic/charts';
-import moment from 'moment';
-import { Position } from '@elastic/charts/dist/utils/commons';
-import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
+import React, { useState } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { useUrlParams } from '../../../../hooks/useUrlParams';
 import { useFetcher } from '../../../../hooks/useFetcher';
-import { ChartWrapper } from '../ChartWrapper';
-import { DateTimeLabel, PageViewsLabel } from '../translations';
-import { history } from '../../../../utils/history';
-import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
-import { formatBigValue } from '../ClientMetrics';
+import { I18LABELS } from '../translations';
+import { BreakdownFilter } from '../Breakdowns/BreakdownFilter';
+import { PageViewsChart } from '../Charts/PageViewsChart';
+import { BreakdownItem } from '../../../../../typings/ui_filters';
 
 export const PageViewsTrend = () => {
   const { urlParams, uiFilters } = useUrlParams();
 
   const { start, end } = urlParams;
 
+  const [breakdowns, setBreakdowns] = useState<BreakdownItem[]>([]);
+
   const { data, status } = useFetcher(
     (callApmApi) => {
       if (start && end) {
@@ -42,70 +30,41 @@ export const PageViewsTrend = () => {
               start,
               end,
               uiFilters: JSON.stringify(uiFilters),
+              ...(breakdowns.length > 0
+                ? {
+                    breakdowns: JSON.stringify(breakdowns),
+                  }
+                : {}),
             },
           },
         });
       }
     },
-    [end, start, uiFilters]
+    [end, start, uiFilters, breakdowns]
   );
-  const formatter = timeFormatter(niceTimeFormatByDay(2));
-
-  const onBrushEnd: BrushEndListener = ({ x }) => {
-    if (!x) {
-      return;
-    }
-    const [minX, maxX] = x;
-
-    const rangeFrom = moment(minX).toISOString();
-    const rangeTo = moment(maxX).toISOString();
 
-    history.push({
-      ...history.location,
-      search: fromQuery({
-        ...toQuery(history.location.search),
-        rangeFrom,
-        rangeTo,
-      }),
-    });
+  const onBreakdownChange = (values: BreakdownItem[]) => {
+    setBreakdowns(values);
   };
 
   return (
     <div>
-      <EuiTitle size="xs">
-        <h3>{PageViewsLabel}</h3>
-      </EuiTitle>
-      <ChartWrapper loading={status !== 'success'} height="200px">
-        <Chart>
-          <Settings
-            showLegend={false}
-            showLegendExtra
-            legendPosition={Position.Bottom}
-            onBrushEnd={onBrushEnd}
-          />
-          <Axis
-            id="date_time"
-            position={Position.Bottom}
-            title={DateTimeLabel}
-            tickFormat={formatter}
-          />
-          <Axis
-            id="page_views"
-            title={PageViewsLabel}
-            position={Position.Left}
-            tickFormat={(d) => formatBigValue(Number(d))}
-          />
-          <BarSeries
-            id={PageViewsLabel}
-            color={[euiLightVars.euiColorLightShade]}
-            xScaleType={ScaleType.Linear}
-            yScaleType={ScaleType.Linear}
-            xAccessor="x"
-            yAccessors={['y']}
-            data={data ?? []}
+      <EuiFlexGroup responsive={false}>
+        <EuiFlexItem>
+          <EuiTitle size="xs">
+            <h3>{I18LABELS.pageViews}</h3>
+          </EuiTitle>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <BreakdownFilter
+            id={'pageView'}
+            selectedBreakdowns={breakdowns}
+            onBreakdownChange={onBreakdownChange}
           />
-        </Chart>
-      </ChartWrapper>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="s" />
+      <PageViewsChart data={data} loading={status !== 'success'} />
     </div>
   );
 };
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/RumDashboard.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/RumDashboard.tsx
index e3fa7374afb38b..cd50f3b575113d 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/RumDashboard.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/RumDashboard.tsx
@@ -15,7 +15,7 @@ import React from 'react';
 import { ClientMetrics } from './ClientMetrics';
 import { PageViewsTrend } from './PageViewsTrend';
 import { PageLoadDistribution } from './PageLoadDistribution';
-import { getWhatIsGoingOnLabel } from './translations';
+import { I18LABELS } from './translations';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 
 export function RumDashboard() {
@@ -32,7 +32,7 @@ export function RumDashboard() {
   return (
     <>
       <EuiTitle>
-        <h2>{getWhatIsGoingOnLabel(environmentLabel)}</h2>
+        <h2>{I18LABELS.getWhatIsGoingOn(environmentLabel)}</h2>
       </EuiTitle>
       <EuiSpacer />
       <EuiFlexGroup direction="column" gutterSize="s">
@@ -41,7 +41,7 @@ export function RumDashboard() {
             <EuiFlexGroup justifyContent="spaceBetween">
               <EuiFlexItem grow={1} data-cy={`client-metrics`}>
                 <EuiTitle size="xs">
-                  <h3>Page load times</h3>
+                  <h3>{I18LABELS.pageLoadTimes}</h3>
                 </EuiTitle>
                 <EuiSpacer size="s" />
                 <ClientMetrics />
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/translations.ts b/x-pack/plugins/apm/public/components/app/RumDashboard/translations.ts
index c2aed41a55c7da..4da7b59ec7fa52 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/translations.ts
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/translations.ts
@@ -6,68 +6,55 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const EndUserExperienceLabel = i18n.translate(
-  'xpack.apm.rum.dashboard.title',
-  {
+export const I18LABELS = {
+  endUserExperience: i18n.translate('xpack.apm.rum.dashboard.title', {
     defaultMessage: 'End User Experience',
-  }
-);
-
-export const getWhatIsGoingOnLabel = (environmentVal: string) =>
-  i18n.translate('xpack.apm.rum.dashboard.environment.title', {
-    defaultMessage: `What's going on in {environmentVal}?`,
-    values: { environmentVal },
-  });
-
-export const BackEndLabel = i18n.translate('xpack.apm.rum.dashboard.backend', {
-  defaultMessage: 'Backend',
-});
-
-export const FrontEndLabel = i18n.translate(
-  'xpack.apm.rum.dashboard.frontend',
-  {
+  }),
+  getWhatIsGoingOn: (environmentVal: string) =>
+    i18n.translate('xpack.apm.rum.dashboard.environment.title', {
+      defaultMessage: `What's going on in {environmentVal}?`,
+      values: { environmentVal },
+    }),
+  backEnd: i18n.translate('xpack.apm.rum.dashboard.backend', {
+    defaultMessage: 'Backend',
+  }),
+  frontEnd: i18n.translate('xpack.apm.rum.dashboard.frontend', {
     defaultMessage: 'Frontend',
-  }
-);
-
-export const PageViewsLabel = i18n.translate(
-  'xpack.apm.rum.dashboard.pageViews',
-  {
+  }),
+  pageViews: i18n.translate('xpack.apm.rum.dashboard.pageViews', {
     defaultMessage: 'Page views',
-  }
-);
-
-export const DateTimeLabel = i18n.translate(
-  'xpack.apm.rum.dashboard.dateTime.label',
-  {
+  }),
+  dateTime: i18n.translate('xpack.apm.rum.dashboard.dateTime.label', {
     defaultMessage: 'Date / Time',
-  }
-);
-
-export const PercPageLoadedLabel = i18n.translate(
-  'xpack.apm.rum.dashboard.pagesLoaded.label',
-  {
+  }),
+  percPageLoaded: i18n.translate('xpack.apm.rum.dashboard.pagesLoaded.label', {
     defaultMessage: 'Pages loaded',
-  }
-);
-
-export const PageLoadTimeLabel = i18n.translate(
-  'xpack.apm.rum.dashboard.pageLoadTime.label',
-  {
+  }),
+  pageLoadTime: i18n.translate('xpack.apm.rum.dashboard.pageLoadTime.label', {
     defaultMessage: 'Page load time (seconds)',
-  }
-);
-
-export const PageLoadDistLabel = i18n.translate(
-  'xpack.apm.rum.dashboard.pageLoadDistribution.label',
-  {
-    defaultMessage: 'Page load distribution',
-  }
-);
-
-export const ResetZoomLabel = i18n.translate(
-  'xpack.apm.rum.dashboard.resetZoom.label',
-  {
+  }),
+  pageLoadTimes: i18n.translate('xpack.apm.rum.dashboard.pageLoadTimes.label', {
+    defaultMessage: 'Page load times',
+  }),
+  pageLoadDistribution: i18n.translate(
+    'xpack.apm.rum.dashboard.pageLoadDistribution.label',
+    {
+      defaultMessage: 'Page load distribution',
+    }
+  ),
+  resetZoom: i18n.translate('xpack.apm.rum.dashboard.resetZoom.label', {
     defaultMessage: 'Reset zoom',
-  }
-);
+  }),
+  overall: i18n.translate('xpack.apm.rum.dashboard.overall.label', {
+    defaultMessage: 'Overall',
+  }),
+  selectBreakdown: i18n.translate('xpack.apm.rum.filterGroup.selectBreakdown', {
+    defaultMessage: 'Select breakdown',
+  }),
+  breakdown: i18n.translate('xpack.apm.rum.filterGroup.breakdown', {
+    defaultMessage: 'Breakdown',
+  }),
+  seconds: i18n.translate('xpack.apm.rum.filterGroup.seconds', {
+    defaultMessage: 'seconds',
+  }),
+};
diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx
index 46fd5d925699b7..167574f9aa00d8 100644
--- a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx
@@ -140,6 +140,7 @@ const Filter = ({
                 </FlexItem>
                 <FlexItem grow={false}>
                   <ApplyButton
+                    data-cy="applyFilter"
                     color="primary"
                     fill={true}
                     onClick={() => {
diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/index.tsx b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/index.tsx
index 4aae82518ab3c6..020b7481c68ea9 100644
--- a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/index.tsx
@@ -80,6 +80,7 @@ const LocalUIFilters = ({
               iconType="cross"
               flush="left"
               onClick={clearValues}
+              data-cy="clearFilters"
             >
               {i18n.translate('xpack.apm.clearFilters', {
                 defaultMessage: 'Clear filters',
diff --git a/x-pack/plugins/apm/readme.md b/x-pack/plugins/apm/readme.md
index cb694712d7c97b..778b1f2ad2d91b 100644
--- a/x-pack/plugins/apm/readme.md
+++ b/x-pack/plugins/apm/readme.md
@@ -80,19 +80,38 @@ For debugging access Elasticsearch on http://localhost:9220` (elastic/changeme)
 
 ### API integration tests
 
+Our tests are separated in two suites: one suite runs with a basic license, and the other
+with a trial license (the equivalent of gold+). This requires separate test servers and test runs.
+
 **Start server**
 
+Basic:
+
+```
+node scripts/functional_tests_server --config x-pack/test/apm_api_integration/basic/config.ts
+```
+
+Trial:
+
 ```
-node scripts/functional_tests_server --config x-pack/test/api_integration/config.ts
+node scripts/functional_tests_server --config x-pack/test/apm_api_integration/trial/config.ts
 ```
 
 **Run tests**
 
+Basic:
+
+```
+node scripts/functional_test_runner --config x-pack/test/apm_api_integration/basic/config.ts
+```
+
+Trial:
+
 ```
-node scripts/functional_test_runner --config x-pack/test/api_integration/config.ts --grep='APM specs'
+node scripts/functional_test_runner --config x-pack/test/apm_api_integration/trial/config.ts
 ```
 
-APM tests are located in `x-pack/test/api_integration/apis/apm`.
+APM tests are located in `x-pack/test/apm_api_integration`.
 For debugging access Elasticsearch on http://localhost:9220` (elastic/changeme)
 
 ### Linting
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
index fab39da505a352..e53a0e24b4723d 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { merge } from 'lodash';
-import { Logger, CallAPIOptions } from 'kibana/server';
+import { Logger, LegacyCallAPIOptions } from 'kibana/server';
 import { IndicesStatsParams, Client } from 'elasticsearch';
 import {
   ESSearchRequest,
@@ -21,7 +21,7 @@ type TelemetryTaskExecutor = (params: {
   ): Promise<ESSearchResponse<unknown, TSearchRequest>>;
   indicesStats(
     params: IndicesStatsParams,
-    options?: CallAPIOptions
+    options?: LegacyCallAPIOptions
   ): ReturnType<Client['indices']['stats']>;
   transportRequest: (params: {
     path: string;
diff --git a/x-pack/plugins/apm/server/lib/index_pattern/get_dynamic_index_pattern.ts b/x-pack/plugins/apm/server/lib/index_pattern/get_dynamic_index_pattern.ts
index 6251bd7bd66017..ee03e77de35805 100644
--- a/x-pack/plugins/apm/server/lib/index_pattern/get_dynamic_index_pattern.ts
+++ b/x-pack/plugins/apm/server/lib/index_pattern/get_dynamic_index_pattern.ts
@@ -5,7 +5,7 @@
  */
 
 import LRU from 'lru-cache';
-import { APICaller } from '../../../../../../src/core/server';
+import { LegacyAPICaller } from '../../../../../../src/core/server';
 import {
   IndexPatternsFetcher,
   IIndexPattern,
@@ -37,7 +37,7 @@ export const getDynamicIndexPattern = async ({
   }
 
   const indexPatternsFetcher = new IndexPatternsFetcher(
-    (...rest: Parameters<APICaller>) =>
+    (...rest: Parameters<LegacyAPICaller>) =>
       context.core.elasticsearch.legacy.client.callAsCurrentUser(...rest)
   );
 
diff --git a/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap
index 7d8f31aaeca7fa..c006d01637483c 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap
@@ -67,13 +67,7 @@ exports[`rum client dashboard queries fetches page load distribution 1`] = `
 Object {
   "body": Object {
     "aggs": Object {
-      "durationMinMax": Object {
-        "min": Object {
-          "field": "transaction.duration.us",
-          "missing": 0,
-        },
-      },
-      "durationPercentiles": Object {
+      "durPercentiles": Object {
         "percentiles": Object {
           "field": "transaction.duration.us",
           "percents": Array [
@@ -83,13 +77,12 @@ Object {
             95,
             99,
           ],
-          "script": Object {
-            "lang": "painless",
-            "params": Object {
-              "timeUnit": 1000,
-            },
-            "source": "doc['transaction.duration.us'].value / params.timeUnit",
-          },
+        },
+      },
+      "minDuration": Object {
+        "min": Object {
+          "field": "transaction.duration.us",
+          "missing": 0,
         },
       },
     },
@@ -139,13 +132,7 @@ Object {
   "body": Object {
     "aggs": Object {
       "pageViews": Object {
-        "aggs": Object {
-          "trans_count": Object {
-            "value_count": Object {
-              "field": "transaction.type",
-            },
-          },
-        },
+        "aggs": Object {},
         "auto_date_histogram": Object {
           "buckets": 50,
           "field": "@timestamp",
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_page_load_distribution.ts b/x-pack/plugins/apm/server/lib/rum_client/get_page_load_distribution.ts
index 3c563946e4052f..43af18999547dc 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_page_load_distribution.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_page_load_distribution.ts
@@ -32,23 +32,16 @@ export async function getPageLoadDistribution({
         bool: projection.body.query.bool,
       },
       aggs: {
-        durationMinMax: {
+        minDuration: {
           min: {
             field: 'transaction.duration.us',
             missing: 0,
           },
         },
-        durationPercentiles: {
+        durPercentiles: {
           percentiles: {
             field: 'transaction.duration.us',
             percents: [50, 75, 90, 95, 99],
-            script: {
-              lang: 'painless',
-              source: "doc['transaction.duration.us'].value / params.timeUnit",
-              params: {
-                timeUnit: 1000,
-              },
-            },
           },
         },
       },
@@ -66,31 +59,32 @@ export async function getPageLoadDistribution({
     return null;
   }
 
-  const minDuration = (aggregations?.durationMinMax.value ?? 0) / 1000;
+  const minDuration = aggregations?.minDuration.value ?? 0;
 
   const minPerc = minPercentile ? +minPercentile : minDuration;
 
-  const maxPercentileQuery =
-    aggregations?.durationPercentiles.values['99.0'] ?? 100;
+  const maxPercQuery = aggregations?.durPercentiles.values['99.0'] ?? 10000;
 
-  const maxPerc = maxPercentile ? +maxPercentile : maxPercentileQuery;
+  const maxPerc = maxPercentile ? +maxPercentile : maxPercQuery;
 
   const pageDist = await getPercentilesDistribution(setup, minPerc, maxPerc);
   return {
     pageLoadDistribution: pageDist,
-    percentiles: aggregations?.durationPercentiles.values,
+    percentiles: aggregations?.durPercentiles.values,
+    minDuration: minPerc,
+    maxDuration: maxPerc,
   };
 }
 
 const getPercentilesDistribution = async (
   setup: Setup & SetupTimeRange & SetupUIFilters,
-  minPercentiles: number,
-  maxPercentile: number
+  minDuration: number,
+  maxDuration: number
 ) => {
-  const stepValue = (maxPercentile - minPercentiles) / 50;
+  const stepValue = (maxDuration - minDuration) / 50;
   const stepValues = [];
-  for (let i = 1; i < 50; i++) {
-    stepValues.push((stepValue * i + minPercentiles).toFixed(2));
+  for (let i = 1; i < 51; i++) {
+    stepValues.push((stepValue * i + minDuration).toFixed(2));
   }
 
   const projection = getRumOverviewProjection({
@@ -109,13 +103,6 @@ const getPercentilesDistribution = async (
             field: 'transaction.duration.us',
             values: stepValues,
             keyed: false,
-            script: {
-              lang: 'painless',
-              source: "doc['transaction.duration.us'].value / params.timeUnit",
-              params: {
-                timeUnit: 1000,
-              },
-            },
           },
         },
       },
@@ -126,14 +113,11 @@ const getPercentilesDistribution = async (
 
   const { aggregations } = await client.search(params);
 
-  const pageDist = (aggregations?.loadDistribution.values ?? []) as Array<{
-    key: number;
-    value: number;
-  }>;
+  const pageDist = aggregations?.loadDistribution.values ?? [];
 
   return pageDist.map(({ key, value }, index: number, arr) => {
     return {
-      x: key,
+      x: Math.round(key / 1000),
       y: index === 0 ? value : value - arr[index - 1].value,
     };
   });
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts b/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts
index 126605206d2993..30b2677d3c2170 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts
@@ -11,15 +11,32 @@ import {
   SetupTimeRange,
   SetupUIFilters,
 } from '../helpers/setup_request';
+import { AggregationInputMap } from '../../../typings/elasticsearch/aggregations';
+import { BreakdownItem } from '../../../typings/ui_filters';
 
 export async function getPageViewTrends({
   setup,
+  breakdowns,
 }: {
   setup: Setup & SetupTimeRange & SetupUIFilters;
+  breakdowns?: string;
 }) {
   const projection = getRumOverviewProjection({
     setup,
   });
+  const breakdownAggs: AggregationInputMap = {};
+  if (breakdowns) {
+    const breakdownList: BreakdownItem[] = JSON.parse(breakdowns);
+    breakdownList.forEach(({ name, type, fieldName }) => {
+      breakdownAggs[name] = {
+        terms: {
+          field: fieldName,
+          size: 9,
+          missing: 'Other',
+        },
+      };
+    });
+  }
 
   const params = mergeProjection(projection, {
     body: {
@@ -33,13 +50,7 @@ export async function getPageViewTrends({
             field: '@timestamp',
             buckets: 50,
           },
-          aggs: {
-            trans_count: {
-              value_count: {
-                field: 'transaction.type',
-              },
-            },
-          },
+          aggs: breakdownAggs,
         },
       },
     },
@@ -50,8 +61,27 @@ export async function getPageViewTrends({
   const response = await client.search(params);
 
   const result = response.aggregations?.pageViews.buckets ?? [];
-  return result.map(({ key, trans_count }) => ({
-    x: key,
-    y: trans_count.value,
-  }));
+
+  return result.map((bucket) => {
+    const { key: xVal, doc_count: bCount } = bucket;
+    const res: Record<string, null | number> = {
+      x: xVal,
+      y: bCount,
+    };
+
+    Object.keys(breakdownAggs).forEach((bKey) => {
+      const categoryBuckets = (bucket[bKey] as any).buckets;
+      categoryBuckets.forEach(
+        ({ key, doc_count: docCount }: { key: string; doc_count: number }) => {
+          if (key === 'Other') {
+            res[key + `(${bKey})`] = docCount;
+          } else {
+            res[key] = docCount;
+          }
+        }
+      );
+    });
+
+    return res;
+  });
 }
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_pl_dist_breakdown.ts b/x-pack/plugins/apm/server/lib/rum_client/get_pl_dist_breakdown.ts
new file mode 100644
index 00000000000000..5ae6bd1540f7ca
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_pl_dist_breakdown.ts
@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getRumOverviewProjection } from '../../../common/projections/rum_overview';
+import { mergeProjection } from '../../../common/projections/util/merge_projection';
+import {
+  Setup,
+  SetupTimeRange,
+  SetupUIFilters,
+} from '../helpers/setup_request';
+import {
+  CLIENT_GEO_COUNTRY_ISO_CODE,
+  USER_AGENT_DEVICE,
+  USER_AGENT_NAME,
+  USER_AGENT_OS,
+} from '../../../common/elasticsearch_fieldnames';
+
+export const getBreakdownField = (breakdown: string) => {
+  switch (breakdown) {
+    case 'Location':
+      return CLIENT_GEO_COUNTRY_ISO_CODE;
+    case 'Device':
+      return USER_AGENT_DEVICE;
+    case 'OS':
+      return USER_AGENT_OS;
+    case 'Browser':
+    default:
+      return USER_AGENT_NAME;
+  }
+};
+
+export const getPageLoadDistBreakdown = async (
+  setup: Setup & SetupTimeRange & SetupUIFilters,
+  minDuration: number,
+  maxDuration: number,
+  breakdown: string
+) => {
+  const stepValue = (maxDuration - minDuration) / 50;
+  const stepValues = [];
+
+  for (let i = 1; i < 51; i++) {
+    stepValues.push((stepValue * i + minDuration).toFixed(2));
+  }
+
+  const projection = getRumOverviewProjection({
+    setup,
+  });
+
+  const params = mergeProjection(projection, {
+    body: {
+      size: 0,
+      query: {
+        bool: projection.body.query.bool,
+      },
+      aggs: {
+        breakdowns: {
+          terms: {
+            field: getBreakdownField(breakdown),
+            size: 9,
+          },
+          aggs: {
+            page_dist: {
+              percentile_ranks: {
+                field: 'transaction.duration.us',
+                values: stepValues,
+                keyed: false,
+              },
+            },
+          },
+        },
+      },
+    },
+  });
+
+  const { client } = setup;
+
+  const { aggregations } = await client.search(params);
+
+  const pageDistBreakdowns = aggregations?.breakdowns.buckets;
+
+  return pageDistBreakdowns?.map(({ key, page_dist: pageDist }) => {
+    return {
+      name: String(key),
+      data: pageDist.values?.map(({ key: pKey, value }, index: number, arr) => {
+        return {
+          x: Math.round(pKey / 1000),
+          y: index === 0 ? value : value - arr[index - 1].value,
+        };
+      }),
+    };
+  });
+};
diff --git a/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts b/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts
index e77307a3f9db13..75aeb27ea21225 100644
--- a/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts
+++ b/x-pack/plugins/apm/server/lib/services/annotations/get_stored_annotations.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller, Logger } from 'kibana/server';
+import { LegacyAPICaller, Logger } from 'kibana/server';
 import { SERVICE_NAME } from '../../../../common/elasticsearch_fieldnames';
 import { ESSearchResponse } from '../../../../typings/elasticsearch';
 import { ScopedAnnotationsClient } from '../../../../../observability/server';
@@ -24,7 +24,7 @@ export async function getStoredAnnotations({
   setup: Setup & SetupTimeRange;
   serviceName: string;
   environment?: string;
-  apiCaller: APICaller;
+  apiCaller: LegacyAPICaller;
   annotationsClient: ScopedAnnotationsClient;
   logger: Logger;
 }): Promise<Annotation[]> {
diff --git a/x-pack/plugins/apm/server/lib/services/annotations/index.ts b/x-pack/plugins/apm/server/lib/services/annotations/index.ts
index e2b6e74d4d65a5..a5f8e595ccf54d 100644
--- a/x-pack/plugins/apm/server/lib/services/annotations/index.ts
+++ b/x-pack/plugins/apm/server/lib/services/annotations/index.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { APICaller, Logger } from 'kibana/server';
+import { LegacyAPICaller, Logger } from 'kibana/server';
 import { ScopedAnnotationsClient } from '../../../../../observability/server';
 import { getDerivedServiceAnnotations } from './get_derived_service_annotations';
 import { Setup, SetupTimeRange } from '../../helpers/setup_request';
@@ -21,7 +21,7 @@ export async function getServiceAnnotations({
   environment?: string;
   setup: Setup & SetupTimeRange;
   annotationsClient?: ScopedAnnotationsClient;
-  apiCaller: APICaller;
+  apiCaller: LegacyAPICaller;
   logger: Logger;
 }) {
   // start fetching derived annotations (based on transactions), but don't wait on it
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
index d480342bbef11f..83117db1167b5d 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IClusterClient, Logger } from 'src/core/server';
+import { ILegacyClusterClient, Logger } from 'src/core/server';
 import {
   createOrUpdateIndex,
   MappingsDefinition,
@@ -17,7 +17,7 @@ export async function createApmAgentConfigurationIndex({
   config,
   logger,
 }: {
-  esClient: IClusterClient;
+  esClient: ILegacyClusterClient;
   config: APMConfig;
   logger: Logger;
 }) {
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
index a690e7fd8665a6..2bfe0d620e4e8e 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IClusterClient, Logger } from 'src/core/server';
+import { ILegacyClusterClient, Logger } from 'src/core/server';
 import {
   createOrUpdateIndex,
   MappingsDefinition,
@@ -17,7 +17,7 @@ export const createApmCustomLinkIndex = async ({
   config,
   logger,
 }: {
-  esClient: IClusterClient;
+  esClient: ILegacyClusterClient;
   config: APMConfig;
   logger: Logger;
 }) => {
diff --git a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts
index 25a559cb07a3de..7a3d9d94dec8e6 100644
--- a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts
+++ b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts
@@ -14,8 +14,8 @@ import {
   TRANSACTION_URL,
   USER_AGENT_NAME,
   USER_AGENT_DEVICE,
-  CLIENT_GEO,
   USER_AGENT_OS,
+  CLIENT_GEO_COUNTRY_ISO_CODE,
 } from '../../../../common/elasticsearch_fieldnames';
 
 const filtersByName = {
@@ -77,7 +77,7 @@ const filtersByName = {
     title: i18n.translate('xpack.apm.localFilters.titles.location', {
       defaultMessage: 'Location',
     }),
-    fieldName: CLIENT_GEO,
+    fieldName: CLIENT_GEO_COUNTRY_ISO_CODE,
   },
   os: {
     title: i18n.translate('xpack.apm.localFilters.titles.os', {
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index eb781ee0783075..deafda67b806d7 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -4,46 +4,42 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { i18n } from '@kbn/i18n';
+import { combineLatest, Observable } from 'rxjs';
+import { map, take } from 'rxjs/operators';
 import {
-  PluginInitializerContext,
-  Plugin,
   CoreSetup,
   CoreStart,
   Logger,
+  Plugin,
+  PluginInitializerContext,
 } from 'src/core/server';
-import { Observable, combineLatest } from 'rxjs';
-import { map, take } from 'rxjs/operators';
-import { ObservabilityPluginSetup } from '../../observability/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import { TaskManagerSetupContract } from '../../task_manager/server';
-import { AlertingPlugin } from '../../alerts/server';
-import { ActionsPlugin } from '../../actions/server';
+import { APMConfig, APMXPackConfig, mergeConfigs } from '.';
 import { APMOSSPluginSetup } from '../../../../src/plugins/apm_oss/server';
-import { createApmAgentConfigurationIndex } from './lib/settings/agent_configuration/create_agent_config_index';
-import { createApmCustomLinkIndex } from './lib/settings/custom_link/create_custom_link_index';
-import { createApmApi } from './routes/create_apm_api';
-import { getApmIndices } from './lib/settings/apm_indices/get_apm_indices';
-import { APMConfig, mergeConfigs, APMXPackConfig } from '.';
 import { HomeServerPluginSetup } from '../../../../src/plugins/home/server';
+import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
+import { ActionsPlugin } from '../../actions/server';
+import { AlertingPlugin } from '../../alerts/server';
 import { CloudSetup } from '../../cloud/server';
-import { getInternalSavedObjectsClient } from './lib/helpers/get_internal_saved_objects_client';
-import {
-  LicensingPluginSetup,
-  LicensingPluginStart,
-} from '../../licensing/server';
-import { registerApmAlerts } from './lib/alerts/register_apm_alerts';
-import { createApmTelemetry } from './lib/apm_telemetry';
-
 import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
+import { LicensingPluginSetup } from '../../licensing/server';
+import { MlPluginSetup } from '../../ml/server';
+import { ObservabilityPluginSetup } from '../../observability/server';
+import { SecurityPluginSetup } from '../../security/server';
+import { TaskManagerSetupContract } from '../../task_manager/server';
 import {
   APM_FEATURE,
   APM_SERVICE_MAPS_FEATURE_NAME,
   APM_SERVICE_MAPS_LICENSE_TYPE,
 } from './feature';
+import { registerApmAlerts } from './lib/alerts/register_apm_alerts';
+import { createApmTelemetry } from './lib/apm_telemetry';
+import { getInternalSavedObjectsClient } from './lib/helpers/get_internal_saved_objects_client';
+import { createApmAgentConfigurationIndex } from './lib/settings/agent_configuration/create_agent_config_index';
+import { getApmIndices } from './lib/settings/apm_indices/get_apm_indices';
+import { createApmCustomLinkIndex } from './lib/settings/custom_link/create_custom_link_index';
+import { createApmApi } from './routes/create_apm_api';
 import { apmIndices, apmTelemetry } from './saved_objects';
 import { createElasticCloudInstructions } from './tutorial/elastic_cloud';
-import { MlPluginSetup } from '../../ml/server';
 
 export interface APMPluginSetup {
   config$: Observable<APMConfig>;
@@ -135,18 +131,14 @@ export class APMPlugin implements Plugin<APMPluginSetup> {
       APM_SERVICE_MAPS_LICENSE_TYPE
     );
 
-    core.getStartServices().then(([_coreStart, pluginsStart]) => {
-      createApmApi().init(core, {
-        config$: mergedConfig$,
-        logger: this.logger!,
-        plugins: {
-          licensing: (pluginsStart as { licensing: LicensingPluginStart })
-            .licensing,
-          observability: plugins.observability,
-          security: plugins.security,
-          ml: plugins.ml,
-        },
-      });
+    createApmApi().init(core, {
+      config$: mergedConfig$,
+      logger: this.logger!,
+      plugins: {
+        observability: plugins.observability,
+        security: plugins.security,
+        ml: plugins.ml,
+      },
     });
 
     return {
diff --git a/x-pack/plugins/apm/server/routes/create_api/index.test.ts b/x-pack/plugins/apm/server/routes/create_api/index.test.ts
index f5db936c00d3a7..3d3e26f680e0d2 100644
--- a/x-pack/plugins/apm/server/routes/create_api/index.test.ts
+++ b/x-pack/plugins/apm/server/routes/create_api/index.test.ts
@@ -9,7 +9,6 @@ import { CoreSetup, Logger } from 'src/core/server';
 import { Params } from '../typings';
 import { BehaviorSubject } from 'rxjs';
 import { APMConfig } from '../..';
-import { LicensingPluginStart } from '../../../../licensing/server';
 
 const getCoreMock = () => {
   const get = jest.fn();
@@ -41,7 +40,7 @@ const getCoreMock = () => {
       logger: ({
         error: jest.fn(),
       } as unknown) as Logger,
-      plugins: { licensing: {} as LicensingPluginStart },
+      plugins: {},
     },
   };
 };
diff --git a/x-pack/plugins/apm/server/routes/create_apm_api.ts b/x-pack/plugins/apm/server/routes/create_apm_api.ts
index 02be2e7e4dcdfb..ed1c045616a27c 100644
--- a/x-pack/plugins/apm/server/routes/create_apm_api.ts
+++ b/x-pack/plugins/apm/server/routes/create_apm_api.ts
@@ -75,6 +75,7 @@ import {
   rumClientMetricsRoute,
   rumPageViewsTrendRoute,
   rumPageLoadDistributionRoute,
+  rumPageLoadDistBreakdownRoute,
 } from './rum_client';
 import {
   observabilityDashboardHasDataRoute,
@@ -164,6 +165,7 @@ const createApmApi = () => {
     .add(rumOverviewLocalFiltersRoute)
     .add(rumPageViewsTrendRoute)
     .add(rumPageLoadDistributionRoute)
+    .add(rumPageLoadDistBreakdownRoute)
     .add(rumClientMetricsRoute)
 
     // Observability dashboard
diff --git a/x-pack/plugins/apm/server/routes/rum_client.ts b/x-pack/plugins/apm/server/routes/rum_client.ts
index 9b5f6529b17836..75651f646a50d4 100644
--- a/x-pack/plugins/apm/server/routes/rum_client.ts
+++ b/x-pack/plugins/apm/server/routes/rum_client.ts
@@ -11,6 +11,7 @@ import { getClientMetrics } from '../lib/rum_client/get_client_metrics';
 import { rangeRt, uiFiltersRt } from './default_api_types';
 import { getPageViewTrends } from '../lib/rum_client/get_page_view_trends';
 import { getPageLoadDistribution } from '../lib/rum_client/get_page_load_distribution';
+import { getPageLoadDistBreakdown } from '../lib/rum_client/get_pl_dist_breakdown';
 
 export const percentileRangeRt = t.partial({
   minPercentile: t.string,
@@ -45,13 +46,48 @@ export const rumPageLoadDistributionRoute = createRoute(() => ({
   },
 }));
 
+export const rumPageLoadDistBreakdownRoute = createRoute(() => ({
+  path: '/api/apm/rum-client/page-load-distribution/breakdown',
+  params: {
+    query: t.intersection([
+      uiFiltersRt,
+      rangeRt,
+      percentileRangeRt,
+      t.type({ breakdown: t.string }),
+    ]),
+  },
+  handler: async ({ context, request }) => {
+    const setup = await setupRequest(context, request);
+
+    const {
+      query: { minPercentile, maxPercentile, breakdown },
+    } = context.params;
+
+    return getPageLoadDistBreakdown(
+      setup,
+      Number(minPercentile),
+      Number(maxPercentile),
+      breakdown
+    );
+  },
+}));
+
 export const rumPageViewsTrendRoute = createRoute(() => ({
   path: '/api/apm/rum-client/page-view-trends',
   params: {
-    query: t.intersection([uiFiltersRt, rangeRt]),
+    query: t.intersection([
+      uiFiltersRt,
+      rangeRt,
+      t.partial({ breakdowns: t.string }),
+    ]),
   },
   handler: async ({ context, request }) => {
     const setup = await setupRequest(context, request);
-    return getPageViewTrends({ setup });
+
+    const {
+      query: { breakdowns },
+    } = context.params;
+
+    return getPageViewTrends({ setup, breakdowns });
   },
 }));
diff --git a/x-pack/plugins/apm/server/routes/service_map.ts b/x-pack/plugins/apm/server/routes/service_map.ts
index 3937c18b3fe5e0..a3e2f708b0b22e 100644
--- a/x-pack/plugins/apm/server/routes/service_map.ts
+++ b/x-pack/plugins/apm/server/routes/service_map.ts
@@ -35,10 +35,7 @@ export const serviceMapRoute = createRoute(() => ({
     if (!isValidPlatinumLicense(context.licensing.license)) {
       throw Boom.forbidden(invalidLicenseMessage);
     }
-
-    context.plugins.licensing.featureUsage.notifyUsage(
-      APM_SERVICE_MAPS_FEATURE_NAME
-    );
+    context.licensing.featureUsage.notifyUsage(APM_SERVICE_MAPS_FEATURE_NAME);
 
     const setup = await setupRequest(context, request);
     const {
diff --git a/x-pack/plugins/apm/server/routes/typings.ts b/x-pack/plugins/apm/server/routes/typings.ts
index f30a9d18d7aeab..b1815e88d29178 100644
--- a/x-pack/plugins/apm/server/routes/typings.ts
+++ b/x-pack/plugins/apm/server/routes/typings.ts
@@ -14,7 +14,6 @@ import {
 import { PickByValue, Optional } from 'utility-types';
 import { Observable } from 'rxjs';
 import { Server } from 'hapi';
-import { LicensingPluginStart } from '../../../licensing/server';
 import { ObservabilityPluginSetup } from '../../../observability/server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { FetchOptions } from '../../public/services/rest/callApi';
@@ -67,7 +66,6 @@ export type APMRequestHandlerContext<
   config: APMConfig;
   logger: Logger;
   plugins: {
-    licensing: LicensingPluginStart;
     observability?: ObservabilityPluginSetup;
     security?: SecurityPluginSetup;
     ml?: MlPluginSetup;
@@ -116,7 +114,6 @@ export interface ServerAPI<TRouteState extends RouteState> {
       config$: Observable<APMConfig>;
       logger: Logger;
       plugins: {
-        licensing: LicensingPluginStart;
         observability?: ObservabilityPluginSetup;
         security?: SecurityPluginSetup;
         ml?: MlPluginSetup;
diff --git a/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
index 6ee26caa4ef7c4..a340aa24aebfb1 100644
--- a/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
+++ b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
@@ -35,6 +35,11 @@ type MetricsAggregationOptions =
 interface MetricsAggregationResponsePart {
   value: number | null;
 }
+interface DateHistogramBucket {
+  doc_count: number;
+  key: number;
+  key_as_string: string;
+}
 
 type GetCompositeKeys<
   TAggregationOptionsMap extends AggregationOptionsMap
@@ -204,14 +209,8 @@ interface AggregationResponsePart<
   };
   date_histogram: {
     buckets: Array<
-      {
-        doc_count: number;
-        key: number;
-        key_as_string: string;
-      } & BucketSubAggregationResponse<
-        TAggregationOptionsMap['aggs'],
-        TDocument
-      >
+      DateHistogramBucket &
+        BucketSubAggregationResponse<TAggregationOptionsMap['aggs'], TDocument>
     >;
   };
   avg: MetricsAggregationResponsePart;
@@ -312,20 +311,18 @@ interface AggregationResponsePart<
   };
   auto_date_histogram: {
     buckets: Array<
-      {
-        doc_count: number;
-        key: number;
-        key_as_string: string;
-      } & BucketSubAggregationResponse<
-        TAggregationOptionsMap['aggs'],
-        TDocument
-      >
+      DateHistogramBucket &
+        AggregationResponseMap<TAggregationOptionsMap['aggs'], TDocument>
     >;
     interval: string;
   };
 
   percentile_ranks: {
-    values: Record<string, number> | Array<{ key: number; value: number }>;
+    values: TAggregationOptionsMap extends {
+      percentile_ranks: { keyed: false };
+    }
+      ? Array<{ key: number; value: number }>
+      : Record<string, number>;
   };
 }
 
diff --git a/x-pack/plugins/apm/typings/ui_filters.ts b/x-pack/plugins/apm/typings/ui_filters.ts
index 3f03e80325b498..2a727dda7241da 100644
--- a/x-pack/plugins/apm/typings/ui_filters.ts
+++ b/x-pack/plugins/apm/typings/ui_filters.ts
@@ -11,3 +11,11 @@ export type UIFilters = {
   kuery?: string;
   environment?: string;
 } & { [key in LocalUIFilterName]?: string[] };
+
+export interface BreakdownItem {
+  name: string;
+  count: number;
+  type: string;
+  fieldName: string;
+  selected?: boolean;
+}
diff --git a/x-pack/plugins/canvas/README.md b/x-pack/plugins/canvas/README.md
index fbcd674f72181e..7bd9a1994ba7ed 100644
--- a/x-pack/plugins/canvas/README.md
+++ b/x-pack/plugins/canvas/README.md
@@ -6,13 +6,13 @@
 
 Canvas is included with X-Pack and requires a Basic license or better to use.
 
-### Developing in Canvas
+## Developing in Canvas
 
 To develop your own Canvas plugins, you simply create a Kibana plugin, and register your customizations with Canvas.
 
 The following is a step-by-step guide to adding your own custom random number Canvas plugin.
 
-#### Generating a Kibana plugin
+### Generating a Kibana plugin
 
 ```bash
 # in the kibana directory
@@ -24,12 +24,13 @@ This will prompt you for some input. Generally, you can answer as follows:
 
 ```
 ❯ node scripts/generate_plugin.js canvas_example
+? Would you like to create the plugin in a different folder? No
 ? Provide a short description An awesome Kibana plugin
 ? What Kibana version are you targeting? master
 ? Should an app component be generated? No
-? Should translation files be generated? No
-? Should a hack component be generated? No
 ? Should a server API be generated? No
+? Should translation files be generated? No
+? Would you like to use a custom eslint file? No
 ```
 
 Once this has completed, go to your plugin directory:
@@ -41,55 +42,52 @@ cd plugins/canvas_example
 Open that folder in your code editor of choice: `code .`
 
 #### Creating a Canvas element and function
+Open your plugin's `kibana.json` file. Make sure that `ui` has a value of true, and that `'canvas'` is included in `requiredPlugins`.  It should look something like this.  
+
+```json
+{
+  "id": "canvasExample",
+  "version": "7.8.0",
+  "server": false,
+  "ui": true,
+  "requiredPlugins": ["canvas"],
+  "optionalPlugins": []
+}
+```
 
-Open your plugin's `index.js` file, and modify it to look something like this (but replace canvas_example with whatever you named your plugin):
+In your plugin folder, create a new folder `public` and an `index.ts` file within it.
 
-```js
-export default function (kibana) {
-  return new kibana.Plugin({
-    // Tell Kibana that this plugin needs canvas and the Kibana interpreter
-    require: ['canvas'],
+This `index.ts` will need export a Kibana Plugin. You can use this as a starting point for your plugin.
 
-    // The name of your plugin. Make this whatever you want.
-    name: 'canvas_example',
+```typescript
+import { Plugin, CoreSetup, CoreStart } from '../../../src/core/public';
+import { CanvasSetup } from '../../../x-pack/plugins/canvas/public';
 
-    uiExports: {
-      // Tell Kibana that the files in `/public` should be loaded into the
-      // browser only when the user is in the Canvas app.
-      canvas: ['plugins/canvas_example']
-    },
+interface CanvasExampleSetupPlugins {
+  canvas: CanvasSetup;
+}
 
-    // Enable the plugin by default
-    config(Joi) {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-      }).default();
-    },
-  });
+interface CanvasExampleStartPlugins {}
+
+class CanvasExamplePlugin
+  implements Plugin<void, void, CanvasExampleSetupPlugins, CanvasExampleStartPlugins> {
+  setup(core: CoreSetup, plugins: CanvasExampleSetupPlugins) {}
+
+  start(core: CoreStart) {}
 }
+
+export const plugin = () => new CanvasExamplePlugin();
 ```
 
-Now that the Kibana plugin boilerplate is out of the way, you can write a Canvas plugin.
 
-Create a new file: `public/index.js` and make it look like this:
+Now that the Kibana plugin boilerplate is out of the way, you can start adding functionality to Canvas.  
 
-```js
-/*global kbnInterpreter */
+Let's start by adding a new function.
 
-// Elements show up in the Canvas elements menu and can be visually added to a canvas
-const elements = [
-  () => ({
-    name: 'randomNumber',
-    displayName: 'Random Number',
-    help: 'A random number between 1 and 100',
-    image: 'https://images.contentstack.io/v3/assets/bltefdd0b53724fa2ce/bltb59c89a07c05b937/5c583a6602ac90e80ba0ab8f/icon-white-circle-elastic-stack.svg',
-    expression: 'random | metric "Random Number"',
-  }),
-];
+In your `index.ts` add a new function definition:
 
-// Browser functions are Canvas functions which run in the browser, and can be used in
-// expressions (such as `random | metric "Random Number"`)
-const browserFunctions = [
+```typescript
+const canvasFunctions = [
   () => ({
     name: 'random',
     help: 'Make a random number between 1 and 100',
@@ -99,15 +97,41 @@ const browserFunctions = [
     }
   }),
 ];
+```
+
+Then, in the `setup` method of your plugin, you can add this new function definition to Canvas:
 
-// Register our elements and browserFunctions with the Canvas interpreter.
-kbnInterpreter.register({
-  elements,
-  browserFunctions,
-});
+```typescript
+setup(core: CoreSetup, plugins: CanvasExampleSetupPlugins) {
+  plugins.canvas.addFunctions(canvasFunctions);
+}
+```
 
+Now, let's add a new Element type.  In your `index.ts` add a new element definition:
+
+```typescript
+const elements = [
+  () => ({
+    name: 'randomNumber',
+    displayName: 'Random Number',
+    help: 'A random number between 1 and 100',
+    image: 'https://images.contentstack.io/v3/assets/bltefdd0b53724fa2ce/bltb59c89a07c05b937/5c583a6602ac90e80ba0ab8f/icon-white-circle-elastic-stack.svg',
+    expression: 'random | metric "Random Number"',
+  }),
+];
 ```
 
+And then, in the `setup` method of the plugin, add this new element definition to Canvas, just like you did with the function:
+
+```typescript
+setup(core: CoreSetup, plugins: CanvasExampleSetupPlugins) {
+  plugins.canvas.addFunctions(canvasFunctions);
+  plugins.canvas.addElements(elements);
+}
+```
+
+Now, your 'Random Number' element will show up in the list of other Canvas elements.
+
 #### Trying out your new plugin
 
 In the terminal, in your plugin's directory, run:
@@ -120,53 +144,71 @@ yarn start
 - Pull up Kibana in your browser: `http://localhost:5601`
 - Go to canvas, and click: "Create workpad"
 - Click: "Add element"
+- Click: "Other"
 - Click: "Random Number"
 
 #### Adding a server-side function
 
+> Server side functions may be deprecated in a later version of Kibana as they require using an API marked _legacy_
+
 Now, let's add a function which runs on the server.
 
-In your plugin's root `index.js` file, modify the `kibana.Plugin` definition to have an init function:
+In your plugin's `kibana.json` file, set `server` to true, and add `"expressions"` as a requiredPlugin. 
 
-```js
-export default function (kibana) {
-  return new kibana.Plugin({
-    // Tell Kibana that this plugin needs canvas and the Kibana interpreter
-    require: ['canvas'],
+```typescript
+{
+  "id": "canvasExample",
+  "version": "8.0.0",
+  "server": false,
+  "ui": true,
+  "requiredPlugins": ["canvas", "expressions"],
+  "optionalPlugins": []
+}
+```
 
-    // The name of your plugin. Make this whatever you want.
-    name: 'canvas_example',
+Now, much like we made the client plugin, we'll make a server plugin.  
 
-    uiExports: {
-      // Tell Kibana that the files in `/public` should be loaded into the
-      // browser only when the user is in the Canvas app.
-      canvas: ['plugins/canvas_example']
-    },
+Start by making the `server` directory and an `index.ts` file with a shell for your server plugin:
 
-    // Enable the plugin by default
-    config(Joi) {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-      }).default();
-    },
+```typescript
+import { Plugin, CoreSetup, CoreStart } from '../../../src/core/server';
+import { ExpressionsServerSetup } from '../../../src/plugins/expressions/server';
+
+interface CanvasExamplePluginsSetup {
+  expressions: ExpressionsServerSetup;
+}
 
-    // Add this init function, which registers a new function with Canvas: `serverTime`
-    init(server) {
-      const { register } = server.plugins.interpreter;
-      register({
-        serverFunctions: [
-          () => ({
-            name: 'serverTime',
-            help: 'Get the server time in milliseconds',
-            args: {},
-            fn() {
-              return Date.now();
-            },
-          })
-        ],
-      });
+class CanvasExamplePlugin implements Plugin {
+  setup(core: CoreSetup, plugins: CanvasExamplePluginsSetup) {}
+
+  start(core: CoreStart) {}
+}
+
+export const plugin = () => new CanvasExamplePlugin();
+```
+
+Now, we'll create a simple function definition that we will register on the server:
+
+```typescript
+const serverFunctions = [
+  () => ({
+    name: 'serverTime',
+    help: 'Get the server time in milliseconds',
+    args: {},
+    fn() {
+      return Date.now();
     },
-  });
+  }),
+];
+```
+
+And then in our setup method, register it with the Expressions plugin:
+
+```typescript
+setup(core: CoreSetup, plugins: CanvasExamplePluginsSetup) {
+  // .register requires serverFunctions and types, so pass an empty array
+  // if you don't have any custom types to register
+  plugins.expressions.__LEGACY.register({ serverFunctions, types: [] });
 }
 ```
 
@@ -182,6 +224,22 @@ Now, let's try out our new server function.
 
 You should now see one random number and one "Server Time in ms" value.
 
+> More information about building Kibana Plugins can be found in [src/core](https://github.com/elastic/kibana/blob/master/src/core/README.md)
+
+#### My Canvas Plugin stopped working
+
+If your Kibana Server is crashing on startup with a message like
+
+> **FATAL** Error: Unmet requirement "canvas" for plugin "your_plugin_name"
+
+or
+
+> **FATAL** Error: Unmet requirement "interpreter" for plugin "your_plugin_name"
+
+then your plugin was likely created to work on a previous version of Kibana. Starting with version 7.8, the plugin system was redesigned and caused breaking changes to these earlier plugins.  
+
+The good news is that all of your existing Canvas extension code can be reused, it just needs to be in an updated Kibana plugin.  Follow the [instructions](#generating-a-kibana-plugin) for creating a new Canvas Kibana plugin, and then add in your existing functions and elements.  
+
 ## Scripts
 
 There are several scripts available once you are in that path as well.
@@ -219,11 +277,3 @@ While both can be used as a way to build up reports, Canvas and Dashboard have d
 Elasticon 2017 keynote (starts at 01:27:00): https://www.elastic.co/elasticon/conf/2017/sf/opening-keynote
 
 Shane Connelly's SQL webinar: https://www.elastic.co/webinars/introduction-to-elasticsearch-sql
-
-**How can I get an early build?**
-
-Check the technical previews out, see http://canvas.elastic.co/stories/installing.html
-
-**Where can I get screenshots?**
-
-If you want a stream of conciousness of the absolute latest development, check out the technical preview microsite at http://canvas.elastic.co/
diff --git a/x-pack/plugins/canvas/common/lib/constants.ts b/x-pack/plugins/canvas/common/lib/constants.ts
index f2155d9202939c..f42f4095c26970 100644
--- a/x-pack/plugins/canvas/common/lib/constants.ts
+++ b/x-pack/plugins/canvas/common/lib/constants.ts
@@ -20,7 +20,6 @@ export const LOCALSTORAGE_PREFIX = `kibana.canvas`;
 export const LOCALSTORAGE_CLIPBOARD = `${LOCALSTORAGE_PREFIX}.clipboard`;
 export const SESSIONSTORAGE_LASTPATH = 'lastPath:canvas';
 export const FETCH_TIMEOUT = 30000; // 30 seconds
-export const CANVAS_USAGE_TYPE = 'canvas';
 export const DEFAULT_WORKPAD_CSS = '.canvasPage {\n\n}';
 export const DEFAULT_ELEMENT_CSS = '.canvasRenderEl{\n\n}';
 export const VALID_IMAGE_TYPES = ['gif', 'jpeg', 'png', 'svg+xml'];
diff --git a/x-pack/plugins/canvas/server/collectors/collector.ts b/x-pack/plugins/canvas/server/collectors/collector.ts
index e266e9826a47d7..48396d93d13e63 100644
--- a/x-pack/plugins/canvas/server/collectors/collector.ts
+++ b/x-pack/plugins/canvas/server/collectors/collector.ts
@@ -6,7 +6,6 @@
 
 import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { CANVAS_USAGE_TYPE } from '../../common/lib/constants';
 import { TelemetryCollector } from '../../types';
 
 import { workpadCollector } from './workpad_collector';
@@ -31,20 +30,16 @@ export function registerCanvasUsageCollector(
   }
 
   const canvasCollector = usageCollection.makeUsageCollector({
-    type: CANVAS_USAGE_TYPE,
+    type: 'canvas',
     isReady: () => true,
     fetch: async (callCluster: CallCluster) => {
       const collectorResults = await Promise.all(
         collectors.map((collector) => collector(kibanaIndex, callCluster))
       );
 
-      return collectorResults.reduce(
-        (reduction, usage) => {
-          return { ...reduction, ...usage };
-        },
-
-        {}
-      );
+      return collectorResults.reduce((reduction, usage) => {
+        return { ...reduction, ...usage };
+      }, {});
     },
   });
 
diff --git a/x-pack/plugins/cloud/common/constants.ts b/x-pack/plugins/cloud/common/constants.ts
index 4fafafb9e42136..b72f68247d02b2 100644
--- a/x-pack/plugins/cloud/common/constants.ts
+++ b/x-pack/plugins/cloud/common/constants.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const KIBANA_CLOUD_STATS_TYPE = 'cloud';
 export const ELASTIC_SUPPORT_LINK = 'https://support.elastic.co/';
diff --git a/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts b/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts
index f3eb92eeddfbe7..b0495f06e7ad4b 100644
--- a/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts
+++ b/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts
@@ -5,17 +5,23 @@
  */
 
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { KIBANA_CLOUD_STATS_TYPE } from '../../common/constants';
 
 interface Config {
   isCloudEnabled: boolean;
 }
 
+interface CloudUsage {
+  isCloudEnabled: boolean;
+}
+
 export function createCloudUsageCollector(usageCollection: UsageCollectionSetup, config: Config) {
   const { isCloudEnabled } = config;
-  return usageCollection.makeUsageCollector({
-    type: KIBANA_CLOUD_STATS_TYPE,
+  return usageCollection.makeUsageCollector<CloudUsage>({
+    type: 'cloud',
     isReady: () => true,
+    schema: {
+      isCloudEnabled: { type: 'boolean' },
+    },
     fetch: () => {
       return {
         isCloudEnabled,
diff --git a/x-pack/plugins/cross_cluster_replication/server/plugin.ts b/x-pack/plugins/cross_cluster_replication/server/plugin.ts
index d9fe296553f38c..e39b4dfd471a82 100644
--- a/x-pack/plugins/cross_cluster_replication/server/plugin.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/plugin.ts
@@ -15,12 +15,12 @@ import { first } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
 import {
   CoreSetup,
-  ICustomClusterClient,
+  ILegacyCustomClusterClient,
   Plugin,
   Logger,
   PluginInitializerContext,
-  APICaller,
-  IScopedClusterClient,
+  LegacyAPICaller,
+  ILegacyScopedClusterClient,
 } from 'src/core/server';
 
 import { Index } from '../../index_management/server';
@@ -34,7 +34,7 @@ import { isEsError } from './shared_imports';
 import { formatEsError } from './lib/format_es_error';
 
 interface CrossClusterReplicationContext {
-  client: IScopedClusterClient;
+  client: ILegacyScopedClusterClient;
 }
 
 async function getCustomEsClient(getStartServices: CoreSetup['getStartServices']) {
@@ -44,7 +44,7 @@ async function getCustomEsClient(getStartServices: CoreSetup['getStartServices']
   return core.elasticsearch.legacy.createClient('crossClusterReplication', esClientConfig);
 }
 
-const ccrDataEnricher = async (indicesList: Index[], callWithRequest: APICaller) => {
+const ccrDataEnricher = async (indicesList: Index[], callWithRequest: LegacyAPICaller) => {
   if (!indicesList?.length) {
     return indicesList;
   }
@@ -77,7 +77,7 @@ export class CrossClusterReplicationServerPlugin implements Plugin<void, void, a
   private readonly config$: Observable<CrossClusterReplicationConfig>;
   private readonly license: License;
   private readonly logger: Logger;
-  private ccrEsClient?: ICustomClusterClient;
+  private ccrEsClient?: ILegacyCustomClusterClient;
 
   constructor(initializerContext: PluginInitializerContext) {
     this.logger = initializerContext.logger.get();
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_permissions_route.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_permissions_route.ts
index b8eb5ae14750e3..008828d264a2b7 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_permissions_route.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_permissions_route.ts
@@ -43,13 +43,13 @@ export const registerPermissionsRoute = ({
         });
 
         const missingClusterPrivileges = Object.keys(cluster).reduce(
-          (permissions: any, permissionName: any) => {
+          (permissions: string[], permissionName: string) => {
             if (!cluster[permissionName]) {
               permissions.push(permissionName);
-              return permissions;
             }
+            return permissions;
           },
-          [] as any[]
+          []
         );
 
         return response.ok({
diff --git a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
index 9083ab24a4521a..aa8b0bfc66639d 100644
--- a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
+++ b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
@@ -8,7 +8,7 @@ import { first } from 'rxjs/operators';
 import { mapKeys, snakeCase } from 'lodash';
 import { SearchResponse } from 'elasticsearch';
 import { Observable } from 'rxjs';
-import { APICaller, SharedGlobalConfig } from '../../../../../src/core/server';
+import { LegacyAPICaller, SharedGlobalConfig } from '../../../../../src/core/server';
 import { ES_SEARCH_STRATEGY } from '../../../../../src/plugins/data/common';
 import {
   ISearch,
@@ -59,7 +59,7 @@ export const enhancedEsSearchStrategyProvider = (
 };
 
 async function asyncSearch(
-  caller: APICaller,
+  caller: LegacyAPICaller,
   request: IEnhancedEsSearchRequest,
   options?: ISearchOptions
 ) {
@@ -93,7 +93,7 @@ async function asyncSearch(
 }
 
 async function rollupSearch(
-  caller: APICaller,
+  caller: LegacyAPICaller,
   request: IEnhancedEsSearchRequest,
   options?: ISearchOptions
 ) {
diff --git a/x-pack/plugins/discover_enhanced/kibana.json b/x-pack/plugins/discover_enhanced/kibana.json
index 25b2a83baf98f8..704096ce7fcade 100644
--- a/x-pack/plugins/discover_enhanced/kibana.json
+++ b/x-pack/plugins/discover_enhanced/kibana.json
@@ -2,8 +2,9 @@
   "id": "discoverEnhanced",
   "version": "8.0.0",
   "kibanaVersion": "kibana",
-  "server": false,
+  "server": true,
   "ui": true,
   "requiredPlugins": ["uiActions", "embeddable", "discover"],
-  "optionalPlugins": ["share"]
+  "optionalPlugins": ["share"],
+  "configPath": ["xpack", "discoverEnhanced"]
 }
diff --git a/x-pack/plugins/discover_enhanced/public/plugin.ts b/x-pack/plugins/discover_enhanced/public/plugin.ts
index ea3c1222eb369d..9613a9a8e3c8cc 100644
--- a/x-pack/plugins/discover_enhanced/public/plugin.ts
+++ b/x-pack/plugins/discover_enhanced/public/plugin.ts
@@ -53,7 +53,11 @@ export interface DiscoverEnhancedStartDependencies {
 export class DiscoverEnhancedPlugin
   implements
     Plugin<void, void, DiscoverEnhancedSetupDependencies, DiscoverEnhancedStartDependencies> {
-  constructor(public readonly initializerContext: PluginInitializerContext) {}
+  public readonly config: { actions: { exploreDataInChart: { enabled: boolean } } };
+
+  constructor(protected readonly context: PluginInitializerContext) {
+    this.config = context.config.get();
+  }
 
   setup(
     core: CoreSetup<DiscoverEnhancedStartDependencies>,
@@ -68,9 +72,11 @@ export class DiscoverEnhancedPlugin
       const exploreDataAction = new ExploreDataContextMenuAction(params);
       uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, exploreDataAction);
 
-      const exploreDataChartAction = new ExploreDataChartAction(params);
-      uiActions.addTriggerAction(SELECT_RANGE_TRIGGER, exploreDataChartAction);
-      uiActions.addTriggerAction(VALUE_CLICK_TRIGGER, exploreDataChartAction);
+      if (this.config.actions.exploreDataInChart.enabled) {
+        const exploreDataChartAction = new ExploreDataChartAction(params);
+        uiActions.addTriggerAction(SELECT_RANGE_TRIGGER, exploreDataChartAction);
+        uiActions.addTriggerAction(VALUE_CLICK_TRIGGER, exploreDataChartAction);
+      }
     }
   }
 
diff --git a/x-pack/plugins/discover_enhanced/server/config.ts b/x-pack/plugins/discover_enhanced/server/config.ts
new file mode 100644
index 00000000000000..becbdee1bfe408
--- /dev/null
+++ b/x-pack/plugins/discover_enhanced/server/config.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+import { PluginConfigDescriptor } from '../../../../src/core/server';
+
+export const configSchema = schema.object({
+  actions: schema.object({
+    exploreDataInChart: schema.object({
+      enabled: schema.boolean({ defaultValue: true }),
+    }),
+  }),
+});
+
+export type ConfigSchema = TypeOf<typeof configSchema>;
+
+export const config: PluginConfigDescriptor<ConfigSchema> = {
+  schema: configSchema,
+  exposeToBrowser: {
+    actions: true,
+  },
+};
diff --git a/x-pack/plugins/discover_enhanced/server/index.ts b/x-pack/plugins/discover_enhanced/server/index.ts
new file mode 100644
index 00000000000000..e361b9fb075eda
--- /dev/null
+++ b/x-pack/plugins/discover_enhanced/server/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { config } from './config';
+
+export const plugin = () => ({
+  setup() {},
+  start() {},
+});
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
index 459a2cc65671e6..feec1ee9ba0088 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ClusterClient, Logger } from '../../../../../src/core/server';
+import { LegacyClusterClient, Logger } from '../../../../../src/core/server';
 import { elasticsearchServiceMock, loggingSystemMock } from '../../../../../src/core/server/mocks';
 import { ClusterClientAdapter, IClusterClientAdapter } from './cluster_client_adapter';
 import moment from 'moment';
 import { findOptionsSchema } from '../event_log_client';
 
-type EsClusterClient = Pick<jest.Mocked<ClusterClient>, 'callAsInternalUser' | 'asScoped'>;
+type EsClusterClient = Pick<jest.Mocked<LegacyClusterClient>, 'callAsInternalUser' | 'asScoped'>;
 
 let logger: Logger;
 let clusterClient: EsClusterClient;
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
index a036bfb74e4081..3478358f88a545 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
@@ -6,11 +6,11 @@
 
 import { reject, isUndefined } from 'lodash';
 import { SearchResponse, Client } from 'elasticsearch';
-import { Logger, ClusterClient } from '../../../../../src/core/server';
+import { Logger, LegacyClusterClient } from '../../../../../src/core/server';
 import { IEvent, SAVED_OBJECT_REL_PRIMARY } from '../types';
 import { FindOptionsType } from '../event_log_client';
 
-export type EsClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
+export type EsClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'asScoped'>;
 export type IClusterClientAdapter = PublicMethodsOf<ClusterClientAdapter>;
 
 export interface ConstructorOpts {
diff --git a/x-pack/plugins/event_log/server/es/context.test.ts b/x-pack/plugins/event_log/server/es/context.test.ts
index 6f9ee5875ddb73..3fd7e12ed8a0cd 100644
--- a/x-pack/plugins/event_log/server/es/context.test.ts
+++ b/x-pack/plugins/event_log/server/es/context.test.ts
@@ -5,12 +5,12 @@
  */
 
 import { createEsContext } from './context';
-import { ClusterClient, Logger } from '../../../../../src/core/server';
+import { LegacyClusterClient, Logger } from '../../../../../src/core/server';
 import { elasticsearchServiceMock, loggingSystemMock } from '../../../../../src/core/server/mocks';
 jest.mock('../lib/../../../../package.json', () => ({
   version: '1.2.3',
 }));
-type EsClusterClient = Pick<jest.Mocked<ClusterClient>, 'callAsInternalUser' | 'asScoped'>;
+type EsClusterClient = Pick<jest.Mocked<LegacyClusterClient>, 'callAsInternalUser' | 'asScoped'>;
 
 let logger: Logger;
 let clusterClient: EsClusterClient;
diff --git a/x-pack/plugins/event_log/server/es/context.ts b/x-pack/plugins/event_log/server/es/context.ts
index 0b3f22c6eecc06..16a460be1793b2 100644
--- a/x-pack/plugins/event_log/server/es/context.ts
+++ b/x-pack/plugins/event_log/server/es/context.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Logger, ClusterClient } from 'src/core/server';
+import { Logger, LegacyClusterClient } from 'src/core/server';
 
 import { EsNames, getEsNames } from './names';
 import { initializeEs } from './init';
 import { ClusterClientAdapter, IClusterClientAdapter } from './cluster_client_adapter';
 import { createReadySignal, ReadySignal } from '../lib/ready_signal';
 
-export type EsClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
+export type EsClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'asScoped'>;
 
 export interface EsContext {
   logger: Logger;
diff --git a/x-pack/plugins/event_log/server/event_log_client.ts b/x-pack/plugins/event_log/server/event_log_client.ts
index 8ef245e60aadc4..e7ba598de2ac68 100644
--- a/x-pack/plugins/event_log/server/event_log_client.ts
+++ b/x-pack/plugins/event_log/server/event_log_client.ts
@@ -5,13 +5,13 @@
  */
 
 import { Observable } from 'rxjs';
-import { ClusterClient, SavedObjectsClientContract } from 'src/core/server';
+import { LegacyClusterClient, SavedObjectsClientContract } from 'src/core/server';
 
 import { schema, TypeOf } from '@kbn/config-schema';
 import { EsContext } from './es';
 import { IEventLogClient } from './types';
 import { QueryEventsBySavedObjectResult } from './es/cluster_client_adapter';
-export type PluginClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
+export type PluginClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'asScoped'>;
 export type AdminClusterClient$ = Observable<PluginClusterClient>;
 
 interface EventLogServiceCtorParams {
diff --git a/x-pack/plugins/event_log/server/event_log_service.ts b/x-pack/plugins/event_log/server/event_log_service.ts
index fc72de6e473568..6cfb16d1264272 100644
--- a/x-pack/plugins/event_log/server/event_log_service.ts
+++ b/x-pack/plugins/event_log/server/event_log_service.ts
@@ -6,13 +6,13 @@
 
 import _ from 'lodash';
 import { Observable } from 'rxjs';
-import { ClusterClient } from 'src/core/server';
+import { LegacyClusterClient } from 'src/core/server';
 
 import { Plugin } from './plugin';
 import { EsContext } from './es';
 import { IEvent, IEventLogger, IEventLogService, IEventLogConfig } from './types';
 import { EventLogger } from './event_logger';
-export type PluginClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
+export type PluginClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'asScoped'>;
 export type AdminClusterClient$ = Observable<PluginClusterClient>;
 
 type SystemLogger = Plugin['systemLogger'];
diff --git a/x-pack/plugins/event_log/server/event_log_start_service.ts b/x-pack/plugins/event_log/server/event_log_start_service.ts
index 5938f7a2e614ec..36a6bc0a926afb 100644
--- a/x-pack/plugins/event_log/server/event_log_start_service.ts
+++ b/x-pack/plugins/event_log/server/event_log_start_service.ts
@@ -7,7 +7,7 @@
 import _ from 'lodash';
 import { Observable } from 'rxjs';
 import {
-  ClusterClient,
+  LegacyClusterClient,
   KibanaRequest,
   SavedObjectsServiceStart,
   SavedObjectsClientContract,
@@ -16,7 +16,7 @@ import {
 import { EsContext } from './es';
 import { IEventLogClientService } from './types';
 import { EventLogClient } from './event_log_client';
-export type PluginClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
+export type PluginClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'asScoped'>;
 export type AdminClusterClient$ = Observable<PluginClusterClient>;
 
 interface EventLogServiceCtorParams {
diff --git a/x-pack/plugins/event_log/server/plugin.ts b/x-pack/plugins/event_log/server/plugin.ts
index dd83b2cfb03b8e..ed530607aabbaa 100644
--- a/x-pack/plugins/event_log/server/plugin.ts
+++ b/x-pack/plugins/event_log/server/plugin.ts
@@ -12,7 +12,7 @@ import {
   Logger,
   Plugin as CorePlugin,
   PluginInitializerContext,
-  ClusterClient,
+  LegacyClusterClient,
   SharedGlobalConfig,
   IContextProvider,
   RequestHandler,
@@ -30,7 +30,7 @@ import { EventLogService } from './event_log_service';
 import { createEsContext, EsContext } from './es';
 import { EventLogClientService } from './event_log_start_service';
 
-export type PluginClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
+export type PluginClusterClient = Pick<LegacyClusterClient, 'callAsInternalUser' | 'asScoped'>;
 
 const PROVIDER = 'eventLog';
 
diff --git a/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap b/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap
index 0999063945cb59..fe0a13fe702e55 100644
--- a/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap
+++ b/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap
@@ -240,11 +240,11 @@ Array [
         "kibana",
       ],
       "catalogue": Array [
-        "index_patterns",
+        "indexPatterns",
       ],
       "management": Object {
         "kibana": Array [
-          "index_patterns",
+          "indexPatterns",
         ],
       },
       "savedObject": Object {
@@ -265,11 +265,11 @@ Array [
         "kibana",
       ],
       "catalogue": Array [
-        "index_patterns",
+        "indexPatterns",
       ],
       "management": Object {
         "kibana": Array [
-          "index_patterns",
+          "indexPatterns",
         ],
       },
       "savedObject": Object {
diff --git a/x-pack/plugins/features/server/oss_features.ts b/x-pack/plugins/features/server/oss_features.ts
index 1431ca30bc366c..8d40f51df5760f 100644
--- a/x-pack/plugins/features/server/oss_features.ts
+++ b/x-pack/plugins/features/server/oss_features.ts
@@ -294,16 +294,16 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
       order: 1600,
       icon: 'indexPatternApp',
       app: ['kibana'],
-      catalogue: ['index_patterns'],
+      catalogue: ['indexPatterns'],
       management: {
-        kibana: ['index_patterns'],
+        kibana: ['indexPatterns'],
       },
       privileges: {
         all: {
           app: ['kibana'],
-          catalogue: ['index_patterns'],
+          catalogue: ['indexPatterns'],
           management: {
-            kibana: ['index_patterns'],
+            kibana: ['indexPatterns'],
           },
           savedObject: {
             all: ['index-pattern'],
@@ -313,9 +313,9 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
         },
         read: {
           app: ['kibana'],
-          catalogue: ['index_patterns'],
+          catalogue: ['indexPatterns'],
           management: {
-            kibana: ['index_patterns'],
+            kibana: ['indexPatterns'],
           },
           savedObject: {
             all: [],
diff --git a/x-pack/plugins/file_upload/server/telemetry/file_upload_usage_collector.ts b/x-pack/plugins/file_upload/server/telemetry/file_upload_usage_collector.ts
index 2c2b1183fd5bf3..81b82c141e46fd 100644
--- a/x-pack/plugins/file_upload/server/telemetry/file_upload_usage_collector.ts
+++ b/x-pack/plugins/file_upload/server/telemetry/file_upload_usage_collector.ts
@@ -5,15 +5,23 @@
  */
 
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { getTelemetry, initTelemetry } from './telemetry';
-
-const TELEMETRY_TYPE = 'fileUploadTelemetry';
+import { getTelemetry, initTelemetry, Telemetry } from './telemetry';
 
 export function registerFileUploadUsageCollector(usageCollection: UsageCollectionSetup): void {
-  const fileUploadUsageCollector = usageCollection.makeUsageCollector({
-    type: TELEMETRY_TYPE,
+  const fileUploadUsageCollector = usageCollection.makeUsageCollector<Telemetry>({
+    type: 'fileUploadTelemetry',
     isReady: () => true,
-    fetch: async () => (await getTelemetry()) || initTelemetry(),
+    fetch: async () => {
+      const fileUploadUsage = await getTelemetry();
+      if (!fileUploadUsage) {
+        return initTelemetry();
+      }
+
+      return fileUploadUsage;
+    },
+    schema: {
+      filesUploadedTotalCount: { type: 'long' },
+    },
   });
 
   usageCollection.registerCollector(fileUploadUsageCollector);
diff --git a/x-pack/plugins/global_search/server/types.ts b/x-pack/plugins/global_search/server/types.ts
index eca4aff366883d..7d3f5ebc5d0792 100644
--- a/x-pack/plugins/global_search/server/types.ts
+++ b/x-pack/plugins/global_search/server/types.ts
@@ -7,7 +7,7 @@
 import { Observable } from 'rxjs';
 import {
   ISavedObjectTypeRegistry,
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
   IUiSettingsClient,
   SavedObjectsClientContract,
 } from 'src/core/server';
@@ -46,7 +46,7 @@ export interface GlobalSearchProviderContext {
     };
     elasticsearch: {
       legacy: {
-        client: IScopedClusterClient;
+        client: ILegacyScopedClusterClient;
       };
     };
     uiSettings: {
diff --git a/x-pack/plugins/global_search_providers/kibana.json b/x-pack/plugins/global_search_providers/kibana.json
new file mode 100644
index 00000000000000..025ea2bceed2ca
--- /dev/null
+++ b/x-pack/plugins/global_search_providers/kibana.json
@@ -0,0 +1,10 @@
+{
+  "id": "globalSearchProviders",
+  "version": "8.0.0",
+  "kibanaVersion": "kibana",
+  "server": false,
+  "ui": true,
+  "requiredPlugins": ["globalSearch"],
+  "optionalPlugins": [],
+  "configPath": ["xpack", "global_search_providers"]
+}
diff --git a/x-pack/plugins/global_search_providers/public/index.ts b/x-pack/plugins/global_search_providers/public/index.ts
new file mode 100644
index 00000000000000..bc66994aa393a2
--- /dev/null
+++ b/x-pack/plugins/global_search_providers/public/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PluginInitializer } from 'src/core/public';
+import { GlobalSearchProvidersPlugin, GlobalSearchProvidersPluginSetupDeps } from './plugin';
+
+export const plugin: PluginInitializer<{}, {}, GlobalSearchProvidersPluginSetupDeps, {}> = () =>
+  new GlobalSearchProvidersPlugin();
diff --git a/x-pack/plugins/global_search_providers/public/plugin.test.ts b/x-pack/plugins/global_search_providers/public/plugin.test.ts
new file mode 100644
index 00000000000000..a2880acae440b6
--- /dev/null
+++ b/x-pack/plugins/global_search_providers/public/plugin.test.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { coreMock } from '../../../../src/core/public/mocks';
+import { globalSearchPluginMock } from '../../global_search/public/mocks';
+import { GlobalSearchProvidersPlugin } from './plugin';
+
+describe('GlobalSearchProvidersPlugin', () => {
+  let plugin: GlobalSearchProvidersPlugin;
+  let globalSearchSetup: ReturnType<typeof globalSearchPluginMock.createSetupContract>;
+
+  beforeEach(() => {
+    globalSearchSetup = globalSearchPluginMock.createSetupContract();
+    plugin = new GlobalSearchProvidersPlugin();
+  });
+
+  describe('#setup', () => {
+    it('registers the `application` result provider', () => {
+      const coreSetup = coreMock.createSetup();
+      plugin.setup(coreSetup, { globalSearch: globalSearchSetup });
+
+      expect(globalSearchSetup.registerResultProvider).toHaveBeenCalledTimes(1);
+      expect(globalSearchSetup.registerResultProvider).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: 'application',
+        })
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/global_search_providers/public/plugin.ts b/x-pack/plugins/global_search_providers/public/plugin.ts
new file mode 100644
index 00000000000000..9f18c06608b01e
--- /dev/null
+++ b/x-pack/plugins/global_search_providers/public/plugin.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CoreSetup, Plugin } from 'src/core/public';
+import { GlobalSearchPluginSetup } from '../../global_search/public';
+import { createApplicationResultProvider } from './providers';
+
+export interface GlobalSearchProvidersPluginSetupDeps {
+  globalSearch: GlobalSearchPluginSetup;
+}
+
+export class GlobalSearchProvidersPlugin
+  implements Plugin<{}, {}, GlobalSearchProvidersPluginSetupDeps, {}> {
+  setup(
+    { getStartServices }: CoreSetup<{}, {}>,
+    { globalSearch }: GlobalSearchProvidersPluginSetupDeps
+  ) {
+    const applicationPromise = getStartServices().then(([core]) => core.application);
+    globalSearch.registerResultProvider(createApplicationResultProvider(applicationPromise));
+    return {};
+  }
+
+  start() {
+    return {};
+  }
+}
diff --git a/x-pack/plugins/global_search_providers/public/providers/application.test.mocks.ts b/x-pack/plugins/global_search_providers/public/providers/application.test.mocks.ts
new file mode 100644
index 00000000000000..4fdf8a75a4bc23
--- /dev/null
+++ b/x-pack/plugins/global_search_providers/public/providers/application.test.mocks.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const getAppResultsMock = jest.fn();
+jest.doMock('./get_app_results', () => ({
+  getAppResults: getAppResultsMock,
+}));
diff --git a/x-pack/plugins/global_search_providers/public/providers/application.test.ts b/x-pack/plugins/global_search_providers/public/providers/application.test.ts
new file mode 100644
index 00000000000000..ca19bddb602971
--- /dev/null
+++ b/x-pack/plugins/global_search_providers/public/providers/application.test.ts
@@ -0,0 +1,204 @@
+/*
+ * 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 { getAppResultsMock } from './application.test.mocks';
+
+import { of, EMPTY } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+import { ApplicationStart, AppNavLinkStatus, AppStatus, PublicAppInfo } from 'src/core/public';
+import {
+  GlobalSearchProviderFindOptions,
+  GlobalSearchProviderResult,
+} from '../../../global_search/public';
+import { applicationServiceMock } from 'src/core/public/mocks';
+import { createApplicationResultProvider } from './application';
+
+const getTestScheduler = () =>
+  new TestScheduler((actual, expected) => {
+    expect(actual).toEqual(expected);
+  });
+
+const createApp = (props: Partial<PublicAppInfo> = {}): PublicAppInfo => ({
+  id: 'app1',
+  title: 'App 1',
+  appRoute: '/app/app1',
+  legacy: false,
+  status: AppStatus.accessible,
+  navLinkStatus: AppNavLinkStatus.visible,
+  chromeless: false,
+  ...props,
+});
+
+const createResult = (props: Partial<GlobalSearchProviderResult>): GlobalSearchProviderResult => ({
+  id: 'id',
+  title: 'title',
+  type: 'application',
+  url: '/app/id',
+  score: 100,
+  ...props,
+});
+
+const createAppMap = (apps: PublicAppInfo[]): Map<string, PublicAppInfo> => {
+  return new Map(apps.map((app) => [app.id, app]));
+};
+
+const expectApp = (id: string) => expect.objectContaining({ id });
+const expectResult = expectApp;
+
+describe('applicationResultProvider', () => {
+  let application: ReturnType<typeof applicationServiceMock.createStartContract>;
+
+  const defaultOption: GlobalSearchProviderFindOptions = {
+    preference: 'pref',
+    maxResults: 20,
+    aborted$: EMPTY,
+  };
+
+  beforeEach(() => {
+    application = applicationServiceMock.createStartContract();
+    getAppResultsMock.mockReturnValue([]);
+  });
+
+  it('has the correct id', () => {
+    const provider = createApplicationResultProvider(Promise.resolve(application));
+    expect(provider.id).toBe('application');
+  });
+
+  it('calls `getAppResults` with the term and the list of apps', async () => {
+    application.applications$ = of(
+      createAppMap([
+        createApp({ id: 'app1', title: 'App 1' }),
+        createApp({ id: 'app2', title: 'App 2' }),
+        createApp({ id: 'app3', title: 'App 3' }),
+      ])
+    );
+    const provider = createApplicationResultProvider(Promise.resolve(application));
+
+    await provider.find('term', defaultOption).toPromise();
+
+    expect(getAppResultsMock).toHaveBeenCalledTimes(1);
+    expect(getAppResultsMock).toHaveBeenCalledWith('term', [
+      expectApp('app1'),
+      expectApp('app2'),
+      expectApp('app3'),
+    ]);
+  });
+
+  it('ignores inaccessible apps', async () => {
+    application.applications$ = of(
+      createAppMap([
+        createApp({ id: 'app1', title: 'App 1' }),
+        createApp({ id: 'disabled', title: 'disabled', status: AppStatus.inaccessible }),
+      ])
+    );
+    const provider = createApplicationResultProvider(Promise.resolve(application));
+    await provider.find('term', defaultOption).toPromise();
+
+    expect(getAppResultsMock).toHaveBeenCalledWith('term', [expectApp('app1')]);
+  });
+
+  it('ignores chromeless apps', async () => {
+    application.applications$ = of(
+      createAppMap([
+        createApp({ id: 'app1', title: 'App 1' }),
+        createApp({ id: 'chromeless', title: 'chromeless', chromeless: true }),
+      ])
+    );
+
+    const provider = createApplicationResultProvider(Promise.resolve(application));
+    await provider.find('term', defaultOption).toPromise();
+
+    expect(getAppResultsMock).toHaveBeenCalledWith('term', [expectApp('app1')]);
+  });
+
+  it('sorts the results returned by `getAppResults`', async () => {
+    getAppResultsMock.mockReturnValue([
+      createResult({ id: 'r60', score: 60 }),
+      createResult({ id: 'r100', score: 100 }),
+      createResult({ id: 'r50', score: 50 }),
+      createResult({ id: 'r75', score: 75 }),
+    ]);
+
+    const provider = createApplicationResultProvider(Promise.resolve(application));
+    const results = await provider.find('term', defaultOption).toPromise();
+
+    expect(results).toEqual([
+      expectResult('r100'),
+      expectResult('r75'),
+      expectResult('r60'),
+      expectResult('r50'),
+    ]);
+  });
+
+  it('only returns the highest `maxResults` results', async () => {
+    getAppResultsMock.mockReturnValue([
+      createResult({ id: 'r60', score: 60 }),
+      createResult({ id: 'r100', score: 100 }),
+      createResult({ id: 'r50', score: 50 }),
+      createResult({ id: 'r75', score: 75 }),
+    ]);
+
+    const provider = createApplicationResultProvider(Promise.resolve(application));
+
+    const options = {
+      ...defaultOption,
+      maxResults: 2,
+    };
+    const results = await provider.find('term', options).toPromise();
+
+    expect(results).toEqual([expectResult('r100'), expectResult('r75')]);
+  });
+
+  it('only emits once, even if `application$` emits multiple times', () => {
+    getTestScheduler().run(({ hot, expectObservable }) => {
+      const appMap = createAppMap([createApp({ id: 'app1', title: 'App 1' })]);
+
+      application.applications$ = hot('--a---b', { a: appMap, b: appMap });
+
+      // test scheduler doesnt play well with promises. need to workaround by passing
+      // an observable instead. Behavior with promise is asserted in previous tests of the suite
+      const applicationPromise = (hot('a', { a: application }) as unknown) as Promise<
+        ApplicationStart
+      >;
+
+      const provider = createApplicationResultProvider(applicationPromise);
+
+      const options = {
+        ...defaultOption,
+        aborted$: hot<undefined>('|'),
+      };
+
+      const resultObs = provider.find('term', options);
+
+      expectObservable(resultObs).toBe('--(a|)', { a: [] });
+    });
+  });
+
+  it('only emits results until `aborted$` emits', () => {
+    getTestScheduler().run(({ hot, expectObservable }) => {
+      const appMap = createAppMap([createApp({ id: 'app1', title: 'App 1' })]);
+
+      application.applications$ = hot('---a', { a: appMap, b: appMap });
+
+      // test scheduler doesnt play well with promises. need to workaround by passing
+      // an observable instead. Behavior with promise is asserted in previous tests of the suite
+      const applicationPromise = (hot('a', { a: application }) as unknown) as Promise<
+        ApplicationStart
+      >;
+
+      const provider = createApplicationResultProvider(applicationPromise);
+
+      const options = {
+        ...defaultOption,
+        aborted$: hot<undefined>('-(a|)', { a: undefined }),
+      };
+
+      const resultObs = provider.find('term', options);
+
+      expectObservable(resultObs).toBe('-|');
+    });
+  });
+});
diff --git a/x-pack/plugins/global_search_providers/public/providers/application.ts b/x-pack/plugins/global_search_providers/public/providers/application.ts
new file mode 100644
index 00000000000000..e40fcef17f73c8
--- /dev/null
+++ b/x-pack/plugins/global_search_providers/public/providers/application.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { from } from 'rxjs';
+import { take, map, takeUntil, mergeMap, shareReplay } from 'rxjs/operators';
+import { ApplicationStart } from 'src/core/public';
+import { GlobalSearchResultProvider } from '../../../global_search/public';
+import { getAppResults } from './get_app_results';
+
+export const createApplicationResultProvider = (
+  applicationPromise: Promise<ApplicationStart>
+): GlobalSearchResultProvider => {
+  const searchableApps$ = from(applicationPromise).pipe(
+    mergeMap((application) => application.applications$),
+    map((apps) =>
+      [...apps.values()].filter(
+        (app) => app.status === 0 && (app.legacy === true || app.chromeless !== true)
+      )
+    ),
+    shareReplay(1)
+  );
+
+  return {
+    id: 'application',
+    find: (term, { aborted$, maxResults }) => {
+      return searchableApps$.pipe(
+        takeUntil(aborted$),
+        take(1),
+        map((apps) => {
+          const results = getAppResults(term, [...apps.values()]);
+          return results.sort((a, b) => b.score - a.score).slice(0, maxResults);
+        })
+      );
+    },
+  };
+};
diff --git a/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts b/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts
new file mode 100644
index 00000000000000..1c5a446b8e5645
--- /dev/null
+++ b/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts
@@ -0,0 +1,119 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { AppNavLinkStatus, AppStatus, PublicAppInfo, PublicLegacyAppInfo } from 'src/core/public';
+import { appToResult, getAppResults, scoreApp } from './get_app_results';
+
+const createApp = (props: Partial<PublicAppInfo> = {}): PublicAppInfo => ({
+  id: 'app1',
+  title: 'App 1',
+  appRoute: '/app/app1',
+  legacy: false,
+  status: AppStatus.accessible,
+  navLinkStatus: AppNavLinkStatus.visible,
+  chromeless: false,
+  ...props,
+});
+
+const createLegacyApp = (props: Partial<PublicLegacyAppInfo> = {}): PublicLegacyAppInfo => ({
+  id: 'app1',
+  title: 'App 1',
+  appUrl: '/app/app1',
+  legacy: true,
+  status: AppStatus.accessible,
+  navLinkStatus: AppNavLinkStatus.visible,
+  ...props,
+});
+
+describe('getAppResults', () => {
+  it('retrieves the matching results', () => {
+    const apps = [
+      createApp({ id: 'dashboard', title: 'dashboard' }),
+      createApp({ id: 'visualize', title: 'visualize' }),
+    ];
+
+    const results = getAppResults('dashboard', apps);
+
+    expect(results.length).toBe(1);
+    expect(results[0]).toEqual(expect.objectContaining({ id: 'dashboard', score: 100 }));
+  });
+});
+
+describe('scoreApp', () => {
+  describe('when the term is included in the title', () => {
+    it('returns 100 if the app title is an exact match', () => {
+      expect(scoreApp('dashboard', createApp({ title: 'dashboard' }))).toBe(100);
+      expect(scoreApp('dashboard', createApp({ title: 'DASHBOARD' }))).toBe(100);
+      expect(scoreApp('DASHBOARD', createApp({ title: 'DASHBOARD' }))).toBe(100);
+      expect(scoreApp('dashBOARD', createApp({ title: 'DASHboard' }))).toBe(100);
+    });
+
+    it('returns 90 if the app title starts with the term', () => {
+      expect(scoreApp('dash', createApp({ title: 'dashboard' }))).toBe(90);
+      expect(scoreApp('DASH', createApp({ title: 'dashboard' }))).toBe(90);
+    });
+
+    it('returns 75 if the term in included in the app title', () => {
+      expect(scoreApp('board', createApp({ title: 'dashboard' }))).toBe(75);
+      expect(scoreApp('shboa', createApp({ title: 'dashboard' }))).toBe(75);
+    });
+  });
+
+  describe('when the term is not included in the title', () => {
+    it('returns the levenshtein ratio if superior or equal to 60', () => {
+      expect(scoreApp('0123456789', createApp({ title: '012345' }))).toBe(60);
+      expect(scoreApp('--1234567-', createApp({ title: '123456789' }))).toBe(60);
+    });
+    it('returns 0 if the levenshtein ratio is inferior to 60', () => {
+      expect(scoreApp('0123456789', createApp({ title: '12345' }))).toBe(0);
+      expect(scoreApp('1-2-3-4-5', createApp({ title: '123456789' }))).toBe(0);
+    });
+  });
+
+  it('works with legacy apps', () => {
+    expect(scoreApp('dashboard', createLegacyApp({ title: 'dashboard' }))).toBe(100);
+    expect(scoreApp('dash', createLegacyApp({ title: 'dashboard' }))).toBe(90);
+    expect(scoreApp('board', createLegacyApp({ title: 'dashboard' }))).toBe(75);
+    expect(scoreApp('0123456789', createLegacyApp({ title: '012345' }))).toBe(60);
+    expect(scoreApp('0123456789', createLegacyApp({ title: '12345' }))).toBe(0);
+  });
+});
+
+describe('appToResult', () => {
+  it('converts an app to a result', () => {
+    const app = createApp({
+      id: 'foo',
+      title: 'Foo',
+      euiIconType: 'fooIcon',
+      appRoute: '/app/foo',
+    });
+    expect(appToResult(app, 42)).toEqual({
+      id: 'foo',
+      title: 'Foo',
+      type: 'application',
+      icon: 'fooIcon',
+      url: '/app/foo',
+      score: 42,
+    });
+  });
+
+  it('converts a legacy app to a result', () => {
+    const app = createLegacyApp({
+      id: 'legacy',
+      title: 'Legacy',
+      euiIconType: 'legacyIcon',
+      appUrl: '/app/legacy',
+    });
+    expect(appToResult(app, 69)).toEqual({
+      id: 'legacy',
+      title: 'Legacy',
+      type: 'application',
+      icon: 'legacyIcon',
+      url: '/app/legacy',
+      score: 69,
+    });
+  });
+});
diff --git a/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts b/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
new file mode 100644
index 00000000000000..1a1939230105b2
--- /dev/null
+++ b/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import levenshtein from 'js-levenshtein';
+import { PublicAppInfo, PublicLegacyAppInfo } from 'src/core/public';
+import { GlobalSearchProviderResult } from '../../../global_search/public';
+
+export const getAppResults = (
+  term: string,
+  apps: Array<PublicAppInfo | PublicLegacyAppInfo>
+): GlobalSearchProviderResult[] => {
+  return apps
+    .map((app) => ({ app, score: scoreApp(term, app) }))
+    .filter(({ score }) => score > 0)
+    .map(({ app, score }) => appToResult(app, score));
+};
+
+export const scoreApp = (term: string, { title }: PublicAppInfo | PublicLegacyAppInfo): number => {
+  term = term.toLowerCase();
+  title = title.toLowerCase();
+
+  // shortcuts to avoid calculating the distance when there is an exact match somewhere.
+  if (title === term) {
+    return 100;
+  }
+  if (title.startsWith(term)) {
+    return 90;
+  }
+  if (title.includes(term)) {
+    return 75;
+  }
+  const length = Math.max(term.length, title.length);
+  const distance = levenshtein(term, title);
+
+  // maximum lev distance is length, we compute the match ratio (lower distance is better)
+  const ratio = Math.floor((1 - distance / length) * 100);
+  if (ratio >= 60) {
+    return ratio;
+  }
+  return 0;
+};
+
+export const appToResult = (
+  app: PublicAppInfo | PublicLegacyAppInfo,
+  score: number
+): GlobalSearchProviderResult => {
+  return {
+    id: app.id,
+    title: app.title,
+    type: 'application',
+    icon: app.euiIconType,
+    url: app.legacy ? app.appUrl : app.appRoute,
+    score,
+  };
+};
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/index.ts b/x-pack/plugins/global_search_providers/public/providers/index.ts
similarity index 75%
rename from x-pack/plugins/security_solution/public/resolver/store/data/index.ts
rename to x-pack/plugins/global_search_providers/public/providers/index.ts
index 8db57c5d9681f4..d71c30d41d46a3 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/index.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/index.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { dataReducer } from './reducer';
-export { DataAction } from './action';
+export { createApplicationResultProvider } from './application';
diff --git a/x-pack/plugins/index_lifecycle_management/server/plugin.ts b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
index 79a9849e634b5f..ed179255226100 100644
--- a/x-pack/plugins/index_lifecycle_management/server/plugin.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
@@ -7,7 +7,13 @@
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin, Logger, PluginInitializerContext, APICaller } from 'src/core/server';
+import {
+  CoreSetup,
+  Plugin,
+  Logger,
+  PluginInitializerContext,
+  LegacyAPICaller,
+} from 'src/core/server';
 
 import { PLUGIN } from '../common/constants';
 import { Dependencies } from './types';
@@ -16,7 +22,7 @@ import { License } from './services';
 import { IndexLifecycleManagementConfig } from './config';
 import { isEsError } from './shared_imports';
 
-const indexLifecycleDataEnricher = async (indicesList: any, callAsCurrentUser: APICaller) => {
+const indexLifecycleDataEnricher = async (indicesList: any, callAsCurrentUser: LegacyAPICaller) => {
   if (!indicesList || !indicesList.length) {
     return;
   }
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
index b8870a83ac5ac8..853e3e7662d09b 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
@@ -5,13 +5,13 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { APICaller } from 'src/core/server';
+import { LegacyAPICaller } from 'src/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
 
 async function addLifecyclePolicy(
-  callAsCurrentUser: APICaller,
+  callAsCurrentUser: LegacyAPICaller,
   indexName: string,
   policyName: string,
   alias: string
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
index b1bc2264fc5290..2601775f5d76e6 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
@@ -5,12 +5,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { APICaller } from 'src/core/server';
+import { LegacyAPICaller } from 'src/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
 
-async function removeLifecycle(callAsCurrentUser: APICaller, indexNames: string[]) {
+async function removeLifecycle(callAsCurrentUser: LegacyAPICaller, indexNames: string[]) {
   const responses = [];
   for (let i = 0; i < indexNames.length; i++) {
     const indexName = indexNames[i];
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
index 0a5ca1730d170e..09fd1d6068285f 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
@@ -5,12 +5,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { APICaller } from 'src/core/server';
+import { LegacyAPICaller } from 'src/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
 
-async function retryLifecycle(callAsCurrentUser: APICaller, indexNames: string[]) {
+async function retryLifecycle(callAsCurrentUser: LegacyAPICaller, indexNames: string[]) {
   const responses = [];
   for (let i = 0; i < indexNames.length; i++) {
     const indexName = indexNames[i];
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts
index db0352ec83ee0e..f8d4a9681b3d83 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_details_route.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { APICaller } from 'src/core/server';
+import { LegacyAPICaller } from 'src/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
@@ -26,7 +26,7 @@ function findMatchingNodes(stats: any, nodeAttrs: string): any {
   }, []);
 }
 
-async function fetchNodeStats(callAsCurrentUser: APICaller): Promise<any> {
+async function fetchNodeStats(callAsCurrentUser: LegacyAPICaller): Promise<any> {
   const params = {
     format: 'json',
   };
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
index 91b542284a0417..b30a59c997e874 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'src/core/server';
+import { LegacyAPICaller } from 'src/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
@@ -24,7 +24,7 @@ function convertStatsIntoList(stats: any, disallowedNodeAttributes: string[]): a
   }, {});
 }
 
-async function fetchNodeStats(callAsCurrentUser: APICaller): Promise<any> {
+async function fetchNodeStats(callAsCurrentUser: LegacyAPICaller): Promise<any> {
   const params = {
     format: 'json',
   };
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
index 7bf3f96e2b2ef0..c09e56d236f7f5 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
@@ -5,12 +5,16 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { APICaller } from 'src/core/server';
+import { LegacyAPICaller } from 'src/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
 
-async function createPolicy(callAsCurrentUser: APICaller, name: string, phases: any): Promise<any> {
+async function createPolicy(
+  callAsCurrentUser: LegacyAPICaller,
+  name: string,
+  phases: any
+): Promise<any> {
   const body = {
     policy: {
       phases,
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
index 241668780ea251..992a0fab452ec7 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
@@ -5,12 +5,15 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { APICaller } from 'src/core/server';
+import { LegacyAPICaller } from 'src/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
 
-async function deletePolicies(callAsCurrentUser: APICaller, policyNames: string): Promise<any> {
+async function deletePolicies(
+  callAsCurrentUser: LegacyAPICaller,
+  policyNames: string
+): Promise<any> {
   const params = {
     method: 'DELETE',
     path: `/_ilm/policy/${encodeURIComponent(policyNames)}`,
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
index d581cc15f3053f..2dc1ed1006adb8 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { APICaller } from 'src/core/server';
+import { LegacyAPICaller } from 'src/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
@@ -25,7 +25,7 @@ function formatPolicies(policiesMap: any): any {
   }, []);
 }
 
-async function fetchPolicies(callAsCurrentUser: APICaller): Promise<any> {
+async function fetchPolicies(callAsCurrentUser: LegacyAPICaller): Promise<any> {
   const params = {
     method: 'GET',
     path: '/_ilm/policy',
@@ -36,7 +36,7 @@ async function fetchPolicies(callAsCurrentUser: APICaller): Promise<any> {
   return await callAsCurrentUser('transport.request', params);
 }
 
-async function addLinkedIndices(callAsCurrentUser: APICaller, policiesMap: any) {
+async function addLinkedIndices(callAsCurrentUser: LegacyAPICaller, policiesMap: any) {
   if (policiesMap.status === 404) {
     return policiesMap;
   }
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
index ed05cc270e4c1e..21a389b9a0e358 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
@@ -6,18 +6,21 @@
 
 import { merge } from 'lodash';
 import { schema } from '@kbn/config-schema';
-import { APICaller } from 'src/core/server';
+import { LegacyAPICaller } from 'src/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
 
-async function getIndexTemplate(callAsCurrentUser: APICaller, templateName: string): Promise<any> {
+async function getIndexTemplate(
+  callAsCurrentUser: LegacyAPICaller,
+  templateName: string
+): Promise<any> {
   const response = await callAsCurrentUser('indices.getTemplate', { name: templateName });
   return response[templateName];
 }
 
 async function updateIndexTemplate(
-  callAsCurrentUser: APICaller,
+  callAsCurrentUser: LegacyAPICaller,
   templateName: string,
   policyName: string,
   aliasName?: string
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
index 546d9674b0956d..942eec347341f1 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'src/core/server';
+import { LegacyAPICaller } from 'src/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
@@ -49,7 +49,7 @@ function filterAndFormatTemplates(templates: any): any {
   return formattedTemplates;
 }
 
-async function fetchTemplates(callAsCurrentUser: APICaller): Promise<any> {
+async function fetchTemplates(callAsCurrentUser: LegacyAPICaller): Promise<any> {
   const params = {
     method: 'GET',
     path: '/_template',
diff --git a/x-pack/plugins/index_management/server/plugin.ts b/x-pack/plugins/index_management/server/plugin.ts
index 94af8415bfd559..0cd180a980a84c 100644
--- a/x-pack/plugins/index_management/server/plugin.ts
+++ b/x-pack/plugins/index_management/server/plugin.ts
@@ -16,8 +16,8 @@ import {
   Plugin,
   Logger,
   PluginInitializerContext,
-  IScopedClusterClient,
-  ICustomClusterClient,
+  ILegacyScopedClusterClient,
+  ILegacyCustomClusterClient,
 } from 'src/core/server';
 
 import { PLUGIN } from '../common';
@@ -28,7 +28,7 @@ import { isEsError } from './shared_imports';
 import { elasticsearchJsPlugin } from './client/elasticsearch';
 
 export interface DataManagementContext {
-  client: IScopedClusterClient;
+  client: ILegacyScopedClusterClient;
 }
 
 export interface IndexManagementPluginSetup {
@@ -48,7 +48,7 @@ export class IndexMgmtServerPlugin implements Plugin<IndexManagementPluginSetup,
   private readonly license: License;
   private readonly logger: Logger;
   private readonly indexDataEnricher: IndexDataEnricher;
-  private dataManagementESClient?: ICustomClusterClient;
+  private dataManagementESClient?: ILegacyCustomClusterClient;
 
   constructor(initContext: PluginInitializerContext) {
     this.logger = initContext.logger.get();
diff --git a/x-pack/plugins/index_management/server/types.ts b/x-pack/plugins/index_management/server/types.ts
index dc151f510a0437..cd3eb5dfecd401 100644
--- a/x-pack/plugins/index_management/server/types.ts
+++ b/x-pack/plugins/index_management/server/types.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { ScopedClusterClient, IRouter } from 'src/core/server';
+import { LegacyScopedClusterClient, IRouter } from 'src/core/server';
 import { LicensingPluginSetup } from '../../licensing/server';
 import { SecurityPluginSetup } from '../../security/server';
 import { License, IndexDataEnricher } from './services';
@@ -41,4 +41,4 @@ export interface Index {
   [key: string]: any;
 }
 
-export type CallAsCurrentUser = ScopedClusterClient['callAsCurrentUser'];
+export type CallAsCurrentUser = LegacyScopedClusterClient['callAsCurrentUser'];
diff --git a/x-pack/plugins/infra/common/graphql/types.ts b/x-pack/plugins/infra/common/graphql/types.ts
index bb089bf8bf8ad5..4a18c3d5ff3340 100644
--- a/x-pack/plugins/infra/common/graphql/types.ts
+++ b/x-pack/plugins/infra/common/graphql/types.ts
@@ -329,6 +329,10 @@ export interface UpdateSourceInput {
   logAlias?: string | null;
   /** The field mapping to use for this source */
   fields?: UpdateSourceFieldsInput | null;
+  /** Default view for inventory */
+  inventoryDefaultView?: string | null;
+  /** Default view for Metrics Explorer */
+  metricsExplorerDefaultView?: string | null;
   /** The log columns to display for this source */
   logColumns?: UpdateSourceLogColumnInput[] | null;
 }
@@ -875,6 +879,10 @@ export namespace SourceConfigurationFields {
     fields: Fields;
 
     logColumns: LogColumns[];
+
+    inventoryDefaultView: string;
+
+    metricsExplorerDefaultView: string;
   };
 
   export type Fields = {
diff --git a/x-pack/plugins/infra/common/http_api/source_api.ts b/x-pack/plugins/infra/common/http_api/source_api.ts
index 2c7d15d317cac5..be50989358c72b 100644
--- a/x-pack/plugins/infra/common/http_api/source_api.ts
+++ b/x-pack/plugins/infra/common/http_api/source_api.ts
@@ -69,6 +69,8 @@ export const SavedSourceConfigurationRuntimeType = rt.partial({
   description: rt.string,
   metricAlias: rt.string,
   logAlias: rt.string,
+  inventoryDefaultView: rt.string,
+  metricsExplorerDefaultView: rt.string,
   fields: SavedSourceConfigurationFieldsRuntimeType,
   logColumns: rt.array(SavedSourceConfigurationColumnRuntimeType),
 });
@@ -79,7 +81,16 @@ export interface InfraSavedSourceConfiguration
 export const pickSavedSourceConfiguration = (
   value: InfraSourceConfiguration
 ): InfraSavedSourceConfiguration => {
-  const { name, description, metricAlias, logAlias, fields, logColumns } = value;
+  const {
+    name,
+    description,
+    metricAlias,
+    logAlias,
+    fields,
+    inventoryDefaultView,
+    metricsExplorerDefaultView,
+    logColumns,
+  } = value;
   const { container, host, pod, tiebreaker, timestamp } = fields;
 
   return {
@@ -87,6 +98,8 @@ export const pickSavedSourceConfiguration = (
     description,
     metricAlias,
     logAlias,
+    inventoryDefaultView,
+    metricsExplorerDefaultView,
     fields: { container, host, pod, tiebreaker, timestamp },
     logColumns,
   };
@@ -106,6 +119,8 @@ export const StaticSourceConfigurationRuntimeType = rt.partial({
   description: rt.string,
   metricAlias: rt.string,
   logAlias: rt.string,
+  inventoryDefaultView: rt.string,
+  metricsExplorerDefaultView: rt.string,
   fields: StaticSourceConfigurationFieldsRuntimeType,
   logColumns: rt.array(SavedSourceConfigurationColumnRuntimeType),
 });
diff --git a/x-pack/plugins/infra/common/saved_objects/metrics_explorer_view.ts b/x-pack/plugins/infra/common/saved_objects/metrics_explorer_view.ts
index 88bbc945e32dc7..a92809022c7e8b 100644
--- a/x-pack/plugins/infra/common/saved_objects/metrics_explorer_view.ts
+++ b/x-pack/plugins/infra/common/saved_objects/metrics_explorer_view.ts
@@ -55,6 +55,9 @@ export const metricsExplorerViewSavedObjectType: SavedObjectsType = {
           aggregation: {
             type: 'keyword',
           },
+          source: {
+            type: 'keyword',
+          },
         },
       },
       chartOptions: {
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx
index 1ca7f7bff83ede..39a5a7feb27745 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx
@@ -63,6 +63,8 @@ describe('ExpressionChart', () => {
         logColumns: [],
         metricAlias: 'metricbeat-*',
         logAlias: 'filebeat-*',
+        inventoryDefaultView: 'host',
+        metricsExplorerDefaultView: 'host',
         fields: {
           timestamp: '@timestamp',
           message: ['message'],
diff --git a/x-pack/plugins/infra/public/components/saved_views/view_list_flyout.tsx b/x-pack/plugins/infra/public/components/saved_views/manage_views_flyout.tsx
similarity index 73%
rename from x-pack/plugins/infra/public/components/saved_views/view_list_flyout.tsx
rename to x-pack/plugins/infra/public/components/saved_views/manage_views_flyout.tsx
index 69f3d68023a240..fa9b45558e4918 100644
--- a/x-pack/plugins/infra/public/components/saved_views/view_list_flyout.tsx
+++ b/x-pack/plugins/infra/public/components/saved_views/manage_views_flyout.tsx
@@ -19,17 +19,21 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { SavedView } from '../../hooks/use_saved_view';
+import { SavedView } from '../../containers/saved_view/saved_view';
 
 interface Props<ViewState> {
   views: Array<SavedView<ViewState>>;
   loading: boolean;
+  defaultViewId: string;
+  sourceIsLoading: boolean;
   close(): void;
+  makeDefault(id: string): void;
   setView(viewState: ViewState): void;
   deleteView(id: string): void;
 }
 
 interface DeleteConfimationProps {
+  isDisabled?: boolean;
   confirmedAction(): void;
 }
 const DeleteConfimation = (props: DeleteConfimationProps) => {
@@ -46,6 +50,7 @@ const DeleteConfimation = (props: DeleteConfimationProps) => {
             <FormattedMessage defaultMessage="cancel" id="xpack.infra.waffle.savedViews.cancel" />
           </EuiButtonEmpty>
           <EuiButton
+            disabled={props.isDisabled}
             fill={true}
             iconType="trash"
             color="danger"
@@ -64,13 +69,17 @@ const DeleteConfimation = (props: DeleteConfimationProps) => {
   );
 };
 
-export function SavedViewListFlyout<ViewState>({
+export function SavedViewManageViewsFlyout<ViewState>({
   close,
   views,
+  defaultViewId,
   setView,
+  makeDefault,
   deleteView,
   loading,
+  sourceIsLoading,
 }: Props<ViewState>) {
+  const [inProgressView, setInProgressView] = useState<string | null>(null);
   const renderName = useCallback(
     (name: string, item: SavedView<ViewState>) => (
       <EuiButtonEmpty
@@ -89,6 +98,7 @@ export function SavedViewListFlyout<ViewState>({
     (item: SavedView<ViewState>) => {
       return (
         <DeleteConfimation
+          isDisabled={item.isDefault}
           confirmedAction={() => {
             deleteView(item.id);
           }}
@@ -98,6 +108,25 @@ export function SavedViewListFlyout<ViewState>({
     [deleteView]
   );
 
+  const renderMakeDefaultAction = useCallback(
+    (item: SavedView<ViewState>) => {
+      const isDefault = item.id === defaultViewId;
+      return (
+        <>
+          <EuiButtonEmpty
+            isLoading={inProgressView === item.id && sourceIsLoading}
+            iconType={isDefault ? 'starFilled' : 'starEmpty'}
+            onClick={() => {
+              setInProgressView(item.id);
+              makeDefault(item.id);
+            }}
+          />
+        </>
+      );
+    },
+    [makeDefault, defaultViewId, sourceIsLoading, inProgressView]
+  );
+
   const columns = [
     {
       field: 'name',
@@ -112,7 +141,11 @@ export function SavedViewListFlyout<ViewState>({
       }),
       actions: [
         {
-          available: (item: SavedView<ViewState>) => !item.isDefault,
+          available: () => true,
+          render: renderMakeDefaultAction,
+        },
+        {
+          available: (item: SavedView<ViewState>) => true,
           render: renderDeleteAction,
         },
       ],
@@ -124,7 +157,10 @@ export function SavedViewListFlyout<ViewState>({
       <EuiFlyoutHeader>
         <EuiTitle size="m">
           <h2>
-            <FormattedMessage defaultMessage="Load views" id="xpack.infra.openView.flyoutHeader" />
+            <FormattedMessage
+              defaultMessage="Manage saved views"
+              id="xpack.infra.openView.flyoutHeader"
+            />
           </h2>
         </EuiTitle>
       </EuiFlyoutHeader>
diff --git a/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx b/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
index c66aea669682ee..4e539541ac71b4 100644
--- a/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
+++ b/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
@@ -4,20 +4,28 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiButtonEmpty, EuiFlexGroup } from '@elastic/eui';
-import React, { useCallback, useState, useEffect } from 'react';
-import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiFlexGroup } from '@elastic/eui';
+import React, { useCallback, useState, useEffect, useContext } from 'react';
 import { i18n } from '@kbn/i18n';
-import { useSavedView } from '../../hooks/use_saved_view';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiDescriptionList,
+  EuiDescriptionListTitle,
+  EuiDescriptionListDescription,
+} from '@elastic/eui';
+import { EuiPopover } from '@elastic/eui';
+import { EuiListGroup, EuiListGroupItem } from '@elastic/eui';
+import { EuiFlexItem } from '@elastic/eui';
+import { EuiButtonIcon } from '@elastic/eui';
 import { SavedViewCreateModal } from './create_modal';
-import { SavedViewListFlyout } from './view_list_flyout';
+import { SavedViewUpdateModal } from './update_modal';
+import { SavedViewManageViewsFlyout } from './manage_views_flyout';
 import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { SavedView } from '../../containers/saved_view/saved_view';
+import { SavedViewListModal } from './view_list_modal';
 
 interface Props<ViewState> {
-  viewType: string;
   viewState: ViewState;
-  defaultViewState: ViewState;
-  onViewChange(viewState: ViewState): void;
 }
 
 export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
@@ -26,37 +34,80 @@ export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
     views,
     saveView,
     loading,
+    updateView,
     deletedId,
     deleteView,
+    defaultViewId,
+    makeDefault,
+    sourceIsLoading,
     find,
     errorOnFind,
     errorOnCreate,
-    createdId,
-  } = useSavedView(props.defaultViewState, props.viewType);
+    createdView,
+    updatedView,
+    currentView,
+    setCurrentView,
+  } = useContext(SavedView.Context);
   const [modalOpen, setModalOpen] = useState(false);
+  const [viewListModalOpen, setViewListModalOpen] = useState(false);
   const [isInvalid, setIsInvalid] = useState(false);
+  const [isSavedViewMenuOpen, setIsSavedViewMenuOpen] = useState(false);
   const [createModalOpen, setCreateModalOpen] = useState(false);
+  const [updateModalOpen, setUpdateModalOpen] = useState(false);
+  const hideSavedViewMenu = useCallback(() => {
+    setIsSavedViewMenuOpen(false);
+  }, [setIsSavedViewMenuOpen]);
+  const openViewListModal = useCallback(() => {
+    hideSavedViewMenu();
+    find();
+    setViewListModalOpen(true);
+  }, [setViewListModalOpen, find, hideSavedViewMenu]);
+  const closeViewListModal = useCallback(() => {
+    setViewListModalOpen(false);
+  }, [setViewListModalOpen]);
   const openSaveModal = useCallback(() => {
+    hideSavedViewMenu();
     setIsInvalid(false);
     setCreateModalOpen(true);
-  }, []);
+  }, [hideSavedViewMenu]);
+  const openUpdateModal = useCallback(() => {
+    hideSavedViewMenu();
+    setIsInvalid(false);
+    setUpdateModalOpen(true);
+  }, [hideSavedViewMenu]);
   const closeModal = useCallback(() => setModalOpen(false), []);
   const closeCreateModal = useCallback(() => setCreateModalOpen(false), []);
+  const closeUpdateModal = useCallback(() => setUpdateModalOpen(false), []);
   const loadViews = useCallback(() => {
+    hideSavedViewMenu();
     find();
     setModalOpen(true);
-  }, [find]);
+  }, [find, hideSavedViewMenu]);
+  const showSavedViewMenu = useCallback(() => {
+    setIsSavedViewMenuOpen(true);
+  }, [setIsSavedViewMenuOpen]);
   const save = useCallback(
     (name: string, hasTime: boolean = false) => {
       const currentState = {
         ...props.viewState,
         ...(!hasTime ? { time: undefined } : {}),
       };
-      saveView({ name, ...currentState });
+      saveView({ ...currentState, name });
     },
     [props.viewState, saveView]
   );
 
+  const update = useCallback(
+    (name: string, hasTime: boolean = false) => {
+      const currentState = {
+        ...props.viewState,
+        ...(!hasTime ? { time: undefined } : {}),
+      };
+      updateView(currentView.id, { ...currentState, name });
+    },
+    [props.viewState, updateView, currentView]
+  );
+
   useEffect(() => {
     if (errorOnCreate) {
       setIsInvalid(true);
@@ -64,11 +115,20 @@ export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
   }, [errorOnCreate]);
 
   useEffect(() => {
-    if (createdId !== undefined) {
+    if (updatedView !== undefined) {
+      setCurrentView(updatedView);
       // INFO: Close the modal after the view is created.
+      closeUpdateModal();
+    }
+  }, [updatedView, setCurrentView, closeUpdateModal]);
+
+  useEffect(() => {
+    if (createdView !== undefined) {
+      // INFO: Close the modal after the view is created.
+      setCurrentView(createdView);
       closeCreateModal();
     }
-  }, [createdId, closeCreateModal]);
+  }, [createdView, setCurrentView, closeCreateModal]);
 
   useEffect(() => {
     if (deletedId !== undefined) {
@@ -88,30 +148,110 @@ export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
   return (
     <>
       <EuiFlexGroup>
-        <EuiButtonEmpty iconType="save" onClick={openSaveModal} data-test-subj="openSaveViewModal">
-          <FormattedMessage
-            defaultMessage="Save"
-            id="xpack.infra.waffle.savedViews.saveViewLabel"
-          />
-        </EuiButtonEmpty>
-        <EuiButtonEmpty iconType="importAction" onClick={loadViews} data-test-subj="loadViews">
-          <FormattedMessage
-            defaultMessage="Load"
-            id="xpack.infra.waffle.savedViews.loadViewsLabel"
-          />
-        </EuiButtonEmpty>
+        <EuiPopover
+          button={
+            <EuiFlexGroup gutterSize={'s'} alignItems="center">
+              <EuiFlexItem grow={false}>
+                <EuiButtonIcon
+                  aria-label={i18n.translate('xpack.infra.savedView.changeView', {
+                    defaultMessage: 'Change view',
+                  })}
+                  onClick={showSavedViewMenu}
+                  iconType="globe"
+                />
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <EuiDescriptionList onClick={showSavedViewMenu}>
+                  <EuiDescriptionListTitle>
+                    <FormattedMessage
+                      defaultMessage="Current view"
+                      id="xpack.infra.savedView.currentView"
+                    />
+                  </EuiDescriptionListTitle>
+                  <EuiDescriptionListDescription>
+                    {currentView
+                      ? currentView.name
+                      : i18n.translate('xpack.infra.savedView.unknownView', {
+                          defaultMessage: 'Unknown',
+                        })}
+                  </EuiDescriptionListDescription>
+                </EuiDescriptionList>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          }
+          isOpen={isSavedViewMenuOpen}
+          closePopover={hideSavedViewMenu}
+          anchorPosition="upCenter"
+        >
+          <EuiListGroup flush={true}>
+            <EuiListGroupItem
+              iconType={'indexSettings'}
+              onClick={loadViews}
+              label={i18n.translate('xpack.infra.savedView.manageViews', {
+                defaultMessage: 'Manage views',
+              })}
+            />
+
+            <EuiListGroupItem
+              iconType={'refresh'}
+              onClick={openUpdateModal}
+              disabled={!currentView || currentView.id === '0'}
+              label={i18n.translate('xpack.infra.savedView.updateView', {
+                defaultMessage: 'Update view',
+              })}
+            />
+
+            <EuiListGroupItem
+              iconType={'importAction'}
+              onClick={openViewListModal}
+              label={i18n.translate('xpack.infra.savedView.loadView', {
+                defaultMessage: 'Load view',
+              })}
+            />
+
+            <EuiListGroupItem
+              iconType={'save'}
+              onClick={openSaveModal}
+              label={i18n.translate('xpack.infra.savedView.saveNewView', {
+                defaultMessage: 'Save new view',
+              })}
+            />
+          </EuiListGroup>
+        </EuiPopover>
       </EuiFlexGroup>
 
       {createModalOpen && (
         <SavedViewCreateModal isInvalid={isInvalid} close={closeCreateModal} save={save} />
       )}
+
+      {updateModalOpen && (
+        <SavedViewUpdateModal
+          currentView={currentView}
+          isInvalid={isInvalid}
+          close={closeUpdateModal}
+          save={update}
+        />
+      )}
+
+      {viewListModalOpen && (
+        <SavedViewListModal<any>
+          currentView={currentView}
+          views={views}
+          close={closeViewListModal}
+          setView={setCurrentView}
+        />
+      )}
+
       {modalOpen && (
-        <SavedViewListFlyout<ViewState>
+        <SavedViewManageViewsFlyout<ViewState>
+          sourceIsLoading={sourceIsLoading}
           loading={loading}
           views={views}
+          defaultViewId={defaultViewId}
+          makeDefault={makeDefault}
           deleteView={deleteView}
           close={closeModal}
-          setView={props.onViewChange}
+          setView={setCurrentView}
         />
       )}
     </>
diff --git a/x-pack/plugins/infra/public/components/saved_views/update_modal.tsx b/x-pack/plugins/infra/public/components/saved_views/update_modal.tsx
new file mode 100644
index 00000000000000..4e481b02ad52da
--- /dev/null
+++ b/x-pack/plugins/infra/public/components/saved_views/update_modal.tsx
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback, useState } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiButtonEmpty,
+  EuiButton,
+  EuiModal,
+  EuiModalBody,
+  EuiModalFooter,
+  EuiModalHeader,
+  EuiModalHeaderTitle,
+  EuiOverlayMask,
+  EuiFieldText,
+  EuiSpacer,
+  EuiSwitch,
+  EuiText,
+} from '@elastic/eui';
+
+interface Props<ViewState> {
+  isInvalid: boolean;
+  close(): void;
+  save(name: string, shouldIncludeTime: boolean): void;
+  currentView: ViewState;
+}
+
+export function SavedViewUpdateModal<ViewState extends { id: string; name: string }>({
+  close,
+  save,
+  isInvalid,
+  currentView,
+}: Props<ViewState>) {
+  const [viewName, setViewName] = useState(currentView.name);
+  const [includeTime, setIncludeTime] = useState(false);
+  const onCheckChange = useCallback((e) => setIncludeTime(e.target.checked), []);
+  const textChange = useCallback((e) => setViewName(e.target.value), []);
+
+  const saveView = useCallback(() => {
+    save(viewName, includeTime);
+  }, [includeTime, save, viewName]);
+
+  return (
+    <EuiOverlayMask>
+      <EuiModal onClose={close}>
+        <EuiModalHeader>
+          <EuiModalHeaderTitle>
+            <FormattedMessage
+              defaultMessage="Update View"
+              id="xpack.infra.waffle.savedView.updateHeader"
+            />
+          </EuiModalHeaderTitle>
+        </EuiModalHeader>
+
+        <EuiModalBody>
+          <EuiFieldText
+            isInvalid={isInvalid}
+            placeholder={i18n.translate('xpack.infra.waffle.savedViews.viewNamePlaceholder', {
+              defaultMessage: 'Name',
+            })}
+            data-test-subj="savedViewViweName"
+            value={viewName}
+            onChange={textChange}
+            aria-label={i18n.translate('xpack.infra.waffle.savedViews.viewNamePlaceholder', {
+              defaultMessage: 'Name',
+            })}
+          />
+          <EuiSpacer size="xl" />
+          <EuiSwitch
+            id={'saved-view-save-time-checkbox'}
+            label={
+              <FormattedMessage
+                defaultMessage="Store time with view"
+                id="xpack.infra.waffle.savedViews.includeTimeFilterLabel"
+              />
+            }
+            checked={includeTime}
+            onChange={onCheckChange}
+          />
+          <EuiSpacer size="s" />
+          <EuiText size={'xs'} grow={false} style={{ maxWidth: 400 }}>
+            <FormattedMessage
+              defaultMessage="This changes the time filter to the currently selected time each time the view is loaded"
+              id="xpack.infra.waffle.savedViews.includeTimeHelpText"
+            />
+          </EuiText>
+        </EuiModalBody>
+
+        <EuiModalFooter>
+          <EuiButtonEmpty onClick={close}>
+            <FormattedMessage
+              defaultMessage="Cancel"
+              id="xpack.infra.waffle.savedViews.cancelButton"
+            />
+          </EuiButtonEmpty>
+          <EuiButton
+            color="primary"
+            disabled={!viewName}
+            fill={true}
+            onClick={saveView}
+            data-test-subj="updateSavedViewButton"
+          >
+            <FormattedMessage defaultMessage="Save" id="xpack.infra.waffle.savedViews.saveButton" />
+          </EuiButton>
+        </EuiModalFooter>
+      </EuiModal>
+    </EuiOverlayMask>
+  );
+}
diff --git a/x-pack/plugins/infra/public/components/saved_views/view_list_modal.tsx b/x-pack/plugins/infra/public/components/saved_views/view_list_modal.tsx
new file mode 100644
index 00000000000000..4015d64e1097fe
--- /dev/null
+++ b/x-pack/plugins/infra/public/components/saved_views/view_list_modal.tsx
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback, useState, useMemo } from 'react';
+
+import { EuiButtonEmpty, EuiModalFooter, EuiButton } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiOverlayMask,
+  EuiModal,
+  EuiModalHeader,
+  EuiModalHeaderTitle,
+  EuiModalBody,
+} from '@elastic/eui';
+import { EuiSelectable } from '@elastic/eui';
+import { EuiSelectableOption } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { SavedView } from '../../containers/saved_view/saved_view';
+
+interface Props<ViewState> {
+  views: Array<SavedView<ViewState>>;
+  close(): void;
+  setView(viewState: ViewState): void;
+  currentView?: ViewState;
+}
+
+export function SavedViewListModal<ViewState extends { id: string; name: string }>({
+  close,
+  views,
+  setView,
+  currentView,
+}: Props<ViewState>) {
+  const [options, setOptions] = useState<EuiSelectableOption[] | null>(null);
+
+  const onChange = useCallback((opts: EuiSelectableOption[]) => {
+    setOptions(opts);
+  }, []);
+
+  const loadView = useCallback(() => {
+    if (!options) {
+      close();
+      return;
+    }
+
+    const selected = options.find((o) => o.checked);
+    if (!selected) {
+      close();
+      return;
+    }
+    setView(views.find((v) => v.id === selected.key)!);
+    close();
+  }, [options, views, setView, close]);
+
+  const defaultOptions = useMemo<EuiSelectableOption[]>(() => {
+    return views.map((v) => ({
+      label: v.name,
+      key: v.id,
+      checked: currentView?.id === v.id ? 'on' : undefined,
+    }));
+  }, [views, currentView]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  return (
+    <EuiOverlayMask>
+      <EuiModal onClose={close}>
+        <EuiModalHeader>
+          <EuiModalHeaderTitle>
+            <FormattedMessage
+              defaultMessage="Select a view to load"
+              id="xpack.infra.waffle.savedView.selectViewHeader"
+            />
+          </EuiModalHeaderTitle>
+        </EuiModalHeader>
+        <EuiModalBody>
+          <EuiSelectable
+            singleSelection={true}
+            searchable={true}
+            options={options || defaultOptions}
+            onChange={onChange}
+            searchProps={{
+              placeholder: i18n.translate('xpack.infra.savedView.searchPlaceholder', {
+                defaultMessage: 'Search for saved views',
+              }),
+            }}
+            listProps={{ bordered: true }}
+          >
+            {(list, search) => (
+              <>
+                {search}
+                <div style={{ marginTop: 20 }}>{list}</div>
+              </>
+            )}
+          </EuiSelectable>
+        </EuiModalBody>
+        <EuiModalFooter>
+          <EuiButtonEmpty data-test-subj="cancelSavedViewModal" onClick={close}>
+            <FormattedMessage defaultMessage="Cancel" id="xpack.infra.openView.cancelButton" />
+          </EuiButtonEmpty>
+          <EuiButton
+            fill={true}
+            color={'primary'}
+            data-test-subj="loadSavedViewModal"
+            onClick={loadView}
+          >
+            <FormattedMessage defaultMessage="Load view" id="xpack.infra.openView.loadButton" />
+          </EuiButton>
+        </EuiModalFooter>
+      </EuiModal>
+    </EuiOverlayMask>
+  );
+}
diff --git a/x-pack/plugins/infra/public/containers/metrics_explorer/with_metrics_explorer_options_url_state.tsx b/x-pack/plugins/infra/public/containers/metrics_explorer/with_metrics_explorer_options_url_state.tsx
index b0823f8717a844..22f7d3d3cd50a1 100644
--- a/x-pack/plugins/infra/public/containers/metrics_explorer/with_metrics_explorer_options_url_state.tsx
+++ b/x-pack/plugins/infra/public/containers/metrics_explorer/with_metrics_explorer_options_url_state.tsx
@@ -97,6 +97,7 @@ function isMetricExplorerOptions(subject: any): subject is MetricsExplorerOption
     limit: t.number,
     groupBy: t.string,
     filterQuery: t.string,
+    source: t.string,
   });
 
   const Options = t.intersection([OptionsRequired, OptionsOptional]);
@@ -156,6 +157,7 @@ const mapToUrlState = (value: any): MetricsExplorerUrlState | undefined => {
   const finalState = {};
   if (value) {
     if (value.options && isMetricExplorerOptions(value.options)) {
+      value.options.source = 'url';
       set(finalState, 'options', value.options);
     }
     if (value.timerange && isMetricExplorerTimeOption(value.timerange)) {
diff --git a/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx b/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
new file mode 100644
index 00000000000000..58fecdd54e303d
--- /dev/null
+++ b/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
@@ -0,0 +1,262 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import createContainer from 'constate';
+import { useCallback, useMemo, useState, useEffect, useContext } from 'react';
+import { i18n } from '@kbn/i18n';
+import { SimpleSavedObject, SavedObjectAttributes } from 'kibana/public';
+import { useFindSavedObject } from '../../hooks/use_find_saved_object';
+import { useCreateSavedObject } from '../../hooks/use_create_saved_object';
+import { useDeleteSavedObject } from '../../hooks/use_delete_saved_object';
+import { Source } from '../source';
+import { metricsExplorerViewSavedObjectName } from '../../../common/saved_objects/metrics_explorer_view';
+import { inventoryViewSavedObjectName } from '../../../common/saved_objects/inventory_view';
+import { useSourceConfigurationFormState } from '../../components/source_configuration/source_configuration_form_state';
+import { useGetSavedObject } from '../../hooks/use_get_saved_object';
+import { useUpdateSavedObject } from '../../hooks/use_update_saved_object';
+
+export type SavedView<ViewState> = ViewState & {
+  name: string;
+  id: string;
+  isDefault?: boolean;
+};
+
+export type SavedViewSavedObject<ViewState = {}> = ViewState & {
+  name: string;
+};
+
+export type ViewType =
+  | typeof metricsExplorerViewSavedObjectName
+  | typeof inventoryViewSavedObjectName;
+
+interface Props {
+  defaultViewState: SavedView<any>;
+  viewType: ViewType;
+  shouldLoadDefault: boolean;
+}
+
+export const useSavedView = (props: Props) => {
+  const {
+    source,
+    isLoading: sourceIsLoading,
+    sourceExists,
+    createSourceConfiguration,
+    updateSourceConfiguration,
+  } = useContext(Source.Context);
+  const { viewType, defaultViewState } = props;
+  type ViewState = typeof defaultViewState;
+  const { data, loading, find, error: errorOnFind, hasView } = useFindSavedObject<
+    SavedViewSavedObject<ViewState>
+  >(viewType);
+
+  const [currentView, setCurrentView] = useState<SavedView<any> | null>(null);
+  const [loadingDefaultView, setLoadingDefaultView] = useState<boolean | null>(null);
+  const { create, error: errorOnCreate, data: createdViewData, createdId } = useCreateSavedObject(
+    viewType
+  );
+  const { update, error: errorOnUpdate, data: updatedViewData, updatedId } = useUpdateSavedObject(
+    viewType
+  );
+  const { deleteObject, deletedId } = useDeleteSavedObject(viewType);
+  const { getObject, data: currentViewSavedObject } = useGetSavedObject(viewType);
+  const [createError, setCreateError] = useState<string | null>(null);
+
+  useEffect(() => setCreateError(errorOnCreate), [errorOnCreate]);
+
+  const deleteView = useCallback((id: string) => deleteObject(id), [deleteObject]);
+  const formState = useSourceConfigurationFormState(source && source.configuration);
+  const defaultViewFieldName = useMemo(
+    () => (viewType === 'inventory-view' ? 'inventoryDefaultView' : 'metricsExplorerDefaultView'),
+    [viewType]
+  );
+
+  const makeDefault = useCallback(
+    async (id: string) => {
+      if (sourceExists) {
+        await updateSourceConfiguration({
+          ...formState.formStateChanges,
+          [defaultViewFieldName]: id,
+        });
+      } else {
+        await createSourceConfiguration({
+          ...formState.formState,
+          [defaultViewFieldName]: id,
+        });
+      }
+    },
+    [
+      formState.formState,
+      formState.formStateChanges,
+      sourceExists,
+      defaultViewFieldName,
+      createSourceConfiguration,
+      updateSourceConfiguration,
+    ]
+  );
+
+  const saveView = useCallback(
+    (d: { [p: string]: any }) => {
+      const doSave = async () => {
+        const exists = await hasView(d.name);
+        if (exists) {
+          setCreateError(
+            i18n.translate('xpack.infra.savedView.errorOnCreate.duplicateViewName', {
+              defaultMessage: `A view with that name already exists.`,
+            })
+          );
+          return;
+        }
+        create(d);
+      };
+      setCreateError(null);
+      doSave();
+    },
+    [create, hasView]
+  );
+
+  const updateView = useCallback(
+    (id, d: { [p: string]: any }) => {
+      const doSave = async () => {
+        const view = await hasView(d.name);
+        if (view && view.id !== id) {
+          setCreateError(
+            i18n.translate('xpack.infra.savedView.errorOnCreate.duplicateViewName', {
+              defaultMessage: `A view with that name already exists.`,
+            })
+          );
+          return;
+        }
+        update(id, d);
+      };
+      setCreateError(null);
+      doSave();
+    },
+    [update, hasView]
+  );
+
+  const defaultViewId = useMemo(() => {
+    if (!source || !source.configuration) {
+      return '';
+    }
+    if (defaultViewFieldName === 'inventoryDefaultView') {
+      return source.configuration.inventoryDefaultView;
+    } else if (defaultViewFieldName === 'metricsExplorerDefaultView') {
+      return source.configuration.metricsExplorerDefaultView;
+    } else {
+      return '';
+    }
+  }, [source, defaultViewFieldName]);
+
+  const mapToView = useCallback(
+    (o: SimpleSavedObject<SavedObjectAttributes>) => {
+      return {
+        ...o.attributes,
+        id: o.id,
+        isDefault: defaultViewId === o.id,
+      };
+    },
+    [defaultViewId]
+  );
+
+  const savedObjects = useMemo(() => (data ? data.savedObjects : []), [data]);
+
+  const views = useMemo(() => {
+    const items: Array<SavedView<ViewState>> = [
+      {
+        name: i18n.translate('xpack.infra.savedView.defaultViewNameHosts', {
+          defaultMessage: 'Default view',
+        }),
+        id: '0',
+        isDefault: !defaultViewId || defaultViewId === '0', // If there is no default view then hosts is the default
+        ...defaultViewState,
+      },
+    ];
+
+    savedObjects.forEach((o) => o.type === viewType && items.push(mapToView(o)));
+
+    return items;
+  }, [defaultViewState, savedObjects, viewType, defaultViewId, mapToView]);
+
+  const createdView = useMemo(() => {
+    return createdViewData ? mapToView(createdViewData) : null;
+  }, [createdViewData, mapToView]);
+
+  const updatedView = useMemo(() => {
+    return updatedViewData ? mapToView(updatedViewData) : null;
+  }, [updatedViewData, mapToView]);
+
+  const loadDefaultView = useCallback(() => {
+    setLoadingDefaultView(true);
+    getObject(defaultViewId);
+  }, [setLoadingDefaultView, getObject, defaultViewId]);
+
+  useEffect(() => {
+    if (currentViewSavedObject) {
+      setCurrentView(mapToView(currentViewSavedObject));
+      setLoadingDefaultView(false);
+    }
+  }, [currentViewSavedObject, defaultViewId, mapToView]);
+
+  const setDefault = useCallback(() => {
+    setCurrentView({
+      name: i18n.translate('xpack.infra.savedView.defaultViewNameHosts', {
+        defaultMessage: 'Default view',
+      }),
+      id: '0',
+      isDefault: !defaultViewId || defaultViewId === '0', // If there is no default view then hosts is the default
+      ...defaultViewState,
+    });
+  }, [setCurrentView, defaultViewId, defaultViewState]);
+
+  useEffect(() => {
+    const shouldLoadDefault = props.shouldLoadDefault;
+
+    if (loadingDefaultView || currentView || !shouldLoadDefault) {
+      return;
+    }
+
+    if (defaultViewId !== '0') {
+      loadDefaultView();
+    } else {
+      setDefault();
+      setLoadingDefaultView(false);
+    }
+  }, [
+    loadDefaultView,
+    props.shouldLoadDefault,
+    setDefault,
+    loadingDefaultView,
+    currentView,
+    defaultViewId,
+  ]);
+
+  return {
+    views,
+    saveView,
+    defaultViewId,
+    loading,
+    updateView,
+    updatedView,
+    updatedId,
+    deletedId,
+    createdId,
+    createdView,
+    errorOnUpdate,
+    errorOnFind,
+    errorOnCreate: createError,
+    shouldLoadDefault: props.shouldLoadDefault,
+    makeDefault,
+    sourceIsLoading,
+    deleteView,
+    loadingDefaultView,
+    setCurrentView,
+    currentView,
+    loadDefaultView,
+    find,
+  };
+};
+
+export const SavedView = createContainer(useSavedView);
+export const [SavedViewProvider, useSavedViewContext] = SavedView;
diff --git a/x-pack/plugins/infra/public/containers/source/source_fields_fragment.gql_query.ts b/x-pack/plugins/infra/public/containers/source/source_fields_fragment.gql_query.ts
index 0c28220aed802f..61312a0f2890ed 100644
--- a/x-pack/plugins/infra/public/containers/source/source_fields_fragment.gql_query.ts
+++ b/x-pack/plugins/infra/public/containers/source/source_fields_fragment.gql_query.ts
@@ -12,6 +12,8 @@ export const sourceConfigurationFieldsFragment = gql`
     description
     logAlias
     metricAlias
+    inventoryDefaultView
+    metricsExplorerDefaultView
     fields {
       container
       host
diff --git a/x-pack/plugins/infra/public/graphql/types.ts b/x-pack/plugins/infra/public/graphql/types.ts
index 79351d8dc16cd9..f0f74c34a19e6c 100644
--- a/x-pack/plugins/infra/public/graphql/types.ts
+++ b/x-pack/plugins/infra/public/graphql/types.ts
@@ -54,6 +54,10 @@ export interface InfraSourceConfiguration {
   logAlias: string;
   /** The field mapping to use for this source */
   fields: InfraSourceFields;
+  /** Default view for inventory */
+  inventoryDefaultView: string;
+  /** Default view for Metrics Explorer */
+  metricsExplorerDefaultView?: string | null;
   /** The columns to use for log display */
   logColumns: InfraSourceLogColumn[];
 }
@@ -331,6 +335,10 @@ export interface UpdateSourceInput {
   logAlias?: string | null;
   /** The field mapping to use for this source */
   fields?: UpdateSourceFieldsInput | null;
+  /** Name of default inventory view */
+  inventoryDefaultView?: string | null;
+  /** Default view for Metrics Explorer */
+  metricsExplorerDefaultView?: string | null;
   /** The log columns to display for this source */
   logColumns?: UpdateSourceLogColumnInput[] | null;
 }
@@ -876,6 +884,10 @@ export namespace SourceConfigurationFields {
 
     fields: Fields;
 
+    inventoryDefaultView: string;
+
+    metricsExplorerDefaultView: string;
+
     logColumns: LogColumns[];
   };
 
diff --git a/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx
index 8eb6db6103ed8c..8aead6adfd0ab7 100644
--- a/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx
@@ -49,7 +49,7 @@ export const useFindSavedObject = <SavedObjectType extends SavedObjectAttributes
     const objects = await savedObjectsClient.find<SavedObjectType>({
       type,
     });
-    return objects.savedObjects.filter((o) => o.attributes.name === name).length > 0;
+    return objects.savedObjects.find((o) => o.attributes.name === name);
   };
 
   return {
diff --git a/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx
new file mode 100644
index 00000000000000..0298155441f420
--- /dev/null
+++ b/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useState, useCallback } from 'react';
+import { SavedObjectAttributes, SimpleSavedObject } from 'src/core/public';
+import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+
+export const useGetSavedObject = <SavedObjectType extends SavedObjectAttributes>(type: string) => {
+  const kibana = useKibana();
+  const [data, setData] = useState<SimpleSavedObject<SavedObjectType> | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [loading, setLoading] = useState<boolean>(false);
+  const getObject = useCallback(
+    (id: string) => {
+      setLoading(true);
+      const fetchData = async () => {
+        try {
+          const savedObjectsClient = kibana.services.savedObjects?.client;
+          if (!savedObjectsClient) {
+            throw new Error('Saved objects client is unavailable');
+          }
+          const d = await savedObjectsClient.get<SavedObjectType>(type, id);
+          setError(null);
+          setLoading(false);
+          setData(d);
+        } catch (e) {
+          setLoading(false);
+          setError(e);
+        }
+      };
+      fetchData();
+    },
+    /* eslint-disable-next-line react-hooks/exhaustive-deps */
+    [type, kibana.services.savedObjects]
+  );
+
+  return {
+    data,
+    loading,
+    error,
+    getObject,
+  };
+};
diff --git a/x-pack/plugins/infra/public/hooks/use_http_request.tsx b/x-pack/plugins/infra/public/hooks/use_http_request.tsx
index 943aa059d59518..6143d3fc60a521 100644
--- a/x-pack/plugins/infra/public/hooks/use_http_request.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_http_request.tsx
@@ -9,7 +9,7 @@ import { IHttpFetchError } from 'src/core/public';
 import { i18n } from '@kbn/i18n';
 import { HttpHandler } from 'src/core/public';
 import { ToastInput } from 'src/core/public';
-import { useTrackedPromise } from '../utils/use_tracked_promise';
+import { useTrackedPromise, CanceledPromiseError } from '../utils/use_tracked_promise';
 import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 
 export function useHTTPRequest<Response>(
@@ -40,6 +40,9 @@ export function useHTTPRequest<Response>(
       onResolve: (resp) => setResponse(decode(resp)),
       onReject: (e: unknown) => {
         const err = e as IHttpFetchError;
+        if (e && e instanceof CanceledPromiseError) {
+          return;
+        }
         setError(err);
         toast({
           toastLifeTimeMs: 3000,
diff --git a/x-pack/plugins/infra/public/hooks/use_saved_view.ts b/x-pack/plugins/infra/public/hooks/use_saved_view.ts
deleted file mode 100644
index 60869d8267b8cb..00000000000000
--- a/x-pack/plugins/infra/public/hooks/use_saved_view.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { useCallback, useMemo, useState, useEffect } from 'react';
-import { i18n } from '@kbn/i18n';
-import { useFindSavedObject } from './use_find_saved_object';
-import { useCreateSavedObject } from './use_create_saved_object';
-import { useDeleteSavedObject } from './use_delete_saved_object';
-
-export type SavedView<ViewState> = ViewState & {
-  name: string;
-  id: string;
-  isDefault?: boolean;
-};
-
-export type SavedViewSavedObject<ViewState = {}> = ViewState & {
-  name: string;
-};
-
-export const useSavedView = <ViewState>(defaultViewState: ViewState, viewType: string) => {
-  const { data, loading, find, error: errorOnFind, hasView } = useFindSavedObject<
-    SavedViewSavedObject<ViewState>
-  >(viewType);
-  const { create, error: errorOnCreate, createdId } = useCreateSavedObject(viewType);
-  const { deleteObject, deletedId } = useDeleteSavedObject(viewType);
-  const deleteView = useCallback((id: string) => deleteObject(id), [deleteObject]);
-  const [createError, setCreateError] = useState<string | null>(null);
-
-  useEffect(() => setCreateError(errorOnCreate), [errorOnCreate]);
-
-  const saveView = useCallback(
-    (d: { [p: string]: any }) => {
-      const doSave = async () => {
-        const exists = await hasView(d.name);
-        if (exists) {
-          setCreateError(
-            i18n.translate('xpack.infra.savedView.errorOnCreate.duplicateViewName', {
-              defaultMessage: `A view with that name already exists.`,
-            })
-          );
-          return;
-        }
-        create(d);
-      };
-      setCreateError(null);
-      doSave();
-    },
-    [create, hasView]
-  );
-
-  const savedObjects = useMemo(() => (data ? data.savedObjects : []), [data]);
-  const views = useMemo(() => {
-    const items: Array<SavedView<ViewState>> = [
-      {
-        name: i18n.translate('xpack.infra.savedView.defaultViewName', {
-          defaultMessage: 'Default',
-        }),
-        id: '0',
-        isDefault: true,
-        ...defaultViewState,
-      },
-    ];
-
-    savedObjects.forEach(
-      (o) =>
-        o.type === viewType &&
-        items.push({
-          ...o.attributes,
-          id: o.id,
-        })
-    );
-
-    return items;
-  }, [defaultViewState, savedObjects, viewType]);
-
-  return {
-    views,
-    saveView,
-    loading,
-    deletedId,
-    createdId,
-    errorOnFind,
-    errorOnCreate: createError,
-    deleteView,
-    find,
-  };
-};
diff --git a/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx
new file mode 100644
index 00000000000000..4c1e9ef7a61363
--- /dev/null
+++ b/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useState, useCallback } from 'react';
+import {
+  SavedObjectAttributes,
+  SavedObjectsCreateOptions,
+  SimpleSavedObject,
+} from 'src/core/public';
+import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+
+export const useUpdateSavedObject = (type: string) => {
+  const kibana = useKibana();
+  const [data, setData] = useState<SimpleSavedObject<SavedObjectAttributes> | null>(null);
+  const [updatedId, setUpdatedId] = useState<string | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [loading, setLoading] = useState<boolean>(false);
+
+  const update = useCallback(
+    (id: string, attributes: SavedObjectAttributes, options?: SavedObjectsCreateOptions) => {
+      setLoading(true);
+      const save = async () => {
+        try {
+          const savedObjectsClient = kibana.services.savedObjects?.client;
+          if (!savedObjectsClient) {
+            throw new Error('Saved objects client is unavailable');
+          }
+          const d = await savedObjectsClient.update(type, id, attributes, options);
+          setUpdatedId(d.id);
+          setError(null);
+          setData(d);
+          setLoading(false);
+        } catch (e) {
+          setLoading(false);
+          setError(e);
+        }
+      };
+      save();
+    },
+    /* eslint-disable-next-line react-hooks/exhaustive-deps */
+    [type, kibana.services.savedObjects]
+  );
+
+  return {
+    data,
+    loading,
+    error,
+    update,
+    updatedId,
+  };
+};
diff --git a/x-pack/plugins/infra/public/pages/metrics/index.tsx b/x-pack/plugins/infra/public/pages/metrics/index.tsx
index 121748f8e5220b..3b3ed80f9e7311 100644
--- a/x-pack/plugins/infra/public/pages/metrics/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/index.tsx
@@ -6,16 +6,20 @@
 
 import { i18n } from '@kbn/i18n';
 
-import React from 'react';
+import React, { useContext } from 'react';
 import { Route, RouteComponentProps, Switch } from 'react-router-dom';
 
 import { EuiErrorBoundary, EuiFlexItem, EuiFlexGroup, EuiButtonEmpty } from '@elastic/eui';
+import { IIndexPattern } from 'src/plugins/data/common';
 import { DocumentTitle } from '../../components/document_title';
 import { HelpCenterContent } from '../../components/help_center_content';
 import { RoutedTabs } from '../../components/navigation/routed_tabs';
 import { ColumnarPage } from '../../components/page';
 import { Header } from '../../components/header';
-import { MetricsExplorerOptionsContainer } from './metrics_explorer/hooks/use_metrics_explorer_options';
+import {
+  MetricsExplorerOptionsContainer,
+  DEFAULT_METRICS_EXPLORER_VIEW_STATE,
+} from './metrics_explorer/hooks/use_metrics_explorer_options';
 import { WithMetricsExplorerOptionsUrlState } from '../../containers/metrics_explorer/with_metrics_explorer_options_url_state';
 import { WithSource } from '../../containers/with_source';
 import { Source } from '../../containers/source';
@@ -31,6 +35,8 @@ import { WaffleFiltersProvider } from './inventory_view/hooks/use_waffle_filters
 
 import { InventoryAlertDropdown } from '../../alerting/inventory/components/alert_dropdown';
 import { MetricsAlertDropdown } from '../../alerting/metric_threshold/components/alert_dropdown';
+import { SavedView } from '../../containers/saved_view/saved_view';
+import { SourceConfigurationFields } from '../../graphql/types';
 import { AlertPrefillProvider } from '../../alerting/use_alert_prefill';
 
 const ADD_DATA_LABEL = i18n.translate('xpack.infra.metricsHeaderAddDataButtonLabel', {
@@ -138,10 +144,9 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => {
                             <MetricsExplorerOptionsContainer.Provider>
                               <WithMetricsExplorerOptionsUrlState />
                               {configuration ? (
-                                <MetricsExplorerPage
-                                  derivedIndexPattern={createDerivedIndexPattern('metrics')}
-                                  source={configuration}
-                                  {...props}
+                                <PageContent
+                                  configuration={configuration}
+                                  createDerivedIndexPattern={createDerivedIndexPattern}
                                 />
                               ) : (
                                 <SourceLoadingPage />
@@ -162,3 +167,25 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => {
     </EuiErrorBoundary>
   );
 };
+
+const PageContent = (props: {
+  configuration: SourceConfigurationFields.Fragment;
+  createDerivedIndexPattern: (type: 'logs' | 'metrics' | 'both') => IIndexPattern;
+}) => {
+  const { createDerivedIndexPattern, configuration } = props;
+  const { options } = useContext(MetricsExplorerOptionsContainer.Context);
+
+  return (
+    <SavedView.Provider
+      shouldLoadDefault={options.source === 'default'}
+      viewType={'metrics-explorer-view'}
+      defaultViewState={DEFAULT_METRICS_EXPLORER_VIEW_STATE}
+    >
+      <MetricsExplorerPage
+        derivedIndexPattern={createDerivedIndexPattern('metrics')}
+        source={configuration}
+        {...props}
+      />
+    </SavedView.Provider>
+  );
+};
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
index 1452772e49ca15..3884ee5b7279ab 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { useInterval } from 'react-use';
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
@@ -20,14 +20,17 @@ import { InfraFormatterType } from '../../../../lib/lib';
 import { euiStyled } from '../../../../../../observability/public';
 import { Toolbar } from './toolbars/toolbar';
 import { ViewSwitcher } from './waffle/view_switcher';
-import { SavedViews } from './saved_views';
 import { IntervalLabel } from './waffle/interval_label';
 import { Legend } from './waffle/legend';
 import { createInventoryMetricFormatter } from '../lib/create_inventory_metric_formatter';
 import { createLegend } from '../lib/create_legend';
+import { useSavedViewContext } from '../../../../containers/saved_view/saved_view';
+import { useWaffleViewState } from '../hooks/use_waffle_view_state';
+import { SavedViewsToolbarControls } from '../../../../components/saved_views/toolbar_control';
 
 export const Layout = () => {
   const { sourceId, source } = useSourceContext();
+  const { currentView, shouldLoadDefault } = useSavedViewContext();
   const {
     metric,
     groupBy,
@@ -78,6 +81,20 @@ export const Layout = () => {
   const bounds = autoBounds ? dataBounds : boundsOverride;
   /* eslint-disable-next-line react-hooks/exhaustive-deps */
   const formatter = useCallback(createInventoryMetricFormatter(options.metric), [options.metric]);
+  const { viewState, onViewChange } = useWaffleViewState();
+
+  useEffect(() => {
+    if (currentView) {
+      onViewChange(currentView);
+    }
+  }, [currentView, onViewChange]);
+
+  useEffect(() => {
+    // load snapshot data after default view loaded, unless we're not loading a view
+    if (currentView != null || !shouldLoadDefault) {
+      reload();
+    }
+  }, [reload, currentView, shouldLoadDefault]);
 
   return (
     <>
@@ -107,7 +124,7 @@ export const Layout = () => {
           <BottomActionContainer>
             <EuiFlexGroup justifyContent="spaceBetween">
               <EuiFlexItem grow={false}>
-                <SavedViews />
+                <SavedViewsToolbarControls viewState={viewState} />
               </EuiFlexItem>
               <EuiFlexItem grow={false} style={{ position: 'relative', minWidth: 400 }}>
                 <Legend
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/saved_views.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/saved_views.tsx
index 96271ea1260465..48313d5513dfc3 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/saved_views.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/saved_views.tsx
@@ -5,17 +5,9 @@
  */
 import React from 'react';
 import { SavedViewsToolbarControls } from '../../../../components/saved_views/toolbar_control';
-import { inventoryViewSavedObjectName } from '../../../../../common/saved_objects/inventory_view';
 import { useWaffleViewState } from '../hooks/use_waffle_view_state';
 
 export const SavedViews = () => {
-  const { viewState, defaultViewState, onViewChange } = useWaffleViewState();
-  return (
-    <SavedViewsToolbarControls
-      defaultViewState={defaultViewState}
-      viewState={viewState}
-      onViewChange={onViewChange}
-      viewType={inventoryViewSavedObjectName}
-    />
-  );
+  const { viewState } = useWaffleViewState();
+  return <SavedViewsToolbarControls viewState={viewState} />;
 };
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_snaphot.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_snaphot.ts
index 721a2d5792dca9..63e4579dbbfcdb 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_snaphot.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_snaphot.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useEffect } from 'react';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
@@ -63,12 +62,6 @@ export function useSnapshot(
     decodeResponse
   );
 
-  useEffect(() => {
-    (async () => {
-      await makeRequest();
-    })();
-  }, [makeRequest]);
-
   return {
     error: (error && error.message) || null,
     loading,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.ts
index a3132c83849791..8059d1ad12a3a1 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_options.ts
@@ -39,6 +39,7 @@ export const DEFAULT_WAFFLE_OPTIONS_STATE: WaffleOptionsState = {
     steps: 10,
     reverseColors: false,
   },
+  source: 'default',
   sort: { by: 'name', direction: 'desc' },
 };
 
@@ -161,36 +162,44 @@ export const WaffleSortOptionRT = rt.type({
   direction: rt.keyof({ asc: null, desc: null }),
 });
 
-export const WaffleOptionsStateRT = rt.type({
-  metric: SnapshotMetricInputRT,
-  groupBy: SnapshotGroupByRT,
-  nodeType: ItemTypeRT,
-  view: rt.string,
-  customOptions: rt.array(
-    rt.type({
-      text: rt.string,
-      field: rt.string,
-    })
-  ),
-  boundsOverride: rt.type({
-    min: rt.number,
-    max: rt.number,
+export const WaffleOptionsStateRT = rt.intersection([
+  rt.type({
+    metric: SnapshotMetricInputRT,
+    groupBy: SnapshotGroupByRT,
+    nodeType: ItemTypeRT,
+    view: rt.string,
+    customOptions: rt.array(
+      rt.type({
+        text: rt.string,
+        field: rt.string,
+      })
+    ),
+    boundsOverride: rt.type({
+      min: rt.number,
+      max: rt.number,
+    }),
+    autoBounds: rt.boolean,
+    accountId: rt.string,
+    region: rt.string,
+    customMetrics: rt.array(SnapshotCustomMetricInputRT),
+    legend: WaffleLegendOptionsRT,
+    sort: WaffleSortOptionRT,
   }),
-  autoBounds: rt.boolean,
-  accountId: rt.string,
-  region: rt.string,
-  customMetrics: rt.array(SnapshotCustomMetricInputRT),
-  legend: WaffleLegendOptionsRT,
-  sort: WaffleSortOptionRT,
-});
+  rt.partial({ source: rt.string }),
+]);
 
 export type WaffleSortOption = rt.TypeOf<typeof WaffleSortOptionRT>;
 export type WaffleOptionsState = rt.TypeOf<typeof WaffleOptionsStateRT>;
 const encodeUrlState = (state: WaffleOptionsState) => {
   return WaffleOptionsStateRT.encode(state);
 };
-const decodeUrlState = (value: unknown) =>
-  pipe(WaffleOptionsStateRT.decode(value), fold(constant(undefined), identity));
+const decodeUrlState = (value: unknown) => {
+  const state = pipe(WaffleOptionsStateRT.decode(value), fold(constant(undefined), identity));
+  if (state) {
+    state.source = 'url';
+  }
+  return state;
+};
 
 export const WaffleOptions = createContainer(useWaffleOptions);
 export const [WaffleOptionsProvider, useWaffleOptionsContext] = WaffleOptions;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_view_state.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_view_state.ts
index 35313320a5dce9..c1900ac1f32452 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_view_state.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_view_state.ts
@@ -16,6 +16,13 @@ import {
   WaffleFiltersState,
 } from './use_waffle_filters';
 
+export const DEFAULT_WAFFLE_VIEW_STATE: WaffleViewState = {
+  ...DEFAULT_WAFFLE_OPTIONS_STATE,
+  filterQuery: DEFAULT_WAFFLE_FILTERS_STATE,
+  time: DEFAULT_WAFFLE_TIME_STATE.currentTime,
+  autoReload: DEFAULT_WAFFLE_TIME_STATE.isAutoReloading,
+};
+
 export const useWaffleViewState = () => {
   const {
     metric,
@@ -53,13 +60,6 @@ export const useWaffleViewState = () => {
     legend,
   };
 
-  const defaultViewState: WaffleViewState = {
-    ...DEFAULT_WAFFLE_OPTIONS_STATE,
-    filterQuery: DEFAULT_WAFFLE_FILTERS_STATE,
-    time: DEFAULT_WAFFLE_TIME_STATE.currentTime,
-    autoReload: DEFAULT_WAFFLE_TIME_STATE.isAutoReloading,
-  };
-
   const onViewChange = useCallback(
     (newState: WaffleViewState) => {
       setWaffleOptionsState({
@@ -89,7 +89,7 @@ export const useWaffleViewState = () => {
 
   return {
     viewState,
-    defaultViewState,
+    defaultViewState: DEFAULT_WAFFLE_VIEW_STATE,
     onViewChange,
   };
 };
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
index 5c945688614299..976fead10f7b65 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
@@ -22,6 +22,9 @@ import { useTrackPageview } from '../../../../../observability/public';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { Layout } from './components/layout';
 import { useLinkProps } from '../../../hooks/use_link_props';
+import { SavedView } from '../../../containers/saved_view/saved_view';
+import { DEFAULT_WAFFLE_VIEW_STATE } from './hooks/use_waffle_view_state';
+import { useWaffleOptionsContext } from './hooks/use_waffle_options';
 
 export const SnapshotPage = () => {
   const uiCapabilities = useKibana().services.application?.capabilities;
@@ -30,10 +33,12 @@ export const SnapshotPage = () => {
     isLoading,
     loadSourceFailureMessage,
     loadSource,
+    source,
     metricIndicesExist,
   } = useContext(Source.Context);
   useTrackPageview({ app: 'infra_metrics', path: 'inventory' });
   useTrackPageview({ app: 'infra_metrics', path: 'inventory', delay: 15000 });
+  const { source: optionsSource } = useWaffleOptionsContext();
 
   const tutorialLinkProps = useLinkProps({
     app: 'home',
@@ -53,12 +58,18 @@ export const SnapshotPage = () => {
             })
           }
         />
-        {isLoading ? (
+        {isLoading && !source ? (
           <SourceLoadingPage />
         ) : metricIndicesExist ? (
           <>
             <FilterBar />
-            <Layout />
+            <SavedView.Provider
+              shouldLoadDefault={optionsSource === 'default'}
+              viewType={'inventory-view'}
+              defaultViewState={DEFAULT_WAFFLE_VIEW_STATE}
+            >
+              <Layout />
+            </SavedView.Provider>
           </>
         ) : hasFailedLoadingSource ? (
           <SourceErrorPage errorMessage={loadSourceFailureMessage || ''} retry={loadSource} />
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx
index 1471efbd21e18a..c0ee03eb97b59d 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx
@@ -23,8 +23,6 @@ import { MetricsExplorerGroupBy } from './group_by';
 import { MetricsExplorerAggregationPicker } from './aggregation';
 import { MetricsExplorerChartOptions as MetricsExplorerChartOptionsComponent } from './chart_options';
 import { SavedViewsToolbarControls } from '../../../../components/saved_views/toolbar_control';
-import { MetricExplorerViewState } from '../hooks/use_metric_explorer_state';
-import { metricsExplorerViewSavedObjectName } from '../../../../../common/saved_objects/metrics_explorer_view';
 import { useKibanaUiSetting } from '../../../../utils/use_kibana_ui_setting';
 import { mapKibanaQuickRangesToDatePickerRanges } from '../../../../utils/map_timepicker_quickranges_to_datepicker_ranges';
 import { ToolbarPanel } from '../../../../components/toolbar_panel';
@@ -34,7 +32,6 @@ interface Props {
   timeRange: MetricsExplorerTimeOptions;
   options: MetricsExplorerOptions;
   chartOptions: MetricsExplorerChartOptions;
-  defaultViewState: MetricExplorerViewState;
   onRefresh: () => void;
   onTimeChange: (start: string, end: string) => void;
   onGroupByChange: (groupBy: string | null | string[]) => void;
@@ -42,7 +39,6 @@ interface Props {
   onMetricsChange: (metrics: MetricsExplorerMetric[]) => void;
   onAggregationChange: (aggregation: MetricsExplorerAggregation) => void;
   onChartOptionsChange: (chartOptions: MetricsExplorerChartOptions) => void;
-  onViewStateChange: (vs: MetricExplorerViewState) => void;
 }
 
 export const MetricsExplorerToolbar = ({
@@ -57,8 +53,6 @@ export const MetricsExplorerToolbar = ({
   onAggregationChange,
   chartOptions,
   onChartOptionsChange,
-  defaultViewState,
-  onViewStateChange,
 }: Props) => {
   const isDefaultOptions = options.aggregation === 'avg' && options.metrics.length === 0;
   const [timepickerQuickRanges] = useKibanaUiSetting(UI_SETTINGS.TIMEPICKER_QUICK_RANGES);
@@ -123,14 +117,11 @@ export const MetricsExplorerToolbar = ({
 
         <EuiFlexItem grow={false}>
           <SavedViewsToolbarControls
-            defaultViewState={defaultViewState}
             viewState={{
               options,
               chartOptions,
               currentTimerange: timeRange,
             }}
-            viewType={metricsExplorerViewSavedObjectName}
-            onViewChange={onViewStateChange}
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false} style={{ marginRight: 5 }}>
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts
index 66cc77a576f994..4b46ed2efafc0f 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts
@@ -27,7 +27,8 @@ export interface MetricExplorerViewState {
 
 export const useMetricsExplorerState = (
   source: SourceQuery.Query['source']['configuration'],
-  derivedIndexPattern: IIndexPattern
+  derivedIndexPattern: IIndexPattern,
+  shouldLoadImmediately = true
 ) => {
   const [refreshSignal, setRefreshSignal] = useState(0);
   const [afterKey, setAfterKey] = useState<string | null | Record<string, string | null>>(null);
@@ -40,13 +41,15 @@ export const useMetricsExplorerState = (
     setTimeRange,
     setOptions,
   } = useContext(MetricsExplorerOptionsContainer.Context);
-  const { loading, error, data } = useMetricsExplorerData(
+  const { loading, error, data, loadData } = useMetricsExplorerData(
     options,
     source,
     derivedIndexPattern,
     currentTimerange,
     afterKey,
-    refreshSignal
+    refreshSignal,
+    undefined,
+    shouldLoadImmediately
   );
 
   const handleRefresh = useCallback(() => {
@@ -144,7 +147,7 @@ export const useMetricsExplorerState = (
     handleLoadMore: setAfterKey,
     defaultViewState,
     onViewStateChange,
-
+    loadData,
     refreshSignal,
     afterKey,
   };
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts
index 5ed710414718a2..db1e4ec8e4db81 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts
@@ -6,7 +6,7 @@
 
 import DateMath from '@elastic/datemath';
 import { isEqual } from 'lodash';
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useCallback } from 'react';
 import { HttpHandler } from 'src/core/public';
 import { IIndexPattern } from 'src/plugins/data/public';
 import { SourceQuery } from '../../../../../common/graphql/types';
@@ -30,7 +30,8 @@ export function useMetricsExplorerData(
   timerange: MetricsExplorerTimeOptions,
   afterKey: string | null | Record<string, string | null>,
   signal: any,
-  fetch?: HttpHandler
+  fetch?: HttpHandler,
+  shouldLoadImmediately = true
 ) {
   const kibana = useKibana();
   const fetchFn = fetch ? fetch : kibana.services.http?.fetch;
@@ -40,7 +41,7 @@ export function useMetricsExplorerData(
   const [lastOptions, setLastOptions] = useState<MetricsExplorerOptions | null>(null);
   const [lastTimerange, setLastTimerange] = useState<MetricsExplorerTimeOptions | null>(null);
 
-  useEffect(() => {
+  const loadData = useCallback(() => {
     (async () => {
       setLoading(true);
       try {
@@ -112,9 +113,15 @@ export function useMetricsExplorerData(
       }
       setLoading(false);
     })();
-
-    // TODO: fix this dependency list while preserving the semantics
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [options, source, timerange, signal, afterKey]);
-  return { error, loading, data };
+
+  useEffect(() => {
+    if (!shouldLoadImmediately) {
+      return;
+    }
+
+    loadData();
+  }, [loadData, shouldLoadImmediately]);
+  return { error, loading, data, loadData };
 }
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options.ts
index 8abdffd39ed3aa..fa103ce15e3e8f 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options.ts
@@ -43,6 +43,7 @@ export interface MetricsExplorerOptions {
   aggregation: MetricsExplorerAggregation;
   forceInterval?: boolean;
   dropLastBucket?: boolean;
+  source?: string;
 }
 
 export interface MetricsExplorerTimeOptions {
@@ -84,6 +85,13 @@ export const DEFAULT_METRICS: MetricsExplorerOptionsMetric[] = [
 export const DEFAULT_OPTIONS: MetricsExplorerOptions = {
   aggregation: 'avg',
   metrics: DEFAULT_METRICS,
+  source: 'default',
+};
+
+export const DEFAULT_METRICS_EXPLORER_VIEW_STATE = {
+  options: DEFAULT_OPTIONS,
+  chartOptions: DEFAULT_CHART_OPTIONS,
+  currentTimerange: DEFAULT_TIMERANGE,
 };
 
 function parseJsonOrDefault<Obj>(value: string | null, defaultValue: Obj): Obj {
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
index 8b703b1177c8c8..cd875ae54071cb 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiErrorBoundary } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import React from 'react';
+import React, { useEffect } from 'react';
 import { IIndexPattern } from 'src/plugins/data/public';
 import { useTrackPageview } from '../../../../../observability/public';
 import { SourceQuery } from '../../../../common/graphql/types';
@@ -15,6 +15,7 @@ import { NoData } from '../../../components/empty_states';
 import { MetricsExplorerCharts } from './components/charts';
 import { MetricsExplorerToolbar } from './components/toolbar';
 import { useMetricsExplorerState } from './hooks/use_metric_explorer_state';
+import { useSavedViewContext } from '../../../containers/saved_view/saved_view';
 
 interface MetricsExplorerPageProps {
   source: SourceQuery.Query['source']['configuration'];
@@ -37,13 +38,27 @@ export const MetricsExplorerPage = ({ source, derivedIndexPattern }: MetricsExpl
     handleTimeChange,
     handleRefresh,
     handleLoadMore,
-    defaultViewState,
     onViewStateChange,
-  } = useMetricsExplorerState(source, derivedIndexPattern);
+    loadData,
+  } = useMetricsExplorerState(source, derivedIndexPattern, false);
+  const { currentView, shouldLoadDefault } = useSavedViewContext();
 
   useTrackPageview({ app: 'infra_metrics', path: 'metrics_explorer' });
   useTrackPageview({ app: 'infra_metrics', path: 'metrics_explorer', delay: 15000 });
 
+  useEffect(() => {
+    if (currentView) {
+      onViewStateChange(currentView);
+    }
+  }, [currentView, onViewStateChange]);
+
+  useEffect(() => {
+    if (currentView != null || !shouldLoadDefault) {
+      // load metrics explorer data after default view loaded, unless we're not loading a view
+      loadData();
+    }
+  }, [loadData, currentView, shouldLoadDefault]);
+
   return (
     <EuiErrorBoundary>
       <DocumentTitle
@@ -68,8 +83,6 @@ export const MetricsExplorerPage = ({ source, derivedIndexPattern }: MetricsExpl
         onMetricsChange={handleMetricsChange}
         onAggregationChange={handleAggregationChange}
         onChartOptionsChange={setChartOptions}
-        defaultViewState={defaultViewState}
-        onViewStateChange={onViewStateChange}
       />
       {error ? (
         <NoData
diff --git a/x-pack/plugins/infra/public/utils/fixtures/metrics_explorer.ts b/x-pack/plugins/infra/public/utils/fixtures/metrics_explorer.ts
index 15159ad45c7f33..d532cb84c27821 100644
--- a/x-pack/plugins/infra/public/utils/fixtures/metrics_explorer.ts
+++ b/x-pack/plugins/infra/public/utils/fixtures/metrics_explorer.ts
@@ -29,6 +29,8 @@ export const source = {
   logAlias: 'filebeat-*',
   metricAlias: 'metricbeat-*',
   logColumns: [],
+  inventoryDefaultView: 'host',
+  metricsExplorerDefaultView: 'host',
   fields: {
     host: 'host.name',
     container: 'container.id',
diff --git a/x-pack/plugins/infra/server/graphql/sources/schema.gql.ts b/x-pack/plugins/infra/server/graphql/sources/schema.gql.ts
index a39399cec7c329..dbd0696fe3e039 100644
--- a/x-pack/plugins/infra/server/graphql/sources/schema.gql.ts
+++ b/x-pack/plugins/infra/server/graphql/sources/schema.gql.ts
@@ -36,6 +36,10 @@ export const sourcesSchema = gql`
     metricAlias: String!
     "The alias to read log data from"
     logAlias: String!
+    "Default view for inventory"
+    inventoryDefaultView: String!
+    "Default view for Metrics Explorer"
+    metricsExplorerDefaultView: String!
     "The field mapping to use for this source"
     fields: InfraSourceFields!
     "The columns to use for log display"
@@ -128,6 +132,10 @@ export const sourcesSchema = gql`
     logAlias: String
     "The field mapping to use for this source"
     fields: UpdateSourceFieldsInput
+    "Name of default inventory view"
+    inventoryDefaultView: String
+    "Default view for Metrics Explorer"
+    metricsExplorerDefaultView: String
     "The log columns to display for this source"
     logColumns: [UpdateSourceLogColumnInput!]
   }
diff --git a/x-pack/plugins/infra/server/graphql/types.ts b/x-pack/plugins/infra/server/graphql/types.ts
index 1d6b03ac7bffbd..02dcd76e8b34c8 100644
--- a/x-pack/plugins/infra/server/graphql/types.ts
+++ b/x-pack/plugins/infra/server/graphql/types.ts
@@ -357,6 +357,10 @@ export interface UpdateSourceInput {
   logAlias?: string | null;
   /** The field mapping to use for this source */
   fields?: UpdateSourceFieldsInput | null;
+  /** Name of default inventory view */
+  inventoryDefaultView?: string | null;
+  /** Default view for Metrics Explorer */
+  metricsExplorerDefaultView?: string | null;
   /** The log columns to display for this source */
   logColumns?: UpdateSourceLogColumnInput[] | null;
 }
diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
index 79c276a1e58f7e..453f01ef028f17 100644
--- a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -28,7 +28,7 @@ import {
   RequestHandlerContext,
   KibanaResponseFactory,
   RouteMethod,
-  APICaller,
+  LegacyAPICaller,
 } from '../../../../../../../src/core/server';
 import { RequestHandler } from '../../../../../../../src/core/server';
 import { InfraConfig } from '../../../plugin';
@@ -220,7 +220,7 @@ export class KibanaFramework {
   }
 
   public getIndexPatternsService(requestContext: RequestHandlerContext): IndexPatternsFetcher {
-    return new IndexPatternsFetcher((...rest: Parameters<APICaller>) => {
+    return new IndexPatternsFetcher((...rest: Parameters<LegacyAPICaller>) => {
       rest[1] = rest[1] || {};
       rest[1].allowNoIndices = true;
       return requestContext.core.elasticsearch.legacy.client.callAsCurrentUser(...rest);
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/preview_inventory_metric_threshold_alert.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/preview_inventory_metric_threshold_alert.ts
index 6e8c624e61c49a..ba43303bccf0ba 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/preview_inventory_metric_threshold_alert.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/preview_inventory_metric_threshold_alert.ts
@@ -6,7 +6,7 @@
 import { Unit } from '@elastic/datemath';
 import { first } from 'lodash';
 import { InventoryMetricConditions } from './types';
-import { IScopedClusterClient } from '../../../../../../../src/core/server';
+import { ILegacyScopedClusterClient } from '../../../../../../../src/core/server';
 import { InfraSource } from '../../../../common/http_api/source_api';
 import { getIntervalInSeconds } from '../../../utils/get_interval_in_seconds';
 import { InventoryItemType } from '../../../../common/inventory_models/types';
@@ -20,7 +20,7 @@ interface InventoryMetricThresholdParams {
 }
 
 interface PreviewInventoryMetricThresholdAlertParams {
-  callCluster: IScopedClusterClient['callAsCurrentUser'];
+  callCluster: ILegacyScopedClusterClient['callAsCurrentUser'];
   params: InventoryMetricThresholdParams;
   config: InfraSource['configuration'];
   lookback: Unit;
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.ts
index 52637d52175a42..e58667bfdf3e11 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.ts
@@ -10,7 +10,7 @@ import {
   TOO_MANY_BUCKETS_PREVIEW_EXCEPTION,
   isTooManyBucketsPreviewException,
 } from '../../../../common/alerting/metrics';
-import { IScopedClusterClient } from '../../../../../../../src/core/server';
+import { ILegacyScopedClusterClient } from '../../../../../../../src/core/server';
 import { InfraSource } from '../../../../common/http_api/source_api';
 import { getIntervalInSeconds } from '../../../utils/get_interval_in_seconds';
 import { MetricExpressionParams } from './types';
@@ -19,7 +19,7 @@ import { evaluateAlert } from './lib/evaluate_alert';
 const MAX_ITERATIONS = 50;
 
 interface PreviewMetricThresholdAlertParams {
-  callCluster: IScopedClusterClient['callAsCurrentUser'];
+  callCluster: ILegacyScopedClusterClient['callAsCurrentUser'];
   params: {
     criteria: MetricExpressionParams[];
     groupBy: string | undefined | string[];
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
index 4298ccb61bbedd..c95df6ce93b494 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import type { IScopedClusterClient } from 'src/core/server';
+import type { ILegacyScopedClusterClient } from 'src/core/server';
 import {
   compareDatasetsByMaximumAnomalyScore,
   getJobId,
@@ -186,7 +186,7 @@ export async function getLogEntryCategoryDatasets(
 
 export async function getLogEntryCategoryExamples(
   context: {
-    core: { elasticsearch: { legacy: { client: IScopedClusterClient } } };
+    core: { elasticsearch: { legacy: { client: ILegacyScopedClusterClient } } };
     infra: {
       mlAnomalyDetectors: MlAnomalyDetectors;
       mlSystem: MlSystem;
@@ -472,7 +472,7 @@ async function fetchMlJob(
 }
 
 async function fetchLogEntryCategoryExamples(
-  requestContext: { core: { elasticsearch: { legacy: { client: IScopedClusterClient } } } },
+  requestContext: { core: { elasticsearch: { legacy: { client: ILegacyScopedClusterClient } } } },
   indices: string,
   timestampField: string,
   startTime: number,
diff --git a/x-pack/plugins/infra/server/lib/sources/defaults.ts b/x-pack/plugins/infra/server/lib/sources/defaults.ts
index 6b00f59cca1f41..ba22b4db62d612 100644
--- a/x-pack/plugins/infra/server/lib/sources/defaults.ts
+++ b/x-pack/plugins/infra/server/lib/sources/defaults.ts
@@ -19,6 +19,8 @@ export const defaultSourceConfiguration: InfraSourceConfiguration = {
     tiebreaker: '_doc',
     timestamp: '@timestamp',
   },
+  inventoryDefaultView: '0',
+  metricsExplorerDefaultView: '0',
   logColumns: [
     {
       timestampColumn: {
diff --git a/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts b/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts
index 49780fc249d1f0..a36ef8d1a8921a 100644
--- a/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts
+++ b/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts
@@ -30,6 +30,12 @@ export const infraSourceConfigurationSavedObjectType: SavedObjectsType = {
       logAlias: {
         type: 'keyword',
       },
+      inventoryDefaultView: {
+        type: 'keyword',
+      },
+      metricsExplorerDefaultView: {
+        type: 'keyword',
+      },
       fields: {
         properties: {
           container: {
diff --git a/x-pack/plugins/infra/server/usage/usage_collector.ts b/x-pack/plugins/infra/server/usage/usage_collector.ts
index 7be7364c331fa7..598ee21e6f2732 100644
--- a/x-pack/plugins/infra/server/usage/usage_collector.ts
+++ b/x-pack/plugins/infra/server/usage/usage_collector.ts
@@ -7,8 +7,6 @@
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { InventoryItemType } from '../../common/inventory_models/types';
 
-const KIBANA_REPORTING_TYPE = 'infraops';
-
 interface InfraopsSum {
   infraopsHosts: number;
   infraopsDocker: number;
@@ -24,7 +22,7 @@ export class UsageCollector {
 
   public static getUsageCollector(usageCollection: UsageCollectionSetup) {
     return usageCollection.makeUsageCollector({
-      type: KIBANA_REPORTING_TYPE,
+      type: 'infraops',
       isReady: () => true,
       fetch: async () => {
         return this.getReport();
diff --git a/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts b/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
index a3bef72e8db5a3..c2043a40369e28 100644
--- a/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
+++ b/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
@@ -16,7 +16,7 @@ const CONFIG_KEYS_ORDER = [
   'inputs',
   'enabled',
   'use_output',
-  'package',
+  'meta',
   'input',
 ];
 
diff --git a/x-pack/plugins/ingest_manager/common/services/datasources_to_agent_inputs.test.ts b/x-pack/plugins/ingest_manager/common/services/datasources_to_agent_inputs.test.ts
index df94168ec88d02..538951ff103992 100644
--- a/x-pack/plugins/ingest_manager/common/services/datasources_to_agent_inputs.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/datasources_to_agent_inputs.test.ts
@@ -39,7 +39,7 @@ describe('Ingest Manager - storedDatasourcesToAgentInputs', () => {
       {
         id: 'test-logs-foo',
         enabled: true,
-        dataset: 'foo',
+        dataset: { name: 'foo', type: 'logs' },
         vars: {
           fooVar: { value: 'foo-value' },
           fooVar2: { value: [1, 2] },
@@ -52,7 +52,7 @@ describe('Ingest Manager - storedDatasourcesToAgentInputs', () => {
       {
         id: 'test-logs-bar',
         enabled: true,
-        dataset: 'bar',
+        dataset: { name: 'bar', type: 'logs' },
         vars: {
           barVar: { value: 'bar-value' },
           barVar2: { value: [1, 2] },
@@ -101,23 +101,41 @@ describe('Ingest Manager - storedDatasourcesToAgentInputs', () => {
   });
 
   it('returns agent inputs', () => {
-    expect(storedDatasourcesToAgentInputs([{ ...mockDatasource, inputs: [mockInput] }])).toEqual([
+    expect(
+      storedDatasourcesToAgentInputs([
+        {
+          ...mockDatasource,
+          package: {
+            name: 'mock-package',
+            title: 'Mock package',
+            version: '0.0.0',
+          },
+          inputs: [mockInput],
+        },
+      ])
+    ).toEqual([
       {
         id: 'some-uuid',
         name: 'mock-datasource',
         type: 'test-logs',
         dataset: { namespace: 'default' },
         use_output: 'default',
+        meta: {
+          package: {
+            name: 'mock-package',
+            version: '0.0.0',
+          },
+        },
         streams: [
           {
             id: 'test-logs-foo',
-            dataset: { name: 'foo' },
+            dataset: { name: 'foo', type: 'logs' },
             fooKey: 'fooValue1',
             fooKey2: ['fooValue2'],
           },
           {
             id: 'test-logs-bar',
-            dataset: { name: 'bar' },
+            dataset: { name: 'bar', type: 'logs' },
           },
         ],
       },
@@ -147,7 +165,7 @@ describe('Ingest Manager - storedDatasourcesToAgentInputs', () => {
         streams: [
           {
             id: 'test-logs-foo',
-            dataset: { name: 'foo' },
+            dataset: { name: 'foo', type: 'logs' },
             fooKey: 'fooValue1',
             fooKey2: ['fooValue2'],
           },
diff --git a/x-pack/plugins/ingest_manager/common/services/datasources_to_agent_inputs.ts b/x-pack/plugins/ingest_manager/common/services/datasources_to_agent_inputs.ts
index d5a752e817b4f2..c6c5d784396db3 100644
--- a/x-pack/plugins/ingest_manager/common/services/datasources_to_agent_inputs.ts
+++ b/x-pack/plugins/ingest_manager/common/services/datasources_to_agent_inputs.ts
@@ -24,7 +24,9 @@ export const storedDatasourcesToAgentInputs = (
         id: datasource.id || datasource.name,
         name: datasource.name,
         type: input.type,
-        dataset: { namespace: datasource.namespace || 'default' },
+        dataset: {
+          namespace: datasource.namespace || 'default',
+        },
         use_output: DEFAULT_OUTPUT.name,
         ...Object.entries(input.config || {}).reduce((acc, [key, { value }]) => {
           acc[key] = value;
@@ -35,7 +37,7 @@ export const storedDatasourcesToAgentInputs = (
           .map((stream) => {
             const fullStream: FullAgentConfigInputStream = {
               id: stream.id,
-              dataset: { name: stream.dataset },
+              dataset: stream.dataset,
               ...stream.agent_stream,
               ...Object.entries(stream.config || {}).reduce((acc, [key, { value }]) => {
                 acc[key] = value;
@@ -50,9 +52,11 @@ export const storedDatasourcesToAgentInputs = (
       };
 
       if (datasource.package) {
-        fullInput.package = {
-          name: datasource.package.name,
-          version: datasource.package.version,
+        fullInput.meta = {
+          package: {
+            name: datasource.package.name,
+            version: datasource.package.version,
+          },
         };
       }
 
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts b/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
index a977a1a66e059a..7739fdc3a3b611 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
@@ -34,14 +34,14 @@ describe('Ingest Manager - packageToConfig', () => {
   describe('packageToConfigDatasourceInputs', () => {
     it('returns empty array for packages with no datasources', () => {
       expect(packageToConfigDatasourceInputs(mockPackage)).toEqual([]);
-      expect(packageToConfigDatasourceInputs({ ...mockPackage, datasources: [] })).toEqual([]);
+      expect(packageToConfigDatasourceInputs({ ...mockPackage, config_templates: [] })).toEqual([]);
     });
 
     it('returns empty array for packages a datasource but no inputs', () => {
       expect(
         packageToConfigDatasourceInputs(({
           ...mockPackage,
-          datasources: [{ inputs: [] }],
+          config_templates: [{ inputs: [] }],
         } as unknown) as PackageInfo)
       ).toEqual([]);
     });
@@ -50,13 +50,13 @@ describe('Ingest Manager - packageToConfig', () => {
       expect(
         packageToConfigDatasourceInputs(({
           ...mockPackage,
-          datasources: [{ inputs: [{ type: 'foo' }] }],
+          config_templates: [{ inputs: [{ type: 'foo' }] }],
         } as unknown) as PackageInfo)
       ).toEqual([{ type: 'foo', enabled: true, streams: [] }]);
       expect(
         packageToConfigDatasourceInputs(({
           ...mockPackage,
-          datasources: [{ inputs: [{ type: 'foo' }, { type: 'bar' }] }],
+          config_templates: [{ inputs: [{ type: 'foo' }, { type: 'bar' }] }],
         } as unknown) as PackageInfo)
       ).toEqual([
         { type: 'foo', enabled: true, streams: [] },
@@ -68,12 +68,14 @@ describe('Ingest Manager - packageToConfig', () => {
       expect(
         packageToConfigDatasourceInputs(({
           ...mockPackage,
-          datasources: [
+          datasets: [
+            { type: 'logs', name: 'foo', streams: [{ input: 'foo' }] },
+            { type: 'logs', name: 'bar', streams: [{ input: 'bar' }] },
+            { type: 'logs', name: 'bar2', streams: [{ input: 'bar' }] },
+          ],
+          config_templates: [
             {
-              inputs: [
-                { type: 'foo', streams: [{ dataset: 'foo' }] },
-                { type: 'bar', streams: [{ dataset: 'bar' }, { dataset: 'bar2' }] },
-              ],
+              inputs: [{ type: 'foo' }, { type: 'bar' }],
             },
           ],
         } as unknown) as PackageInfo)
@@ -81,14 +83,14 @@ describe('Ingest Manager - packageToConfig', () => {
         {
           type: 'foo',
           enabled: true,
-          streams: [{ id: 'foo-foo', enabled: true, dataset: 'foo' }],
+          streams: [{ id: 'foo-foo', enabled: true, dataset: { name: 'foo', type: 'logs' } }],
         },
         {
           type: 'bar',
           enabled: true,
           streams: [
-            { id: 'bar-bar', enabled: true, dataset: 'bar' },
-            { id: 'bar-bar2', enabled: true, dataset: 'bar2' },
+            { id: 'bar-bar', enabled: true, dataset: { name: 'bar', type: 'logs' } },
+            { id: 'bar-bar2', enabled: true, dataset: { name: 'bar2', type: 'logs' } },
           ],
         },
       ]);
@@ -98,31 +100,38 @@ describe('Ingest Manager - packageToConfig', () => {
       expect(
         packageToConfigDatasourceInputs(({
           ...mockPackage,
-          datasources: [
+          datasets: [
             {
-              inputs: [
+              type: 'logs',
+              name: 'foo',
+              streams: [{ input: 'foo', vars: [{ default: 'foo-var-value', name: 'var-name' }] }],
+            },
+            {
+              type: 'logs',
+              name: 'bar',
+              streams: [
                 {
-                  type: 'foo',
-                  streams: [
-                    { dataset: 'foo', vars: [{ default: 'foo-var-value', name: 'var-name' }] },
-                  ],
+                  input: 'bar',
+                  vars: [{ default: 'bar-var-value', name: 'var-name', type: 'text' }],
                 },
+              ],
+            },
+            {
+              type: 'logs',
+              name: 'bar2',
+              streams: [
                 {
-                  type: 'bar',
-                  streams: [
-                    {
-                      dataset: 'bar',
-                      vars: [{ default: 'bar-var-value', name: 'var-name', type: 'text' }],
-                    },
-                    {
-                      dataset: 'bar2',
-                      vars: [{ default: 'bar2-var-value', name: 'var-name', type: 'yaml' }],
-                    },
-                  ],
+                  input: 'bar',
+                  vars: [{ default: 'bar2-var-value', name: 'var-name', type: 'yaml' }],
                 },
               ],
             },
           ],
+          config_templates: [
+            {
+              inputs: [{ type: 'foo' }, { type: 'bar' }],
+            },
+          ],
         } as unknown) as PackageInfo)
       ).toEqual([
         {
@@ -132,7 +141,7 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'foo-foo',
               enabled: true,
-              dataset: 'foo',
+              dataset: { name: 'foo', type: 'logs' },
               vars: { 'var-name': { value: 'foo-var-value' } },
             },
           ],
@@ -144,13 +153,13 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'bar-bar',
               enabled: true,
-              dataset: 'bar',
+              dataset: { name: 'bar', type: 'logs' },
               vars: { 'var-name': { type: 'text', value: 'bar-var-value' } },
             },
             {
               id: 'bar-bar2',
               enabled: true,
-              dataset: 'bar2',
+              dataset: { name: 'bar2', type: 'logs' },
               vars: { 'var-name': { type: 'yaml', value: 'bar2-var-value' } },
             },
           ],
@@ -162,7 +171,55 @@ describe('Ingest Manager - packageToConfig', () => {
       expect(
         packageToConfigDatasourceInputs(({
           ...mockPackage,
-          datasources: [
+          datasets: [
+            {
+              type: 'logs',
+              name: 'foo',
+              streams: [{ input: 'foo', vars: [{ default: 'foo-var-value', name: 'var-name' }] }],
+            },
+            {
+              type: 'logs',
+              name: 'bar',
+              streams: [
+                {
+                  input: 'bar',
+                  vars: [{ default: 'bar-var-value', name: 'var-name' }],
+                },
+              ],
+            },
+            {
+              type: 'logs',
+              name: 'bar2',
+              streams: [
+                {
+                  input: 'bar',
+                  vars: [{ default: 'bar2-var-value', name: 'var-name' }],
+                },
+              ],
+            },
+            {
+              type: 'logs',
+              name: 'disabled',
+              streams: [
+                {
+                  input: 'with-disabled-streams',
+                  enabled: false,
+                  vars: [{ multi: true, name: 'var-name' }],
+                },
+              ],
+            },
+            {
+              type: 'logs',
+              name: 'disabled2',
+              streams: [
+                {
+                  input: 'with-disabled-streams',
+                  enabled: false,
+                },
+              ],
+            },
+          ],
+          config_templates: [
             {
               inputs: [
                 {
@@ -172,9 +229,6 @@ describe('Ingest Manager - packageToConfig', () => {
                     { default: 'foo-input2-var-value', name: 'foo-input2-var-name' },
                     { name: 'foo-input3-var-name' },
                   ],
-                  streams: [
-                    { dataset: 'foo', vars: [{ default: 'foo-var-value', name: 'var-name' }] },
-                  ],
                 },
                 {
                   type: 'bar',
@@ -182,21 +236,9 @@ describe('Ingest Manager - packageToConfig', () => {
                     { default: ['value1', 'value2'], name: 'bar-input-var-name' },
                     { default: 123456, name: 'bar-input2-var-name' },
                   ],
-                  streams: [
-                    { dataset: 'bar', vars: [{ default: 'bar-var-value', name: 'var-name' }] },
-                    { dataset: 'bar2', vars: [{ default: 'bar2-var-value', name: 'var-name' }] },
-                  ],
                 },
                 {
                   type: 'with-disabled-streams',
-                  streams: [
-                    {
-                      dataset: 'disabled',
-                      enabled: false,
-                      vars: [{ multi: true, name: 'var-name' }],
-                    },
-                    { dataset: 'disabled2', enabled: false },
-                  ],
                 },
               ],
             },
@@ -215,7 +257,7 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'foo-foo',
               enabled: true,
-              dataset: 'foo',
+              dataset: { name: 'foo', type: 'logs' },
               vars: {
                 'var-name': { value: 'foo-var-value' },
               },
@@ -233,7 +275,7 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'bar-bar',
               enabled: true,
-              dataset: 'bar',
+              dataset: { name: 'bar', type: 'logs' },
               vars: {
                 'var-name': { value: 'bar-var-value' },
               },
@@ -241,7 +283,7 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'bar-bar2',
               enabled: true,
-              dataset: 'bar2',
+              dataset: { name: 'bar2', type: 'logs' },
               vars: {
                 'var-name': { value: 'bar2-var-value' },
               },
@@ -255,7 +297,7 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'with-disabled-streams-disabled',
               enabled: false,
-              dataset: 'disabled',
+              dataset: { name: 'disabled', type: 'logs' },
               vars: {
                 'var-name': { value: [] },
               },
@@ -263,7 +305,7 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'with-disabled-streams-disabled2',
               enabled: false,
-              dataset: 'disabled2',
+              dataset: { name: 'disabled2', type: 'logs' },
             },
           ],
         },
@@ -328,7 +370,7 @@ describe('Ingest Manager - packageToConfig', () => {
     it('returns datasource with inputs', () => {
       const mockPackageWithDatasources = ({
         ...mockPackage,
-        datasources: [{ inputs: [{ type: 'foo' }] }],
+        config_templates: [{ inputs: [{ type: 'foo' }] }],
       } as unknown) as PackageInfo;
 
       expect(packageToConfigDatasource(mockPackageWithDatasources, '1', '2', 'ds-1')).toEqual({
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts b/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
index dc0f73b47c599a..1817077e97f9c1 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
@@ -5,8 +5,9 @@
  */
 import {
   PackageInfo,
-  RegistryDatasource,
+  RegistryConfigTemplate,
   RegistryVarsEntry,
+  RegistryStream,
   Datasource,
   DatasourceConfigRecord,
   DatasourceConfigRecordEntry,
@@ -15,6 +16,29 @@ import {
   NewDatasource,
 } from '../types';
 
+const getStreamsForInputType = (
+  inputType: string,
+  packageInfo: PackageInfo
+): Array<RegistryStream & { dataset: { type: string; name: string } }> => {
+  const streams: Array<RegistryStream & { dataset: { type: string; name: string } }> = [];
+
+  (packageInfo.datasets || []).forEach((dataset) => {
+    (dataset.streams || []).forEach((stream) => {
+      if (stream.input === inputType) {
+        streams.push({
+          ...stream,
+          dataset: {
+            type: dataset.type,
+            name: dataset.name,
+          },
+        });
+      }
+    });
+  });
+
+  return streams;
+};
+
 /*
  * This service creates a datasource inputs definition from defaults provided in package info
  */
@@ -22,8 +46,10 @@ export const packageToConfigDatasourceInputs = (packageInfo: PackageInfo): Datas
   const inputs: Datasource['inputs'] = [];
 
   // Assume package will only ever ship one datasource for now
-  const packageDatasource: RegistryDatasource | null =
-    packageInfo.datasources && packageInfo.datasources[0] ? packageInfo.datasources[0] : null;
+  const packageDatasource: RegistryConfigTemplate | null =
+    packageInfo.config_templates && packageInfo.config_templates[0]
+      ? packageInfo.config_templates[0]
+      : null;
 
   // Create datasource input property
   if (packageDatasource?.inputs?.length) {
@@ -45,19 +71,23 @@ export const packageToConfigDatasourceInputs = (packageInfo: PackageInfo): Datas
       };
 
       // Map each package input stream into datasource input stream
-      const streams: DatasourceInputStream[] = packageInput.streams
-        ? packageInput.streams.map((packageStream) => {
-            const stream: DatasourceInputStream = {
-              id: `${packageInput.type}-${packageStream.dataset}`,
-              enabled: packageStream.enabled === false ? false : true,
-              dataset: packageStream.dataset,
-            };
-            if (packageStream.vars && packageStream.vars.length) {
-              stream.vars = packageStream.vars.reduce(varsReducer, {});
-            }
-            return stream;
-          })
-        : [];
+      const streams: DatasourceInputStream[] = getStreamsForInputType(
+        packageInput.type,
+        packageInfo
+      ).map((packageStream) => {
+        const stream: DatasourceInputStream = {
+          id: `${packageInput.type}-${packageStream.dataset.name}`,
+          enabled: packageStream.enabled === false ? false : true,
+          dataset: {
+            name: packageStream.dataset.name,
+            type: packageStream.dataset.type,
+          },
+        };
+        if (packageStream.vars && packageStream.vars.length) {
+          stream.vars = packageStream.vars.reduce(varsReducer, {});
+        }
+        return stream;
+      });
 
       const input: DatasourceInput = {
         type: packageInput.type,
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
index 36b3176ffa4151..0d7dc13af7a30b 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
@@ -41,7 +41,10 @@ export interface FullAgentConfigInput {
   type: string;
   dataset: { namespace: string };
   use_output: string;
-  package?: Pick<DatasourcePackage, 'name' | 'version'>;
+  meta?: {
+    package?: Pick<DatasourcePackage, 'name' | 'version'>;
+    [key: string]: unknown;
+  };
   streams: FullAgentConfigInputStream[];
   [key: string]: any;
 }
diff --git a/x-pack/plugins/ingest_manager/common/types/models/datasource.ts b/x-pack/plugins/ingest_manager/common/types/models/datasource.ts
index aa92b90a6caec2..aae65bb0039959 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/datasource.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/datasource.ts
@@ -20,7 +20,10 @@ export type DatasourceConfigRecord = Record<string, DatasourceConfigRecordEntry>
 export interface NewDatasourceInputStream {
   id: string;
   enabled: boolean;
-  dataset: string;
+  dataset: {
+    name: string;
+    type: string;
+  };
   processors?: string[];
   config?: DatasourceConfigRecord;
   vars?: DatasourceConfigRecord;
diff --git a/x-pack/plugins/ingest_manager/common/types/models/epm.ts b/x-pack/plugins/ingest_manager/common/types/models/epm.ts
index 599165d2bfd981..f45924c30faadc 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/epm.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/epm.ts
@@ -60,7 +60,7 @@ export interface RegistryPackage {
   internal?: boolean;
   format_version: string;
   datasets?: Dataset[];
-  datasources?: RegistryDatasource[];
+  config_templates?: RegistryConfigTemplate[];
   download: string;
   path: string;
 }
@@ -74,7 +74,7 @@ interface RegistryImage {
   size?: string;
   type?: string;
 }
-export interface RegistryDatasource {
+export interface RegistryConfigTemplate {
   name: string;
   title: string;
   description: string;
@@ -86,17 +86,15 @@ export interface RegistryInput {
   title: string;
   description?: string;
   vars?: RegistryVarsEntry[];
-  streams: RegistryStream[];
 }
 
 export interface RegistryStream {
   input: string;
-  dataset: string;
   title: string;
   description?: string;
   enabled?: boolean;
   vars?: RegistryVarsEntry[];
-  template?: string;
+  template_path: string;
 }
 
 export type RequirementVersion = string;
@@ -122,7 +120,7 @@ export type RegistrySearchResult = Pick<
   | 'download'
   | 'path'
   | 'datasets'
-  | 'datasources'
+  | 'config_templates'
 >;
 
 export type ScreenshotItem = RegistryImage;
@@ -169,15 +167,14 @@ export type ElasticsearchAssetTypeToParts = Record<
 >;
 
 export interface Dataset {
+  type: string;
+  name: string;
   title: string;
-  path: string;
-  id: string;
   release: string;
-  ingest_pipeline: string;
-  vars?: RegistryVarsEntry[];
-  type: string;
   streams?: RegistryStream[];
   package: string;
+  path: string;
+  ingest_pipeline: string;
 }
 
 // EPR types this as `[]map[string]interface{}`
@@ -273,7 +270,7 @@ export interface IndexTemplate {
   index_patterns: string[];
   template: {
     settings: any;
-    mappings: object;
+    mappings: any;
     aliases: object;
   };
   data_stream: {
diff --git a/x-pack/plugins/ingest_manager/dev_docs/api_integration_tests.md b/x-pack/plugins/ingest_manager/dev_docs/api_integration_tests.md
new file mode 100644
index 00000000000000..612d94d01a2d0b
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/dev_docs/api_integration_tests.md
@@ -0,0 +1,113 @@
+# API integration tests
+
+Many API integration tests for Ingest Manager trigger at some point a connection to the package registry, and retrieval of some packages. If these connections are made to a package registry deployment outside of Kibana CI, these tests can fail at any time for two reasons:
+* the deployed registry is temporarily unavailable
+* the packages served by the registry do not match the expectation of the code under test
+
+For that reason, we run a dockerized version of the package registry in Kibana CI. For this to work, our tests must run against a custom test configuration and be kept in a custom directory, `x-pack/test/ingest_manager_api_integration`.
+
+## How to run the tests locally
+
+Usually, having the test server and the test runner in two different shells is most efficient, as it is possible to keep the server running and only rerun the test runner as often as needed. To do so, in one shell in the main `kibana` directory, run:
+```
+$ export INGEST_MANAGEMENT_PACKAGE_REGISTRY_PORT=12345
+$ yarn test:ftr:server --config x-pack/test/ingest_manager_api_integration/config.ts
+```
+
+In another shell in the same directory, run
+```
+$ export INGEST_MANAGEMENT_PACKAGE_REGISTRY_PORT=12345
+$ yarn test:ftr:runner --config x-pack/test/ingest_manager_api_integration/config.ts
+```
+
+However, it is also possible to **alternatively** run everything in one go, again from the main `kibana` directory:
+```
+$ export INGEST_MANAGEMENT_PACKAGE_REGISTRY_PORT=12345
+$ yarn test:ftr --config x-pack/test/ingest_manager_api_integration/config.ts
+```
+Port `12345` is used as an example here, it can be anything, but the environment variable has to be present for the tests to run at all.
+
+
+## DockerServers service setup
+
+We use the `DockerServers` service provided by `kbn-test`. The documentation for this functionality can be found here:
+https://github.com/elastic/kibana/blob/master/packages/kbn-test/src/functional_test_runner/lib/docker_servers/README.md
+
+The main configuration for the `DockerServers` service for our tests can be found in `x-pack/test/ingest_manager_api_integration/config.ts`:
+
+### Specify the arguments to pass to `docker run`:
+
+```
+  const dockerArgs: string[] = [
+    '-v',
+    `${path.join(
+      path.dirname(__filename),
+      './apis/fixtures/package_registry_config.yml'
+    )}:/registry/config.yml`,
+    '-v',
+    `${path.join(
+      path.dirname(__filename),
+      './apis/fixtures/test_packages'
+    )}:/registry/packages/test-packages`,
+  ];
+  ```
+
+  `-v` mounts local paths into the docker image. The first one puts a custom configuration file into the correct place in the docker container, the second one mounts a directory containing additional packages.
+
+### Specify the docker image to use
+
+```
+image: 'docker.elastic.co/package-registry/package-registry:kibana-testing-1'
+```
+
+This image contains the content of `docker.elastic.co/package-registry/package-registry:master` on June 26 2020. The image used here should be stable, i.e. using `master` would defeat the purpose of having a stable set of packages to be used in Kibana CI.
+
+### Packages available for testing
+
+The containerized package registry contains a set of packages which should be sufficient to run tests against all parts of Ingest Manager. The list of the packages are logged to the console when the docker container is initialized during testing, or when the container is started manually with
+
+```
+docker run -p 8080:8080 docker.elastic.co/package-registry/package-registry:kibana-testing-1
+```
+
+Additional packages for testing certain corner cases or error conditions can be put into `x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages`. A package `filetest` has been added there as an example.
+
+## Some DockerServers background
+
+For the `DockerServers` servers to run correctly in CI, the `INGEST_MANAGEMENT_PACKAGE_REGISTRY_PORT` environment variable needs to be under control of the CI environment. The reason behind this: it is possible that several versions of our tests are run in parallel on the same worker in Jenkins, and if we used a hard-coded port number here, those tests would run into port conflicts. (This is also the case for a few other ports, and the setup happens in `vars/kibanaPipeline.groovy`).
+
+Also, not every developer has `docker` installed on their workstation, so it must be possible to run the testsuite as a whole without `docker`, and preferably this should be the default behaviour. Therefore, our `DockerServers` service is only enabled when `INGEST_MANAGEMENT_PACKAGE_REGISTRY_PORT` is set. This needs to be checked in every test like this:
+
+```
+    it('fetches a .json search file', async function () {
+      if (server.enabled) {
+        await supertest
+          .get('/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/search/sample_search.json')
+          .set('kbn-xsrf', 'xxx')
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      } else {
+        warnAndSkipTest(this, log);
+      }
+    });
+```
+
+If the tests are skipped in this way, they are marked in the test summary as `pending` and a warning is logged:
+
+```
+└-: EPM Endpoints
+   └-> "before all" hook
+   └-: list
+     └-> "before all" hook
+     └-> lists all packages from the registry
+       └-> "before each" hook: global before each
+       │ warn disabling tests because DockerServers service is not enabled, set INGEST_MANAGEMENT_PACKAGE_REGISTRY_PORT to run them
+       └-> lists all packages from the registry
+       └-> "after all" hook
+[...]  
+           │
+           │1 passing (233ms)
+           │6 pending
+           │
+
+```
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/datasource_input_panel.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/datasource_input_panel.tsx
index db704d8b1d0f3c..6f6fa5aaa7f3e8 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/datasource_input_panel.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/datasource_input_panel.tsx
@@ -19,7 +19,12 @@ import {
   EuiSpacer,
   EuiIconTip,
 } from '@elastic/eui';
-import { DatasourceInput, DatasourceInputStream, RegistryInput } from '../../../../types';
+import {
+  DatasourceInput,
+  DatasourceInputStream,
+  RegistryInput,
+  RegistryStream,
+} from '../../../../types';
 import { DatasourceInputValidationResults, validationHasErrors } from '../services';
 import { DatasourceInputConfig } from './datasource_input_config';
 import { DatasourceInputStreamConfig } from './datasource_input_stream_config';
@@ -32,12 +37,14 @@ const FlushHorizontalRule = styled(EuiHorizontalRule)`
 
 export const DatasourceInputPanel: React.FunctionComponent<{
   packageInput: RegistryInput;
+  packageInputStreams: Array<RegistryStream & { dataset: { name: string } }>;
   datasourceInput: DatasourceInput;
   updateDatasourceInput: (updatedInput: Partial<DatasourceInput>) => void;
   inputValidationResults: DatasourceInputValidationResults;
   forceShowErrors?: boolean;
 }> = ({
   packageInput,
+  packageInputStreams,
   datasourceInput,
   updateDatasourceInput,
   inputValidationResults,
@@ -111,7 +118,7 @@ export const DatasourceInputPanel: React.FunctionComponent<{
                         </strong>
                       </EuiTextColor>
                     ),
-                    total: packageInput.streams.length,
+                    total: packageInputStreams.length,
                   }}
                 />
               </EuiText>
@@ -168,18 +175,18 @@ export const DatasourceInputPanel: React.FunctionComponent<{
       {/* Per-stream configuration */}
       {isShowingStreams ? (
         <EuiFlexGroup direction="column">
-          {packageInput.streams.map((packageInputStream) => {
+          {packageInputStreams.map((packageInputStream) => {
             const datasourceInputStream = datasourceInput.streams.find(
-              (stream) => stream.dataset === packageInputStream.dataset
+              (stream) => stream.dataset.name === packageInputStream.dataset.name
             );
             return datasourceInputStream ? (
-              <EuiFlexItem key={packageInputStream.dataset}>
+              <EuiFlexItem key={packageInputStream.dataset.name}>
                 <DatasourceInputStreamConfig
                   packageInputStream={packageInputStream}
                   datasourceInputStream={datasourceInputStream}
                   updateDatasourceInputStream={(updatedStream: Partial<DatasourceInputStream>) => {
                     const indexOfUpdatedStream = datasourceInput.streams.findIndex(
-                      (stream) => stream.dataset === packageInputStream.dataset
+                      (stream) => stream.dataset.name === packageInputStream.dataset.name
                     );
                     const newStreams = [...datasourceInput.streams];
                     newStreams[indexOfUpdatedStream] = {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/datasource_input_stream_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/datasource_input_stream_config.tsx
index 978ad83cd5c3c9..f697ef736ef705 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/datasource_input_stream_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/datasource_input_stream_config.tsx
@@ -60,7 +60,7 @@ export const DatasourceInputStreamConfig: React.FunctionComponent<{
             <EuiFlexGroup alignItems="center" gutterSize="s">
               <EuiFlexItem grow={false}>
                 <EuiTextColor color={hasErrors ? 'danger' : 'default'}>
-                  {packageInputStream.title || packageInputStream.dataset}
+                  {packageInputStream.title}
                 </EuiTextColor>
               </EuiFlexItem>
               {hasErrors ? (
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/services/validate_datasource.test.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/services/validate_datasource.test.ts
index 67cde2dec3a56e..64facf01d474a7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/services/validate_datasource.test.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/services/validate_datasource.test.ts
@@ -7,7 +7,7 @@ import {
   PackageInfo,
   InstallationStatus,
   NewDatasource,
-  RegistryDatasource,
+  RegistryConfigTemplate,
 } from '../../../../types';
 import { validateDatasource, validationHasErrors } from './validate_datasource';
 
@@ -32,7 +32,65 @@ describe('Ingest Manager - validateDatasource()', () => {
       },
     },
     status: InstallationStatus.notInstalled,
-    datasources: [
+    datasets: [
+      {
+        name: 'foo',
+        streams: [
+          {
+            input: 'foo',
+            title: 'Foo',
+            vars: [{ name: 'var-name', type: 'yaml' }],
+          },
+        ],
+      },
+      {
+        name: 'bar',
+        streams: [
+          {
+            input: 'bar',
+            title: 'Bar',
+            vars: [{ name: 'var-name', type: 'yaml', required: true }],
+          },
+          {
+            input: 'with-no-stream-vars',
+            title: 'Bar stream no vars',
+            enabled: true,
+          },
+        ],
+      },
+      {
+        name: 'bar2',
+        streams: [
+          {
+            input: 'bar',
+            title: 'Bar 2',
+            vars: [{ default: 'bar2-var-value', name: 'var-name', type: 'text' }],
+          },
+        ],
+      },
+      {
+        name: 'disabled',
+        streams: [
+          {
+            input: 'with-disabled-streams',
+            title: 'Disabled',
+            enabled: false,
+            vars: [{ multi: true, required: true, name: 'var-name', type: 'text' }],
+          },
+        ],
+      },
+      {
+        name: 'disabled2',
+        streams: [
+          {
+            input: 'with-disabled-streams',
+            title: 'Disabled 2',
+            enabled: false,
+          },
+        ],
+      },
+    ],
+    config_templates: [
       {
         name: 'datasource1',
         title: 'Datasource 1',
@@ -51,14 +109,6 @@ describe('Ingest Manager - validateDatasource()', () => {
               },
               { name: 'foo-input3-var-name', type: 'text', required: true, multi: true },
             ],
-            streams: [
-              {
-                dataset: 'foo',
-                input: 'foo',
-                title: 'Foo',
-                vars: [{ name: 'var-name', type: 'yaml' }],
-              },
-            ],
           },
           {
             type: 'bar',
@@ -72,51 +122,19 @@ describe('Ingest Manager - validateDatasource()', () => {
               },
               { name: 'bar-input2-var-name', required: true, type: 'text' },
             ],
-            streams: [
-              {
-                dataset: 'bar',
-                input: 'bar',
-                title: 'Bar',
-                vars: [{ name: 'var-name', type: 'yaml', required: true }],
-              },
-              {
-                dataset: 'bar2',
-                input: 'bar2',
-                title: 'Bar 2',
-                vars: [{ default: 'bar2-var-value', name: 'var-name', type: 'text' }],
-              },
-            ],
           },
           {
             type: 'with-no-config-or-streams',
             title: 'With no config or streams',
-            streams: [],
           },
           {
             type: 'with-disabled-streams',
             title: 'With disabled streams',
-            streams: [
-              {
-                dataset: 'disabled',
-                input: 'disabled',
-                title: 'Disabled',
-                enabled: false,
-                vars: [{ multi: true, required: true, name: 'var-name', type: 'text' }],
-              },
-              { dataset: 'disabled2', input: 'disabled2', title: 'Disabled 2', enabled: false },
-            ],
           },
           {
             type: 'with-no-stream-vars',
             enabled: true,
             vars: [{ required: true, name: 'var-name', type: 'text' }],
-            streams: [
-              {
-                id: 'with-no-stream-vars-bar',
-                dataset: 'bar',
-                enabled: true,
-              },
-            ],
           },
         ],
       },
@@ -140,7 +158,7 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'foo-foo',
-            dataset: 'foo',
+            dataset: { name: 'foo', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: 'test_yaml: value', type: 'yaml' } },
           },
@@ -156,13 +174,13 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'bar-bar',
-            dataset: 'bar',
+            dataset: { name: 'bar', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: 'test_yaml: value', type: 'yaml' } },
           },
           {
             id: 'bar-bar2',
-            dataset: 'bar2',
+            dataset: { name: 'bar2', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: undefined, type: 'text' } },
           },
@@ -179,13 +197,13 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'with-disabled-streams-disabled',
-            dataset: 'disabled',
+            dataset: { name: 'disabled', type: 'logs' },
             enabled: false,
             vars: { 'var-name': { value: undefined, type: 'text' } },
           },
           {
             id: 'with-disabled-streams-disabled-without-vars',
-            dataset: 'disabled2',
+            dataset: { name: 'disabled2', type: 'logs' },
             enabled: false,
           },
         ],
@@ -199,7 +217,7 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'with-no-stream-vars-bar',
-            dataset: 'bar',
+            dataset: { name: 'bar', type: 'logs' },
             enabled: true,
           },
         ],
@@ -222,7 +240,7 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'foo-foo',
-            dataset: 'foo',
+            dataset: { name: 'foo', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: 'invalidyaml: test\n foo bar:', type: 'yaml' } },
           },
@@ -238,13 +256,13 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'bar-bar',
-            dataset: 'bar',
+            dataset: { name: 'bar', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: '    \n\n', type: 'yaml' } },
           },
           {
             id: 'bar-bar2',
-            dataset: 'bar2',
+            dataset: { name: 'bar2', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: undefined, type: 'text' } },
           },
@@ -261,7 +279,7 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'with-disabled-streams-disabled',
-            dataset: 'disabled',
+            dataset: { name: 'disabled', type: 'logs' },
             enabled: false,
             vars: {
               'var-name': {
@@ -272,7 +290,7 @@ describe('Ingest Manager - validateDatasource()', () => {
           },
           {
             id: 'with-disabled-streams-disabled-without-vars',
-            dataset: 'disabled2',
+            dataset: { name: 'disabled2', type: 'logs' },
             enabled: false,
           },
         ],
@@ -286,7 +304,7 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'with-no-stream-vars-bar',
-            dataset: 'bar',
+            dataset: { name: 'bar', type: 'logs' },
             enabled: true,
           },
         ],
@@ -435,7 +453,7 @@ describe('Ingest Manager - validateDatasource()', () => {
     expect(
       validateDatasource(validDatasource, {
         ...mockPackage,
-        datasources: undefined,
+        config_templates: undefined,
       })
     ).toEqual({
       name: null,
@@ -445,7 +463,7 @@ describe('Ingest Manager - validateDatasource()', () => {
     expect(
       validateDatasource(validDatasource, {
         ...mockPackage,
-        datasources: [],
+        config_templates: [],
       })
     ).toEqual({
       name: null,
@@ -458,7 +476,7 @@ describe('Ingest Manager - validateDatasource()', () => {
     expect(
       validateDatasource(validDatasource, {
         ...mockPackage,
-        datasources: [{} as RegistryDatasource],
+        config_templates: [{} as RegistryConfigTemplate],
       })
     ).toEqual({
       name: null,
@@ -468,7 +486,7 @@ describe('Ingest Manager - validateDatasource()', () => {
     expect(
       validateDatasource(validDatasource, {
         ...mockPackage,
-        datasources: [({ inputs: [] } as unknown) as RegistryDatasource],
+        config_templates: [({ inputs: [] } as unknown) as RegistryConfigTemplate],
       })
     ).toEqual({
       name: null,
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/services/validate_datasource.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/services/validate_datasource.ts
index 5b4cfe170a4786..30dca4a5fbf816 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/services/validate_datasource.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/services/validate_datasource.ts
@@ -13,6 +13,7 @@ import {
   DatasourceConfigRecordEntry,
   PackageInfo,
   RegistryInput,
+  RegistryStream,
   RegistryVarsEntry,
 } from '../../../../types';
 
@@ -57,11 +58,11 @@ export const validateDatasource = (
   }
 
   if (
-    !packageInfo.datasources ||
-    packageInfo.datasources.length === 0 ||
-    !packageInfo.datasources[0] ||
-    !packageInfo.datasources[0].inputs ||
-    packageInfo.datasources[0].inputs.length === 0
+    !packageInfo.config_templates ||
+    packageInfo.config_templates.length === 0 ||
+    !packageInfo.config_templates[0] ||
+    !packageInfo.config_templates[0].inputs ||
+    packageInfo.config_templates[0].inputs.length === 0
   ) {
     validationResults.inputs = null;
     return validationResults;
@@ -70,11 +71,18 @@ export const validateDatasource = (
   const registryInputsByType: Record<
     string,
     RegistryInput
-  > = packageInfo.datasources[0].inputs.reduce((inputs, registryInput) => {
+  > = packageInfo.config_templates[0].inputs.reduce((inputs, registryInput) => {
     inputs[registryInput.type] = registryInput;
     return inputs;
   }, {} as Record<string, RegistryInput>);
 
+  const registryStreamsByDataset: Record<string, RegistryStream[]> = (
+    packageInfo.datasets || []
+  ).reduce((datasets, registryDataset) => {
+    datasets[registryDataset.name] = registryDataset.streams || [];
+    return datasets;
+  }, {} as Record<string, RegistryStream[]>);
+
   // Validate each datasource input with either its own config fields or streams
   datasource.inputs.forEach((input) => {
     if (!input.vars && !input.streams) {
@@ -116,8 +124,8 @@ export const validateDatasource = (
         if (stream.vars) {
           const streamVarsByName = (
             (
-              registryInputsByType[input.type].streams.find(
-                (registryStream) => registryStream.dataset === stream.dataset
+              registryStreamsByDataset[stream.dataset.name].find(
+                (registryStream) => registryStream.input === input.type
               ) || {}
             ).vars || []
           ).reduce((vars, registryVar) => {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/step_configure_datasource.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/step_configure_datasource.tsx
index 5499ac287ff051..c319dbc08b2c6b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/step_configure_datasource.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/step_configure_datasource.tsx
@@ -7,12 +7,34 @@ import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiPanel, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { PackageInfo, NewDatasource, DatasourceInput } from '../../../types';
+import { PackageInfo, RegistryStream, NewDatasource, DatasourceInput } from '../../../types';
 import { Loading } from '../../../components';
 import { DatasourceValidationResults, validationHasErrors } from './services';
 import { DatasourceInputPanel, CustomConfigureDatasource } from './components';
 import { CreateDatasourceFrom } from './types';
 
+const findStreamsForInputType = (
+  inputType: string,
+  packageInfo: PackageInfo
+): Array<RegistryStream & { dataset: { name: string } }> => {
+  const streams: Array<RegistryStream & { dataset: { name: string } }> = [];
+
+  (packageInfo.datasets || []).forEach((dataset) => {
+    (dataset.streams || []).forEach((stream) => {
+      if (stream.input === inputType) {
+        streams.push({
+          ...stream,
+          dataset: {
+            name: dataset.name,
+          },
+        });
+      }
+    });
+  });
+
+  return streams;
+};
+
 export const StepConfigureDatasource: React.FunctionComponent<{
   from?: CreateDatasourceFrom;
   packageInfo: PackageInfo;
@@ -35,19 +57,21 @@ export const StepConfigureDatasource: React.FunctionComponent<{
   // Configure inputs (and their streams)
   // Assume packages only export one datasource for now
   const renderConfigureInputs = () =>
-    packageInfo.datasources &&
-    packageInfo.datasources[0] &&
-    packageInfo.datasources[0].inputs &&
-    packageInfo.datasources[0].inputs.length ? (
+    packageInfo.config_templates &&
+    packageInfo.config_templates[0] &&
+    packageInfo.config_templates[0].inputs &&
+    packageInfo.config_templates[0].inputs.length ? (
       <EuiFlexGroup direction="column">
-        {packageInfo.datasources[0].inputs.map((packageInput) => {
+        {packageInfo.config_templates[0].inputs.map((packageInput) => {
           const datasourceInput = datasource.inputs.find(
             (input) => input.type === packageInput.type
           );
+          const packageInputStreams = findStreamsForInputType(packageInput.type, packageInfo);
           return datasourceInput ? (
             <EuiFlexItem key={packageInput.type}>
               <DatasourceInputPanel
                 packageInput={packageInput}
+                packageInputStreams={packageInputStreams}
                 datasourceInput={datasourceInput}
                 updateDatasourceInput={(updatedInput: Partial<DatasourceInput>) => {
                   const indexOfUpdatedInput = datasource.inputs.findIndex(
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
index 1a4c6a8a86f6ed..90315f38fd476b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/index.ts
@@ -81,7 +81,7 @@ export {
   RegistryVarsEntry,
   RegistryInput,
   RegistryStream,
-  RegistryDatasource,
+  RegistryConfigTemplate,
   PackageList,
   PackageListItem,
   PackagesGroupedByStatus,
diff --git a/x-pack/plugins/ingest_manager/server/errors.ts b/x-pack/plugins/ingest_manager/server/errors.ts
index 193a65fd8df7ff..ee03b3faf79d13 100644
--- a/x-pack/plugins/ingest_manager/server/errors.ts
+++ b/x-pack/plugins/ingest_manager/server/errors.ts
@@ -4,26 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable max-classes-per-file */
 export class IngestManagerError extends Error {
-  public type: IngestManagerErrorType;
-  public message: string;
-
-  constructor(type: IngestManagerErrorType, message: string) {
+  constructor(message?: string) {
     super(message);
-    this.type = type;
-    this.message = message;
+    this.name = this.constructor.name; // for stack traces
   }
 }
 
 export const getHTTPResponseCode = (error: IngestManagerError): number => {
-  switch (error.type) {
-    case IngestManagerErrorType.RegistryError:
-      return 502; // Bad Gateway
-    default:
-      return 400; // Bad Request
+  if (error instanceof RegistryError) {
+    return 502; // Bad Gateway
+  } else {
+    return 400; // Bad Request
   }
 };
 
-export enum IngestManagerErrorType {
-  RegistryError,
-}
+export class RegistryError extends IngestManagerError {}
diff --git a/x-pack/plugins/ingest_manager/server/plugin.ts b/x-pack/plugins/ingest_manager/server/plugin.ts
index fcdb6387fed3ae..1ae9528f34410a 100644
--- a/x-pack/plugins/ingest_manager/server/plugin.ts
+++ b/x-pack/plugins/ingest_manager/server/plugin.ts
@@ -54,7 +54,12 @@ import {
   AgentService,
   datasourceService,
 } from './services';
-import { getAgentStatusById, authenticateAgentWithAccessToken } from './services/agents';
+import {
+  getAgentStatusById,
+  authenticateAgentWithAccessToken,
+  listAgents,
+  getAgent,
+} from './services/agents';
 import { CloudSetup } from '../../cloud/server';
 import { agentCheckinState } from './services/agents/checkin/state';
 
@@ -236,7 +241,7 @@ export class IngestManagerPlugin
     plugins: {
       encryptedSavedObjects: EncryptedSavedObjectsPluginStart;
     }
-  ) {
+  ): Promise<IngestManagerStartContract> {
     await appContextService.start({
       encryptedSavedObjectsStart: plugins.encryptedSavedObjects,
       encryptedSavedObjectsSetup: this.encryptedSavedObjectsSetup,
@@ -255,6 +260,8 @@ export class IngestManagerPlugin
     return {
       esIndexPatternService: new ESIndexPatternSavedObjectService(),
       agentService: {
+        getAgent,
+        listAgents,
         getAgentStatusById,
         authenticateAgentWithAccessToken,
       },
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
index 1199c9d198e3a1..43b7606a3ce9e4 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
@@ -212,7 +212,12 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
               properties: {
                 id: { type: 'keyword' },
                 enabled: { type: 'boolean' },
-                dataset: { type: 'keyword' },
+                dataset: {
+                  properties: {
+                    name: { type: 'keyword' },
+                    type: { type: 'keyword' },
+                  },
+                },
                 processors: { type: 'keyword' },
                 config: { type: 'flattened' },
                 agent_stream: { type: 'flattened' },
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/datasources_v790.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/datasources_v790.ts
index 0d1fb6f21a1ae7..d1e4b29daefc60 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/datasources_v790.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/datasources_v790.ts
@@ -6,12 +6,22 @@
 
 import { SavedObjectMigrationFn } from 'kibana/server';
 import { cloneDeep } from 'lodash';
-import { Datasource } from '../../types/models';
+import { Datasource, DatasourceInput, DatasourceInputStream } from '../../types';
 
 type Pre790Datasource = Exclude<
   Datasource,
   'created_at' | 'created_by' | 'updated_at' | 'updated_by'
->;
+> & {
+  inputs: Array<
+    Exclude<DatasourceInput, 'streams'> & {
+      streams: Array<
+        Exclude<DatasourceInputStream, 'dataset'> & {
+          dataset: string;
+        }
+      >;
+    }
+  >;
+};
 
 export const migrateDatasourcesToV790: SavedObjectMigrationFn<Pre790Datasource, Datasource> = (
   doc
@@ -23,6 +33,11 @@ export const migrateDatasourcesToV790: SavedObjectMigrationFn<Pre790Datasource,
   updatedDatasource.attributes.created_at = updatedDatasource?.updated_at ?? defDate;
   updatedDatasource.attributes.updated_by = 'system';
   updatedDatasource.attributes.updated_at = updatedDatasource?.updated_at ?? defDate;
+  updatedDatasource.attributes.inputs.forEach((input) => {
+    input.streams.forEach((stream) => {
+      stream.dataset = { name: (stream.dataset as unknown) as string, type: '' };
+    });
+  });
 
   return updatedDatasource;
 };
diff --git a/x-pack/plugins/ingest_manager/server/services/datasource.test.ts b/x-pack/plugins/ingest_manager/server/services/datasource.test.ts
index 3682ae6d1167b9..8d98e41c8ae690 100644
--- a/x-pack/plugins/ingest_manager/server/services/datasource.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/datasource.test.ts
@@ -7,33 +7,51 @@
 import { datasourceService } from './datasource';
 import { PackageInfo } from '../types';
 
-const TEMPLATE = `
+async function mockedGetAssetsData(_a: any, _b: any, dataset: string) {
+  if (dataset === 'dataset1') {
+    return [
+      {
+        buffer: Buffer.from(`
 type: log
 metricset: ["dataset1"]
 paths:
 {{#each paths}}
 - {{this}}
 {{/each}}
-`;
+`),
+      },
+    ];
+  }
+  return [];
+}
+
+jest.mock('./epm/packages/assets', () => {
+  return {
+    getAssetsData: mockedGetAssetsData,
+  };
+});
+
+jest.mock('./epm/registry', () => {
+  return {
+    fetchInfo: () => ({}),
+  };
+});
 
 describe('Datasource service', () => {
   describe('assignPackageStream', () => {
     it('should work with config variables from the stream', async () => {
       const inputs = await datasourceService.assignPackageStream(
         ({
-          datasources: [
+          datasets: [
             {
-              inputs: [
-                {
-                  type: 'log',
-                  streams: [
-                    {
-                      dataset: 'package.dataset1',
-                      template: TEMPLATE,
-                    },
-                  ],
-                },
-              ],
+              type: 'logs',
+              name: 'package.dataset1',
+              streams: [{ input: 'log', template_path: 'some_template_path.yml' }],
+            },
+          ],
+          config_templates: [
+            {
+              inputs: [{ type: 'log' }],
             },
           ],
         } as unknown) as PackageInfo,
@@ -44,7 +62,7 @@ describe('Datasource service', () => {
             streams: [
               {
                 id: 'dataset01',
-                dataset: 'package.dataset1',
+                dataset: { name: 'package.dataset1', type: 'logs' },
                 enabled: true,
                 vars: {
                   paths: {
@@ -64,7 +82,7 @@ describe('Datasource service', () => {
           streams: [
             {
               id: 'dataset01',
-              dataset: 'package.dataset1',
+              dataset: { name: 'package.dataset1', type: 'logs' },
               enabled: true,
               vars: {
                 paths: {
@@ -85,19 +103,16 @@ describe('Datasource service', () => {
     it('should work with config variables at the input level', async () => {
       const inputs = await datasourceService.assignPackageStream(
         ({
-          datasources: [
+          datasets: [
             {
-              inputs: [
-                {
-                  type: 'log',
-                  streams: [
-                    {
-                      dataset: 'package.dataset1',
-                      template: TEMPLATE,
-                    },
-                  ],
-                },
-              ],
+              name: 'package.dataset1',
+              type: 'logs',
+              streams: [{ input: 'log', template_path: 'some_template_path.yml' }],
+            },
+          ],
+          config_templates: [
+            {
+              inputs: [{ type: 'log' }],
             },
           ],
         } as unknown) as PackageInfo,
@@ -113,7 +128,7 @@ describe('Datasource service', () => {
             streams: [
               {
                 id: 'dataset01',
-                dataset: 'package.dataset1',
+                dataset: { name: 'package.dataset1', type: 'logs' },
                 enabled: true,
               },
             ],
@@ -133,7 +148,7 @@ describe('Datasource service', () => {
           streams: [
             {
               id: 'dataset01',
-              dataset: 'package.dataset1',
+              dataset: { name: 'package.dataset1', type: 'logs' },
               enabled: true,
               agent_stream: {
                 metricset: ['dataset1'],
diff --git a/x-pack/plugins/ingest_manager/server/services/datasource.ts b/x-pack/plugins/ingest_manager/server/services/datasource.ts
index f3f460d2a74206..fecec0c463459c 100644
--- a/x-pack/plugins/ingest_manager/server/services/datasource.ts
+++ b/x-pack/plugins/ingest_manager/server/services/datasource.ts
@@ -13,10 +13,18 @@ import {
   PackageInfo,
 } from '../../common';
 import { DATASOURCE_SAVED_OBJECT_TYPE } from '../constants';
-import { NewDatasource, Datasource, ListWithKuery, DatasourceSOAttributes } from '../types';
+import {
+  NewDatasource,
+  Datasource,
+  ListWithKuery,
+  DatasourceSOAttributes,
+  RegistryPackage,
+} from '../types';
 import { agentConfigService } from './agent_config';
-import { getPackageInfo, getInstallation } from './epm/packages';
 import { outputService } from './output';
+import * as Registry from './epm/registry';
+import { getPackageInfo, getInstallation } from './epm/packages';
+import { getAssetsData } from './epm/packages/assets';
 import { createStream } from './epm/agent/agent';
 
 const SAVED_OBJECT_TYPE = DATASOURCE_SAVED_OBJECT_TYPE;
@@ -251,15 +259,22 @@ class DatasourceService {
     pkgInfo: PackageInfo,
     inputs: DatasourceInput[]
   ): Promise<DatasourceInput[]> {
-    const inputsPromises = inputs.map((input) => _assignPackageStreamToInput(pkgInfo, input));
+    const registryPkgInfo = await Registry.fetchInfo(pkgInfo.name, pkgInfo.version);
+    const inputsPromises = inputs.map((input) =>
+      _assignPackageStreamToInput(registryPkgInfo, pkgInfo, input)
+    );
 
     return Promise.all(inputsPromises);
   }
 }
 
-async function _assignPackageStreamToInput(pkgInfo: PackageInfo, input: DatasourceInput) {
+async function _assignPackageStreamToInput(
+  registryPkgInfo: RegistryPackage,
+  pkgInfo: PackageInfo,
+  input: DatasourceInput
+) {
   const streamsPromises = input.streams.map((stream) =>
-    _assignPackageStreamToStream(pkgInfo, input, stream)
+    _assignPackageStreamToStream(registryPkgInfo, pkgInfo, input, stream)
   );
 
   const streams = await Promise.all(streamsPromises);
@@ -267,6 +282,7 @@ async function _assignPackageStreamToInput(pkgInfo: PackageInfo, input: Datasour
 }
 
 async function _assignPackageStreamToStream(
+  registryPkgInfo: RegistryPackage,
   pkgInfo: PackageInfo,
   input: DatasourceInput,
   stream: DatasourceInputStream
@@ -274,32 +290,46 @@ async function _assignPackageStreamToStream(
   if (!stream.enabled) {
     return { ...stream, agent_stream: undefined };
   }
-  const dataset = getDataset(stream.dataset);
-  const datasource = pkgInfo.datasources?.[0];
-  if (!datasource) {
-    throw new Error('Stream template not found, no datasource');
+  const datasetPath = getDataset(stream.dataset.name);
+  const packageDatasets = pkgInfo.datasets;
+  if (!packageDatasets) {
+    throw new Error('Stream template not found, no datasets');
   }
 
-  const inputFromPkg = datasource.inputs.find((pkgInput) => pkgInput.type === input.type);
-  if (!inputFromPkg) {
-    throw new Error(`Stream template not found, unable to found input ${input.type}`);
+  const packageDataset = packageDatasets.find(
+    (pkgDataset) => pkgDataset.name === stream.dataset.name
+  );
+  if (!packageDataset) {
+    throw new Error(`Stream template not found, unable to find dataset ${datasetPath}`);
   }
 
-  const streamFromPkg = inputFromPkg.streams.find(
-    (pkgStream) => pkgStream.dataset === stream.dataset
+  const streamFromPkg = (packageDataset.streams || []).find(
+    (pkgStream) => pkgStream.input === input.type
   );
   if (!streamFromPkg) {
-    throw new Error(`Stream template not found, unable to found stream ${stream.dataset}`);
+    throw new Error(`Stream template not found, unable to find stream for input ${input.type}`);
+  }
+
+  if (!streamFromPkg.template_path) {
+    throw new Error(`Stream template path not found for dataset ${datasetPath}`);
   }
 
-  if (!streamFromPkg.template) {
-    throw new Error(`Stream template not found for dataset ${dataset}`);
+  const [pkgStream] = await getAssetsData(
+    registryPkgInfo,
+    (path: string) => path.endsWith(streamFromPkg.template_path),
+    datasetPath
+  );
+
+  if (!pkgStream || !pkgStream.buffer) {
+    throw new Error(
+      `Unable to load stream template ${streamFromPkg.template_path} for dataset ${datasetPath}`
+    );
   }
 
   const yaml = createStream(
     // Populate template variables from input vars and stream vars
     Object.assign({}, input.vars, stream.vars),
-    streamFromPkg.template
+    pkgStream.buffer.toString()
   );
 
   stream.agent_stream = yaml;
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/index.test.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/index.test.ts
index 851a3bc2dd7206..bdd8883ea29c24 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/index.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/index.test.ts
@@ -9,7 +9,7 @@ import { getDatasetAssetBaseName } from './index';
 
 test('getBaseName', () => {
   const dataset: Dataset = {
-    id: 'nginx.access',
+    name: 'nginx.access',
     title: 'Nginx Acess Logs',
     release: 'beta',
     type: 'logs',
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/index.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/index.ts
index e00b9db71db10b..0cb09ba054bf10 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/index.ts
@@ -11,5 +11,5 @@ import { Dataset } from '../../../types';
  * {type}-{id}
  */
 export function getDatasetAssetBaseName(dataset: Dataset): string {
-  return `${dataset.type}-${dataset.id}`;
+  return `${dataset.type}-${dataset.name}`;
 }
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ingest_pipeline/ingest_pipelines.test.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ingest_pipeline/ingest_pipelines.test.ts
index c3b135993105e5..36a19c512a8b48 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ingest_pipeline/ingest_pipelines.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ingest_pipeline/ingest_pipelines.test.ts
@@ -107,7 +107,7 @@ test('a yml-format pipeline with no pipeline references stays unchanged', () =>
 
 test('getPipelineNameForInstallation gets correct name', () => {
   const dataset: Dataset = {
-    id: 'coredns.log',
+    name: 'coredns.log',
     title: 'CoreDNS logs',
     release: 'ga',
     type: 'logs',
@@ -127,8 +127,10 @@ test('getPipelineNameForInstallation gets correct name', () => {
     dataset,
     packageVersion,
   });
-  expect(pipelineEntryNameForInstallation).toBe(`${dataset.type}-${dataset.id}-${packageVersion}`);
+  expect(pipelineEntryNameForInstallation).toBe(
+    `${dataset.type}-${dataset.name}-${packageVersion}`
+  );
   expect(pipelineRefNameForInstallation).toBe(
-    `${dataset.type}-${dataset.id}-${packageVersion}-${pipelineRefName}`
+    `${dataset.type}-${dataset.name}-${packageVersion}-${pipelineRefName}`
   );
 });
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ingest_pipeline/install.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ingest_pipeline/install.ts
index 11543fe73886f2..0865ee5d59e57a 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ingest_pipeline/install.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ingest_pipeline/install.ts
@@ -192,5 +192,5 @@ export const getPipelineNameForInstallation = ({
   const isPipelineEntry = pipelineName === dataset.ingest_pipeline;
   const suffix = isPipelineEntry ? '' : `-${pipelineName}`;
   // if this is the pipeline entry, don't add a suffix
-  return `${dataset.type}-${dataset.id}-${packageVersion}${suffix}`;
+  return `${dataset.type}-${dataset.name}-${packageVersion}${suffix}`;
 };
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
index b7760a9032aca8..9e8f327d520e3b 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
@@ -330,11 +330,15 @@ const getIndices = async (
   template: TemplateRef
 ): Promise<CurrentIndex[] | undefined> => {
   const { templateName, indexTemplate } = template;
-  const res = await callCluster('search', getIndexQuery(templateName));
-  const indices: any[] = res?.aggregations?.index.buckets;
-  if (indices) {
-    return indices.map((index) => ({
-      indexName: index.key,
+  // Until ES provides a way to update mappings of a data stream
+  // get the last index of the data stream, which is the current write index
+  const res = await callCluster('transport.request', {
+    method: 'GET',
+    path: `/_data_stream/${templateName}-*`,
+  });
+  if (res.length) {
+    return res.map((datastream: any) => ({
+      indexName: datastream.indices[datastream.indices.length - 1].index_name,
       indexTemplate,
     }));
   }
@@ -359,18 +363,40 @@ const updateExistingIndex = async ({
   indexTemplate: IndexTemplate;
 }) => {
   const { settings, mappings } = indexTemplate.template;
+
+  // for now, remove from object so as not to update stream or dataset properties of the index until type and name
+  // are added in https://github.com/elastic/kibana/issues/66551.  namespace value we will continue
+  // to skip updating and assume the value in the index mapping is correct
+  delete mappings.properties.stream;
+  delete mappings.properties.dataset;
+
+  // get the dataset values from the index template to compose data stream name
+  const indexMappings = await getIndexMappings(indexName, callCluster);
+  const dataset = indexMappings[indexName].mappings.properties.dataset.properties;
+  if (!dataset.type.value || !dataset.name.value || !dataset.namespace.value)
+    throw new Error(`dataset values are missing from the index template ${indexName}`);
+  const dataStreamName = `${dataset.type.value}-${dataset.name.value}-${dataset.namespace.value}`;
+
   // try to update the mappings first
-  // for now we assume updates are compatible
   try {
     await callCluster('indices.putMapping', {
       index: indexName,
       body: mappings,
     });
+    // if update fails, rollover data stream
   } catch (err) {
-    throw new Error('incompatible mappings update');
+    try {
+      const path = `/${dataStreamName}/_rollover`;
+      await callCluster('transport.request', {
+        method: 'POST',
+        path,
+      });
+    } catch (error) {
+      throw new Error(`cannot rollover data stream ${dataStreamName}`);
+    }
   }
   // update settings after mappings was successful to ensure
-  // pointing to theme new pipeline is safe
+  // pointing to the new pipeline is safe
   // for now, only update the pipeline
   if (!settings.index.default_pipeline) return;
   try {
@@ -379,36 +405,17 @@ const updateExistingIndex = async ({
       body: { index: { default_pipeline: settings.index.default_pipeline } },
     });
   } catch (err) {
-    throw new Error('incompatible settings update');
+    throw new Error(`could not update index template settings for ${indexName}`);
   }
 };
 
-const getIndexQuery = (templateName: string) => ({
-  index: `${templateName}-*`,
-  size: 0,
-  body: {
-    query: {
-      bool: {
-        must: [
-          {
-            exists: {
-              field: 'dataset.namespace',
-            },
-          },
-          {
-            exists: {
-              field: 'dataset.name',
-            },
-          },
-        ],
-      },
-    },
-    aggs: {
-      index: {
-        terms: {
-          field: '_index',
-        },
-      },
-    },
-  },
-});
+const getIndexMappings = async (indexName: string, callCluster: CallESAsCurrentUser) => {
+  try {
+    const indexMappings = await callCluster('indices.getMapping', {
+      index: indexName,
+    });
+    return indexMappings;
+  } catch (err) {
+    throw new Error(`could not get mapping from ${indexName}`);
+  }
+};
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/packages/assets.ts b/x-pack/plugins/ingest_manager/server/services/epm/packages/assets.ts
index 37fcf0db671310..19a023eb2ad4c5 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/packages/assets.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/packages/assets.ts
@@ -71,13 +71,3 @@ export async function getAssetsData(
 
   return entries;
 }
-
-export async function getAssetsDataForPackageKey(
-  { pkgName, pkgVersion }: { pkgName: string; pkgVersion: string },
-  filter = (path: string): boolean => true,
-  datasetName?: string
-): Promise<Registry.ArchiveEntry[]> {
-  const registryPkgInfo = await Registry.fetchInfo(pkgName, pkgVersion);
-
-  return getAssetsData(registryPkgInfo, filter, datasetName);
-}
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.ts b/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.ts
index 6d039345e31c35..abf77ddddfd7ab 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.ts
@@ -6,7 +6,7 @@
 
 import fetch, { Response } from 'node-fetch';
 import { streamToString } from './streams';
-import { IngestManagerError, IngestManagerErrorType } from '../../../errors';
+import { RegistryError } from '../../../errors';
 
 export async function getResponse(url: string): Promise<Response> {
   try {
@@ -14,16 +14,12 @@ export async function getResponse(url: string): Promise<Response> {
     if (response.ok) {
       return response;
     } else {
-      throw new IngestManagerError(
-        IngestManagerErrorType.RegistryError,
+      throw new RegistryError(
         `Error connecting to package registry at ${url}: ${response.statusText}`
       );
     }
   } catch (e) {
-    throw new IngestManagerError(
-      IngestManagerErrorType.RegistryError,
-      `Error connecting to package registry at ${url}: ${e.message}`
-    );
+    throw new RegistryError(`Error connecting to package registry at ${url}: ${e.message}`);
   }
 }
 
diff --git a/x-pack/plugins/ingest_manager/server/services/index.ts b/x-pack/plugins/ingest_manager/server/services/index.ts
index 1a0fb262eeb7f3..49896959f3c3a0 100644
--- a/x-pack/plugins/ingest_manager/server/services/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/index.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
-import { AgentStatus } from '../types';
+import { SavedObjectsClientContract, KibanaRequest } from 'kibana/server';
+import { AgentStatus, Agent } from '../types';
 import * as settingsService from './settings';
 export { ESIndexPatternSavedObjectService } from './es_index_pattern';
 
@@ -24,12 +24,38 @@ export interface ESIndexPatternService {
  * A service that provides exported functions that return information about an Agent
  */
 export interface AgentService {
+  /**
+   * Get an Agent by id
+   */
+  getAgent(soClient: SavedObjectsClientContract, agentId: string): Promise<Agent>;
+  /**
+   * Authenticate an agent with access toekn
+   */
+  authenticateAgentWithAccessToken(
+    soClient: SavedObjectsClientContract,
+    request: KibanaRequest
+  ): Promise<Agent>;
   /**
    * Return the status by the Agent's id
-   * @param soClient
-   * @param agentId
    */
   getAgentStatusById(soClient: SavedObjectsClientContract, agentId: string): Promise<AgentStatus>;
+  /**
+   * List agents
+   */
+  listAgents(
+    soClient: SavedObjectsClientContract,
+    options: {
+      page: number;
+      perPage: number;
+      kuery?: string;
+      showInactive: boolean;
+    }
+  ): Promise<{
+    agents: Agent[];
+    total: number;
+    page: number;
+    perPage: number;
+  }>;
 }
 
 // Saved object services
diff --git a/x-pack/plugins/ingest_manager/server/types/index.tsx b/x-pack/plugins/ingest_manager/server/types/index.tsx
index 2b543490ca8dab..eedb5d86abda32 100644
--- a/x-pack/plugins/ingest_manager/server/types/index.tsx
+++ b/x-pack/plugins/ingest_manager/server/types/index.tsx
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { ScopedClusterClient } from 'src/core/server';
+import { LegacyScopedClusterClient } from 'src/core/server';
 
 export {
   // Object types
@@ -18,6 +18,8 @@ export {
   AgentAction,
   AgentActionSOAttributes,
   Datasource,
+  DatasourceInput,
+  DatasourceInputStream,
   NewDatasource,
   DatasourceSOAttributes,
   FullAgentConfigInput,
@@ -59,7 +61,7 @@ export {
   SettingsSOAttributes,
 } from '../../common';
 
-export type CallESAsCurrentUser = ScopedClusterClient['callAsCurrentUser'];
+export type CallESAsCurrentUser = LegacyScopedClusterClient['callAsCurrentUser'];
 
 export type AgentConfigUpdateHandler = (
   action: 'created' | 'updated' | 'deleted',
diff --git a/x-pack/plugins/ingest_manager/server/types/models/datasource.ts b/x-pack/plugins/ingest_manager/server/types/models/datasource.ts
index 3bca6d20d96a20..114986c4a486e5 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/datasource.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/datasource.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { schema } from '@kbn/config-schema';
-export { Datasource, NewDatasource } from '../../../common';
 
 const ConfigRecordSchema = schema.recordOf(
   schema.string(),
@@ -47,7 +46,7 @@ const DatasourceBaseSchema = {
         schema.object({
           id: schema.string(),
           enabled: schema.boolean(),
-          dataset: schema.string(),
+          dataset: schema.object({ name: schema.string(), type: schema.string() }),
           processors: schema.maybe(schema.arrayOf(schema.string())),
           vars: schema.maybe(ConfigRecordSchema),
           config: schema.maybe(
diff --git a/x-pack/plugins/ingest_manager/server/types/models/output.ts b/x-pack/plugins/ingest_manager/server/types/models/output.ts
index 36b945db2cbcef..22a101ecd94b8e 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/output.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/output.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { schema } from '@kbn/config-schema';
-export { Output, NewOutput } from '../../../common';
 
 export enum OutputType {
   Elasticsearch = 'elasticsearch',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
index d8d8ebcf12de4f..e8c8c5762bb833 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
@@ -177,8 +177,7 @@ function mockClient() {
   } as unknown) as Pick<SavedObjectsClientContract, 'find' | 'bulkGet'>;
 }
 
-// Failing: See https://github.com/elastic/kibana/issues/70104
-describe.skip('loader', () => {
+describe('loader', () => {
   describe('loadIndexPatterns', () => {
     it('should not load index patterns that are already loaded', async () => {
       const cache = await loadIndexPatterns({
@@ -318,7 +317,6 @@ describe.skip('loader', () => {
           a: sampleIndexPatterns.a,
         },
         layers: {},
-        showEmptyFields: false,
       });
       expect(storage.set).toHaveBeenCalledWith('lens-settings', {
         indexPatternId: 'a',
@@ -341,7 +339,6 @@ describe.skip('loader', () => {
           b: sampleIndexPatterns.b,
         },
         layers: {},
-        showEmptyFields: false,
       });
     });
 
diff --git a/x-pack/plugins/lens/server/routes/existing_fields.test.ts b/x-pack/plugins/lens/server/routes/existing_fields.test.ts
index 33541c7206c532..728b78c8e97bc4 100644
--- a/x-pack/plugins/lens/server/routes/existing_fields.test.ts
+++ b/x-pack/plugins/lens/server/routes/existing_fields.test.ts
@@ -172,4 +172,19 @@ describe('buildFieldList', () => {
       script: '2+2',
     });
   });
+
+  it('handles missing mappings', () => {
+    const fields = buildFieldList(indexPattern, {}, fieldDescriptors);
+    expect(fields.every((f) => f.isAlias === false)).toEqual(true);
+  });
+
+  it('handles empty fieldDescriptors by skipping multi-mappings', () => {
+    const fields = buildFieldList(indexPattern, mappings, []);
+    expect(fields.find((f) => f.name === 'baz')).toMatchObject({
+      isAlias: false,
+      isScript: false,
+      name: 'baz',
+      path: ['baz'],
+    });
+  });
 });
diff --git a/x-pack/plugins/lens/server/routes/existing_fields.ts b/x-pack/plugins/lens/server/routes/existing_fields.ts
index 461406591d4329..7ab3cdceb21457 100644
--- a/x-pack/plugins/lens/server/routes/existing_fields.ts
+++ b/x-pack/plugins/lens/server/routes/existing_fields.ts
@@ -6,7 +6,7 @@
 
 import Boom from 'boom';
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient, SavedObject, RequestHandlerContext } from 'src/core/server';
+import { ILegacyScopedClusterClient, SavedObject, RequestHandlerContext } from 'src/core/server';
 import { CoreSetup } from 'src/core/server';
 import { BASE_API_URL } from '../../common';
 import {
@@ -41,8 +41,7 @@ export interface Field {
   script?: string;
 }
 
-// TODO: Pull this from kibana advanced settings
-const metaFields = ['_source', '_id', '_type', '_index', '_score'];
+const metaFields = ['_source', '_type'];
 
 export async function existingFieldsRoute(setup: CoreSetup) {
   const router = setup.http.createRouter();
@@ -137,6 +136,18 @@ async function fetchIndexPatternDefinition(indexPatternId: string, context: Requ
     indexPatternId
   );
   const indexPatternTitle = indexPattern.attributes.title;
+
+  if (indexPatternTitle.includes(':')) {
+    // Cross cluster search patterns include a colon, and we aren't able to fetch
+    // mapping information.
+    return {
+      indexPattern,
+      indexPatternTitle,
+      mappings: {},
+      fieldDescriptors: [],
+    };
+  }
+
   // TODO: maybe don't use IndexPatternsFetcher at all, since we're only using it
   // to look up field values in the resulting documents. We can accomplish the same
   // using the mappings which we're also fetching here.
@@ -166,10 +177,10 @@ async function fetchIndexPatternDefinition(indexPatternId: string, context: Requ
  */
 export function buildFieldList(
   indexPattern: SavedObject<IndexPatternAttributes>,
-  mappings: MappingResult,
+  mappings: MappingResult | {},
   fieldDescriptors: FieldDescriptor[]
 ): Field[] {
-  const aliasMap = Object.entries(Object.values(mappings)[0].mappings.properties)
+  const aliasMap = Object.entries(Object.values(mappings)[0]?.mappings.properties ?? {})
     .map(([name, v]) => ({ ...v, name }))
     .filter((f) => f.type === 'alias')
     .reduce((acc, f) => {
@@ -207,7 +218,7 @@ async function fetchIndexPatternStats({
   toDate,
   fields,
 }: {
-  client: IScopedClusterClient;
+  client: ILegacyScopedClusterClient;
   index: string;
   dslQuery: object;
   timeFieldName?: string;
@@ -242,6 +253,7 @@ async function fetchIndexPatternStats({
     body: {
       size: SAMPLE_SIZE,
       query,
+      sort: timeFieldName && fromDate && toDate ? [{ [timeFieldName]: 'desc' }] : [],
       // _source is required because we are also providing script fields.
       _source: '*',
       script_fields: scriptedFields.reduce((acc, field) => {
diff --git a/x-pack/plugins/lens/server/usage/task.ts b/x-pack/plugins/lens/server/usage/task.ts
index cde6e7eb6c090b..edc5a778749af1 100644
--- a/x-pack/plugins/lens/server/usage/task.ts
+++ b/x-pack/plugins/lens/server/usage/task.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller, CoreSetup, Logger } from 'kibana/server';
+import { LegacyAPICaller, CoreSetup, Logger } from 'kibana/server';
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
 import moment from 'moment';
@@ -70,7 +70,7 @@ async function scheduleTasks(logger: Logger, taskManager: TaskManagerStartContra
 
 export async function getDailyEvents(
   kibanaIndex: string,
-  callCluster: APICaller
+  callCluster: LegacyAPICaller
 ): Promise<{
   byDate: Record<string, Record<string, number>>;
   suggestionsByDate: Record<string, Record<string, number>>;
@@ -185,7 +185,7 @@ export function telemetryTaskRunner(
 ) {
   return ({ taskInstance }: RunContext) => {
     const { state } = taskInstance;
-    const callCluster = async (...args: Parameters<APICaller>) => {
+    const callCluster = async (...args: Parameters<LegacyAPICaller>) => {
       const [coreStart] = await core.getStartServices();
       return coreStart.elasticsearch.legacy.client.callAsInternalUser(...args);
     };
diff --git a/x-pack/plugins/lens/server/usage/visualization_counts.ts b/x-pack/plugins/lens/server/usage/visualization_counts.ts
index 00b84fe100224e..c3c6b2b7e4cbdd 100644
--- a/x-pack/plugins/lens/server/usage/visualization_counts.ts
+++ b/x-pack/plugins/lens/server/usage/visualization_counts.ts
@@ -4,11 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { LensVisualizationUsage } from './types';
 
 export async function getVisualizationCounts(
-  callCluster: APICaller,
+  callCluster: LegacyAPICaller,
   kibanaIndex: string
 ): Promise<LensVisualizationUsage> {
   const scriptedMetric = {
diff --git a/x-pack/plugins/license_management/server/types.ts b/x-pack/plugins/license_management/server/types.ts
index 11b1ed696874bc..5b432b7ff05798 100644
--- a/x-pack/plugins/license_management/server/types.ts
+++ b/x-pack/plugins/license_management/server/types.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { ScopedClusterClient, IRouter } from 'kibana/server';
+import { LegacyScopedClusterClient, IRouter } from 'kibana/server';
 
 import { LicensingPluginSetup } from '../../licensing/server';
 import { SecurityPluginSetup } from '../../security/server';
@@ -27,6 +27,6 @@ export interface RouteDependencies {
   };
 }
 
-export type CallAsCurrentUser = ScopedClusterClient['callAsCurrentUser'];
+export type CallAsCurrentUser = LegacyScopedClusterClient['callAsCurrentUser'];
 
-export type CallAsInternalUser = ScopedClusterClient['callAsInternalUser'];
+export type CallAsInternalUser = LegacyScopedClusterClient['callAsInternalUser'];
diff --git a/x-pack/plugins/licensing/server/plugin.test.ts b/x-pack/plugins/licensing/server/plugin.test.ts
index 9d76472b51cd26..bf549c18da303f 100644
--- a/x-pack/plugins/licensing/server/plugin.test.ts
+++ b/x-pack/plugins/licensing/server/plugin.test.ts
@@ -14,7 +14,7 @@ import {
   elasticsearchServiceMock,
   loggingSystemMock,
 } from '../../../../src/core/server/mocks';
-import { IClusterClient } from '../../../../src/core/server/';
+import { ILegacyClusterClient } from '../../../../src/core/server/';
 
 function buildRawLicense(options: Partial<RawLicense> = {}): RawLicense {
   const defaultRawLicense: RawLicense = {
@@ -29,7 +29,7 @@ function buildRawLicense(options: Partial<RawLicense> = {}): RawLicense {
 
 const flushPromises = (ms = 50) => new Promise((res) => setTimeout(res, ms));
 
-function createCoreSetupWith(esClient: IClusterClient) {
+function createCoreSetupWith(esClient: ILegacyClusterClient) {
   const coreSetup = coreMock.createSetup();
 
   coreSetup.getStartServices.mockResolvedValue([
diff --git a/x-pack/plugins/licensing/server/plugin.ts b/x-pack/plugins/licensing/server/plugin.ts
index 0a6964b1b829d1..6cdba0ac466446 100644
--- a/x-pack/plugins/licensing/server/plugin.ts
+++ b/x-pack/plugins/licensing/server/plugin.ts
@@ -15,8 +15,8 @@ import {
   Logger,
   Plugin,
   PluginInitializerContext,
-  IClusterClient,
-  IScopedClusterClient,
+  ILegacyClusterClient,
+  ILegacyScopedClusterClient,
   ScopeableRequest,
 } from 'src/core/server';
 
@@ -100,20 +100,20 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup, LicensingPl
     const pollingFrequency = config.api_polling_frequency;
 
     async function callAsInternalUser(
-      ...args: Parameters<IScopedClusterClient['callAsInternalUser']>
-    ): ReturnType<IScopedClusterClient['callAsInternalUser']> {
+      ...args: Parameters<ILegacyScopedClusterClient['callAsInternalUser']>
+    ): ReturnType<ILegacyScopedClusterClient['callAsInternalUser']> {
       const [coreStart] = await core.getStartServices();
       const client = coreStart.elasticsearch.legacy.client;
       return await client.callAsInternalUser(...args);
     }
 
-    const client: IClusterClient = {
+    const client: ILegacyClusterClient = {
       callAsInternalUser,
-      asScoped(request?: ScopeableRequest): IScopedClusterClient {
+      asScoped(request?: ScopeableRequest): ILegacyScopedClusterClient {
         return {
           async callAsCurrentUser(
-            ...args: Parameters<IScopedClusterClient['callAsCurrentUser']>
-          ): ReturnType<IScopedClusterClient['callAsCurrentUser']> {
+            ...args: Parameters<ILegacyScopedClusterClient['callAsCurrentUser']>
+          ): ReturnType<ILegacyScopedClusterClient['callAsCurrentUser']> {
             const [coreStart] = await core.getStartServices();
             const _client = coreStart.elasticsearch.legacy.client;
             return await _client.asScoped(request).callAsCurrentUser(...args);
@@ -147,7 +147,7 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup, LicensingPl
     };
   }
 
-  private createLicensePoller(clusterClient: IClusterClient, pollingFrequency: number) {
+  private createLicensePoller(clusterClient: ILegacyClusterClient, pollingFrequency: number) {
     this.logger.debug(`Polling Elasticsearch License API with frequency ${pollingFrequency}ms.`);
 
     const intervalRefresh$ = timer(0, pollingFrequency);
@@ -176,7 +176,7 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup, LicensingPl
     };
   }
 
-  private fetchLicense = async (clusterClient: IClusterClient): Promise<ILicense> => {
+  private fetchLicense = async (clusterClient: ILegacyClusterClient): Promise<ILicense> => {
     try {
       const response = await clusterClient.callAsInternalUser('transport.request', {
         method: 'GET',
diff --git a/x-pack/plugins/licensing/server/types.ts b/x-pack/plugins/licensing/server/types.ts
index 53d9a8ddfcb873..dd1277429eabda 100644
--- a/x-pack/plugins/licensing/server/types.ts
+++ b/x-pack/plugins/licensing/server/types.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { Observable } from 'rxjs';
-import { IClusterClient } from 'src/core/server';
+import { ILegacyClusterClient } from 'src/core/server';
 import { ILicense, LicenseStatus, LicenseType } from '../common/types';
 import { FeatureUsageServiceSetup, FeatureUsageServiceStart } from './services';
 
@@ -74,7 +74,7 @@ export interface LicensingPluginSetup {
    * @deprecated in favour of the counterpart provided from start contract
    */
   createLicensePoller: (
-    clusterClient: IClusterClient,
+    clusterClient: ILegacyClusterClient,
     pollingFrequency: number
   ) => { license$: Observable<ILicense>; refresh(): Promise<ILicense> };
   /**
@@ -99,7 +99,7 @@ export interface LicensingPluginStart {
    * given polling frequency.
    */
   createLicensePoller: (
-    clusterClient: IClusterClient,
+    clusterClient: ILegacyClusterClient,
     pollingFrequency: number
   ) => { license$: Observable<ILicense>; refresh(): Promise<ILicense> };
   /**
diff --git a/x-pack/plugins/lists/common/get_call_cluster.mock.ts b/x-pack/plugins/lists/common/get_call_cluster.mock.ts
index f036605a6a1742..be6f1b3a58629a 100644
--- a/x-pack/plugins/lists/common/get_call_cluster.mock.ts
+++ b/x-pack/plugins/lists/common/get_call_cluster.mock.ts
@@ -5,7 +5,7 @@
  */
 
 import { CreateDocumentResponse } from 'elasticsearch';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { LIST_INDEX } from './constants.mock';
 import { getShardMock } from './get_shard.mock';
@@ -22,4 +22,4 @@ export const getEmptyCreateDocumentResponseMock = (): CreateDocumentResponse =>
 
 export const getCallClusterMock = (
   callCluster: unknown = getEmptyCreateDocumentResponseMock()
-): APICaller => jest.fn().mockResolvedValue(callCluster);
+): LegacyAPICaller => jest.fn().mockResolvedValue(callCluster);
diff --git a/x-pack/plugins/lists/server/services/items/create_list_item.ts b/x-pack/plugins/lists/server/services/items/create_list_item.ts
index d46b9b4703fcbc..7c2f8ade6521e5 100644
--- a/x-pack/plugins/lists/server/services/items/create_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/create_list_item.ts
@@ -6,7 +6,7 @@
 
 import uuid from 'uuid';
 import { CreateDocumentResponse } from 'elasticsearch';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import {
   IdOrUndefined,
@@ -22,7 +22,7 @@ export interface CreateListItemOptions {
   listId: string;
   type: Type;
   value: string;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listItemIndex: string;
   user: string;
   meta: MetaOrUndefined;
diff --git a/x-pack/plugins/lists/server/services/items/create_list_items_bulk.ts b/x-pack/plugins/lists/server/services/items/create_list_items_bulk.ts
index eac294c5f244a2..ced1a6344f9b7f 100644
--- a/x-pack/plugins/lists/server/services/items/create_list_items_bulk.ts
+++ b/x-pack/plugins/lists/server/services/items/create_list_items_bulk.ts
@@ -5,7 +5,7 @@
  */
 
 import uuid from 'uuid';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { transformListItemToElasticQuery } from '../utils';
 import {
@@ -19,7 +19,7 @@ export interface CreateListItemsBulkOptions {
   listId: string;
   type: Type;
   value: string[];
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listItemIndex: string;
   user: string;
   meta: MetaOrUndefined;
diff --git a/x-pack/plugins/lists/server/services/items/delete_list_item.ts b/x-pack/plugins/lists/server/services/items/delete_list_item.ts
index 9992f43387c89f..b006aed6f6dde3 100644
--- a/x-pack/plugins/lists/server/services/items/delete_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/delete_list_item.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { Id, ListItemSchema } from '../../../common/schemas';
 
@@ -12,7 +12,7 @@ import { getListItem } from '.';
 
 export interface DeleteListItemOptions {
   id: Id;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listItemIndex: string;
 }
 
diff --git a/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.ts b/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.ts
index 57aced5f3701cf..3551cb75dc5bcb 100644
--- a/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.ts
+++ b/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { ListItemArraySchema, Type } from '../../../common/schemas';
 import { getQueryFilterFromTypeValue } from '../utils';
@@ -15,7 +15,7 @@ export interface DeleteListItemByValueOptions {
   listId: string;
   type: Type;
   value: string;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listItemIndex: string;
 }
 
diff --git a/x-pack/plugins/lists/server/services/items/find_list_item.ts b/x-pack/plugins/lists/server/services/items/find_list_item.ts
index d10e6466d03d0c..0f120f73d195e1 100644
--- a/x-pack/plugins/lists/server/services/items/find_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/find_list_item.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import {
   Filter,
@@ -35,7 +35,7 @@ interface FindListItemOptions {
   page: Page;
   sortField: SortFieldOrUndefined;
   sortOrder: SortOrderOrUndefined;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listIndex: string;
   listItemIndex: string;
 }
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item.ts b/x-pack/plugins/lists/server/services/items/get_list_item.ts
index 296d1e4e821849..0c84ba50525cf8 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { Id, ListItemSchema, SearchEsListItemSchema } from '../../../common/schemas';
 import { deriveTypeFromItem, transformElasticToListItem } from '../utils';
 
 interface GetListItemOptions {
   id: Id;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listItemIndex: string;
 }
 
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item_by_value.ts b/x-pack/plugins/lists/server/services/items/get_list_item_by_value.ts
index 49bcf12043d7c9..6b75a171a26d6a 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item_by_value.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item_by_value.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { ListItemArraySchema, Type } from '../../../common/schemas';
 
@@ -12,7 +12,7 @@ import { getListItemByValues } from '.';
 
 export interface GetListItemByValueOptions {
   listId: string;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listItemIndex: string;
   type: Type;
   value: string;
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.ts b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.ts
index cf0ccf3f10aa6e..5e232443625dd3 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { ListItemArraySchema, SearchEsListItemSchema, Type } from '../../../common/schemas';
 import { getQueryFilterFromTypeValue, transformElasticToListItem } from '../utils';
 
 export interface GetListItemByValuesOptions {
   listId: string;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listItemIndex: string;
   type: Type;
   value: string[];
diff --git a/x-pack/plugins/lists/server/services/items/update_list_item.ts b/x-pack/plugins/lists/server/services/items/update_list_item.ts
index 6a428b4be854d3..4ddb6e4c4c7423 100644
--- a/x-pack/plugins/lists/server/services/items/update_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/update_list_item.ts
@@ -5,7 +5,7 @@
  */
 
 import { CreateDocumentResponse } from 'elasticsearch';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import {
   Id,
@@ -20,7 +20,7 @@ import { getListItem } from './get_list_item';
 export interface UpdateListItemOptions {
   id: Id;
   value: string | null | undefined;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listItemIndex: string;
   user: string;
   meta: MetaOrUndefined;
diff --git a/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.ts b/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.ts
index b3097799628896..de983158ac7072 100644
--- a/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.ts
+++ b/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.ts
@@ -6,7 +6,7 @@
 
 import { Readable } from 'stream';
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { MetaOrUndefined, Type } from '../../../common/schemas';
 
@@ -17,7 +17,7 @@ import { createListItemsBulk } from './create_list_items_bulk';
 export interface ImportListItemsToStreamOptions {
   listId: string;
   stream: Readable;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listItemIndex: string;
   type: Type;
   user: string;
@@ -55,7 +55,7 @@ export const importListItemsToStream = ({
 
 export interface WriteBufferToItemsOptions {
   listId: string;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listItemIndex: string;
   buffer: string[];
   type: Type;
diff --git a/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.ts b/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.ts
index f485f557433c6e..91f4644d359e36 100644
--- a/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.ts
+++ b/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.ts
@@ -7,7 +7,7 @@
 import { PassThrough } from 'stream';
 
 import { SearchResponse } from 'elasticsearch';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { SearchEsListItemSchema } from '../../../common/schemas';
 import { ErrorWithStatusCode } from '../../error_with_status_code';
@@ -20,7 +20,7 @@ export const SIZE = 100;
 
 export interface ExportListItemsToStreamOptions {
   listId: string;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listItemIndex: string;
   stream: PassThrough;
   stringToAppend: string | null | undefined;
@@ -60,7 +60,7 @@ export const exportListItemsToStream = ({
 
 export interface WriteNextResponseOptions {
   listId: string;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listItemIndex: string;
   stream: PassThrough;
   searchAfter: string[] | undefined;
@@ -100,7 +100,7 @@ export const getSearchAfterFromResponse = <T>({
     : undefined;
 
 export interface GetResponseOptions {
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listId: string;
   searchAfter: undefined | string[];
   listItemIndex: string;
diff --git a/x-pack/plugins/lists/server/services/lists/create_list.ts b/x-pack/plugins/lists/server/services/lists/create_list.ts
index 0d2ee606a066df..29ac5ebd967107 100644
--- a/x-pack/plugins/lists/server/services/lists/create_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/create_list.ts
@@ -6,7 +6,7 @@
 
 import uuid from 'uuid';
 import { CreateDocumentResponse } from 'elasticsearch';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import {
   Description,
@@ -23,7 +23,7 @@ export interface CreateListOptions {
   type: Type;
   name: Name;
   description: Description;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listIndex: string;
   user: string;
   meta: MetaOrUndefined;
diff --git a/x-pack/plugins/lists/server/services/lists/delete_list.ts b/x-pack/plugins/lists/server/services/lists/delete_list.ts
index bc66c88b082a31..64359b72732744 100644
--- a/x-pack/plugins/lists/server/services/lists/delete_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/delete_list.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { Id, ListSchema } from '../../../common/schemas';
 
@@ -12,7 +12,7 @@ import { getList } from './get_list';
 
 export interface DeleteListOptions {
   id: Id;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listIndex: string;
   listItemIndex: string;
 }
diff --git a/x-pack/plugins/lists/server/services/lists/find_list.ts b/x-pack/plugins/lists/server/services/lists/find_list.ts
index 41dcdfcd0f8dbe..86cead9e868d6e 100644
--- a/x-pack/plugins/lists/server/services/lists/find_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/find_list.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import {
   Filter,
@@ -32,7 +32,7 @@ interface FindListOptions {
   page: Page;
   sortField: SortFieldOrUndefined;
   sortOrder: SortOrderOrUndefined;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listIndex: string;
 }
 
diff --git a/x-pack/plugins/lists/server/services/lists/get_list.ts b/x-pack/plugins/lists/server/services/lists/get_list.ts
index 386232bfeee1f3..13550eb7d30dd0 100644
--- a/x-pack/plugins/lists/server/services/lists/get_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/get_list.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { Id, ListSchema, SearchEsListSchema } from '../../../common/schemas';
 import { transformElasticToList } from '../utils/transform_elastic_to_list';
 
 interface GetListOptions {
   id: Id;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listIndex: string;
 }
 
diff --git a/x-pack/plugins/lists/server/services/lists/list_client.ts b/x-pack/plugins/lists/server/services/lists/list_client.ts
index 5a7d20c7d64d53..662d082a08e4ba 100644
--- a/x-pack/plugins/lists/server/services/lists/list_client.ts
+++ b/x-pack/plugins/lists/server/services/lists/list_client.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import {
   FoundListItemSchema,
@@ -75,7 +75,7 @@ export class ListClient {
   private readonly spaceId: string;
   private readonly user: string;
   private readonly config: ConfigType;
-  private readonly callCluster: APICaller;
+  private readonly callCluster: LegacyAPICaller;
 
   constructor({ spaceId, user, config, callCluster }: ConstructorOptions) {
     this.spaceId = spaceId;
diff --git a/x-pack/plugins/lists/server/services/lists/list_client_types.ts b/x-pack/plugins/lists/server/services/lists/list_client_types.ts
index 4171b6ee9f1655..0c7a6a6e99a8e2 100644
--- a/x-pack/plugins/lists/server/services/lists/list_client_types.ts
+++ b/x-pack/plugins/lists/server/services/lists/list_client_types.ts
@@ -6,7 +6,7 @@
 
 import { PassThrough, Readable } from 'stream';
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import {
   Description,
@@ -27,7 +27,7 @@ import {
 import { ConfigType } from '../../config';
 
 export interface ConstructorOptions {
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   config: ConfigType;
   spaceId: string;
   user: string;
diff --git a/x-pack/plugins/lists/server/services/lists/update_list.ts b/x-pack/plugins/lists/server/services/lists/update_list.ts
index 28be50e9d6ac86..7d763013fb10e4 100644
--- a/x-pack/plugins/lists/server/services/lists/update_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/update_list.ts
@@ -5,7 +5,7 @@
  */
 
 import { CreateDocumentResponse } from 'elasticsearch';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import {
   DescriptionOrUndefined,
@@ -20,7 +20,7 @@ import { getList } from '.';
 
 export interface UpdateListOptions {
   id: Id;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   listIndex: string;
   user: string;
   name: NameOrUndefined;
diff --git a/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts b/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
index 2af501106d6598..dd1ac74d40acd1 100644
--- a/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
+++ b/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { Filter, SortFieldOrUndefined, SortOrderOrUndefined } from '../../../common/schemas';
 import { Scroll } from '../lists/types';
@@ -15,7 +15,7 @@ import { getSourceWithTieBreaker } from './get_source_with_tie_breaker';
 import { TieBreaker, getSearchAfterWithTieBreaker } from './get_search_after_with_tie_breaker';
 
 interface GetSearchAfterOptions {
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   filter: Filter;
   hops: number;
   hopSize: number;
diff --git a/x-pack/plugins/lists/server/services/utils/scroll_to_start_page.ts b/x-pack/plugins/lists/server/services/utils/scroll_to_start_page.ts
index 6b898a54bb9fef..0b04cdc196eb6f 100644
--- a/x-pack/plugins/lists/server/services/utils/scroll_to_start_page.ts
+++ b/x-pack/plugins/lists/server/services/utils/scroll_to_start_page.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { Filter, SortFieldOrUndefined, SortOrderOrUndefined } from '../../../common/schemas';
 import { Scroll } from '../lists/types';
@@ -13,7 +13,7 @@ import { calculateScrollMath } from './calculate_scroll_math';
 import { getSearchAfterScroll } from './get_search_after_scroll';
 
 interface ScrollToStartPageOptions {
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   filter: Filter;
   sortField: SortFieldOrUndefined;
   sortOrder: SortOrderOrUndefined;
diff --git a/x-pack/plugins/lists/server/types.ts b/x-pack/plugins/lists/server/types.ts
index 6808aaa04ab7a0..9ea7e7a2bc0018 100644
--- a/x-pack/plugins/lists/server/types.ts
+++ b/x-pack/plugins/lists/server/types.ts
@@ -5,8 +5,8 @@
  */
 
 import {
-  APICaller,
   IContextProvider,
+  LegacyAPICaller,
   RequestHandler,
   SavedObjectsClientContract,
 } from 'kibana/server';
@@ -25,7 +25,7 @@ export interface PluginsSetup {
 }
 
 export type GetListClientType = (
-  dataClient: APICaller,
+  dataClient: LegacyAPICaller,
   spaceId: string,
   user: string
 ) => ListClient;
diff --git a/x-pack/plugins/logstash/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts b/x-pack/plugins/logstash/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts
index 060cf188a4c60e..f7cfc4d4fa12a9 100755
--- a/x-pack/plugins/logstash/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts
+++ b/x-pack/plugins/logstash/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { APICaller } from 'src/core/server';
+import { LegacyAPICaller } from 'src/core/server';
 import { SearchResponse } from 'elasticsearch';
 
 import { ES_SCROLL_SETTINGS } from '../../../common/constants';
@@ -11,7 +11,7 @@ import { Hits } from '../../types';
 
 export async function fetchAllFromScroll(
   response: SearchResponse<any>,
-  callWithRequest: APICaller,
+  callWithRequest: LegacyAPICaller,
   hits: Hits = []
 ): Promise<Hits> {
   const newHits = response.hits?.hits || [];
diff --git a/x-pack/plugins/logstash/server/plugin.ts b/x-pack/plugins/logstash/server/plugin.ts
index c048dd13bfb0cf..eb79e1d2a8d8bc 100644
--- a/x-pack/plugins/logstash/server/plugin.ts
+++ b/x-pack/plugins/logstash/server/plugin.ts
@@ -6,7 +6,7 @@
 import {
   CoreSetup,
   CoreStart,
-  ICustomClusterClient,
+  ILegacyCustomClusterClient,
   Logger,
   Plugin,
   PluginInitializerContext,
@@ -23,7 +23,7 @@ interface SetupDeps {
 
 export class LogstashPlugin implements Plugin {
   private readonly logger: Logger;
-  private esClient?: ICustomClusterClient;
+  private esClient?: ILegacyCustomClusterClient;
   private coreSetup?: CoreSetup;
   constructor(context: PluginInitializerContext) {
     this.logger = context.logger.get();
diff --git a/x-pack/plugins/logstash/server/routes/pipelines/delete.ts b/x-pack/plugins/logstash/server/routes/pipelines/delete.ts
index e29d0128353b56..4b2471c89fe07c 100644
--- a/x-pack/plugins/logstash/server/routes/pipelines/delete.ts
+++ b/x-pack/plugins/logstash/server/routes/pipelines/delete.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { schema } from '@kbn/config-schema';
-import { APICaller, IRouter } from 'src/core/server';
+import { LegacyAPICaller, IRouter } from 'src/core/server';
 import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
 
 import { INDEX_NAMES } from '../../../common/constants';
 import { checkLicense } from '../../lib/check_license';
 
-async function deletePipelines(callWithRequest: APICaller, pipelineIds: string[]) {
+async function deletePipelines(callWithRequest: LegacyAPICaller, pipelineIds: string[]) {
   const deletePromises = pipelineIds.map((pipelineId) => {
     return callWithRequest('delete', {
       index: INDEX_NAMES.PIPELINES,
diff --git a/x-pack/plugins/logstash/server/routes/pipelines/list.ts b/x-pack/plugins/logstash/server/routes/pipelines/list.ts
index 594e2b8ed8b3c2..de2266b89e3d03 100644
--- a/x-pack/plugins/logstash/server/routes/pipelines/list.ts
+++ b/x-pack/plugins/logstash/server/routes/pipelines/list.ts
@@ -5,7 +5,7 @@
  */
 import { i18n } from '@kbn/i18n';
 import { SearchResponse } from 'elasticsearch';
-import { APICaller, IRouter } from 'src/core/server';
+import { LegacyAPICaller, IRouter } from 'src/core/server';
 import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
 
 import { INDEX_NAMES, ES_SCROLL_SETTINGS } from '../../../common/constants';
@@ -13,7 +13,7 @@ import { PipelineListItem } from '../../models/pipeline_list_item';
 import { fetchAllFromScroll } from '../../lib/fetch_all_from_scroll';
 import { checkLicense } from '../../lib/check_license';
 
-async function fetchPipelines(callWithRequest: APICaller) {
+async function fetchPipelines(callWithRequest: LegacyAPICaller) {
   const params = {
     index: INDEX_NAMES.PIPELINES,
     scroll: ES_SCROLL_SETTINGS.KEEPALIVE,
diff --git a/x-pack/plugins/logstash/server/types.ts b/x-pack/plugins/logstash/server/types.ts
index 2b266b2f277089..29198407013abe 100644
--- a/x-pack/plugins/logstash/server/types.ts
+++ b/x-pack/plugins/logstash/server/types.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { SearchResponse } from 'elasticsearch';
-import { IScopedClusterClient } from 'src/core/server';
+import { ILegacyScopedClusterClient } from 'src/core/server';
 
 type UnwrapArray<T> = T extends Array<infer U> ? U : never;
 
@@ -21,7 +21,7 @@ export interface PipelineListItemOptions {
 declare module 'src/core/server' {
   interface RequestHandlerContext {
     logstash?: {
-      esClient: IScopedClusterClient;
+      esClient: ILegacyScopedClusterClient;
     };
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/__snapshots__/layer_template.test.tsx.snap b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/__snapshots__/layer_template.test.tsx.snap
new file mode 100644
index 00000000000000..3a301a951ed571
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/__snapshots__/layer_template.test.tsx.snap
@@ -0,0 +1,107 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should render EMS UI when left source is BOUNDARIES_SOURCE.EMS 1`] = `
+<Fragment>
+  <EuiPanel>
+    <EuiTitle
+      size="xs"
+    >
+      <h5>
+        <FormattedMessage
+          defaultMessage="Boundaries source"
+          id="xpack.maps.choropleth.boundariesLabel"
+          values={Object {}}
+        />
+      </h5>
+    </EuiTitle>
+    <EuiSpacer
+      size="m"
+    />
+    <EuiFormRow
+      describedByIds={Array []}
+      display="row"
+      fullWidth={false}
+      hasChildLabel={true}
+      hasEmptyLabelSpace={false}
+      labelType="label"
+    >
+      <EuiRadioGroup
+        idSelected="EMS"
+        onChange={[Function]}
+        options={
+          Array [
+            Object {
+              "id": "EMS",
+              "label": "Administrative boundaries from Elastic Maps Service",
+            },
+            Object {
+              "id": "ELASTICSEARCH",
+              "label": "Points, lines, and polygons from Elasticsearch",
+            },
+          ]
+        }
+      />
+    </EuiFormRow>
+    <EMSFileSelect
+      onChange={[Function]}
+      value={null}
+    />
+  </EuiPanel>
+  <EuiSpacer
+    size="s"
+  />
+</Fragment>
+`;
+
+exports[`should render elasticsearch UI when left source is BOUNDARIES_SOURCE.ELASTICSEARCH 1`] = `
+<Fragment>
+  <EuiPanel>
+    <EuiTitle
+      size="xs"
+    >
+      <h5>
+        <FormattedMessage
+          defaultMessage="Boundaries source"
+          id="xpack.maps.choropleth.boundariesLabel"
+          values={Object {}}
+        />
+      </h5>
+    </EuiTitle>
+    <EuiSpacer
+      size="m"
+    />
+    <EuiFormRow
+      describedByIds={Array []}
+      display="row"
+      fullWidth={false}
+      hasChildLabel={true}
+      hasEmptyLabelSpace={false}
+      labelType="label"
+    >
+      <EuiRadioGroup
+        idSelected="ELASTICSEARCH"
+        onChange={[Function]}
+        options={
+          Array [
+            Object {
+              "id": "EMS",
+              "label": "Administrative boundaries from Elastic Maps Service",
+            },
+            Object {
+              "id": "ELASTICSEARCH",
+              "label": "Points, lines, and polygons from Elasticsearch",
+            },
+          ]
+        }
+      />
+    </EuiFormRow>
+    <GeoIndexPatternSelect
+      onChange={[Function]}
+      value=""
+    />
+  </EuiPanel>
+  <EuiSpacer
+    size="s"
+  />
+</Fragment>
+`;
diff --git a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/choropleth_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/choropleth_layer_wizard.tsx
new file mode 100644
index 00000000000000..6e806f4530df25
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/choropleth_layer_wizard.tsx
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { LAYER_WIZARD_CATEGORY } from '../../../../common/constants';
+import { LayerWizard, RenderWizardArguments } from '../layer_wizard_registry';
+import { LayerTemplate } from './layer_template';
+
+export const choroplethLayerWizardConfig: LayerWizard = {
+  categories: [LAYER_WIZARD_CATEGORY.ELASTICSEARCH],
+  description: i18n.translate('xpack.maps.choropleth.desc', {
+    defaultMessage: 'Shaded areas to compare statistics across boundaries',
+  }),
+  icon: 'logoElasticsearch',
+  renderWizard: (renderWizardArguments: RenderWizardArguments) => {
+    return <LayerTemplate {...renderWizardArguments} />;
+  },
+  title: i18n.translate('xpack.maps.choropleth.title', {
+    defaultMessage: 'Choropleth',
+  }),
+};
diff --git a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts
new file mode 100644
index 00000000000000..61fb6ef54c2073
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/create_choropleth_layer_descriptor.ts
@@ -0,0 +1,144 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import uuid from 'uuid/v4';
+import {
+  AGG_TYPE,
+  COLOR_MAP_TYPE,
+  FIELD_ORIGIN,
+  SCALING_TYPES,
+  SOURCE_TYPES,
+  STYLE_TYPE,
+  VECTOR_STYLES,
+} from '../../../../common/constants';
+import { getJoinAggKey } from '../../../../common/get_agg_key';
+import {
+  AggDescriptor,
+  ColorDynamicOptions,
+  EMSFileSourceDescriptor,
+  ESSearchSourceDescriptor,
+} from '../../../../common/descriptor_types';
+import { VectorStyle } from '../../styles/vector/vector_style';
+import { VectorLayer } from '../vector_layer/vector_layer';
+import { EMSFileSource } from '../../sources/ems_file_source';
+// @ts-ignore
+import { ESSearchSource } from '../../sources/es_search_source';
+import { getDefaultDynamicProperties } from '../../styles/vector/vector_style_defaults';
+
+const defaultDynamicProperties = getDefaultDynamicProperties();
+
+function createChoroplethLayerDescriptor({
+  sourceDescriptor,
+  leftField,
+  rightIndexPatternId,
+  rightIndexPatternTitle,
+  rightTermField,
+}: {
+  sourceDescriptor: EMSFileSourceDescriptor | ESSearchSourceDescriptor;
+  leftField: string;
+  rightIndexPatternId: string;
+  rightIndexPatternTitle: string;
+  rightTermField: string;
+}) {
+  const metricsDescriptor: AggDescriptor = { type: AGG_TYPE.COUNT };
+  const joinId = uuid();
+  const joinKey = getJoinAggKey({
+    aggType: metricsDescriptor.type,
+    aggFieldName: metricsDescriptor.field ? metricsDescriptor.field : '',
+    rightSourceId: joinId,
+  });
+  return VectorLayer.createDescriptor({
+    joins: [
+      {
+        leftField,
+        right: {
+          type: SOURCE_TYPES.ES_TERM_SOURCE,
+          id: joinId,
+          indexPatternId: rightIndexPatternId,
+          indexPatternTitle: rightIndexPatternTitle,
+          term: rightTermField,
+          metrics: [metricsDescriptor],
+        },
+      },
+    ],
+    sourceDescriptor,
+    style: VectorStyle.createDescriptor({
+      [VECTOR_STYLES.FILL_COLOR]: {
+        type: STYLE_TYPE.DYNAMIC,
+        options: {
+          ...(defaultDynamicProperties[VECTOR_STYLES.FILL_COLOR]!.options as ColorDynamicOptions),
+          field: {
+            name: joinKey,
+            origin: FIELD_ORIGIN.JOIN,
+          },
+          color: 'Yellow to Red',
+          type: COLOR_MAP_TYPE.ORDINAL,
+        },
+      },
+      [VECTOR_STYLES.LINE_COLOR]: {
+        type: STYLE_TYPE.STATIC,
+        options: {
+          color: '#3d3d3d',
+        },
+      },
+    }),
+  });
+}
+
+export function createEmsChoroplethLayerDescriptor({
+  leftEmsFileId,
+  leftEmsField,
+  rightIndexPatternId,
+  rightIndexPatternTitle,
+  rightTermField,
+}: {
+  leftEmsFileId: string;
+  leftEmsField: string;
+  rightIndexPatternId: string;
+  rightIndexPatternTitle: string;
+  rightTermField: string;
+}) {
+  return createChoroplethLayerDescriptor({
+    sourceDescriptor: EMSFileSource.createDescriptor({
+      id: leftEmsFileId,
+      tooltipProperties: [leftEmsField],
+    }),
+    leftField: leftEmsField,
+    rightIndexPatternId,
+    rightIndexPatternTitle,
+    rightTermField,
+  });
+}
+
+export function createEsChoroplethLayerDescriptor({
+  leftIndexPatternId,
+  leftGeoField,
+  leftJoinField,
+  rightIndexPatternId,
+  rightIndexPatternTitle,
+  rightTermField,
+}: {
+  leftIndexPatternId: string;
+  leftGeoField: string;
+  leftJoinField: string;
+  rightIndexPatternId: string;
+  rightIndexPatternTitle: string;
+  rightTermField: string;
+}) {
+  return createChoroplethLayerDescriptor({
+    sourceDescriptor: ESSearchSource.createDescriptor({
+      indexPatternId: leftIndexPatternId,
+      geoField: leftGeoField,
+      scalingType: SCALING_TYPES.LIMIT,
+      tooltipProperties: [leftJoinField],
+      applyGlobalQuery: false,
+    }),
+    leftField: leftJoinField,
+    rightIndexPatternId,
+    rightIndexPatternTitle,
+    rightTermField,
+  });
+}
diff --git a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/index.ts b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/index.ts
new file mode 100644
index 00000000000000..afabfea0c8d46a
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/index.ts
@@ -0,0 +1,7 @@
+/*
+ * 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.
+ */
+
+export { choroplethLayerWizardConfig } from './choropleth_layer_wizard';
diff --git a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.test.tsx b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.test.tsx
new file mode 100644
index 00000000000000..ecb86756e1ca73
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.test.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+jest.mock('../../../kibana_services', () => {
+  const MockIndexPatternSelect = (props: unknown) => {
+    return <div />;
+  };
+  return {
+    getIndexPatternSelectComponent: () => {
+      return MockIndexPatternSelect;
+    },
+  };
+});
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { BOUNDARIES_SOURCE, LayerTemplate } from './layer_template';
+
+const renderWizardArguments = {
+  previewLayers: () => {},
+  mapColors: [],
+  currentStepId: null,
+  enableNextBtn: () => {},
+  disableNextBtn: () => {},
+  startStepLoading: () => {},
+  stopStepLoading: () => {},
+  advanceToNextStep: () => {},
+};
+
+test('should render elasticsearch UI when left source is BOUNDARIES_SOURCE.ELASTICSEARCH', async () => {
+  const component = shallow(<LayerTemplate {...renderWizardArguments} />);
+  component.setState({ leftSource: BOUNDARIES_SOURCE.ELASTICSEARCH });
+  expect(component).toMatchSnapshot();
+});
+
+test('should render EMS UI when left source is BOUNDARIES_SOURCE.EMS', async () => {
+  const component = shallow(<LayerTemplate {...renderWizardArguments} />);
+  component.setState({ leftSource: BOUNDARIES_SOURCE.EMS });
+  expect(component).toMatchSnapshot();
+});
diff --git a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx
new file mode 100644
index 00000000000000..72618781902d2a
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx
@@ -0,0 +1,459 @@
+/*
+ * 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 React, { Component } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { FileLayer } from '@elastic/ems-client';
+import {
+  EuiComboBox,
+  EuiComboBoxOptionOption,
+  EuiFormRow,
+  EuiPanel,
+  EuiRadioGroup,
+  EuiSpacer,
+  EuiTitle,
+} from '@elastic/eui';
+import { IFieldType, IndexPattern } from 'src/plugins/data/public';
+import { RenderWizardArguments } from '../layer_wizard_registry';
+import { EMSFileSelect } from '../../../components/ems_file_select';
+import { GeoIndexPatternSelect } from '../../../components/geo_index_pattern_select';
+import { SingleFieldSelect } from '../../../components/single_field_select';
+import { getGeoFields, getSourceFields, getTermsFields } from '../../../index_pattern_util';
+import { getEmsFileLayers } from '../../../meta';
+import { getIndexPatternSelectComponent, getIndexPatternService } from '../../../kibana_services';
+import {
+  createEmsChoroplethLayerDescriptor,
+  createEsChoroplethLayerDescriptor,
+} from './create_choropleth_layer_descriptor';
+
+export enum BOUNDARIES_SOURCE {
+  ELASTICSEARCH = 'ELASTICSEARCH',
+  EMS = 'EMS',
+}
+
+const BOUNDARIES_OPTIONS = [
+  {
+    id: BOUNDARIES_SOURCE.EMS,
+    label: i18n.translate('xpack.maps.choropleth.boundaries.ems', {
+      defaultMessage: 'Administrative boundaries from Elastic Maps Service',
+    }),
+  },
+  {
+    id: BOUNDARIES_SOURCE.ELASTICSEARCH,
+    label: i18n.translate('xpack.maps.choropleth.boundaries.elasticsearch', {
+      defaultMessage: 'Points, lines, and polygons from Elasticsearch',
+    }),
+  },
+];
+
+interface State {
+  leftSource: BOUNDARIES_SOURCE;
+  leftEmsFileId: string | null;
+  leftEmsFields: Array<EuiComboBoxOptionOption<string>>;
+  leftIndexPattern: IndexPattern | null;
+  leftGeoFields: IFieldType[];
+  leftJoinFields: IFieldType[];
+  leftGeoField: string | null;
+  leftEmsJoinField: string | null;
+  leftElasticsearchJoinField: string | null;
+  rightIndexPatternId: string | null;
+  rightIndexPatternTitle: string | null;
+  rightTermsFields: IFieldType[];
+  rightJoinField: string | null;
+}
+
+export class LayerTemplate extends Component<RenderWizardArguments, State> {
+  private _isMounted: boolean = false;
+
+  state = {
+    leftSource: BOUNDARIES_SOURCE.EMS,
+    leftEmsFileId: null,
+    leftEmsFields: [],
+    leftIndexPattern: null,
+    leftGeoFields: [],
+    leftJoinFields: [],
+    leftGeoField: null,
+    leftEmsJoinField: null,
+    leftElasticsearchJoinField: null,
+    rightIndexPatternId: null,
+    rightIndexPatternTitle: null,
+    rightTermsFields: [],
+    rightJoinField: null,
+  };
+
+  componentWillUnmount() {
+    this._isMounted = false;
+  }
+
+  componentDidMount() {
+    this._isMounted = true;
+  }
+
+  _loadRightFields = async (indexPatternId: string) => {
+    this.setState({ rightTermsFields: [], rightIndexPatternTitle: null });
+
+    let indexPattern;
+    try {
+      indexPattern = await getIndexPatternService().get(indexPatternId);
+    } catch (err) {
+      return;
+    }
+
+    // method may be called again before 'get' returns
+    // ignore response when fetched index pattern does not match active index pattern
+    if (!this._isMounted || indexPatternId !== this.state.rightIndexPatternId) {
+      return;
+    }
+
+    this.setState({
+      rightTermsFields: getTermsFields(indexPattern.fields),
+      rightIndexPatternTitle: indexPattern.title,
+    });
+  };
+
+  _loadEmsFileFields = async () => {
+    const emsFileLayers = await getEmsFileLayers();
+    const emsFileLayer = emsFileLayers.find((fileLayer: FileLayer) => {
+      return fileLayer.getId() === this.state.leftEmsFileId;
+    });
+
+    if (!this._isMounted || !emsFileLayer) {
+      return;
+    }
+
+    const leftEmsFields = emsFileLayer
+      .getFieldsInLanguage()
+      .filter((field) => {
+        return field.type === 'id';
+      })
+      .map((field) => {
+        return {
+          value: field.name,
+          label: field.description,
+        };
+      });
+    this.setState(
+      {
+        leftEmsFields,
+        leftEmsJoinField: leftEmsFields.length ? leftEmsFields[0].value : null,
+      },
+      this._previewLayer
+    );
+  };
+
+  _onLeftSourceChange = (optionId: string) => {
+    this.setState(
+      { leftSource: optionId as BOUNDARIES_SOURCE, rightJoinField: null },
+      this._previewLayer
+    );
+  };
+
+  _onLeftIndexPatternChange = (indexPattern: IndexPattern) => {
+    this.setState(
+      {
+        leftIndexPattern: indexPattern,
+        leftGeoFields: getGeoFields(indexPattern.fields),
+        leftJoinFields: getSourceFields(indexPattern.fields),
+        leftGeoField: null,
+        leftElasticsearchJoinField: null,
+        rightJoinField: null,
+      },
+      () => {
+        // make default geo field selection
+        if (this.state.leftGeoFields.length) {
+          // @ts-expect-error - avoid wrong "Property 'name' does not exist on type 'never'." compile error
+          this._onLeftGeoFieldSelect(this.state.leftGeoFields[0].name);
+        }
+      }
+    );
+  };
+
+  _onLeftGeoFieldSelect = (geoField?: string) => {
+    if (!geoField) {
+      return;
+    }
+    this.setState({ leftGeoField: geoField }, this._previewLayer);
+  };
+
+  _onLeftJoinFieldSelect = (joinField?: string) => {
+    if (!joinField) {
+      return;
+    }
+    this.setState({ leftElasticsearchJoinField: joinField }, this._previewLayer);
+  };
+
+  _onLeftEmsFileChange = (emFileId: string) => {
+    this.setState({ leftEmsFileId: emFileId, leftEmsJoinField: null, rightJoinField: null }, () => {
+      this._previewLayer();
+      this._loadEmsFileFields();
+    });
+  };
+
+  _onLeftEmsFieldChange = (selectedOptions: Array<EuiComboBoxOptionOption<string>>) => {
+    if (selectedOptions.length === 0) {
+      return;
+    }
+
+    this.setState({ leftEmsJoinField: selectedOptions[0].value! }, this._previewLayer);
+  };
+
+  _onRightIndexPatternChange = (indexPatternId: string) => {
+    if (!indexPatternId) {
+      return;
+    }
+
+    this.setState(
+      {
+        rightIndexPatternId: indexPatternId,
+        rightJoinField: null,
+      },
+      () => {
+        this._previewLayer();
+        this._loadRightFields(indexPatternId);
+      }
+    );
+  };
+
+  _onRightJoinFieldSelect = (joinField?: string) => {
+    if (!joinField) {
+      return;
+    }
+    this.setState({ rightJoinField: joinField }, this._previewLayer);
+  };
+
+  _isLeftConfigComplete() {
+    if (this.state.leftSource === BOUNDARIES_SOURCE.ELASTICSEARCH) {
+      return (
+        !!this.state.leftIndexPattern &&
+        !!this.state.leftGeoField &&
+        !!this.state.leftElasticsearchJoinField
+      );
+    } else {
+      return !!this.state.leftEmsFileId && !!this.state.leftEmsJoinField;
+    }
+  }
+
+  _isRightConfigComplete() {
+    return !!this.state.rightIndexPatternId && !!this.state.rightJoinField;
+  }
+
+  _previewLayer() {
+    if (!this._isLeftConfigComplete() || !this._isRightConfigComplete()) {
+      this.props.previewLayers([]);
+      return;
+    }
+
+    const layerDescriptor =
+      this.state.leftSource === BOUNDARIES_SOURCE.ELASTICSEARCH
+        ? createEsChoroplethLayerDescriptor({
+            // @ts-expect-error - avoid wrong "Property 'id' does not exist on type 'never'." compile error
+            leftIndexPatternId: this.state.leftIndexPattern!.id,
+            leftGeoField: this.state.leftGeoField!,
+            leftJoinField: this.state.leftElasticsearchJoinField!,
+            rightIndexPatternId: this.state.rightIndexPatternId!,
+            rightIndexPatternTitle: this.state.rightIndexPatternTitle!,
+            rightTermField: this.state.rightJoinField!,
+          })
+        : createEmsChoroplethLayerDescriptor({
+            leftEmsFileId: this.state.leftEmsFileId!,
+            leftEmsField: this.state.leftEmsJoinField!,
+            rightIndexPatternId: this.state.rightIndexPatternId!,
+            rightIndexPatternTitle: this.state.rightIndexPatternTitle!,
+            rightTermField: this.state.rightJoinField!,
+          });
+
+    this.props.previewLayers([layerDescriptor]);
+  }
+
+  _renderLeftSourceForm() {
+    if (this.state.leftSource === BOUNDARIES_SOURCE.ELASTICSEARCH) {
+      let geoFieldSelect;
+      if (this.state.leftGeoFields.length) {
+        geoFieldSelect = (
+          <EuiFormRow
+            label={i18n.translate('xpack.maps.choropleth.geofieldLabel', {
+              defaultMessage: 'Geospatial field',
+            })}
+          >
+            <SingleFieldSelect
+              placeholder={i18n.translate('xpack.maps.choropleth.geofieldPlaceholder', {
+                defaultMessage: 'Select geo field',
+              })}
+              value={this.state.leftGeoField}
+              onChange={this._onLeftGeoFieldSelect}
+              fields={this.state.leftGeoFields}
+              isClearable={false}
+            />
+          </EuiFormRow>
+        );
+      }
+      let joinFieldSelect;
+      if (this.state.leftJoinFields.length) {
+        joinFieldSelect = (
+          <EuiFormRow
+            label={i18n.translate('xpack.maps.choropleth.joinFieldLabel', {
+              defaultMessage: 'Join field',
+            })}
+          >
+            <SingleFieldSelect
+              placeholder={i18n.translate('xpack.maps.choropleth.joinFieldPlaceholder', {
+                defaultMessage: 'Select field',
+              })}
+              value={this.state.leftElasticsearchJoinField}
+              onChange={this._onLeftJoinFieldSelect}
+              fields={this.state.leftJoinFields}
+              isClearable={false}
+            />
+          </EuiFormRow>
+        );
+      }
+      return (
+        <>
+          <GeoIndexPatternSelect
+            // @ts-expect-error - avoid wrong "Property 'id' does not exist on type 'never'." compile error
+            value={this.state.leftIndexPattern ? this.state.leftIndexPattern!.id : ''}
+            onChange={this._onLeftIndexPatternChange}
+          />
+          {geoFieldSelect}
+          {joinFieldSelect}
+        </>
+      );
+    } else {
+      let emsFieldSelect;
+      if (this.state.leftEmsFields.length) {
+        let selectedOption;
+        if (this.state.leftEmsJoinField) {
+          selectedOption = this.state.leftEmsFields.find(
+            (option: EuiComboBoxOptionOption<string>) => {
+              return this.state.leftEmsJoinField === option.value;
+            }
+          );
+        }
+        emsFieldSelect = (
+          <EuiFormRow
+            label={i18n.translate('xpack.maps.choropleth.joinFieldLabel', {
+              defaultMessage: 'Join field',
+            })}
+          >
+            <EuiComboBox
+              singleSelection={true}
+              isClearable={false}
+              options={this.state.leftEmsFields}
+              selectedOptions={selectedOption ? [selectedOption] : []}
+              onChange={this._onLeftEmsFieldChange}
+            />
+          </EuiFormRow>
+        );
+      }
+      return (
+        <>
+          <EMSFileSelect value={this.state.leftEmsFileId} onChange={this._onLeftEmsFileChange} />
+          {emsFieldSelect}
+        </>
+      );
+    }
+  }
+
+  _renderLeftPanel() {
+    return (
+      <EuiPanel>
+        <EuiTitle size="xs">
+          <h5>
+            <FormattedMessage
+              id="xpack.maps.choropleth.boundariesLabel"
+              defaultMessage="Boundaries source"
+            />
+          </h5>
+        </EuiTitle>
+
+        <EuiSpacer size="m" />
+
+        <EuiFormRow>
+          <EuiRadioGroup
+            options={BOUNDARIES_OPTIONS}
+            idSelected={this.state.leftSource}
+            onChange={this._onLeftSourceChange}
+          />
+        </EuiFormRow>
+
+        {this._renderLeftSourceForm()}
+      </EuiPanel>
+    );
+  }
+
+  _renderRightPanel() {
+    if (!this._isLeftConfigComplete()) {
+      return null;
+    }
+    const IndexPatternSelect = getIndexPatternSelectComponent();
+
+    let joinFieldSelect;
+    if (this.state.rightTermsFields.length) {
+      joinFieldSelect = (
+        <EuiFormRow
+          label={i18n.translate('xpack.maps.choropleth.joinFieldLabel', {
+            defaultMessage: 'Join field',
+          })}
+        >
+          <SingleFieldSelect
+            placeholder={i18n.translate('xpack.maps.choropleth.joinFieldPlaceholder', {
+              defaultMessage: 'Select field',
+            })}
+            value={this.state.rightJoinField}
+            onChange={this._onRightJoinFieldSelect}
+            fields={this.state.rightTermsFields}
+            isClearable={false}
+          />
+        </EuiFormRow>
+      );
+    }
+
+    return (
+      <EuiPanel>
+        <EuiTitle size="xs">
+          <h5>
+            <FormattedMessage
+              id="xpack.maps.choropleth.statisticsLabel"
+              defaultMessage="Statistics source"
+            />
+          </h5>
+        </EuiTitle>
+
+        <EuiSpacer size="m" />
+
+        <EuiFormRow
+          label={i18n.translate('xpack.maps.choropleth.rightSourceLabel', {
+            defaultMessage: 'Index pattern',
+          })}
+        >
+          <IndexPatternSelect
+            placeholder={i18n.translate('xpack.maps.maps.choropleth.rightSourcePlaceholder', {
+              defaultMessage: 'Select index pattern',
+            })}
+            indexPatternId={this.state.rightIndexPatternId}
+            onChange={this._onRightIndexPatternChange}
+            isClearable={false}
+          />
+        </EuiFormRow>
+
+        {joinFieldSelect}
+      </EuiPanel>
+    );
+  }
+
+  render() {
+    return (
+      <>
+        {this._renderLeftPanel()}
+
+        <EuiSpacer size="s" />
+
+        {this._renderRightPanel()}
+      </>
+    );
+  }
+}
diff --git a/x-pack/plugins/maps/public/classes/layers/load_layer_wizards.ts b/x-pack/plugins/maps/public/classes/layers/load_layer_wizards.ts
index 8357971a3778f3..37bcb3b23c0728 100644
--- a/x-pack/plugins/maps/public/classes/layers/load_layer_wizards.ts
+++ b/x-pack/plugins/maps/public/classes/layers/load_layer_wizards.ts
@@ -26,6 +26,7 @@ import { wmsLayerWizardConfig } from '../sources/wms_source';
 import { mvtVectorSourceWizardConfig } from '../sources/mvt_single_layer_vector_source';
 import { ObservabilityLayerWizardConfig } from './solution_layers/observability';
 import { SecurityLayerWizardConfig } from './solution_layers/security';
+import { choroplethLayerWizardConfig } from './choropleth_layer_wizard';
 import { getEnableVectorTiles } from '../../kibana_services';
 
 let registered = false;
@@ -41,6 +42,7 @@ export function registerLayerWizards() {
   // @ts-ignore
   registerLayerWizard(esDocumentsLayerWizardConfig);
   // @ts-ignore
+  registerLayerWizard(choroplethLayerWizardConfig);
   registerLayerWizard(clustersLayerWizardConfig);
   // @ts-ignore
   registerLayerWizard(heatmapLayerWizardConfig);
diff --git a/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/observability_layer_template.tsx b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/observability_layer_template.tsx
index 3f3c556dcae1e5..3fe640a135aa61 100644
--- a/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/observability_layer_template.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/observability_layer_template.tsx
@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
+import { EuiPanel } from '@elastic/eui';
 import { RenderWizardArguments } from '../../layer_wizard_registry';
 import { LayerSelect, OBSERVABILITY_LAYER_TYPE } from './layer_select';
 import { getMetricOptionsForLayer, MetricSelect, OBSERVABILITY_METRIC_TYPE } from './metric_select';
@@ -63,7 +64,7 @@ export class ObservabilityLayerTemplate extends Component<RenderWizardArguments,
 
   render() {
     return (
-      <Fragment>
+      <EuiPanel>
         <LayerSelect value={this.state.layer} onChange={this._onLayerChange} />
         <MetricSelect
           layer={this.state.layer}
@@ -75,7 +76,7 @@ export class ObservabilityLayerTemplate extends Component<RenderWizardArguments,
           value={this.state.display}
           onChange={this._onDisplayChange}
         />
-      </Fragment>
+      </EuiPanel>
     );
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/layers/solution_layers/security/security_layer_template.tsx b/x-pack/plugins/maps/public/classes/layers/solution_layers/security/security_layer_template.tsx
index eda489c88fda22..b20f57f4c276d7 100644
--- a/x-pack/plugins/maps/public/classes/layers/solution_layers/security/security_layer_template.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/solution_layers/security/security_layer_template.tsx
@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
+import { EuiPanel } from '@elastic/eui';
 import { RenderWizardArguments } from '../../layer_wizard_registry';
 import { IndexPatternSelect } from './index_pattern_select';
 import { createSecurityLayerDescriptors } from './create_layer_descriptors';
@@ -44,12 +45,12 @@ export class SecurityLayerTemplate extends Component<RenderWizardArguments, Stat
 
   render() {
     return (
-      <Fragment>
+      <EuiPanel>
         <IndexPatternSelect
           value={this.state.indexPatternId ? this.state.indexPatternId! : ''}
           onChange={this._onIndexPatternChange}
         />
-      </Fragment>
+      </EuiPanel>
     );
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/client_file_source/create_client_file_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/client_file_source/create_client_file_source_editor.tsx
index 344bdc92489e03..cf2692393192d7 100644
--- a/x-pack/plugins/maps/public/classes/sources/client_file_source/create_client_file_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/client_file_source/create_client_file_source_editor.tsx
@@ -5,6 +5,7 @@
  */
 
 import React, { Component } from 'react';
+import { EuiPanel } from '@elastic/eui';
 import { IFieldType } from 'src/plugins/data/public';
 import {
   ES_GEO_FIELD_TYPE,
@@ -146,15 +147,17 @@ export class ClientFileCreateSourceEditor extends Component<RenderWizardArgument
   render() {
     const FileUpload = getFileUploadComponent();
     return (
-      <FileUpload
-        appName={'Maps'}
-        isIndexingTriggered={this.state.indexingStage === INDEXING_STAGE.TRIGGERED}
-        onFileUpload={this._onFileUpload}
-        onFileRemove={this._onFileRemove}
-        onIndexReady={this._onIndexReady}
-        transformDetails={'geo'}
-        onIndexingComplete={this._onIndexingComplete}
-      />
+      <EuiPanel>
+        <FileUpload
+          appName={'Maps'}
+          isIndexingTriggered={this.state.indexingStage === INDEXING_STAGE.TRIGGERED}
+          onFileUpload={this._onFileUpload}
+          onFileRemove={this._onFileRemove}
+          onIndexReady={this._onIndexReady}
+          transformDetails={'geo'}
+          onIndexingComplete={this._onIndexingComplete}
+        />
+      </EuiPanel>
     );
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_file_source/create_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/ems_file_source/create_source_editor.tsx
index a78a49032503b8..ef15a8d7866076 100644
--- a/x-pack/plugins/maps/public/classes/sources/ems_file_source/create_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/ems_file_source/create_source_editor.tsx
@@ -5,95 +5,33 @@
  */
 
 import React, { Component } from 'react';
-import { EuiComboBox, EuiComboBoxOptionOption, EuiFormRow } from '@elastic/eui';
-
-import { i18n } from '@kbn/i18n';
-import { FileLayer } from '@elastic/ems-client';
-import { getEmsFileLayers } from '../../../meta';
-import { getEmsUnavailableMessage } from '../ems_unavailable_message';
+import { EuiPanel } from '@elastic/eui';
 import { EMSFileSourceDescriptor } from '../../../../common/descriptor_types';
+import { EMSFileSelect } from '../../../components/ems_file_select';
 
 interface Props {
   onSourceConfigChange: (sourceConfig: Partial<EMSFileSourceDescriptor>) => void;
 }
 
 interface State {
-  hasLoadedOptions: boolean;
-  emsFileOptions: Array<EuiComboBoxOptionOption<string>>;
-  selectedOption: EuiComboBoxOptionOption<string> | null;
+  emsFileId: string | null;
 }
 
 export class EMSFileCreateSourceEditor extends Component<Props, State> {
-  private _isMounted: boolean = false;
-
   state = {
-    hasLoadedOptions: false,
-    emsFileOptions: [],
-    selectedOption: null,
-  };
-
-  _loadFileOptions = async () => {
-    const fileLayers: FileLayer[] = await getEmsFileLayers();
-    const options = fileLayers.map((fileLayer) => {
-      return {
-        value: fileLayer.getId(),
-        label: fileLayer.getDisplayName(),
-      };
-    });
-    if (this._isMounted) {
-      this.setState({
-        hasLoadedOptions: true,
-        emsFileOptions: options,
-      });
-    }
+    emsFileId: null,
   };
 
-  componentWillUnmount() {
-    this._isMounted = false;
-  }
-
-  componentDidMount() {
-    this._isMounted = true;
-    this._loadFileOptions();
-  }
-
-  _onChange = (selectedOptions: Array<EuiComboBoxOptionOption<string>>) => {
-    if (selectedOptions.length === 0) {
-      return;
-    }
-
-    this.setState({ selectedOption: selectedOptions[0] });
-
-    const emsFileId = selectedOptions[0].value;
+  _onChange = (emsFileId: string) => {
+    this.setState({ emsFileId });
     this.props.onSourceConfigChange({ id: emsFileId });
   };
 
   render() {
-    if (!this.state.hasLoadedOptions) {
-      // TODO display loading message
-      return null;
-    }
-
     return (
-      <EuiFormRow
-        label={i18n.translate('xpack.maps.source.emsFile.layerLabel', {
-          defaultMessage: 'Layer',
-        })}
-        helpText={this.state.emsFileOptions.length === 0 ? getEmsUnavailableMessage() : null}
-      >
-        <EuiComboBox
-          placeholder={i18n.translate('xpack.maps.source.emsFile.selectPlaceholder', {
-            defaultMessage: 'Select EMS vector shapes',
-          })}
-          options={this.state.emsFileOptions}
-          selectedOptions={this.state.selectedOption ? [this.state.selectedOption!] : []}
-          onChange={this._onChange}
-          isClearable={false}
-          singleSelection={true}
-          isDisabled={this.state.emsFileOptions.length === 0}
-          data-test-subj="emsVectorComboBox"
-        />
-      </EuiFormRow>
+      <EuiPanel>
+        <EMSFileSelect value={this.state.emsFileId} onChange={this._onChange} />
+      </EuiPanel>
     );
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/tile_service_select.js b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/tile_service_select.js
index 3931e441ff2548..2b54e00cae7394 100644
--- a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/tile_service_select.js
+++ b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/tile_service_select.js
@@ -5,10 +5,10 @@
  */
 
 import React from 'react';
-import { EuiSelect, EuiFormRow } from '@elastic/eui';
+import { EuiSelect, EuiFormRow, EuiPanel } from '@elastic/eui';
 
 import { getEmsTmsServices } from '../../../meta';
-import { getEmsUnavailableMessage } from '../ems_unavailable_message';
+import { getEmsUnavailableMessage } from '../../../components/ems_unavailable_message';
 import { i18n } from '@kbn/i18n';
 
 export const AUTO_SELECT = 'auto_select';
@@ -71,23 +71,25 @@ export class TileServiceSelect extends React.Component {
     }
 
     return (
-      <EuiFormRow
-        label={i18n.translate('xpack.maps.source.emsTile.label', {
-          defaultMessage: 'Tile service',
-        })}
-        helpText={helpText}
-        display="columnCompressed"
-      >
-        <EuiSelect
-          hasNoInitialSelection={!selectedId}
-          value={selectedId}
-          options={this.state.emsTmsOptions}
-          onChange={this._onChange}
-          isLoading={!this.state.hasLoaded}
-          disabled={this.state.hasLoaded && this.state.emsTmsOptions.length === 0}
-          compressed
-        />
-      </EuiFormRow>
+      <EuiPanel>
+        <EuiFormRow
+          label={i18n.translate('xpack.maps.source.emsTile.label', {
+            defaultMessage: 'Tile service',
+          })}
+          helpText={helpText}
+          display="columnCompressed"
+        >
+          <EuiSelect
+            hasNoInitialSelection={!selectedId}
+            value={selectedId}
+            options={this.state.emsTmsOptions}
+            onChange={this._onChange}
+            isLoading={!this.state.hasLoaded}
+            disabled={this.state.hasLoaded && this.state.emsTmsOptions.length === 0}
+            compressed
+          />
+        </EuiFormRow>
+      </EuiPanel>
     );
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/create_source_editor.js
index 24edf0251c1535..ebe312d73eccea 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/create_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/create_source_editor.js
@@ -4,17 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import _ from 'lodash';
-import React, { Fragment, Component } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
-import { ES_GEO_FIELD_TYPES } from '../../../../common/constants';
 import { SingleFieldSelect } from '../../../components/single_field_select';
-import { getIndexPatternService, getIndexPatternSelectComponent } from '../../../kibana_services';
-import { NoIndexPatternCallout } from '../../../components/no_index_pattern_callout';
+import { GeoIndexPatternSelect } from '../../../components/geo_index_pattern_select';
 import { i18n } from '@kbn/i18n';
 
-import { EuiFormRow, EuiSpacer } from '@elastic/eui';
+import { EuiFormRow, EuiPanel } from '@elastic/eui';
 import {
   getFieldsWithGeoTileAgg,
   getGeoFields,
@@ -33,76 +30,26 @@ export class CreateSourceEditor extends Component {
   };
 
   state = {
-    isLoadingIndexPattern: false,
-    indexPatternId: '',
+    indexPattern: null,
     geoField: '',
     requestType: this.props.requestType,
-    noGeoIndexPatternsExist: false,
   };
 
-  componentWillUnmount() {
-    this._isMounted = false;
-  }
-
-  componentDidMount() {
-    this._isMounted = true;
-  }
-
-  onIndexPatternSelect = (indexPatternId) => {
+  onIndexPatternSelect = (indexPattern) => {
     this.setState(
       {
-        indexPatternId,
+        indexPattern,
       },
-      this.loadIndexPattern.bind(null, indexPatternId)
+      () => {
+        //make default selection
+        const geoFieldsWithGeoTileAgg = getFieldsWithGeoTileAgg(indexPattern.fields);
+        if (geoFieldsWithGeoTileAgg[0]) {
+          this._onGeoFieldSelect(geoFieldsWithGeoTileAgg[0].name);
+        }
+      }
     );
   };
 
-  loadIndexPattern = (indexPatternId) => {
-    this.setState(
-      {
-        isLoadingIndexPattern: true,
-        indexPattern: undefined,
-        geoField: undefined,
-      },
-      this.debouncedLoad.bind(null, indexPatternId)
-    );
-  };
-
-  debouncedLoad = _.debounce(async (indexPatternId) => {
-    if (!indexPatternId || indexPatternId.length === 0) {
-      return;
-    }
-
-    let indexPattern;
-    try {
-      indexPattern = await getIndexPatternService().get(indexPatternId);
-    } catch (err) {
-      // index pattern no longer exists
-      return;
-    }
-
-    if (!this._isMounted) {
-      return;
-    }
-
-    // props.indexPatternId may be updated before getIndexPattern returns
-    // ignore response when fetched index pattern does not match active index pattern
-    if (indexPattern.id !== indexPatternId) {
-      return;
-    }
-
-    this.setState({
-      isLoadingIndexPattern: false,
-      indexPattern: indexPattern,
-    });
-
-    //make default selection
-    const geoFieldsWithGeoTileAgg = getFieldsWithGeoTileAgg(indexPattern.fields);
-    if (geoFieldsWithGeoTileAgg[0]) {
-      this._onGeoFieldSelect(geoFieldsWithGeoTileAgg[0].name);
-    }
-  }, 300);
-
   _onGeoFieldSelect = (geoField) => {
     this.setState(
       {
@@ -122,17 +69,13 @@ export class CreateSourceEditor extends Component {
   };
 
   previewLayer = () => {
-    const { indexPatternId, geoField, requestType } = this.state;
+    const { indexPattern, geoField, requestType } = this.state;
 
     const sourceConfig =
-      indexPatternId && geoField ? { indexPatternId, geoField, requestType } : null;
+      indexPattern && geoField ? { indexPatternId: indexPattern.id, geoField, requestType } : null;
     this.props.onSourceConfigChange(sourceConfig);
   };
 
-  _onNoIndexPatterns = () => {
-    this.setState({ noGeoIndexPatternsExist: true });
-  };
-
   _renderGeoSelect() {
     if (!this.state.indexPattern) {
       return null;
@@ -170,50 +113,16 @@ export class CreateSourceEditor extends Component {
     );
   }
 
-  _renderIndexPatternSelect() {
-    const IndexPatternSelect = getIndexPatternSelectComponent();
-
+  render() {
     return (
-      <EuiFormRow
-        label={i18n.translate('xpack.maps.source.esGeoGrid.indexPatternLabel', {
-          defaultMessage: 'Index pattern',
-        })}
-      >
-        <IndexPatternSelect
-          isDisabled={this.state.noGeoIndexPatternsExist}
-          indexPatternId={this.state.indexPatternId}
+      <EuiPanel>
+        <GeoIndexPatternSelect
+          value={this.state.indexPattern ? this.state.indexPattern.id : ''}
           onChange={this.onIndexPatternSelect}
-          placeholder={i18n.translate('xpack.maps.source.esGeoGrid.indexPatternPlaceholder', {
-            defaultMessage: 'Select index pattern',
-          })}
-          fieldTypes={ES_GEO_FIELD_TYPES}
-          onNoIndexPatterns={this._onNoIndexPatterns}
         />
-      </EuiFormRow>
-    );
-  }
-
-  _renderNoIndexPatternWarning() {
-    if (!this.state.noGeoIndexPatternsExist) {
-      return null;
-    }
-
-    return (
-      <Fragment>
-        <NoIndexPatternCallout />
-        <EuiSpacer size="s" />
-      </Fragment>
-    );
-  }
-
-  render() {
-    return (
-      <Fragment>
-        {this._renderNoIndexPatternWarning()}
-        {this._renderIndexPatternSelect()}
         {this._renderGeoSelect()}
         {this._renderRenderAsSelect()}
-      </Fragment>
+      </EuiPanel>
     );
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/create_source_editor.js
index 38a5850537200b..3fe3d536ff8098 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/create_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/create_source_editor.js
@@ -13,7 +13,7 @@ import { getIndexPatternService, getIndexPatternSelectComponent } from '../../..
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { EuiFormRow, EuiCallOut } from '@elastic/eui';
+import { EuiFormRow, EuiCallOut, EuiPanel } from '@elastic/eui';
 import { getFieldsWithGeoTileAgg } from '../../../index_pattern_util';
 import { ES_GEO_FIELD_TYPE } from '../../../../common/constants';
 
@@ -200,11 +200,11 @@ export class CreateSourceEditor extends Component {
     }
 
     return (
-      <Fragment>
+      <EuiPanel>
         {callout}
         {this._renderIndexPatternSelect()}
         {this._renderGeoSelects()}
-      </Fragment>
+      </EuiPanel>
     );
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap
index 2b04da92517561..8ebb389472f74c 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap
@@ -210,8 +210,10 @@ exports[`should render top hits form when scaling type is TOP_HITS 1`] = `
     <SingleFieldSelect
       compressed={true}
       fields={Array []}
+      isClearable={false}
       onChange={[Function]}
       placeholder="Select entity field"
+      value={null}
     />
   </EuiFormRow>
 </Fragment>
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js
index 73abfd87e47975..0423d70b3f4276 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js
@@ -4,16 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import _ from 'lodash';
 import React, { Fragment, Component } from 'react';
 import PropTypes from 'prop-types';
-import { EuiFormRow, EuiSpacer } from '@elastic/eui';
+import { EuiFormRow, EuiPanel, EuiSpacer } from '@elastic/eui';
 
 import { SingleFieldSelect } from '../../../components/single_field_select';
-import { getIndexPatternService, getIndexPatternSelectComponent } from '../../../kibana_services';
-import { NoIndexPatternCallout } from '../../../components/no_index_pattern_callout';
+import { GeoIndexPatternSelect } from '../../../components/geo_index_pattern_select';
 import { i18n } from '@kbn/i18n';
-import { ES_GEO_FIELD_TYPES, SCALING_TYPES } from '../../../../common/constants';
+import { SCALING_TYPES } from '../../../../common/constants';
 import { DEFAULT_FILTER_BY_MAP_BOUNDS } from './constants';
 import { ScalingForm } from './scaling_form';
 import {
@@ -45,80 +43,33 @@ export class CreateSourceEditor extends Component {
   };
 
   state = {
-    isLoadingIndexPattern: false,
-    noGeoIndexPatternsExist: false,
     ...RESET_INDEX_PATTERN_STATE,
   };
 
-  componentWillUnmount() {
-    this._isMounted = false;
-  }
-
-  componentDidMount() {
-    this._isMounted = true;
-  }
-
-  _onIndexPatternSelect = (indexPatternId) => {
-    this.setState(
-      {
-        indexPatternId,
-      },
-      this._loadIndexPattern(indexPatternId)
-    );
-  };
+  _onIndexPatternSelect = (indexPattern) => {
+    const geoFields = getGeoFields(indexPattern.fields);
 
-  _loadIndexPattern = (indexPatternId) => {
     this.setState(
       {
-        isLoadingIndexPattern: true,
         ...RESET_INDEX_PATTERN_STATE,
+        indexPattern,
+        geoFields,
       },
-      this._debouncedLoad.bind(null, indexPatternId)
+      () => {
+        if (geoFields.length) {
+          // make default selection, prefer aggregatable field over the first available
+          const firstAggregatableGeoField = geoFields.find((geoField) => {
+            return geoField.aggregatable;
+          });
+          const defaultGeoFieldName = firstAggregatableGeoField
+            ? firstAggregatableGeoField
+            : geoFields[0];
+          this._onGeoFieldSelect(defaultGeoFieldName.name);
+        }
+      }
     );
   };
 
-  _debouncedLoad = _.debounce(async (indexPatternId) => {
-    if (!indexPatternId || indexPatternId.length === 0) {
-      return;
-    }
-
-    let indexPattern;
-    try {
-      indexPattern = await getIndexPatternService().get(indexPatternId);
-    } catch (err) {
-      // index pattern no longer exists
-      return;
-    }
-
-    if (!this._isMounted) {
-      return;
-    }
-
-    // props.indexPatternId may be updated before getIndexPattern returns
-    // ignore response when fetched index pattern does not match active index pattern
-    if (indexPattern.id !== indexPatternId) {
-      return;
-    }
-
-    const geoFields = getGeoFields(indexPattern.fields);
-    this.setState({
-      isLoadingIndexPattern: false,
-      indexPattern: indexPattern,
-      geoFields,
-    });
-
-    if (geoFields.length) {
-      // make default selection, prefer aggregatable field over the first available
-      const firstAggregatableGeoField = geoFields.find((geoField) => {
-        return geoField.aggregatable;
-      });
-      const defaultGeoFieldName = firstAggregatableGeoField
-        ? firstAggregatableGeoField
-        : geoFields[0];
-      this._onGeoFieldSelect(defaultGeoFieldName.name);
-    }
-  }, 300);
-
   _onGeoFieldSelect = (geoFieldName) => {
     // Respect previous scaling type selection unless newly selected geo field does not support clustering.
     const scalingType =
@@ -146,7 +97,7 @@ export class CreateSourceEditor extends Component {
 
   _previewLayer = () => {
     const {
-      indexPatternId,
+      indexPattern,
       geoFieldName,
       filterByMapBounds,
       scalingType,
@@ -155,9 +106,9 @@ export class CreateSourceEditor extends Component {
     } = this.state;
 
     const sourceConfig =
-      indexPatternId && geoFieldName
+      indexPattern && geoFieldName
         ? {
-            indexPatternId,
+            indexPatternId: indexPattern.id,
             geoField: geoFieldName,
             filterByMapBounds,
             scalingType,
@@ -168,10 +119,6 @@ export class CreateSourceEditor extends Component {
     this.props.onSourceConfigChange(sourceConfig);
   };
 
-  _onNoIndexPatterns = () => {
-    this.setState({ noGeoIndexPatternsExist: true });
-  };
-
   _renderGeoSelect() {
     if (!this.state.indexPattern) {
       return;
@@ -205,7 +152,7 @@ export class CreateSourceEditor extends Component {
         <EuiSpacer size="m" />
         <ScalingForm
           filterByMapBounds={this.state.filterByMapBounds}
-          indexPatternId={this.state.indexPatternId}
+          indexPatternId={this.state.indexPattern ? this.state.indexPattern.id : ''}
           onChange={this._onScalingPropChange}
           scalingType={this.state.scalingType}
           supportsClustering={doesGeoFieldSupportGeoTileAgg(
@@ -227,50 +174,18 @@ export class CreateSourceEditor extends Component {
     );
   }
 
-  _renderNoIndexPatternWarning() {
-    if (!this.state.noGeoIndexPatternsExist) {
-      return null;
-    }
-
-    return (
-      <Fragment>
-        <NoIndexPatternCallout />
-        <EuiSpacer size="s" />
-      </Fragment>
-    );
-  }
-
   render() {
-    const IndexPatternSelect = getIndexPatternSelectComponent();
-
     return (
-      <Fragment>
-        {this._renderNoIndexPatternWarning()}
-
-        <EuiFormRow
-          label={i18n.translate('xpack.maps.source.esSearch.indexPatternLabel', {
-            defaultMessage: 'Index pattern',
-          })}
-        >
-          <IndexPatternSelect
-            isDisabled={this.state.noGeoIndexPatternsExist}
-            indexPatternId={this.state.indexPatternId}
-            onChange={this._onIndexPatternSelect}
-            placeholder={i18n.translate(
-              'xpack.maps.source.esSearch.selectIndexPatternPlaceholder',
-              {
-                defaultMessage: 'Select index pattern',
-              }
-            )}
-            fieldTypes={ES_GEO_FIELD_TYPES}
-            onNoIndexPatterns={this._onNoIndexPatterns}
-          />
-        </EuiFormRow>
+      <EuiPanel>
+        <GeoIndexPatternSelect
+          value={this.state.indexPattern ? this.state.indexPattern.id : ''}
+          onChange={this._onIndexPatternSelect}
+        />
 
         {this._renderGeoSelect()}
 
         {this._renderScalingPanel()}
-      </Fragment>
+      </EuiPanel>
     );
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_documents_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_documents_layer_wizard.tsx
index 4598b1467229d4..1ec6d2a1ff6716 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_documents_layer_wizard.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_documents_layer_wizard.tsx
@@ -26,7 +26,7 @@ export function createDefaultLayerDescriptor(sourceConfig: unknown, mapColors: s
 export const esDocumentsLayerWizardConfig: LayerWizard = {
   categories: [LAYER_WIZARD_CATEGORY.ELASTICSEARCH],
   description: i18n.translate('xpack.maps.source.esSearchDescription', {
-    defaultMessage: 'Vector data from a Kibana index pattern',
+    defaultMessage: 'Points, lines, and polygons from Elasticsearch',
   }),
   icon: 'logoElasticsearch',
   renderWizard: ({ previewLayers, mapColors }: RenderWizardArguments) => {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.test.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.test.tsx
index 3ec746223c7cf3..6e56c179b4ead2 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.test.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.test.tsx
@@ -25,6 +25,7 @@ const defaultProps = {
   scalingType: SCALING_TYPES.LIMIT,
   supportsClustering: true,
   termFields: [],
+  topHitsSplitField: null,
   topHitsSize: 1,
 };
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.tsx
index a998fe3569835c..816db6a98d593b 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.tsx
@@ -40,7 +40,7 @@ interface Props {
   supportsClustering: boolean;
   clusteringDisabledReason?: string | null;
   termFields: IFieldType[];
-  topHitsSplitField?: string;
+  topHitsSplitField: string | null;
   topHitsSize: number;
 }
 
@@ -90,6 +90,9 @@ export class ScalingForm extends Component<Props, State> {
   };
 
   _onTopHitsSplitFieldChange = (topHitsSplitField?: string) => {
+    if (!topHitsSplitField) {
+      return;
+    }
     this.props.onChange({ propName: 'topHitsSplitField', value: topHitsSplitField });
   };
 
@@ -141,6 +144,7 @@ export class ScalingForm extends Component<Props, State> {
             value={this.props.topHitsSplitField}
             onChange={this._onTopHitsSplitFieldChange}
             fields={this.props.termFields}
+            isClearable={false}
             compressed
           />
         </EuiFormRow>
diff --git a/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/create_source_editor.js
index 5e28916e79f3f8..82f80e7fe484b5 100644
--- a/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/create_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/create_source_editor.js
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { EuiSelect, EuiFormRow } from '@elastic/eui';
+import { EuiSelect, EuiFormRow, EuiPanel } from '@elastic/eui';
 import { getKibanaRegionList } from '../../../meta';
 import { i18n } from '@kbn/i18n';
 
@@ -31,19 +31,21 @@ export function CreateSourceEditor({ onSourceConfigChange }) {
       : null;
 
   return (
-    <EuiFormRow
-      label={i18n.translate('xpack.maps.source.kbnRegionMap.vectorLayerLabel', {
-        defaultMessage: 'Vector layer',
-      })}
-      helpText={helpText}
-    >
-      <EuiSelect
-        hasNoInitialSelection
-        options={regionmapOptions}
-        onChange={onChange}
-        disabled={regionmapOptions.length === 0}
-      />
-    </EuiFormRow>
+    <EuiPanel>
+      <EuiFormRow
+        label={i18n.translate('xpack.maps.source.kbnRegionMap.vectorLayerLabel', {
+          defaultMessage: 'Vector layer',
+        })}
+        helpText={helpText}
+      >
+        <EuiSelect
+          hasNoInitialSelection
+          options={regionmapOptions}
+          onChange={onChange}
+          disabled={regionmapOptions.length === 0}
+        />
+      </EuiFormRow>
+    </EuiPanel>
   );
 }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/create_source_editor.js
index a0a507ff9d32d7..1cbf4c1a87de31 100644
--- a/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/create_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/create_source_editor.js
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { EuiFieldText, EuiFormRow } from '@elastic/eui';
+import { EuiFieldText, EuiFormRow, EuiPanel } from '@elastic/eui';
 
 import { getKibanaTileMap } from '../../../meta';
 import { i18n } from '@kbn/i18n';
@@ -19,21 +19,23 @@ export function CreateSourceEditor({ onSourceConfigChange }) {
   }
 
   return (
-    <EuiFormRow
-      label={i18n.translate('xpack.maps.source.kbnTMS.kbnTMS.urlLabel', {
-        defaultMessage: 'Tilemap url',
-      })}
-      helpText={
-        tilemap.url
-          ? null
-          : i18n.translate('xpack.maps.source.kbnTMS.noLayerAvailableHelptext', {
-              defaultMessage:
-                'No tilemap layer is available. Ask your system administrator to set "map.tilemap.url" in kibana.yml.',
-            })
-      }
-    >
-      <EuiFieldText readOnly value={tilemap.url} />
-    </EuiFormRow>
+    <EuiPanel>
+      <EuiFormRow
+        label={i18n.translate('xpack.maps.source.kbnTMS.kbnTMS.urlLabel', {
+          defaultMessage: 'Tilemap url',
+        })}
+        helpText={
+          tilemap.url
+            ? null
+            : i18n.translate('xpack.maps.source.kbnTMS.noLayerAvailableHelptext', {
+                defaultMessage:
+                  'No tilemap layer is available. Ask your system administrator to set "map.tilemap.url" in kibana.yml.',
+              })
+        }
+      >
+        <EuiFieldText readOnly value={tilemap.url} />
+      </EuiFormRow>
+    </EuiPanel>
   );
 }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor.tsx
index 7a4b8d43811da8..760b8c676cb37e 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor.tsx
@@ -5,9 +5,9 @@
  */
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import React, { Fragment, Component, ChangeEvent } from 'react';
+import React, { Component, ChangeEvent } from 'react';
 import _ from 'lodash';
-import { EuiFieldText, EuiFormRow } from '@elastic/eui';
+import { EuiFieldText, EuiFormRow, EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { MAX_ZOOM, MIN_ZOOM } from '../../../../common/constants';
 import { ValidatedDualRange, Value } from '../../../../../../../src/plugins/kibana_react/public';
@@ -85,7 +85,7 @@ export class MVTSingleLayerVectorSourceEditor extends Component<Props, State> {
 
   render() {
     return (
-      <Fragment>
+      <EuiPanel>
         <EuiFormRow
           label={i18n.translate('xpack.maps.source.MVTSingleLayerVectorSourceEditor.urlMessage', {
             defaultMessage: 'Url',
@@ -122,7 +122,7 @@ export class MVTSingleLayerVectorSourceEditor extends Component<Props, State> {
             }
           )}
         />
-      </Fragment>
+      </EuiPanel>
     );
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/wms_source/wms_create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/wms_source/wms_create_source_editor.js
index df00faf43daa38..ce9af42117683c 100644
--- a/x-pack/plugins/maps/public/classes/sources/wms_source/wms_create_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/wms_source/wms_create_source_editor.js
@@ -13,7 +13,7 @@ import {
   EuiComboBox,
   EuiFieldText,
   EuiFormRow,
-  EuiForm,
+  EuiPanel,
   EuiSpacer,
 } from '@elastic/eui';
 import { WmsClient } from './wms_client';
@@ -289,7 +289,7 @@ export class WMSCreateSourceEditor extends Component {
 
   render() {
     return (
-      <EuiForm>
+      <EuiPanel>
         <EuiFormRow
           label={i18n.translate('xpack.maps.source.wms.urlLabel', {
             defaultMessage: 'Url',
@@ -303,7 +303,7 @@ export class WMSCreateSourceEditor extends Component {
         {this._renderLayerAndStyleInputs()}
 
         {this._renderAttributionInputs()}
-      </EuiForm>
+      </EuiPanel>
     );
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_editor.tsx b/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_editor.tsx
index 715ff0e4c2fdd4..bf5f2c3dfe04d5 100644
--- a/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_editor.tsx
@@ -5,9 +5,9 @@
  */
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import React, { Fragment, Component, ChangeEvent } from 'react';
+import React, { Component, ChangeEvent } from 'react';
 import _ from 'lodash';
-import { EuiFormRow, EuiFieldText } from '@elastic/eui';
+import { EuiFormRow, EuiFieldText, EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { AttributionDescriptor } from '../../../../common/descriptor_types';
 
@@ -77,7 +77,7 @@ export class XYZTMSEditor extends Component<Props, State> {
   render() {
     const { attributionText, attributionUrl } = this.state;
     return (
-      <Fragment>
+      <EuiPanel>
         <EuiFormRow label="Url">
           <EuiFieldText
             placeholder={'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png'}
@@ -116,7 +116,7 @@ export class XYZTMSEditor extends Component<Props, State> {
             }
           />
         </EuiFormRow>
-      </Fragment>
+      </EuiPanel>
     );
   }
 }
diff --git a/x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap b/x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap
new file mode 100644
index 00000000000000..809fe618625130
--- /dev/null
+++ b/x-pack/plugins/maps/public/components/__snapshots__/geo_index_pattern_select.test.tsx.snap
@@ -0,0 +1,104 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should render 1`] = `
+<Fragment>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    label="Index pattern"
+    labelType="label"
+  >
+    <MockIndexPatternSelect
+      fieldTypes={
+        Array [
+          "geo_point",
+          "geo_shape",
+        ]
+      }
+      indexPatternId="indexPatternId"
+      isClearable={false}
+      isDisabled={false}
+      onChange={[Function]}
+      onNoIndexPatterns={[Function]}
+      placeholder="Select index pattern"
+    />
+  </EuiFormRow>
+</Fragment>
+`;
+
+exports[`should render no index pattern warning when there are no matching index patterns 1`] = `
+<Fragment>
+  <EuiCallOut
+    color="warning"
+    title="Couldn't find any index patterns with geospatial fields"
+  >
+    <p>
+      <FormattedMessage
+        defaultMessage="You'll need to "
+        id="xpack.maps.noIndexPattern.doThisPrefixDescription"
+        values={Object {}}
+      />
+      <EuiLink
+        href="abc//app/management/kibana/indexPatterns"
+      >
+        <FormattedMessage
+          defaultMessage="create an index pattern"
+          id="xpack.maps.noIndexPattern.doThisLinkTextDescription"
+          values={Object {}}
+        />
+      </EuiLink>
+      <FormattedMessage
+        defaultMessage=" with geospatial fields."
+        id="xpack.maps.noIndexPattern.doThisSuffixDescription"
+        values={Object {}}
+      />
+    </p>
+    <p>
+      <FormattedMessage
+        defaultMessage="Don't have any geospatial data sets? "
+        id="xpack.maps.noIndexPattern.hintDescription"
+        values={Object {}}
+      />
+      <EuiLink
+        href="abc//app/home#/tutorial_directory/sampleData"
+      >
+        <FormattedMessage
+          defaultMessage="Get started with some sample data sets."
+          id="xpack.maps.noIndexPattern.getStartedLinkText"
+          values={Object {}}
+        />
+      </EuiLink>
+    </p>
+  </EuiCallOut>
+  <EuiSpacer
+    size="s"
+  />
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    label="Index pattern"
+    labelType="label"
+  >
+    <MockIndexPatternSelect
+      fieldTypes={
+        Array [
+          "geo_point",
+          "geo_shape",
+        ]
+      }
+      indexPatternId="indexPatternId"
+      isClearable={false}
+      isDisabled={true}
+      onChange={[Function]}
+      onNoIndexPatterns={[Function]}
+      placeholder="Select index pattern"
+    />
+  </EuiFormRow>
+</Fragment>
+`;
diff --git a/x-pack/plugins/maps/public/components/ems_file_select.tsx b/x-pack/plugins/maps/public/components/ems_file_select.tsx
new file mode 100644
index 00000000000000..f66e813608ce19
--- /dev/null
+++ b/x-pack/plugins/maps/public/components/ems_file_select.tsx
@@ -0,0 +1,105 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Component } from 'react';
+import { EuiComboBox, EuiComboBoxOptionOption, EuiFormRow, EuiSelect } from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+import { FileLayer } from '@elastic/ems-client';
+import { getEmsFileLayers } from '../meta';
+import { getEmsUnavailableMessage } from './ems_unavailable_message';
+
+interface Props {
+  onChange: (emsFileId: string) => void;
+  value: string | null;
+}
+
+interface State {
+  hasLoadedOptions: boolean;
+  emsFileOptions: Array<EuiComboBoxOptionOption<string>>;
+}
+
+export class EMSFileSelect extends Component<Props, State> {
+  private _isMounted: boolean = false;
+
+  state = {
+    hasLoadedOptions: false,
+    emsFileOptions: [],
+  };
+
+  _loadFileOptions = async () => {
+    const fileLayers: FileLayer[] = await getEmsFileLayers();
+    const options = fileLayers.map((fileLayer) => {
+      return {
+        value: fileLayer.getId(),
+        label: fileLayer.getDisplayName(),
+      };
+    });
+    if (this._isMounted) {
+      this.setState({
+        hasLoadedOptions: true,
+        emsFileOptions: options,
+      });
+    }
+  };
+
+  componentWillUnmount() {
+    this._isMounted = false;
+  }
+
+  componentDidMount() {
+    this._isMounted = true;
+    this._loadFileOptions();
+  }
+
+  _onChange = (selectedOptions: Array<EuiComboBoxOptionOption<string>>) => {
+    if (selectedOptions.length === 0) {
+      return;
+    }
+
+    this.props.onChange(selectedOptions[0].value!);
+  };
+
+  _renderSelect() {
+    if (!this.state.hasLoadedOptions) {
+      return <EuiSelect isLoading />;
+    }
+
+    const selectedOption = this.state.emsFileOptions.find(
+      (option: EuiComboBoxOptionOption<string>) => {
+        return option.value === this.props.value;
+      }
+    );
+
+    return (
+      <EuiComboBox
+        placeholder={i18n.translate('xpack.maps.emsFileSelect.selectPlaceholder', {
+          defaultMessage: 'Select EMS layer',
+        })}
+        options={this.state.emsFileOptions}
+        selectedOptions={selectedOption ? [selectedOption!] : []}
+        onChange={this._onChange}
+        isClearable={false}
+        singleSelection={true}
+        isDisabled={this.state.emsFileOptions.length === 0}
+        data-test-subj="emsVectorComboBox"
+      />
+    );
+  }
+
+  render() {
+    return (
+      <EuiFormRow
+        label={i18n.translate('xpack.maps.source.emsFileSelect.selectLabel', {
+          defaultMessage: 'Layer',
+        })}
+        helpText={this.state.emsFileOptions.length === 0 ? getEmsUnavailableMessage() : null}
+      >
+        {this._renderSelect()}
+      </EuiFormRow>
+    );
+  }
+}
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_unavailable_message.ts b/x-pack/plugins/maps/public/components/ems_unavailable_message.tsx
similarity index 93%
rename from x-pack/plugins/maps/public/classes/sources/ems_unavailable_message.ts
rename to x-pack/plugins/maps/public/components/ems_unavailable_message.tsx
index 748016cf889e25..dea161fafd609e 100644
--- a/x-pack/plugins/maps/public/classes/sources/ems_unavailable_message.ts
+++ b/x-pack/plugins/maps/public/components/ems_unavailable_message.tsx
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
-import { getIsEmsEnabled } from '../../kibana_services';
+import { getIsEmsEnabled } from '../kibana_services';
 
 export function getEmsUnavailableMessage(): string {
   const isEmsEnabled = getIsEmsEnabled();
diff --git a/x-pack/plugins/maps/public/components/geo_index_pattern_select.test.tsx b/x-pack/plugins/maps/public/components/geo_index_pattern_select.test.tsx
new file mode 100644
index 00000000000000..74d29e7d7e59a8
--- /dev/null
+++ b/x-pack/plugins/maps/public/components/geo_index_pattern_select.test.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+jest.mock('../kibana_services', () => {
+  const MockIndexPatternSelect = (props: unknown) => {
+    return <div />;
+  };
+  const MockHttp = {
+    basePath: {
+      prepend: (path: string) => {
+        return `abc/${path}`;
+      },
+    },
+  };
+  return {
+    getIndexPatternSelectComponent: () => {
+      return MockIndexPatternSelect;
+    },
+    getHttp: () => {
+      return MockHttp;
+    },
+  };
+});
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { GeoIndexPatternSelect } from './geo_index_pattern_select';
+
+test('should render', async () => {
+  const component = shallow(<GeoIndexPatternSelect onChange={() => {}} value={'indexPatternId'} />);
+
+  expect(component).toMatchSnapshot();
+});
+
+test('should render no index pattern warning when there are no matching index patterns', async () => {
+  const component = shallow(<GeoIndexPatternSelect onChange={() => {}} value={'indexPatternId'} />);
+  component.setState({ noGeoIndexPatternsExist: true });
+  expect(component).toMatchSnapshot();
+});
diff --git a/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx b/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx
new file mode 100644
index 00000000000000..ae23d9d97de86e
--- /dev/null
+++ b/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx
@@ -0,0 +1,139 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Component } from 'react';
+import { EuiCallOut, EuiFormRow, EuiLink, EuiSpacer } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { IndexPattern } from 'src/plugins/data/public';
+import {
+  getIndexPatternSelectComponent,
+  getIndexPatternService,
+  getHttp,
+} from '../kibana_services';
+import { ES_GEO_FIELD_TYPES } from '../../common/constants';
+
+interface Props {
+  onChange: (indexPattern: IndexPattern) => void;
+  value: string | null;
+}
+
+interface State {
+  noGeoIndexPatternsExist: boolean;
+}
+
+export class GeoIndexPatternSelect extends Component<Props, State> {
+  private _isMounted: boolean = false;
+
+  state = {
+    noGeoIndexPatternsExist: false,
+  };
+
+  componentWillUnmount() {
+    this._isMounted = false;
+  }
+
+  componentDidMount() {
+    this._isMounted = true;
+  }
+
+  _onIndexPatternSelect = async (indexPatternId: string) => {
+    if (!indexPatternId || indexPatternId.length === 0) {
+      return;
+    }
+
+    let indexPattern;
+    try {
+      indexPattern = await getIndexPatternService().get(indexPatternId);
+    } catch (err) {
+      return;
+    }
+
+    // method may be called again before 'get' returns
+    // ignore response when fetched index pattern does not match active index pattern
+    if (this._isMounted && indexPattern.id === indexPatternId) {
+      this.props.onChange(indexPattern);
+    }
+  };
+
+  _onNoIndexPatterns = () => {
+    this.setState({ noGeoIndexPatternsExist: true });
+  };
+
+  _renderNoIndexPatternWarning() {
+    if (!this.state.noGeoIndexPatternsExist) {
+      return null;
+    }
+
+    return (
+      <>
+        <EuiCallOut
+          title={i18n.translate('xpack.maps.noIndexPattern.messageTitle', {
+            defaultMessage: `Couldn't find any index patterns with geospatial fields`,
+          })}
+          color="warning"
+        >
+          <p>
+            <FormattedMessage
+              id="xpack.maps.noIndexPattern.doThisPrefixDescription"
+              defaultMessage="You'll need to "
+            />
+            <EuiLink href={getHttp().basePath.prepend(`/app/management/kibana/indexPatterns`)}>
+              <FormattedMessage
+                id="xpack.maps.noIndexPattern.doThisLinkTextDescription"
+                defaultMessage="create an index pattern"
+              />
+            </EuiLink>
+            <FormattedMessage
+              id="xpack.maps.noIndexPattern.doThisSuffixDescription"
+              defaultMessage=" with geospatial fields."
+            />
+          </p>
+          <p>
+            <FormattedMessage
+              id="xpack.maps.noIndexPattern.hintDescription"
+              defaultMessage="Don't have any geospatial data sets? "
+            />
+            <EuiLink href={getHttp().basePath.prepend('/app/home#/tutorial_directory/sampleData')}>
+              <FormattedMessage
+                id="xpack.maps.noIndexPattern.getStartedLinkText"
+                defaultMessage="Get started with some sample data sets."
+              />
+            </EuiLink>
+          </p>
+        </EuiCallOut>
+        <EuiSpacer size="s" />
+      </>
+    );
+  }
+
+  render() {
+    const IndexPatternSelect = getIndexPatternSelectComponent();
+    return (
+      <>
+        {this._renderNoIndexPatternWarning()}
+
+        <EuiFormRow
+          label={i18n.translate('xpack.maps.indexPatternSelectLabel', {
+            defaultMessage: 'Index pattern',
+          })}
+        >
+          <IndexPatternSelect
+            isDisabled={this.state.noGeoIndexPatternsExist}
+            indexPatternId={this.props.value}
+            onChange={this._onIndexPatternSelect}
+            placeholder={i18n.translate('xpack.maps.indexPatternSelectPlaceholder', {
+              defaultMessage: 'Select index pattern',
+            })}
+            fieldTypes={ES_GEO_FIELD_TYPES}
+            onNoIndexPatterns={this._onNoIndexPatterns}
+            isClearable={false}
+          />
+        </EuiFormRow>
+      </>
+    );
+  }
+}
diff --git a/x-pack/plugins/maps/public/components/no_index_pattern_callout.js b/x-pack/plugins/maps/public/components/no_index_pattern_callout.js
deleted file mode 100644
index 2daab8c6322dd3..00000000000000
--- a/x-pack/plugins/maps/public/components/no_index_pattern_callout.js
+++ /dev/null
@@ -1,52 +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 { getHttp } from '../kibana_services';
-import React from 'react';
-import { EuiCallOut, EuiLink } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-export function NoIndexPatternCallout() {
-  const http = getHttp();
-  return (
-    <EuiCallOut
-      title={i18n.translate('xpack.maps.noIndexPattern.messageTitle', {
-        defaultMessage: `Couldn't find any index patterns with geospatial fields`,
-      })}
-      color="warning"
-    >
-      <p>
-        <FormattedMessage
-          id="xpack.maps.noIndexPattern.doThisPrefixDescription"
-          defaultMessage="You'll need to "
-        />
-        <EuiLink href={http.basePath.prepend(`/app/management/kibana/indexPatterns`)}>
-          <FormattedMessage
-            id="xpack.maps.noIndexPattern.doThisLinkTextDescription"
-            defaultMessage="create an index pattern"
-          />
-        </EuiLink>
-        <FormattedMessage
-          id="xpack.maps.noIndexPattern.doThisSuffixDescription"
-          defaultMessage=" with geospatial fields."
-        />
-      </p>
-      <p>
-        <FormattedMessage
-          id="xpack.maps.noIndexPattern.hintDescription"
-          defaultMessage="Don't have any geospatial data sets? "
-        />
-        <EuiLink href={http.basePath.prepend('/app/home#/tutorial_directory/sampleData')}>
-          <FormattedMessage
-            id="xpack.maps.noIndexPattern.getStartedLinkText"
-            defaultMessage="Get started with some sample data sets."
-          />
-        </EuiLink>
-      </p>
-    </EuiCallOut>
-  );
-}
diff --git a/x-pack/plugins/maps/public/components/single_field_select.tsx b/x-pack/plugins/maps/public/components/single_field_select.tsx
index eb3a28be0efc01..2895479c4fd0e7 100644
--- a/x-pack/plugins/maps/public/components/single_field_select.tsx
+++ b/x-pack/plugins/maps/public/components/single_field_select.tsx
@@ -49,7 +49,7 @@ type Props = Omit<
 > & {
   fields?: IFieldType[];
   onChange: (fieldName?: string) => void;
-  value?: string; // index pattern field name
+  value: string | null; // index pattern field name
   isFieldDisabled?: (field: IFieldType) => boolean;
   getFieldDisabledReason?: (field: IFieldType) => string | null;
 };
diff --git a/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/flyout_body.tsx b/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/flyout_body.tsx
index 38474b84114fab..3f493ef7d43555 100644
--- a/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/flyout_body.tsx
+++ b/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/flyout_body.tsx
@@ -5,7 +5,7 @@
  */
 
 import React, { Fragment } from 'react';
-import { EuiButtonEmpty, EuiPanel, EuiSpacer } from '@elastic/eui';
+import { EuiButtonEmpty, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { LayerWizardSelect } from './layer_wizard_select';
 import { LayerWizard, RenderWizardArguments } from '../../../classes/layers/layer_wizard_registry';
@@ -50,7 +50,7 @@ export const FlyoutBody = (props: Props) => {
     return (
       <Fragment>
         {backButton}
-        <EuiPanel>{props.layerWizard.renderWizard(renderWizardArgs)}</EuiPanel>
+        {props.layerWizard.renderWizard(renderWizardArgs)}
       </Fragment>
     );
   }
diff --git a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
index ce775a425fa730..d4218d8e55c3e5 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import {
   MlCapabilities,
   adminMlCapabilities,
@@ -14,7 +14,7 @@ import { upgradeCheckProvider } from './upgrade';
 import { MlLicense } from '../../../common/license';
 
 export function capabilitiesProvider(
-  callAsCurrentUser: IScopedClusterClient['callAsCurrentUser'],
+  callAsCurrentUser: ILegacyScopedClusterClient['callAsCurrentUser'],
   capabilities: MlCapabilities,
   mlLicense: MlLicense,
   isMlEnabledInSpace: () => Promise<boolean>
diff --git a/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts b/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts
index a1d66f00f26e19..259606ba8c7ea9 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts
@@ -4,10 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { mlLog } from '../../client/log';
 
-export function upgradeCheckProvider(callAsCurrentUser: IScopedClusterClient['callAsCurrentUser']) {
+export function upgradeCheckProvider(
+  callAsCurrentUser: ILegacyScopedClusterClient['callAsCurrentUser']
+) {
   async function isUpgradeInProgress(): Promise<boolean> {
     let upgradeInProgress = false;
     try {
diff --git a/x-pack/plugins/ml/server/lib/check_annotations/index.ts b/x-pack/plugins/ml/server/lib/check_annotations/index.ts
index 980a48df480d79..2c46be394cbb22 100644
--- a/x-pack/plugins/ml/server/lib/check_annotations/index.ts
+++ b/x-pack/plugins/ml/server/lib/check_annotations/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { mlLog } from '../../client/log';
 
 import {
@@ -17,7 +17,7 @@ import {
 // - ML_ANNOTATIONS_INDEX_PATTERN index is present
 // - ML_ANNOTATIONS_INDEX_ALIAS_READ alias is present
 // - ML_ANNOTATIONS_INDEX_ALIAS_WRITE alias is present
-export async function isAnnotationsFeatureAvailable(callAsCurrentUser: APICaller) {
+export async function isAnnotationsFeatureAvailable(callAsCurrentUser: LegacyAPICaller) {
   try {
     const indexParams = { index: ML_ANNOTATIONS_INDEX_PATTERN };
 
diff --git a/x-pack/plugins/ml/server/lib/telemetry/ml_usage_collector.ts b/x-pack/plugins/ml/server/lib/telemetry/ml_usage_collector.ts
index 21e5dce8e47067..35c6936598c406 100644
--- a/x-pack/plugins/ml/server/lib/telemetry/ml_usage_collector.ts
+++ b/x-pack/plugins/ml/server/lib/telemetry/ml_usage_collector.ts
@@ -7,12 +7,10 @@
 import { CoreSetup } from 'kibana/server';
 
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { getTelemetry, initTelemetry } from './telemetry';
+import { getTelemetry, initTelemetry, Telemetry } from './telemetry';
 import { mlTelemetryMappingsType } from './mappings';
 import { setInternalRepository } from './internal_repository';
 
-const TELEMETRY_TYPE = 'mlTelemetry';
-
 export function initMlTelemetry(coreSetup: CoreSetup, usageCollection: UsageCollectionSetup) {
   coreSetup.savedObjects.registerType(mlTelemetryMappingsType);
   registerMlUsageCollector(usageCollection);
@@ -22,10 +20,22 @@ export function initMlTelemetry(coreSetup: CoreSetup, usageCollection: UsageColl
 }
 
 function registerMlUsageCollector(usageCollection: UsageCollectionSetup): void {
-  const mlUsageCollector = usageCollection.makeUsageCollector({
-    type: TELEMETRY_TYPE,
+  const mlUsageCollector = usageCollection.makeUsageCollector<Telemetry>({
+    type: 'mlTelemetry',
     isReady: () => true,
-    fetch: async () => (await getTelemetry()) || initTelemetry(),
+    schema: {
+      file_data_visualizer: {
+        index_creation_count: { type: 'long' },
+      },
+    },
+    fetch: async () => {
+      const mlUsage = await getTelemetry();
+      if (!mlUsage) {
+        return initTelemetry();
+      }
+
+      return mlUsage;
+    },
   });
 
   usageCollection.registerCollector(mlUsageCollector);
diff --git a/x-pack/plugins/ml/server/lib/telemetry/telemetry.ts b/x-pack/plugins/ml/server/lib/telemetry/telemetry.ts
index bc56e8b2a43722..f2162ff2c3d30a 100644
--- a/x-pack/plugins/ml/server/lib/telemetry/telemetry.ts
+++ b/x-pack/plugins/ml/server/lib/telemetry/telemetry.ts
@@ -11,7 +11,7 @@ import { getInternalRepository } from './internal_repository';
 
 export const TELEMETRY_DOC_ID = 'ml-telemetry';
 
-interface Telemetry {
+export interface Telemetry {
   file_data_visualizer: {
     index_creation_count: number;
   };
diff --git a/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts b/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts
index 0d88fd0cd1bb02..19db8b7b56aa6a 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts
@@ -6,7 +6,7 @@
 
 import getAnnotationsRequestMock from './__mocks__/get_annotations_request.json';
 import getAnnotationsResponseMock from './__mocks__/get_annotations_response.json';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { ANNOTATION_TYPE } from '../../../common/constants/annotations';
 import { ML_ANNOTATIONS_INDEX_ALIAS_WRITE } from '../../../common/constants/index_patterns';
@@ -31,7 +31,7 @@ describe('annotation_service', () => {
         case 'search':
           return Promise.resolve(getAnnotationsResponseMock);
       }
-    }) as unknown) as APICaller;
+    }) as unknown) as LegacyAPICaller;
   });
 
   describe('deleteAnnotation()', () => {
@@ -86,7 +86,7 @@ describe('annotation_service', () => {
 
       const callWithRequestSpyError = (jest.fn(() => {
         return Promise.resolve(mockEsError);
-      }) as unknown) as APICaller;
+      }) as unknown) as LegacyAPICaller;
 
       const { getAnnotations } = annotationServiceProvider(callWithRequestSpyError);
 
diff --git a/x-pack/plugins/ml/server/models/annotation_service/annotation.ts b/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
index 6c33de94c94b33..2808b06103a757 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
@@ -6,7 +6,7 @@
 
 import Boom from 'boom';
 import _ from 'lodash';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { ANNOTATION_TYPE } from '../../../common/constants/annotations';
 import {
@@ -68,7 +68,7 @@ export type callWithRequestType = (
   params: annotationProviderParams
 ) => Promise<any>;
 
-export function annotationProvider(callAsCurrentUser: APICaller) {
+export function annotationProvider(callAsCurrentUser: LegacyAPICaller) {
   async function indexAnnotation(annotation: Annotation, username: string) {
     if (isAnnotation(annotation) === false) {
       // No need to translate, this will not be exposed in the UI.
diff --git a/x-pack/plugins/ml/server/models/annotation_service/index.ts b/x-pack/plugins/ml/server/models/annotation_service/index.ts
index 995f800b0a498e..efc42c693c24b6 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/index.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/index.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { annotationProvider } from './annotation';
 
-export function annotationServiceProvider(callAsCurrentUser: APICaller) {
+export function annotationServiceProvider(callAsCurrentUser: LegacyAPICaller) {
   return {
     ...annotationProvider(callAsCurrentUser),
   };
diff --git a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts
index bdf1cbd5b34dca..3e80e79705a5c2 100644
--- a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts
+++ b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { ES_AGGREGATION } from '../../../common/constants/aggregation_types';
 
 export interface BucketSpanEstimatorData {
@@ -21,7 +21,7 @@ export interface BucketSpanEstimatorData {
 }
 
 export function estimateBucketSpanFactory(
-  callAsCurrentUser: APICaller,
-  callAsInternalUser: APICaller,
+  callAsCurrentUser: LegacyAPICaller,
+  callAsInternalUser: LegacyAPICaller,
   isSecurityDisabled: boolean
 ): (config: BucketSpanEstimatorData) => Promise<any>;
diff --git a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts
index 8e8301db2a3a37..8da1fb69eec34f 100644
--- a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts
+++ b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { ES_AGGREGATION } from '../../../common/constants/aggregation_types';
 
@@ -17,7 +17,7 @@ import { estimateBucketSpanFactory, BucketSpanEstimatorData } from './bucket_spa
 // sufficient permissions should be returned, the second time insufficient
 // permissions.
 const permissions = [false, true];
-const callWithRequest: APICaller = (method: string) => {
+const callWithRequest: LegacyAPICaller = (method: string) => {
   return new Promise((resolve) => {
     if (method === 'ml.privilegeCheck') {
       resolve({
@@ -34,7 +34,7 @@ const callWithRequest: APICaller = (method: string) => {
   }) as Promise<any>;
 };
 
-const callWithInternalUser: APICaller = () => {
+const callWithInternalUser: LegacyAPICaller = () => {
   return new Promise((resolve) => {
     resolve({});
   }) as Promise<any>;
diff --git a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
index 9533fbc89c76cb..61299aa3ae26df 100644
--- a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
+++ b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
@@ -5,7 +5,7 @@
  */
 
 import numeral from '@elastic/numeral';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { MLCATEGORY } from '../../../common/constants/field_types';
 import { AnalysisConfig } from '../../../common/types/anomaly_detection_jobs';
 import { fieldsServiceProvider } from '../fields_service';
@@ -36,7 +36,7 @@ export interface ModelMemoryEstimate {
 /**
  * Retrieves overall and max bucket cardinalities.
  */
-const cardinalityCheckProvider = (callAsCurrentUser: APICaller) => {
+const cardinalityCheckProvider = (callAsCurrentUser: LegacyAPICaller) => {
   const fieldsService = fieldsServiceProvider(callAsCurrentUser);
 
   return async (
@@ -123,7 +123,7 @@ const cardinalityCheckProvider = (callAsCurrentUser: APICaller) => {
   };
 };
 
-export function calculateModelMemoryLimitProvider(callAsCurrentUser: APICaller) {
+export function calculateModelMemoryLimitProvider(callAsCurrentUser: LegacyAPICaller) {
   const getCardinalities = cardinalityCheckProvider(callAsCurrentUser);
 
   /**
diff --git a/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts b/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
index 2eec704f1e784c..5df9c037b3f837 100644
--- a/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
+++ b/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
@@ -5,7 +5,7 @@
  */
 
 import { difference } from 'lodash';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { EventManager, CalendarEvent } from './event_manager';
 
 interface BasicCalendar {
@@ -23,10 +23,10 @@ export interface FormCalendar extends BasicCalendar {
 }
 
 export class CalendarManager {
-  private _callAsCurrentUser: APICaller;
+  private _callAsCurrentUser: LegacyAPICaller;
   private _eventManager: EventManager;
 
-  constructor(callAsCurrentUser: APICaller) {
+  constructor(callAsCurrentUser: LegacyAPICaller) {
     this._callAsCurrentUser = callAsCurrentUser;
     this._eventManager = new EventManager(callAsCurrentUser);
   }
diff --git a/x-pack/plugins/ml/server/models/calendar/event_manager.ts b/x-pack/plugins/ml/server/models/calendar/event_manager.ts
index 02da0718d83ae6..57034ab772710f 100644
--- a/x-pack/plugins/ml/server/models/calendar/event_manager.ts
+++ b/x-pack/plugins/ml/server/models/calendar/event_manager.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { GLOBAL_CALENDAR } from '../../../common/constants/calendars';
 
 export interface CalendarEvent {
@@ -16,7 +16,7 @@ export interface CalendarEvent {
 }
 
 export class EventManager {
-  constructor(private _callAsCurrentUser: APICaller) {}
+  constructor(private _callAsCurrentUser: LegacyAPICaller) {}
 
   async getCalendarEvents(calendarId: string) {
     const resp = await this._callAsCurrentUser('ml.events', { calendarId });
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
index bcdc58e61ad7cb..ee8598ad338e32 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller, SavedObjectsClientContract } from 'kibana/server';
+import { LegacyAPICaller, SavedObjectsClientContract } from 'kibana/server';
 import { Module } from '../../../common/types/modules';
 import { DataRecognizer } from '../data_recognizer';
 
 describe('ML - data recognizer', () => {
   const dr = new DataRecognizer(
-    jest.fn() as APICaller,
+    jest.fn() as LegacyAPICaller,
     ({
       find: jest.fn(),
       bulkCreate: jest.fn(),
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
index 82a272b068bb39..1ed9df8da65dde 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
@@ -7,7 +7,7 @@
 import fs from 'fs';
 import Boom from 'boom';
 import numeral from '@elastic/numeral';
-import { APICaller, SavedObjectsClientContract } from 'kibana/server';
+import { LegacyAPICaller, SavedObjectsClientContract } from 'kibana/server';
 import moment from 'moment';
 import { IndexPatternAttributes } from 'src/plugins/data/server';
 import { merge } from 'lodash';
@@ -113,7 +113,7 @@ export class DataRecognizer {
   jobsForModelMemoryEstimation: Array<{ job: ModuleJob; query: any }> = [];
 
   constructor(
-    private callAsCurrentUser: APICaller,
+    private callAsCurrentUser: LegacyAPICaller,
     private savedObjectsClient: SavedObjectsClientContract
   ) {}
 
diff --git a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
index 43581ad75fb17a..dc1eef8edd0be8 100644
--- a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
+++ b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CallAPIOptions, IScopedClusterClient } from 'kibana/server';
+import { LegacyCallAPIOptions, ILegacyScopedClusterClient } from 'kibana/server';
 import _ from 'lodash';
 import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 import { getSafeAggregationName } from '../../../common/util/job_utils';
@@ -110,10 +110,10 @@ export class DataVisualizer {
   callAsCurrentUser: (
     endpoint: string,
     clientParams: Record<string, any>,
-    options?: CallAPIOptions
+    options?: LegacyCallAPIOptions
   ) => Promise<any>;
 
-  constructor(callAsCurrentUser: IScopedClusterClient['callAsCurrentUser']) {
+  constructor(callAsCurrentUser: ILegacyScopedClusterClient['callAsCurrentUser']) {
     this.callAsCurrentUser = callAsCurrentUser;
   }
 
diff --git a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
index d9d765028b123a..661ea6c6fec24b 100644
--- a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
+++ b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
@@ -5,7 +5,7 @@
  */
 
 import Boom from 'boom';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { duration } from 'moment';
 import { parseInterval } from '../../../common/util/parse_interval';
 import { initCardinalityFieldsCache } from './fields_aggs_cache';
@@ -14,7 +14,7 @@ import { initCardinalityFieldsCache } from './fields_aggs_cache';
  * Service for carrying out queries to obtain data
  * specific to fields in Elasticsearch indices.
  */
-export function fieldsServiceProvider(callAsCurrentUser: APICaller) {
+export function fieldsServiceProvider(callAsCurrentUser: LegacyAPICaller) {
   const fieldsAggsCache = initCardinalityFieldsCache();
 
   /**
diff --git a/x-pack/plugins/ml/server/models/file_data_visualizer/file_data_visualizer.ts b/x-pack/plugins/ml/server/models/file_data_visualizer/file_data_visualizer.ts
index d53378b886a995..978355d098b13a 100644
--- a/x-pack/plugins/ml/server/models/file_data_visualizer/file_data_visualizer.ts
+++ b/x-pack/plugins/ml/server/models/file_data_visualizer/file_data_visualizer.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import {
   AnalysisResult,
   FormattedOverrides,
@@ -13,7 +13,7 @@ import {
 
 export type InputData = any[];
 
-export function fileDataVisualizerProvider(callAsCurrentUser: APICaller) {
+export function fileDataVisualizerProvider(callAsCurrentUser: LegacyAPICaller) {
   async function analyzeFile(data: any, overrides: any): Promise<AnalysisResult> {
     const results = await callAsCurrentUser('ml.fileStructure', {
       body: data,
diff --git a/x-pack/plugins/ml/server/models/file_data_visualizer/import_data.ts b/x-pack/plugins/ml/server/models/file_data_visualizer/import_data.ts
index afe699cc7fecf7..e082a7462241a5 100644
--- a/x-pack/plugins/ml/server/models/file_data_visualizer/import_data.ts
+++ b/x-pack/plugins/ml/server/models/file_data_visualizer/import_data.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { INDEX_META_DATA_CREATED_BY } from '../../../common/constants/file_datavisualizer';
 import {
   ImportResponse,
@@ -15,7 +15,7 @@ import {
 } from '../../../common/types/file_datavisualizer';
 import { InputData } from './file_data_visualizer';
 
-export function importDataProvider(callAsCurrentUser: APICaller) {
+export function importDataProvider(callAsCurrentUser: LegacyAPICaller) {
   async function importData(
     id: string,
     index: string,
diff --git a/x-pack/plugins/ml/server/models/filter/filter_manager.ts b/x-pack/plugins/ml/server/models/filter/filter_manager.ts
index 11208b4d941f38..22d3df3cc8a63f 100644
--- a/x-pack/plugins/ml/server/models/filter/filter_manager.ts
+++ b/x-pack/plugins/ml/server/models/filter/filter_manager.ts
@@ -5,7 +5,7 @@
  */
 
 import Boom from 'boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 
 import { DetectorRule, DetectorRuleScope } from '../../../common/types/detector_rules';
 
@@ -58,9 +58,9 @@ interface PartialJob {
 }
 
 export class FilterManager {
-  private _client: IScopedClusterClient['callAsCurrentUser'];
+  private _client: ILegacyScopedClusterClient['callAsCurrentUser'];
 
-  constructor(client: IScopedClusterClient['callAsCurrentUser']) {
+  constructor(client: ILegacyScopedClusterClient['callAsCurrentUser']) {
     this._client = client;
   }
 
diff --git a/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.d.ts b/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.d.ts
index 00538f498d61b1..f11771a88c5c63 100644
--- a/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.d.ts
+++ b/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.d.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 export function jobAuditMessagesProvider(
-  callAsCurrentUser: APICaller
+  callAsCurrentUser: LegacyAPICaller
 ): {
   getJobAuditMessages: (jobId?: string, from?: string) => any;
   getAuditMessagesSummary: (jobIds?: string[]) => any;
diff --git a/x-pack/plugins/ml/server/models/job_service/datafeeds.ts b/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
index f0168980759185..0f64f5e0e7b4f2 100644
--- a/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
+++ b/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { i18n } from '@kbn/i18n';
 import { JOB_STATE, DATAFEED_STATE } from '../../../common/constants/states';
 import { fillResultsWithTimeouts, isRequestTimeout } from './error_utils';
@@ -26,7 +26,7 @@ interface Results {
   };
 }
 
-export function datafeedsProvider(callAsCurrentUser: APICaller) {
+export function datafeedsProvider(callAsCurrentUser: LegacyAPICaller) {
   async function forceStartDatafeeds(datafeedIds: string[], start?: number, end?: number) {
     const jobIds = await getJobIdsByDatafeedId();
     const doStartsCalled = datafeedIds.reduce((acc, cur) => {
diff --git a/x-pack/plugins/ml/server/models/job_service/groups.ts b/x-pack/plugins/ml/server/models/job_service/groups.ts
index 56757e4cc3ff7c..ab5707ab29e65c 100644
--- a/x-pack/plugins/ml/server/models/job_service/groups.ts
+++ b/x-pack/plugins/ml/server/models/job_service/groups.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { CalendarManager } from '../calendar';
 import { GLOBAL_CALENDAR } from '../../../common/constants/calendars';
 import { Job } from '../../../common/types/anomaly_detection_jobs';
@@ -23,7 +23,7 @@ interface Results {
   };
 }
 
-export function groupsProvider(callAsCurrentUser: APICaller) {
+export function groupsProvider(callAsCurrentUser: LegacyAPICaller) {
   const calMngr = new CalendarManager(callAsCurrentUser);
 
   async function getAllGroups() {
diff --git a/x-pack/plugins/ml/server/models/job_service/index.ts b/x-pack/plugins/ml/server/models/job_service/index.ts
index b6e87b98735ee7..5d053c1be73e42 100644
--- a/x-pack/plugins/ml/server/models/job_service/index.ts
+++ b/x-pack/plugins/ml/server/models/job_service/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { datafeedsProvider } from './datafeeds';
 import { jobsProvider } from './jobs';
 import { groupsProvider } from './groups';
@@ -12,7 +12,7 @@ import { newJobCapsProvider } from './new_job_caps';
 import { newJobChartsProvider, topCategoriesProvider } from './new_job';
 import { modelSnapshotProvider } from './model_snapshots';
 
-export function jobServiceProvider(callAsCurrentUser: APICaller) {
+export function jobServiceProvider(callAsCurrentUser: LegacyAPICaller) {
   return {
     ...datafeedsProvider(callAsCurrentUser),
     ...jobsProvider(callAsCurrentUser),
diff --git a/x-pack/plugins/ml/server/models/job_service/jobs.ts b/x-pack/plugins/ml/server/models/job_service/jobs.ts
index 852264b3d03374..2d26b2150edf33 100644
--- a/x-pack/plugins/ml/server/models/job_service/jobs.ts
+++ b/x-pack/plugins/ml/server/models/job_service/jobs.ts
@@ -7,7 +7,7 @@
 import { i18n } from '@kbn/i18n';
 import { uniq } from 'lodash';
 import Boom from 'boom';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { JOB_STATE, DATAFEED_STATE } from '../../../common/constants/states';
 import {
   MlSummaryJob,
@@ -46,7 +46,7 @@ interface Results {
   };
 }
 
-export function jobsProvider(callAsCurrentUser: APICaller) {
+export function jobsProvider(callAsCurrentUser: LegacyAPICaller) {
   const { forceDeleteDatafeed, getDatafeedIdsByJobId } = datafeedsProvider(callAsCurrentUser);
   const { getAuditMessagesSummary } = jobAuditMessagesProvider(callAsCurrentUser);
   const { getLatestBucketTimestampByJob } = resultsServiceProvider(callAsCurrentUser);
diff --git a/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts b/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts
index 4ffae17fc1c069..136d4f47c7facc 100644
--- a/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts
+++ b/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts
@@ -6,7 +6,7 @@
 
 import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { ModelSnapshot } from '../../../common/types/anomaly_detection_jobs';
 import { datafeedsProvider, MlDatafeedsResponse } from './datafeeds';
 import { MlJobsResponse } from './jobs';
@@ -20,7 +20,7 @@ export interface RevertModelSnapshotResponse {
   model: ModelSnapshot;
 }
 
-export function modelSnapshotProvider(callAsCurrentUser: APICaller) {
+export function modelSnapshotProvider(callAsCurrentUser: LegacyAPICaller) {
   const { forceStartDatafeeds, getDatafeedIdsByJobId } = datafeedsProvider(callAsCurrentUser);
 
   async function revertModelSnapshot(
diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
index 0aae4388e73992..8deaae823e8b3a 100644
--- a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { validateJob, ValidateJobPayload } from './job_validation';
 import { JobValidationMessage } from '../../../common/constants/messages';
 
 // mock callWithRequest
-const callWithRequest: APICaller = (method: string) => {
+const callWithRequest: LegacyAPICaller = (method: string) => {
   return new Promise((resolve) => {
     if (method === 'fieldCaps') {
       resolve({ fields: [] });
diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
index 9d7154bbbb304d..6e65e5e64f3b75 100644
--- a/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import Boom from 'boom';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { TypeOf } from '@kbn/config-schema';
 import { fieldsServiceProvider } from '../fields_service';
@@ -35,10 +35,10 @@ export type ValidateJobPayload = TypeOf<typeof validateJobSchema>;
  * @kbn/config-schema has checked the payload {@link validateJobSchema}.
  */
 export async function validateJob(
-  callWithRequest: APICaller,
+  callWithRequest: LegacyAPICaller,
   payload: ValidateJobPayload,
   kbnVersion = 'current',
-  callAsInternalUser?: APICaller,
+  callAsInternalUser?: LegacyAPICaller,
   isSecurityDisabled?: boolean
 ) {
   const messages = getMessages();
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts
index 13e5495aac4c41..bcfe4a48a0de00 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts
@@ -6,7 +6,7 @@
 
 import _ from 'lodash';
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 
@@ -21,7 +21,7 @@ const mockResponses = {
 };
 
 // mock callWithRequestFactory
-const callWithRequestFactory = (responses: Record<string, any>, fail = false): APICaller => {
+const callWithRequestFactory = (responses: Record<string, any>, fail = false): LegacyAPICaller => {
   return (requestName: string) => {
     return new Promise((resolve, reject) => {
       const response = responses[requestName];
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts
index 62f272f26bb3f1..d5bc6aa20e32aa 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { DataVisualizer } from '../data_visualizer';
 
 import { validateJobObject } from './validate_job_object';
@@ -43,7 +43,7 @@ type Validator = (obj: {
   messages: Messages;
 }>;
 
-const validateFactory = (callWithRequest: APICaller, job: CombinedJob): Validator => {
+const validateFactory = (callWithRequest: LegacyAPICaller, job: CombinedJob): Validator => {
   const dv = new DataVisualizer(callWithRequest);
 
   const modelPlotConfigTerms = job?.model_plot_config?.terms ?? '';
@@ -150,7 +150,7 @@ const validateFactory = (callWithRequest: APICaller, job: CombinedJob): Validato
 };
 
 export async function validateCardinality(
-  callWithRequest: APICaller,
+  callWithRequest: LegacyAPICaller,
   job?: CombinedJob
 ): Promise<Messages> | never {
   const messages: Messages = [];
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_influencers.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_influencers.test.ts
index 89c265d0b6f602..594b51a773adae 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_influencers.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_influencers.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 
@@ -13,7 +13,7 @@ import { validateInfluencers } from './validate_influencers';
 describe('ML - validateInfluencers', () => {
   it('called without arguments throws an error', (done) => {
     validateInfluencers(
-      (undefined as unknown) as APICaller,
+      (undefined as unknown) as LegacyAPICaller,
       (undefined as unknown) as CombinedJob
     ).then(
       () => done(new Error('Promise should not resolve for this test without job argument.')),
@@ -22,7 +22,10 @@ describe('ML - validateInfluencers', () => {
   });
 
   it('called with non-valid job argument #1, missing analysis_config', (done) => {
-    validateInfluencers((undefined as unknown) as APICaller, ({} as unknown) as CombinedJob).then(
+    validateInfluencers(
+      (undefined as unknown) as LegacyAPICaller,
+      ({} as unknown) as CombinedJob
+    ).then(
       () => done(new Error('Promise should not resolve for this test without valid job argument.')),
       () => done()
     );
@@ -34,7 +37,10 @@ describe('ML - validateInfluencers', () => {
       datafeed_config: { indices: [] },
       data_description: { time_field: '@timestamp' },
     };
-    validateInfluencers((undefined as unknown) as APICaller, (job as unknown) as CombinedJob).then(
+    validateInfluencers(
+      (undefined as unknown) as LegacyAPICaller,
+      (job as unknown) as CombinedJob
+    ).then(
       () => done(new Error('Promise should not resolve for this test without valid job argument.')),
       () => done()
     );
@@ -46,7 +52,10 @@ describe('ML - validateInfluencers', () => {
       datafeed_config: { indices: [] },
       data_description: { time_field: '@timestamp' },
     };
-    validateInfluencers((undefined as unknown) as APICaller, (job as unknown) as CombinedJob).then(
+    validateInfluencers(
+      (undefined as unknown) as LegacyAPICaller,
+      (job as unknown) as CombinedJob
+    ).then(
       () => done(new Error('Promise should not resolve for this test without valid job argument.')),
       () => done()
     );
@@ -66,7 +75,7 @@ describe('ML - validateInfluencers', () => {
 
   it('success_influencer', () => {
     const job = getJobConfig(['airline']);
-    return validateInfluencers((undefined as unknown) as APICaller, job).then((messages) => {
+    return validateInfluencers((undefined as unknown) as LegacyAPICaller, job).then((messages) => {
       const ids = messages.map((m) => m.id);
       expect(ids).toStrictEqual(['success_influencers']);
     });
@@ -84,7 +93,7 @@ describe('ML - validateInfluencers', () => {
       ]
     );
 
-    return validateInfluencers((undefined as unknown) as APICaller, job).then((messages) => {
+    return validateInfluencers((undefined as unknown) as LegacyAPICaller, job).then((messages) => {
       const ids = messages.map((m) => m.id);
       expect(ids).toStrictEqual([]);
     });
@@ -92,7 +101,7 @@ describe('ML - validateInfluencers', () => {
 
   it('influencer_low', () => {
     const job = getJobConfig();
-    return validateInfluencers((undefined as unknown) as APICaller, job).then((messages) => {
+    return validateInfluencers((undefined as unknown) as LegacyAPICaller, job).then((messages) => {
       const ids = messages.map((m) => m.id);
       expect(ids).toStrictEqual(['influencer_low']);
     });
@@ -100,7 +109,7 @@ describe('ML - validateInfluencers', () => {
 
   it('influencer_high', () => {
     const job = getJobConfig(['i1', 'i2', 'i3', 'i4']);
-    return validateInfluencers((undefined as unknown) as APICaller, job).then((messages) => {
+    return validateInfluencers((undefined as unknown) as LegacyAPICaller, job).then((messages) => {
       const ids = messages.map((m) => m.id);
       expect(ids).toStrictEqual(['influencer_high']);
     });
@@ -118,7 +127,7 @@ describe('ML - validateInfluencers', () => {
         },
       ]
     );
-    return validateInfluencers((undefined as unknown) as APICaller, job).then((messages) => {
+    return validateInfluencers((undefined as unknown) as LegacyAPICaller, job).then((messages) => {
       const ids = messages.map((m) => m.id);
       expect(ids).toStrictEqual(['influencer_low_suggestion']);
     });
@@ -148,7 +157,7 @@ describe('ML - validateInfluencers', () => {
         },
       ]
     );
-    return validateInfluencers((undefined as unknown) as APICaller, job).then((messages) => {
+    return validateInfluencers((undefined as unknown) as LegacyAPICaller, job).then((messages) => {
       expect(messages).toStrictEqual([
         {
           id: 'influencer_low_suggestions',
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_influencers.ts b/x-pack/plugins/ml/server/models/job_validation/validate_influencers.ts
index 531d4dfdba0c55..1a77bfaf608115 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_influencers.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_influencers.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 
@@ -14,7 +14,7 @@ const INFLUENCER_LOW_THRESHOLD = 0;
 const INFLUENCER_HIGH_THRESHOLD = 4;
 const DETECTOR_FIELD_NAMES_THRESHOLD = 1;
 
-export async function validateInfluencers(callWithRequest: APICaller, job: CombinedJob) {
+export async function validateInfluencers(callWithRequest: LegacyAPICaller, job: CombinedJob) {
   validateJobObject(job);
 
   const messages = [];
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts
index 581153036fed7c..d9be8e282e9235 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { CombinedJob, Detector } from '../../../common/types/anomaly_detection_jobs';
 import { ModelMemoryEstimate } from '../calculate_model_memory_limit/calculate_model_memory_limit';
 import { validateModelMemoryLimit } from './validate_model_memory_limit';
@@ -97,7 +97,7 @@ describe('ML - validateModelMemoryLimit', () => {
         response = estimateModelMemory || modelMemoryEstimateResponse;
       }
       return Promise.resolve(response);
-    }) as APICaller;
+    }) as LegacyAPICaller;
 
   function getJobConfig(influencers: string[] = [], detectors: Detector[] = []) {
     return ({
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts
index 5c3250af6ef468..2c7d1cc23bbaad 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts
@@ -5,7 +5,7 @@
  */
 
 import numeral from '@elastic/numeral';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 import { validateJobObject } from './validate_job_object';
 import { calculateModelMemoryLimitProvider } from '../calculate_model_memory_limit';
@@ -16,7 +16,7 @@ import { MlInfoResponse } from '../../../common/types/ml_server_info';
 const MODEL_MEMORY_LIMIT_MINIMUM_BYTES = 1048576;
 
 export async function validateModelMemoryLimit(
-  callWithRequest: APICaller,
+  callWithRequest: LegacyAPICaller,
   job: CombinedJob,
   duration?: { start?: number; end?: number }
 ) {
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts
index 3ba8701b4bbd2b..d4e1f0cc379fb9 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts
@@ -6,7 +6,7 @@
 
 import _ from 'lodash';
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 
@@ -21,7 +21,7 @@ const mockSearchResponse = {
   search: mockTimeRange,
 };
 
-const callWithRequestFactory = (resp: any): APICaller => {
+const callWithRequestFactory = (resp: any): LegacyAPICaller => {
   return (path: string) => {
     return new Promise((resolve) => {
       resolve(resp[path]);
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts
index f60ca66b092f91..f47938e059ec04 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/server';
 import { parseInterval } from '../../../common/util/parse_interval';
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
@@ -27,7 +27,7 @@ const BUCKET_SPAN_COMPARE_FACTOR = 25;
 const MIN_TIME_SPAN_MS = 7200000;
 const MIN_TIME_SPAN_READABLE = '2 hours';
 
-export async function isValidTimeField(callAsCurrentUser: APICaller, job: CombinedJob) {
+export async function isValidTimeField(callAsCurrentUser: LegacyAPICaller, job: CombinedJob) {
   const index = job.datafeed_config.indices.join(',');
   const timeField = job.data_description.time_field;
 
@@ -45,7 +45,7 @@ export async function isValidTimeField(callAsCurrentUser: APICaller, job: Combin
 }
 
 export async function validateTimeRange(
-  callAsCurrentUser: APICaller,
+  callAsCurrentUser: LegacyAPICaller,
   job: CombinedJob,
   timeRange?: Partial<TimeRange>
 ) {
diff --git a/x-pack/plugins/ml/server/models/results_service/results_service.ts b/x-pack/plugins/ml/server/models/results_service/results_service.ts
index a985ef7b8f3f58..8255395000f47d 100644
--- a/x-pack/plugins/ml/server/models/results_service/results_service.ts
+++ b/x-pack/plugins/ml/server/models/results_service/results_service.ts
@@ -7,7 +7,7 @@
 import _ from 'lodash';
 import moment from 'moment';
 import { SearchResponse } from 'elasticsearch';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { buildAnomalyTableItems } from './build_anomaly_table_items';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../common/constants/index_patterns';
 import { ANOMALIES_TABLE_DEFAULT_QUERY_SIZE } from '../../../common/constants/search';
@@ -30,7 +30,7 @@ interface Influencer {
   fieldValue: any;
 }
 
-export function resultsServiceProvider(callAsCurrentUser: APICaller) {
+export function resultsServiceProvider(callAsCurrentUser: LegacyAPICaller) {
   // Obtains data for the anomalies table, aggregating anomalies by day or hour as requested.
   // Return an Object with properties 'anomalies' and 'interval' (interval used to aggregate anomalies,
   // one of day, hour or second. Note 'auto' can be provided as the aggregationInterval in the request,
diff --git a/x-pack/plugins/ml/server/plugin.ts b/x-pack/plugins/ml/server/plugin.ts
index b167214cc33cfd..3e753627ead937 100644
--- a/x-pack/plugins/ml/server/plugin.ts
+++ b/x-pack/plugins/ml/server/plugin.ts
@@ -9,11 +9,11 @@ import {
   CoreSetup,
   CoreStart,
   Plugin,
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
   KibanaRequest,
   Logger,
   PluginInitializerContext,
-  ICustomClusterClient,
+  ILegacyCustomClusterClient,
   CapabilitiesStart,
 } from 'kibana/server';
 import { PluginsSetup, RouteInitialization } from './types';
@@ -52,13 +52,13 @@ import { registerKibanaSettings } from './lib/register_settings';
 declare module 'kibana/server' {
   interface RequestHandlerContext {
     ml?: {
-      mlClient: IScopedClusterClient;
+      mlClient: ILegacyScopedClusterClient;
     };
   }
 }
 
 export interface MlPluginSetup extends SharedServices {
-  mlClient: ICustomClusterClient;
+  mlClient: ILegacyCustomClusterClient;
 }
 export type MlPluginStart = void;
 
diff --git a/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts b/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts
index 880aebfde409c3..a2e3ce6569e604 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { LicenseCheck } from '../license_checks';
 import { Job } from '../../../common/types/anomaly_detection_jobs';
 
 export interface AnomalyDetectorsProvider {
   anomalyDetectorsProvider(
-    callAsCurrentUser: APICaller
+    callAsCurrentUser: LegacyAPICaller
   ): {
     jobs(jobId?: string): Promise<{ count: number; jobs: Job[] }>;
   };
@@ -18,7 +18,7 @@ export interface AnomalyDetectorsProvider {
 
 export function getAnomalyDetectorsProvider(isFullLicense: LicenseCheck): AnomalyDetectorsProvider {
   return {
-    anomalyDetectorsProvider(callAsCurrentUser: APICaller) {
+    anomalyDetectorsProvider(callAsCurrentUser: LegacyAPICaller) {
       return {
         jobs(jobId?: string) {
           isFullLicense();
diff --git a/x-pack/plugins/ml/server/shared_services/providers/job_service.ts b/x-pack/plugins/ml/server/shared_services/providers/job_service.ts
index 8dd3f1ca145823..5deb7c3cb75654 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/job_service.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/job_service.ts
@@ -4,17 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { LicenseCheck } from '../license_checks';
 import { jobServiceProvider } from '../../models/job_service';
 
 export interface JobServiceProvider {
-  jobServiceProvider(callAsCurrentUser: APICaller): ReturnType<typeof jobServiceProvider>;
+  jobServiceProvider(callAsCurrentUser: LegacyAPICaller): ReturnType<typeof jobServiceProvider>;
 }
 
 export function getJobServiceProvider(isFullLicense: LicenseCheck): JobServiceProvider {
   return {
-    jobServiceProvider(callAsCurrentUser: APICaller) {
+    jobServiceProvider(callAsCurrentUser: LegacyAPICaller) {
       isFullLicense();
       return jobServiceProvider(callAsCurrentUser);
     },
diff --git a/x-pack/plugins/ml/server/shared_services/providers/modules.ts b/x-pack/plugins/ml/server/shared_services/providers/modules.ts
index ec876273c2c33e..e5359a0b0f804b 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/modules.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/modules.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller, SavedObjectsClientContract } from 'kibana/server';
+import { LegacyAPICaller, SavedObjectsClientContract } from 'kibana/server';
 import { LicenseCheck } from '../license_checks';
 import { DataRecognizer, RecognizeResult } from '../../models/data_recognizer';
 import {
@@ -16,7 +16,7 @@ import {
 
 export interface ModulesProvider {
   modulesProvider(
-    callAsCurrentUser: APICaller,
+    callAsCurrentUser: LegacyAPICaller,
     savedObjectsClient: SavedObjectsClientContract
   ): {
     recognize(indexPatternTitle: string): Promise<RecognizeResult[]>;
@@ -40,7 +40,10 @@ export interface ModulesProvider {
 
 export function getModulesProvider(isFullLicense: LicenseCheck): ModulesProvider {
   return {
-    modulesProvider(callAsCurrentUser: APICaller, savedObjectsClient: SavedObjectsClientContract) {
+    modulesProvider(
+      callAsCurrentUser: LegacyAPICaller,
+      savedObjectsClient: SavedObjectsClientContract
+    ) {
       isFullLicense();
       return {
         recognize(indexPatternTitle: string) {
@@ -91,7 +94,7 @@ export function getModulesProvider(isFullLicense: LicenseCheck): ModulesProvider
 }
 
 function dataRecognizerFactory(
-  callAsCurrentUser: APICaller,
+  callAsCurrentUser: LegacyAPICaller,
   savedObjectsClient: SavedObjectsClientContract
 ) {
   return new DataRecognizer(callAsCurrentUser, savedObjectsClient);
diff --git a/x-pack/plugins/ml/server/shared_services/providers/results_service.ts b/x-pack/plugins/ml/server/shared_services/providers/results_service.ts
index e321713e27d81f..8da25a02278ef5 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/results_service.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/results_service.ts
@@ -4,17 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { LicenseCheck } from '../license_checks';
 import { resultsServiceProvider } from '../../models/results_service';
 
 export interface ResultsServiceProvider {
-  resultsServiceProvider(callAsCurrentUser: APICaller): ReturnType<typeof resultsServiceProvider>;
+  resultsServiceProvider(
+    callAsCurrentUser: LegacyAPICaller
+  ): ReturnType<typeof resultsServiceProvider>;
 }
 
 export function getResultsServiceProvider(isFullLicense: LicenseCheck): ResultsServiceProvider {
   return {
-    resultsServiceProvider(callAsCurrentUser: APICaller) {
+    resultsServiceProvider(callAsCurrentUser: LegacyAPICaller) {
       isFullLicense();
       return resultsServiceProvider(callAsCurrentUser);
     },
diff --git a/x-pack/plugins/ml/server/shared_services/providers/system.ts b/x-pack/plugins/ml/server/shared_services/providers/system.ts
index 33a4d854dd3e98..8f1cfbc5c1b631 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/system.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/system.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller, KibanaRequest } from 'kibana/server';
+import { LegacyAPICaller, KibanaRequest } from 'kibana/server';
 import { SearchResponse, SearchParams } from 'elasticsearch';
 import { MlServerLicense } from '../../lib/license';
 import { CloudSetup } from '../../../../cloud/server';
@@ -18,7 +18,7 @@ import { MlCapabilitiesResponse, ResolveMlCapabilities } from '../../../common/t
 
 export interface MlSystemProvider {
   mlSystemProvider(
-    callAsCurrentUser: APICaller,
+    callAsCurrentUser: LegacyAPICaller,
     request: KibanaRequest
   ): {
     mlCapabilities(): Promise<MlCapabilitiesResponse>;
@@ -36,7 +36,7 @@ export function getMlSystemProvider(
   resolveMlCapabilities: ResolveMlCapabilities
 ): MlSystemProvider {
   return {
-    mlSystemProvider(callAsCurrentUser: APICaller, request: KibanaRequest) {
+    mlSystemProvider(callAsCurrentUser: LegacyAPICaller, request: KibanaRequest) {
       return {
         async mlCapabilities() {
           isMinimumLicense();
diff --git a/x-pack/plugins/monitoring/server/alerts/cluster_state.ts b/x-pack/plugins/monitoring/server/alerts/cluster_state.ts
index 5b6521179002a0..c357a5878b93a5 100644
--- a/x-pack/plugins/monitoring/server/alerts/cluster_state.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cluster_state.ts
@@ -6,7 +6,7 @@
 
 import moment from 'moment-timezone';
 import { i18n } from '@kbn/i18n';
-import { Logger, ICustomClusterClient, UiSettingsServiceStart } from 'src/core/server';
+import { Logger, ILegacyCustomClusterClient, UiSettingsServiceStart } from 'src/core/server';
 import { ALERT_TYPE_CLUSTER_STATE } from '../../common/constants';
 import { AlertType } from '../../../alerts/server';
 import { executeActions, getUiMessage } from '../lib/alerts/cluster_state.lib';
@@ -22,7 +22,7 @@ import { fetchClusterState } from '../lib/alerts/fetch_cluster_state';
 
 export const getClusterState = (
   getUiSettingsService: () => Promise<UiSettingsServiceStart>,
-  monitoringCluster: ICustomClusterClient,
+  monitoringCluster: ILegacyCustomClusterClient,
   getLogger: (...scopes: string[]) => Logger,
   ccsEnabled: boolean
 ): AlertType => {
diff --git a/x-pack/plugins/monitoring/server/alerts/license_expiration.ts b/x-pack/plugins/monitoring/server/alerts/license_expiration.ts
index d57f1a7655b187..277e108e8f0c0a 100644
--- a/x-pack/plugins/monitoring/server/alerts/license_expiration.ts
+++ b/x-pack/plugins/monitoring/server/alerts/license_expiration.ts
@@ -5,7 +5,7 @@
  */
 
 import moment from 'moment-timezone';
-import { Logger, ICustomClusterClient, UiSettingsServiceStart } from 'src/core/server';
+import { Logger, ILegacyCustomClusterClient, UiSettingsServiceStart } from 'src/core/server';
 import { i18n } from '@kbn/i18n';
 import { ALERT_TYPE_LICENSE_EXPIRATION } from '../../common/constants';
 import { AlertType } from '../../../alerts/server';
@@ -24,7 +24,7 @@ const EXPIRES_DAYS = [60, 30, 14, 7];
 
 export const getLicenseExpiration = (
   getUiSettingsService: () => Promise<UiSettingsServiceStart>,
-  monitoringCluster: ICustomClusterClient,
+  monitoringCluster: ILegacyCustomClusterClient,
   getLogger: (...scopes: string[]) => Logger,
   ccsEnabled: boolean
 ): AlertType => {
diff --git a/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts b/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts
index 5b097220352cfe..d9746853846340 100644
--- a/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts
+++ b/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { ConfigOptions } from 'elasticsearch';
-import { Logger, ICustomClusterClient } from 'kibana/server';
+import { Logger, ILegacyCustomClusterClient } from 'kibana/server';
 // @ts-ignore
 import { monitoringBulk } from '../kibana_monitoring/lib/monitoring_bulk';
 import { MonitoringElasticsearchConfig } from '../config';
@@ -20,7 +20,10 @@ type ESClusterConfig = MonitoringElasticsearchConfig & Pick<ConfigOptions, 'plug
 export function instantiateClient(
   elasticsearchConfig: MonitoringElasticsearchConfig,
   log: Logger,
-  createClient: (type: string, clientConfig?: Partial<ESClusterConfig>) => ICustomClusterClient
+  createClient: (
+    type: string,
+    clientConfig?: Partial<ESClusterConfig>
+  ) => ILegacyCustomClusterClient
 ) {
   const isMonitoringCluster = hasMonitoringCluster(elasticsearchConfig);
   const cluster = createClient('monitoring', {
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/get_prepared_alert.ts b/x-pack/plugins/monitoring/server/lib/alerts/get_prepared_alert.ts
index cfaaeb36535a01..1d307bc018a7bf 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/get_prepared_alert.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/get_prepared_alert.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Logger, ICustomClusterClient, UiSettingsServiceStart } from 'kibana/server';
+import { Logger, ILegacyCustomClusterClient, UiSettingsServiceStart } from 'kibana/server';
 import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
 import { AlertServices } from '../../../../alerts/server';
 import { AlertCommonCluster } from '../../alerts/types';
@@ -23,7 +23,7 @@ export interface PreparedAlert {
 }
 
 async function getCallCluster(
-  monitoringCluster: ICustomClusterClient,
+  monitoringCluster: ILegacyCustomClusterClient,
   services: Pick<AlertServices, 'callCluster'>
 ): Promise<any> {
   if (!monitoringCluster) {
@@ -36,7 +36,7 @@ async function getCallCluster(
 export async function getPreparedAlert(
   alertType: string,
   getUiSettingsService: () => Promise<UiSettingsServiceStart>,
-  monitoringCluster: ICustomClusterClient,
+  monitoringCluster: ILegacyCustomClusterClient,
   logger: Logger,
   ccsEnabled: boolean,
   services: Pick<AlertServices, 'callCluster' | 'savedObjectsClient'>,
diff --git a/x-pack/plugins/monitoring/server/license_service.ts b/x-pack/plugins/monitoring/server/license_service.ts
index 396e8cd566e1fd..7dcdf8897f6a18 100644
--- a/x-pack/plugins/monitoring/server/license_service.ts
+++ b/x-pack/plugins/monitoring/server/license_service.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { Subscription } from 'rxjs';
-import { ICustomClusterClient } from 'kibana/server';
+import { ILegacyCustomClusterClient } from 'kibana/server';
 import { ILicense, LicenseFeature } from '../../licensing/common/types';
 import { LicensingPluginSetup } from '../../licensing/server';
 import { MonitoringConfig } from './config';
@@ -13,7 +13,7 @@ import { MonitoringLicenseService } from './types';
 
 interface SetupDeps {
   licensing: LicensingPluginSetup;
-  monitoringClient: ICustomClusterClient;
+  monitoringClient: ILegacyCustomClusterClient;
   config: MonitoringConfig;
   log: Logger;
 }
diff --git a/x-pack/plugins/monitoring/server/plugin.ts b/x-pack/plugins/monitoring/server/plugin.ts
index 881d0080ab7892..ad2a5b7bb1ce2f 100644
--- a/x-pack/plugins/monitoring/server/plugin.ts
+++ b/x-pack/plugins/monitoring/server/plugin.ts
@@ -18,10 +18,10 @@ import {
   KibanaRequest,
   KibanaResponseFactory,
   CoreSetup,
-  ICustomClusterClient,
+  ILegacyCustomClusterClient,
   CoreStart,
   IRouter,
-  IClusterClient,
+  ILegacyClusterClient,
   CustomHttpResponseOptions,
   ResponseError,
 } from 'kibana/server';
@@ -83,7 +83,7 @@ interface MonitoringCore {
 interface LegacyShimDependencies {
   router: IRouter;
   instanceUuid: string;
-  esDataClient: IClusterClient;
+  esDataClient: ILegacyClusterClient;
   kibanaStatsCollector: any;
 }
 
@@ -109,7 +109,7 @@ export class Plugin {
   private readonly initializerContext: PluginInitializerContext;
   private readonly log: Logger;
   private readonly getLogger: (...scopes: string[]) => Logger;
-  private cluster = {} as ICustomClusterClient;
+  private cluster = {} as ILegacyCustomClusterClient;
   private licenseService = {} as MonitoringLicenseService;
   private monitoringCore = {} as MonitoringCore;
   private legacyShimDependencies = {} as LegacyShimDependencies;
@@ -322,7 +322,7 @@ export class Plugin {
     legacyConfig: any,
     getCoreServices: () => Promise<[CoreStart, PluginsStart, {}]>,
     licenseService: MonitoringLicenseService,
-    cluster: ICustomClusterClient
+    cluster: ILegacyCustomClusterClient
   ): MonitoringCore {
     const router = this.legacyShimDependencies.router;
     const legacyConfigWrapper = () => ({
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts b/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts
index d81f549de75229..1e5549fe4d8003 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ICustomClusterClient } from 'kibana/server';
+import { ILegacyCustomClusterClient } from 'kibana/server';
 import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
 import { getAllStats, CustomContext } from './get_all_stats';
 import { getClusterUuids } from './get_cluster_uuids';
@@ -12,7 +12,7 @@ import { getLicenses } from './get_licenses';
 
 export function registerMonitoringCollection(
   telemetryCollectionManager: TelemetryCollectionManagerPluginSetup,
-  esCluster: ICustomClusterClient,
+  esCluster: ILegacyCustomClusterClient,
   customContext: CustomContext
 ) {
   telemetryCollectionManager.setCollection({
diff --git a/x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts b/x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts
index 71b1a42b2000d9..1fb5211a71bcdf 100644
--- a/x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts
+++ b/x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller, Logger } from 'kibana/server';
+import { LegacyAPICaller, Logger } from 'kibana/server';
 import * as t from 'io-ts';
 import { Client } from 'elasticsearch';
 import Boom from 'boom';
@@ -40,7 +40,7 @@ interface IndexDocumentResponse {
 
 export function createAnnotationsClient(params: {
   index: string;
-  apiCaller: APICaller;
+  apiCaller: LegacyAPICaller;
   logger: Logger;
   license?: ILicense;
 }) {
diff --git a/x-pack/plugins/observability/server/utils/create_or_update_index.ts b/x-pack/plugins/observability/server/utils/create_or_update_index.ts
index aa12b2227b7d23..1898331451262c 100644
--- a/x-pack/plugins/observability/server/utils/create_or_update_index.ts
+++ b/x-pack/plugins/observability/server/utils/create_or_update_index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import pRetry from 'p-retry';
-import { Logger, APICaller } from 'src/core/server';
+import { Logger, LegacyAPICaller } from 'src/core/server';
 
 export interface MappingsObject {
   type: string;
@@ -29,7 +29,7 @@ export async function createOrUpdateIndex({
 }: {
   index: string;
   mappings: MappingsDefinition;
-  apiCaller: APICaller;
+  apiCaller: LegacyAPICaller;
   logger: Logger;
 }) {
   try {
@@ -79,7 +79,7 @@ function createNewIndex({
   mappings,
 }: {
   index: string;
-  apiCaller: APICaller;
+  apiCaller: LegacyAPICaller;
   mappings: MappingsDefinition;
 }) {
   return apiCaller('indices.create', {
@@ -98,7 +98,7 @@ function updateExistingIndex({
   mappings,
 }: {
   index: string;
-  apiCaller: APICaller;
+  apiCaller: LegacyAPICaller;
   mappings: MappingsDefinition;
 }) {
   return apiCaller('indices.putMapping', {
diff --git a/x-pack/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts b/x-pack/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts
index 5f7f70ee5d62a6..d7a708173d3adc 100644
--- a/x-pack/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts
+++ b/x-pack/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
 import _, { countBy, groupBy, mapValues } from 'lodash';
 import { first } from 'rxjs/operators';
 
-import { APICaller, IClusterClient } from 'src/core/server';
+import { LegacyAPICaller, ILegacyClusterClient } from 'src/core/server';
 import { getNextMidnight } from '../../get_next_midnight';
 import { getPastDays } from '../../get_past_days';
 import { TaskInstance } from '../../../../../task_manager/server';
@@ -23,7 +23,7 @@ interface VisSummary {
 /*
  * Parse the response data into telemetry payload
  */
-async function getStats(callCluster: APICaller, index: string) {
+async function getStats(callCluster: LegacyAPICaller, index: string) {
   const searchParams = {
     size: 10000, // elasticsearch index.max_result_window default value
     index,
@@ -85,7 +85,7 @@ async function getStats(callCluster: APICaller, index: string) {
 export function visualizationsTaskRunner(
   taskInstance: TaskInstance,
   config: Observable<{ kibana: { index: string } }>,
-  esClientPromise: Promise<IClusterClient>
+  esClientPromise: Promise<ILegacyClusterClient>
 ) {
   return async () => {
     let stats;
diff --git a/x-pack/plugins/oss_telemetry/server/test_utils/index.ts b/x-pack/plugins/oss_telemetry/server/test_utils/index.ts
index 93bde69629fbdc..7ac98196808394 100644
--- a/x-pack/plugins/oss_telemetry/server/test_utils/index.ts
+++ b/x-pack/plugins/oss_telemetry/server/test_utils/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { of } from 'rxjs';
 import moment from 'moment';
@@ -46,16 +46,20 @@ const defaultMockSavedObjects = [
 
 const defaultMockTaskDocs = [getMockTaskInstance()];
 
-export const getMockEs = async (mockCallWithInternal: APICaller = getMockCallWithInternal()) => {
+export const getMockEs = async (
+  mockCallWithInternal: LegacyAPICaller = getMockCallWithInternal()
+) => {
   const client = elasticsearchServiceMock.createClusterClient();
   (client.callAsInternalUser as any) = mockCallWithInternal;
   return client;
 };
 
-export const getMockCallWithInternal = (hits: unknown[] = defaultMockSavedObjects): APICaller => {
+export const getMockCallWithInternal = (
+  hits: unknown[] = defaultMockSavedObjects
+): LegacyAPICaller => {
   return ((() => {
     return Promise.resolve({ hits: { hits } });
-  }) as unknown) as APICaller;
+  }) as unknown) as LegacyAPICaller;
 };
 
 export const getMockTaskFetch = (
diff --git a/x-pack/plugins/reporting/common/constants.ts b/x-pack/plugins/reporting/common/constants.ts
index 48483c79d1af23..c461c2de4e2ad2 100644
--- a/x-pack/plugins/reporting/common/constants.ts
+++ b/x-pack/plugins/reporting/common/constants.ts
@@ -54,12 +54,6 @@ export const KBN_SCREENSHOT_HEADER_BLACKLIST_STARTS_WITH_PATTERN = ['proxy-'];
 
 export const UI_SETTINGS_CUSTOM_PDF_LOGO = 'xpackReporting:customPdfLogo';
 
-/**
- * The type name used within the Monitoring index to publish reporting stats.
- * @type {string}
- */
-export const KIBANA_REPORTING_TYPE = 'reporting';
-
 export const PDF_JOB_TYPE = 'printable_pdf';
 export const PNG_JOB_TYPE = 'PNG';
 export const CSV_JOB_TYPE = 'csv';
diff --git a/x-pack/plugins/reporting/server/export_types/common/layouts/preserve_layout.css b/x-pack/plugins/reporting/server/export_types/common/layouts/preserve_layout.css
index 88e38d55e57849..0ea9f3079de825 100644
--- a/x-pack/plugins/reporting/server/export_types/common/layouts/preserve_layout.css
+++ b/x-pack/plugins/reporting/server/export_types/common/layouts/preserve_layout.css
@@ -17,6 +17,7 @@
 /* hide unusable controls */
 kbn-top-nav,
 filter-bar,
+.kbnTopNavMenu__wrapper,
 ::-webkit-scrollbar,
 .euiNavDrawer {
   display: none !important;
@@ -55,7 +56,7 @@ discover-app .discover-table-footer {
 
 /* hide unusable controls
 *  !important is required to override resizable panel inline display */
-visualization-editor .visEditor--default > :not(.visEditor__visualization) {
+.visEditor__content .visEditor--default > :not(.visEditor__visualization) {
   display: none !important;
 }
 
@@ -73,7 +74,7 @@ visualization-editor .visEditor--default > :not(.visEditor__visualization) {
 /* remove left padding from visualizations so that map lines up with .leaflet-container and
 *  setting the position to be fixed and to take up the entire screen, because some zoom levels/viewports
 *  are triggering the media breakpoints that cause the .visEditor__canvas to take up more room than the viewport */
-visualize-app .visEditor__canvas {
+.visEditor .visEditor__canvas {
   padding-left: 0px;
   position: fixed;
   width: 100%;
diff --git a/x-pack/plugins/reporting/server/export_types/common/layouts/print.css b/x-pack/plugins/reporting/server/export_types/common/layouts/print.css
index ddd280c7b3f233..b5b6eae5e1ff60 100644
--- a/x-pack/plugins/reporting/server/export_types/common/layouts/print.css
+++ b/x-pack/plugins/reporting/server/export_types/common/layouts/print.css
@@ -17,6 +17,7 @@
 /* hide unusable controls */
 kbn-top-nav,
 filter-bar,
+.kbnTopNavMenu__wrapper,
 ::-webkit-scrollbar,
 .euiNavDrawer {
   display: none !important;
@@ -54,7 +55,7 @@ discover-app .discover-table-footer {
 
 /* hide unusable controls
 *  !important is required to override resizable panel inline display */
-visualization-editor .visEditor--default > :not(.visEditor__visualization) {
+.visEditor__content .visEditor--default > :not(.visEditor__visualization) {
   display: none !important;
 }
 /** THIS IS FOR TSVB UNTIL REFACTOR **/
@@ -71,7 +72,7 @@ visualization-editor .visEditor--default > :not(.visEditor__visualization) {
 /* remove left padding from visualizations so that map lines up with .leaflet-container and
 *  setting the position to be fixed and to take up the entire screen, because some zoom levels/viewports
 *  are triggering the media breakpoints that cause the .visEditor__canvas to take up more room than the viewport */
-visualize-app .visEditor__canvas {
+.visEditor .visEditor__canvas {
   padding-left: 0px;
   position: fixed;
   width: 100%;
diff --git a/x-pack/plugins/reporting/server/routes/generation.test.ts b/x-pack/plugins/reporting/server/routes/generation.test.ts
index 4474f2c95e1c31..7de7c68122125a 100644
--- a/x-pack/plugins/reporting/server/routes/generation.test.ts
+++ b/x-pack/plugins/reporting/server/routes/generation.test.ts
@@ -57,6 +57,9 @@ describe('POST /api/reporting/generate', () => {
         },
       },
       security: {
+        license: {
+          isEnabled: () => true,
+        },
         authc: {
           getCurrentUser: () => ({
             id: '123',
diff --git a/x-pack/plugins/reporting/server/routes/jobs.test.ts b/x-pack/plugins/reporting/server/routes/jobs.test.ts
index 35594474685b0d..a0e3379da12be7 100644
--- a/x-pack/plugins/reporting/server/routes/jobs.test.ts
+++ b/x-pack/plugins/reporting/server/routes/jobs.test.ts
@@ -47,6 +47,9 @@ describe('GET /api/reporting/jobs/download', () => {
         legacy: { client: { callAsInternalUser: jest.fn() } },
       },
       security: {
+        license: {
+          isEnabled: () => true,
+        },
         authc: {
           getCurrentUser: () => ({
             id: '123',
@@ -113,6 +116,9 @@ describe('GET /api/reporting/jobs/download', () => {
       // @ts-ignore
       ...core.pluginSetupDeps,
       security: {
+        license: {
+          isEnabled: () => true,
+        },
         authc: {
           getCurrentUser: () => undefined,
         },
@@ -136,6 +142,9 @@ describe('GET /api/reporting/jobs/download', () => {
       // @ts-ignore
       ...core.pluginSetupDeps,
       security: {
+        license: {
+          isEnabled: () => true,
+        },
         authc: {
           getCurrentUser: () => ({
             id: '123',
diff --git a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts
index b218f9e4607dde..f4591f8436bd2c 100644
--- a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts
@@ -46,7 +46,7 @@ describe('authorized_user_pre_routing', function () {
     mockCore = await createMockReportingCore(mockReportingConfig);
   });
 
-  it('should return from handler with null user when security is disabled', async function () {
+  it('should return from handler with a "null" user when security plugin is not found', async function () {
     mockCore.getPluginSetupDeps = () =>
       (({
         // @ts-ignore
@@ -66,12 +66,37 @@ describe('authorized_user_pre_routing', function () {
     expect(handlerCalled).toBe(true);
   });
 
-  it('should return with 401 when security is enabled but no authenticated user', async function () {
+  it('should return from handler with a "null" user when security is disabled', async function () {
     mockCore.getPluginSetupDeps = () =>
       (({
         // @ts-ignore
         ...mockCore.pluginSetupDeps,
         security: {
+          license: {
+            isEnabled: () => false,
+          },
+        }, // disable security
+      } as unknown) as ReportingInternalSetup);
+    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockCore);
+    const mockResponseFactory = httpServerMock.createResponseFactory() as KibanaResponseFactory;
+
+    let handlerCalled = false;
+    authorizedUserPreRouting((user: unknown) => {
+      expect(user).toBe(null); // verify the user is a null value
+      handlerCalled = true;
+      return Promise.resolve({ status: 200, options: {} });
+    })(getMockContext(), getMockRequest(), mockResponseFactory);
+
+    expect(handlerCalled).toBe(true);
+  });
+
+  it('should return with 401 when security is enabled and the request is unauthenticated', async function () {
+    mockCore.getPluginSetupDeps = () =>
+      (({
+        // @ts-ignore
+        ...mockCore.pluginSetupDeps,
+        security: {
+          license: { isEnabled: () => true },
           authc: { getCurrentUser: () => null },
         },
       } as unknown) as ReportingInternalSetup);
@@ -87,12 +112,13 @@ describe('authorized_user_pre_routing', function () {
     });
   });
 
-  it(`should return with 403 when security is enabled but user doesn't have allowed role`, async function () {
+  it(`should return with 403 when security is enabled but user doesn't have the allowed role`, async function () {
     mockCore.getPluginSetupDeps = () =>
       (({
         // @ts-ignore
         ...mockCore.pluginSetupDeps,
         security: {
+          license: { isEnabled: () => true },
           authc: { getCurrentUser: () => ({ username: 'friendlyuser', roles: ['cowboy'] }) },
         },
       } as unknown) as ReportingInternalSetup);
@@ -113,6 +139,7 @@ describe('authorized_user_pre_routing', function () {
         // @ts-ignore
         ...mockCore.pluginSetupDeps,
         security: {
+          license: { isEnabled: () => true },
           authc: {
             getCurrentUser: () => ({ username: 'friendlyuser', roles: ['reporting_user'] }),
           },
diff --git a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
index 2f5d4ebe1419aa..74737b0a5d1e27 100644
--- a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
@@ -24,7 +24,7 @@ export const authorizedUserPreRoutingFactory = function authorizedUserPreRouting
   return <P, Q, B>(handler: RequestHandlerUser): RequestHandler<P, Q, B, RouteMethod> => {
     return (context, req, res) => {
       let user: ReportingUser = null;
-      if (setupDeps.security) {
+      if (setupDeps.security && setupDeps.security.license.isEnabled()) {
         // find the authenticated user, or null if security is not enabled
         user = getUser(req);
         if (!user) {
diff --git a/x-pack/plugins/reporting/server/usage/reporting_usage_collector.ts b/x-pack/plugins/reporting/server/usage/reporting_usage_collector.ts
index 364f5187f056c0..100d09a2da7e41 100644
--- a/x-pack/plugins/reporting/server/usage/reporting_usage_collector.ts
+++ b/x-pack/plugins/reporting/server/usage/reporting_usage_collector.ts
@@ -8,16 +8,22 @@ import { first, map } from 'rxjs/operators';
 import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { ReportingCore } from '../';
-import { KIBANA_REPORTING_TYPE } from '../../common/constants';
 import { ExportTypesRegistry } from '../lib/export_types_registry';
 import { ReportingSetupDeps } from '../types';
 import { GetLicense } from './';
 import { getReportingUsage } from './get_reporting_usage';
-import { RangeStats } from './types';
+import { ReportingUsageType } from './types';
 
 // places the reporting data as kibana stats
 const METATYPE = 'kibana_stats';
 
+interface XpackBulkUpload {
+  usage: {
+    xpack: {
+      reporting: ReportingUsageType;
+    };
+  };
+}
 /*
  * @return {Object} kibana usage stats type collection object
  */
@@ -28,20 +34,19 @@ export function getReportingUsageCollector(
   exportTypesRegistry: ExportTypesRegistry,
   isReady: () => Promise<boolean>
 ) {
-  return usageCollection.makeUsageCollector({
-    type: KIBANA_REPORTING_TYPE,
+  return usageCollection.makeUsageCollector<ReportingUsageType, XpackBulkUpload>({
+    type: 'reporting',
     fetch: (callCluster: CallCluster) => {
       const config = reporting.getConfig();
       return getReportingUsage(config, getLicense, callCluster, exportTypesRegistry);
     },
     isReady,
-
     /*
      * Format the response data into a model for internal upload
      * 1. Make this data part of the "kibana_stats" type
      * 2. Organize the payload in the usage.xpack.reporting namespace of the data payload
      */
-    formatForBulkUpload: (result: RangeStats) => {
+    formatForBulkUpload: (result: ReportingUsageType) => {
       return {
         type: METATYPE,
         payload: {
diff --git a/x-pack/plugins/rollup/server/collectors/register.ts b/x-pack/plugins/rollup/server/collectors/register.ts
index 629dd8b180fdd7..c679098bc05bea 100644
--- a/x-pack/plugins/rollup/server/collectors/register.ts
+++ b/x-pack/plugins/rollup/server/collectors/register.ts
@@ -12,8 +12,6 @@ interface IdToFlagMap {
   [key: string]: boolean;
 }
 
-const ROLLUP_USAGE_TYPE = 'rollups';
-
 // elasticsearch index.max_result_window default value
 const ES_MAX_RESULT_WINDOW_DEFAULT_VALUE = 1000;
 
@@ -174,13 +172,42 @@ async function fetchRollupVisualizations(
   };
 }
 
+interface Usage {
+  index_patterns: {
+    total: number;
+  };
+  saved_searches: {
+    total: number;
+  };
+  visualizations: {
+    total: number;
+    saved_searches: {
+      total: number;
+    };
+  };
+}
+
 export function registerRollupUsageCollector(
   usageCollection: UsageCollectionSetup,
   kibanaIndex: string
 ): void {
-  const collector = usageCollection.makeUsageCollector({
-    type: ROLLUP_USAGE_TYPE,
+  const collector = usageCollection.makeUsageCollector<Usage>({
+    type: 'rollups',
     isReady: () => true,
+    schema: {
+      index_patterns: {
+        total: { type: 'long' },
+      },
+      saved_searches: {
+        total: { type: 'long' },
+      },
+      visualizations: {
+        saved_searches: {
+          total: { type: 'long' },
+        },
+        total: { type: 'long' },
+      },
+    },
     fetch: async (callCluster: CallCluster) => {
       const rollupIndexPatterns = await fetchRollupIndexPatterns(kibanaIndex, callCluster);
       const rollupIndexPatternToFlagMap = createIdToFlagMap(rollupIndexPatterns);
diff --git a/x-pack/plugins/rollup/server/plugin.ts b/x-pack/plugins/rollup/server/plugin.ts
index 0d795ab7dbfe1d..713852b4d73984 100644
--- a/x-pack/plugins/rollup/server/plugin.ts
+++ b/x-pack/plugins/rollup/server/plugin.ts
@@ -14,13 +14,13 @@ import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
 import {
   CoreSetup,
-  ICustomClusterClient,
+  ILegacyCustomClusterClient,
   Plugin,
   Logger,
   KibanaRequest,
   PluginInitializerContext,
-  IScopedClusterClient,
-  APICaller,
+  ILegacyScopedClusterClient,
+  LegacyAPICaller,
   SharedGlobalConfig,
 } from 'src/core/server';
 import { i18n } from '@kbn/i18n';
@@ -41,7 +41,7 @@ import { getCapabilitiesForRollupIndices } from './lib/map_capabilities';
 import { mergeCapabilitiesWithFields } from './lib/merge_capabilities_with_fields';
 
 interface RollupContext {
-  client: IScopedClusterClient;
+  client: ILegacyScopedClusterClient;
 }
 async function getCustomEsClient(getStartServices: CoreSetup['getStartServices']) {
   const [core] = await getStartServices();
@@ -54,7 +54,7 @@ export class RollupPlugin implements Plugin<void, void, any, any> {
   private readonly logger: Logger;
   private readonly globalConfig$: Observable<SharedGlobalConfig>;
   private readonly license: License;
-  private rollupEsClient?: ICustomClusterClient;
+  private rollupEsClient?: ILegacyCustomClusterClient;
 
   constructor(initializerContext: PluginInitializerContext) {
     this.logger = initializerContext.logger.get();
@@ -122,8 +122,8 @@ export class RollupPlugin implements Plugin<void, void, any, any> {
       const callWithRequestFactoryShim = (
         elasticsearchServiceShim: CallWithRequestFactoryShim,
         request: KibanaRequest
-      ): APICaller => {
-        return async (...args: Parameters<APICaller>) => {
+      ): LegacyAPICaller => {
+        return async (...args: Parameters<LegacyAPICaller>) => {
           this.rollupEsClient = this.rollupEsClient ?? (await getCustomEsClient(getStartServices));
           return await this.rollupEsClient.asScoped(request).callAsCurrentUser(...args);
         };
diff --git a/x-pack/plugins/rollup/server/types.ts b/x-pack/plugins/rollup/server/types.ts
index 6659ac2b023579..2a7644de764b2f 100644
--- a/x-pack/plugins/rollup/server/types.ts
+++ b/x-pack/plugins/rollup/server/types.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IRouter, APICaller, KibanaRequest } from 'src/core/server';
+import { IRouter, LegacyAPICaller, KibanaRequest } from 'src/core/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { VisTypeTimeseriesSetup } from 'src/plugins/vis_type_timeseries/server';
 
@@ -42,4 +42,4 @@ export interface RouteDependencies {
 export type CallWithRequestFactoryShim = (
   elasticsearchServiceShim: CallWithRequestFactoryShim,
   request: KibanaRequest
-) => APICaller;
+) => LegacyAPICaller;
diff --git a/x-pack/plugins/security/server/authentication/api_keys.test.ts b/x-pack/plugins/security/server/authentication/api_keys.test.ts
index ad55f15545bd9f..0cdd452d459d1f 100644
--- a/x-pack/plugins/security/server/authentication/api_keys.test.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IClusterClient, IScopedClusterClient } from '../../../../../src/core/server';
+import { ILegacyClusterClient, ILegacyScopedClusterClient } from '../../../../../src/core/server';
 import { SecurityLicense } from '../../common/licensing';
 import { APIKeys } from './api_keys';
 
@@ -19,15 +19,15 @@ const encodeToBase64 = (str: string) => Buffer.from(str).toString('base64');
 
 describe('API Keys', () => {
   let apiKeys: APIKeys;
-  let mockClusterClient: jest.Mocked<IClusterClient>;
-  let mockScopedClusterClient: jest.Mocked<IScopedClusterClient>;
+  let mockClusterClient: jest.Mocked<ILegacyClusterClient>;
+  let mockScopedClusterClient: jest.Mocked<ILegacyScopedClusterClient>;
   let mockLicense: jest.Mocked<SecurityLicense>;
 
   beforeEach(() => {
     mockClusterClient = elasticsearchServiceMock.createClusterClient();
     mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
     mockClusterClient.asScoped.mockReturnValue(
-      (mockScopedClusterClient as unknown) as jest.Mocked<IScopedClusterClient>
+      (mockScopedClusterClient as unknown) as jest.Mocked<ILegacyScopedClusterClient>
     );
 
     mockLicense = licenseMock.create();
diff --git a/x-pack/plugins/security/server/authentication/api_keys.ts b/x-pack/plugins/security/server/authentication/api_keys.ts
index 29ff7e1f69f955..3b6aee72651e29 100644
--- a/x-pack/plugins/security/server/authentication/api_keys.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IClusterClient, KibanaRequest, Logger } from '../../../../../src/core/server';
+import { ILegacyClusterClient, KibanaRequest, Logger } from '../../../../../src/core/server';
 import { SecurityLicense } from '../../common/licensing';
 import { HTTPAuthorizationHeader } from './http_authentication';
 import { BasicHTTPAuthorizationHeaderCredentials } from './http_authentication';
@@ -15,7 +15,7 @@ import { BasicHTTPAuthorizationHeaderCredentials } from './http_authentication';
  */
 export interface ConstructorOptions {
   logger: Logger;
-  clusterClient: IClusterClient;
+  clusterClient: ILegacyClusterClient;
   license: SecurityLicense;
 }
 
@@ -116,7 +116,7 @@ export interface InvalidateAPIKeyResult {
  */
 export class APIKeys {
   private readonly logger: Logger;
-  private readonly clusterClient: IClusterClient;
+  private readonly clusterClient: ILegacyClusterClient;
   private readonly license: SecurityLicense;
 
   constructor({ logger, clusterClient, license }: ConstructorOptions) {
diff --git a/x-pack/plugins/security/server/authentication/authenticator.ts b/x-pack/plugins/security/server/authentication/authenticator.ts
index 70f4063878aa89..42ec3f79bddf36 100644
--- a/x-pack/plugins/security/server/authentication/authenticator.ts
+++ b/x-pack/plugins/security/server/authentication/authenticator.ts
@@ -12,7 +12,7 @@ import {
   LoggerFactory,
   Logger,
   HttpServiceSetup,
-  IClusterClient,
+  ILegacyClusterClient,
 } from '../../../../../src/core/server';
 import { SecurityLicense } from '../../common/licensing';
 import { AuthenticatedUser } from '../../common/model';
@@ -101,7 +101,7 @@ export interface AuthenticatorOptions {
   basePath: HttpServiceSetup['basePath'];
   license: SecurityLicense;
   loggers: LoggerFactory;
-  clusterClient: IClusterClient;
+  clusterClient: ILegacyClusterClient;
   sessionStorageFactory: SessionStorageFactory<ProviderSession>;
 }
 
diff --git a/x-pack/plugins/security/server/authentication/index.test.ts b/x-pack/plugins/security/server/authentication/index.test.ts
index 0acd4fa7fae406..4157f0598b3d06 100644
--- a/x-pack/plugins/security/server/authentication/index.test.ts
+++ b/x-pack/plugins/security/server/authentication/index.test.ts
@@ -24,11 +24,11 @@ import { securityAuditLoggerMock } from '../audit/index.mock';
 import {
   AuthenticationHandler,
   AuthToolkit,
-  IClusterClient,
+  ILegacyClusterClient,
   CoreSetup,
   KibanaRequest,
   LoggerFactory,
-  ScopedClusterClient,
+  LegacyScopedClusterClient,
 } from '../../../../../src/core/server';
 import { AuthenticatedUser } from '../../common/model';
 import { ConfigSchema, ConfigType, createConfig } from '../config';
@@ -51,11 +51,11 @@ describe('setupAuthentication()', () => {
     config: ConfigType;
     loggers: LoggerFactory;
     http: jest.Mocked<CoreSetup['http']>;
-    clusterClient: jest.Mocked<IClusterClient>;
+    clusterClient: jest.Mocked<ILegacyClusterClient>;
     license: jest.Mocked<SecurityLicense>;
     getFeatureUsageService: () => jest.Mocked<SecurityFeatureUsageServiceStart>;
   };
-  let mockScopedClusterClient: jest.Mocked<PublicMethodsOf<ScopedClusterClient>>;
+  let mockScopedClusterClient: jest.Mocked<PublicMethodsOf<LegacyScopedClusterClient>>;
   beforeEach(() => {
     mockSetupAuthenticationParams = {
       auditLogger: securityAuditLoggerMock.create(),
@@ -79,7 +79,7 @@ describe('setupAuthentication()', () => {
 
     mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
     mockSetupAuthenticationParams.clusterClient.asScoped.mockReturnValue(
-      (mockScopedClusterClient as unknown) as jest.Mocked<ScopedClusterClient>
+      (mockScopedClusterClient as unknown) as jest.Mocked<LegacyScopedClusterClient>
     );
   });
 
diff --git a/x-pack/plugins/security/server/authentication/index.ts b/x-pack/plugins/security/server/authentication/index.ts
index 68fc6559769b74..659a378388a13c 100644
--- a/x-pack/plugins/security/server/authentication/index.ts
+++ b/x-pack/plugins/security/server/authentication/index.ts
@@ -5,7 +5,7 @@
  */
 import { UnwrapPromise } from '@kbn/utility-types';
 import {
-  IClusterClient,
+  ILegacyClusterClient,
   CoreSetup,
   KibanaRequest,
   LoggerFactory,
@@ -40,7 +40,7 @@ interface SetupAuthenticationParams {
   auditLogger: SecurityAuditLogger;
   getFeatureUsageService: () => SecurityFeatureUsageServiceStart;
   http: CoreSetup['http'];
-  clusterClient: IClusterClient;
+  clusterClient: ILegacyClusterClient;
   config: ConfigType;
   license: SecurityLicense;
   loggers: LoggerFactory;
diff --git a/x-pack/plugins/security/server/authentication/providers/base.ts b/x-pack/plugins/security/server/authentication/providers/base.ts
index 32ea41802d31bb..631721b032752a 100644
--- a/x-pack/plugins/security/server/authentication/providers/base.ts
+++ b/x-pack/plugins/security/server/authentication/providers/base.ts
@@ -8,7 +8,7 @@ import {
   KibanaRequest,
   Logger,
   HttpServiceSetup,
-  IClusterClient,
+  ILegacyClusterClient,
   Headers,
 } from '../../../../../../src/core/server';
 import { deepFreeze } from '../../../../../../src/core/server';
@@ -23,7 +23,7 @@ import { Tokens } from '../tokens';
 export interface AuthenticationProviderOptions {
   name: string;
   basePath: HttpServiceSetup['basePath'];
-  client: IClusterClient;
+  client: ILegacyClusterClient;
   logger: Logger;
   tokens: PublicMethodsOf<Tokens>;
   urls: {
diff --git a/x-pack/plugins/security/server/authentication/providers/basic.test.ts b/x-pack/plugins/security/server/authentication/providers/basic.test.ts
index ee6a12e36df05f..95de8ca9d00e71 100644
--- a/x-pack/plugins/security/server/authentication/providers/basic.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/basic.test.ts
@@ -8,7 +8,7 @@ import { elasticsearchServiceMock, httpServerMock } from '../../../../../../src/
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { mockAuthenticationProviderOptions } from './base.mock';
 
-import { IClusterClient, ScopeableRequest } from '../../../../../../src/core/server';
+import { ILegacyClusterClient, ScopeableRequest } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
 import { BasicAuthenticationProvider } from './basic';
@@ -18,7 +18,7 @@ function generateAuthorizationHeader(username: string, password: string) {
 }
 
 function expectAuthenticateCall(
-  mockClusterClient: jest.Mocked<IClusterClient>,
+  mockClusterClient: jest.Mocked<ILegacyClusterClient>,
   scopeableRequest: ScopeableRequest
 ) {
   expect(mockClusterClient.asScoped).toHaveBeenCalledTimes(1);
diff --git a/x-pack/plugins/security/server/authentication/providers/http.test.ts b/x-pack/plugins/security/server/authentication/providers/http.test.ts
index 47715670e4697a..e6949269e3fc75 100644
--- a/x-pack/plugins/security/server/authentication/providers/http.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/http.test.ts
@@ -9,8 +9,8 @@ import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.
 import { MockAuthenticationProviderOptions, mockAuthenticationProviderOptions } from './base.mock';
 
 import {
-  ElasticsearchErrorHelpers,
-  IClusterClient,
+  LegacyElasticsearchErrorHelpers,
+  ILegacyClusterClient,
   ScopeableRequest,
 } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
@@ -18,7 +18,7 @@ import { DeauthenticationResult } from '../deauthentication_result';
 import { HTTPAuthenticationProvider } from './http';
 
 function expectAuthenticateCall(
-  mockClusterClient: jest.Mocked<IClusterClient>,
+  mockClusterClient: jest.Mocked<ILegacyClusterClient>,
   scopeableRequest: ScopeableRequest
 ) {
   expect(mockClusterClient.asScoped).toHaveBeenCalledTimes(1);
@@ -146,7 +146,7 @@ describe('HTTPAuthenticationProvider', () => {
     });
 
     it('fails if authentication via `authorization` header with supported scheme fails.', async () => {
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
+      const failureReason = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
       for (const { schemes, header } of [
         { schemes: ['basic'], header: 'Basic xxx' },
         { schemes: ['bearer'], header: 'Bearer xxx' },
diff --git a/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts b/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts
index ebf1341127e5f0..c00374efd59b47 100644
--- a/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts
@@ -12,8 +12,8 @@ import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.
 import { MockAuthenticationProviderOptions, mockAuthenticationProviderOptions } from './base.mock';
 
 import {
-  ElasticsearchErrorHelpers,
-  IClusterClient,
+  LegacyElasticsearchErrorHelpers,
+  ILegacyClusterClient,
   KibanaRequest,
   ScopeableRequest,
 } from '../../../../../../src/core/server';
@@ -22,7 +22,7 @@ import { DeauthenticationResult } from '../deauthentication_result';
 import { KerberosAuthenticationProvider } from './kerberos';
 
 function expectAuthenticateCall(
-  mockClusterClient: jest.Mocked<IClusterClient>,
+  mockClusterClient: jest.Mocked<ILegacyClusterClient>,
   scopeableRequest: ScopeableRequest
 ) {
   expect(mockClusterClient.asScoped).toHaveBeenCalledTimes(1);
@@ -63,7 +63,7 @@ describe('KerberosAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -77,7 +77,7 @@ describe('KerberosAuthenticationProvider', () => {
     it('fails with `Negotiate` challenge if backend supports Kerberos.', async () => {
       const request = httpServerMock.createKibanaRequest({ headers: {} });
 
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(
+      const failureReason = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(
         new (errors.AuthenticationException as any)('Unauthorized', {
           body: { error: { header: { 'WWW-Authenticate': 'Negotiate' } } },
         })
@@ -189,7 +189,7 @@ describe('KerberosAuthenticationProvider', () => {
         headers: { authorization: 'negotiate spnego' },
       });
 
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(
+      const failureReason = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(
         new (errors.AuthenticationException as any)('Unauthorized', {
           body: { error: { header: { 'WWW-Authenticate': 'Negotiate response-token' } } },
         })
@@ -214,7 +214,7 @@ describe('KerberosAuthenticationProvider', () => {
         headers: { authorization: 'negotiate spnego' },
       });
 
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(
+      const failureReason = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(
         new (errors.AuthenticationException as any)('Unauthorized', {
           body: { error: { header: { 'WWW-Authenticate': 'Negotiate' } } },
         })
@@ -239,7 +239,7 @@ describe('KerberosAuthenticationProvider', () => {
         headers: { authorization: 'negotiate spnego' },
       });
 
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
+      const failureReason = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
       mockOptions.client.callAsInternalUser.mockRejectedValue(failureReason);
 
       await expect(operation(request)).resolves.toEqual(AuthenticationResult.failed(failureReason));
@@ -256,7 +256,7 @@ describe('KerberosAuthenticationProvider', () => {
         headers: { authorization: 'negotiate spnego' },
       });
 
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
+      const failureReason = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(failureReason);
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
@@ -322,7 +322,7 @@ describe('KerberosAuthenticationProvider', () => {
       const request = httpServerMock.createKibanaRequest();
       const tokenPair = { accessToken: 'token', refreshToken: 'refresh-token' };
 
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
+      const failureReason = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(failureReason);
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
@@ -380,7 +380,7 @@ describe('KerberosAuthenticationProvider', () => {
         if (scopeableRequest?.headers.authorization === `Bearer ${tokenPair.accessToken}`) {
           const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
           mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-            ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+            LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
           );
           return mockScopedClusterClient;
         }
@@ -445,7 +445,7 @@ describe('KerberosAuthenticationProvider', () => {
       const request = httpServerMock.createKibanaRequest();
       const tokenPair = { accessToken: 'expired-token', refreshToken: 'some-valid-refresh-token' };
 
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(
+      const failureReason = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(
         new (errors.AuthenticationException as any)('Unauthorized', {
           body: { error: { header: { 'WWW-Authenticate': 'Negotiate' } } },
         })
@@ -470,7 +470,7 @@ describe('KerberosAuthenticationProvider', () => {
       const request = httpServerMock.createKibanaRequest({ routeAuthRequired: false });
       const tokenPair = { accessToken: 'expired-token', refreshToken: 'some-valid-refresh-token' };
 
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(
+      const failureReason = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(
         new (errors.AuthenticationException as any)('Unauthorized', {
           body: { error: { header: { 'WWW-Authenticate': 'Negotiate' } } },
         })
diff --git a/x-pack/plugins/security/server/authentication/providers/kerberos.ts b/x-pack/plugins/security/server/authentication/providers/kerberos.ts
index 66a0ce22d3d19f..44919fae9ced8f 100644
--- a/x-pack/plugins/security/server/authentication/providers/kerberos.ts
+++ b/x-pack/plugins/security/server/authentication/providers/kerberos.ts
@@ -6,8 +6,8 @@
 
 import Boom from 'boom';
 import {
-  ElasticsearchError,
-  ElasticsearchErrorHelpers,
+  LegacyElasticsearchError,
+  LegacyElasticsearchErrorHelpers,
   KibanaRequest,
 } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
@@ -149,7 +149,7 @@ export class KerberosAuthenticationProvider extends BaseAuthenticationProvider {
       this.logger.debug(`Failed to exchange SPNEGO token for an access token: ${err.message}`);
 
       // Check if SPNEGO context wasn't established and we have a response token to return to the client.
-      const challenge = ElasticsearchErrorHelpers.isNotAuthorizedError(err)
+      const challenge = LegacyElasticsearchErrorHelpers.isNotAuthorizedError(err)
         ? this.getNegotiateChallenge(err)
         : undefined;
       if (!challenge) {
@@ -294,7 +294,7 @@ export class KerberosAuthenticationProvider extends BaseAuthenticationProvider {
     this.logger.debug('Trying to authenticate request via SPNEGO.');
 
     // Try to authenticate current request with Elasticsearch to see whether it supports SPNEGO.
-    let elasticsearchError: ElasticsearchError;
+    let elasticsearchError: LegacyElasticsearchError;
     try {
       await this.getUser(request, {
         // We should send a fake SPNEGO token to Elasticsearch to make sure Kerberos realm is included
@@ -308,7 +308,7 @@ export class KerberosAuthenticationProvider extends BaseAuthenticationProvider {
     } catch (err) {
       // Fail immediately if we get unexpected error (e.g. ES isn't available). We should not touch
       // session cookie in this case.
-      if (!ElasticsearchErrorHelpers.isNotAuthorizedError(err)) {
+      if (!LegacyElasticsearchErrorHelpers.isNotAuthorizedError(err)) {
         return AuthenticationResult.failed(err);
       }
 
@@ -334,7 +334,7 @@ export class KerberosAuthenticationProvider extends BaseAuthenticationProvider {
    * Extracts `Negotiate` challenge from the list of challenges returned with Elasticsearch error if any.
    * @param error Error to extract challenges from.
    */
-  private getNegotiateChallenge(error: ElasticsearchError) {
+  private getNegotiateChallenge(error: LegacyElasticsearchError) {
     const challenges = ([] as string[]).concat(error.output.headers[WWWAuthenticateHeaderName]);
 
     const negotiateChallenge = challenges.find((challenge) =>
diff --git a/x-pack/plugins/security/server/authentication/providers/oidc.test.ts b/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
index 74344e8ae3edad..d787e76628d6db 100644
--- a/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
@@ -11,8 +11,8 @@ import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.
 import { MockAuthenticationProviderOptions, mockAuthenticationProviderOptions } from './base.mock';
 
 import {
-  ElasticsearchErrorHelpers,
-  IClusterClient,
+  LegacyElasticsearchErrorHelpers,
+  ILegacyClusterClient,
   KibanaRequest,
   ScopeableRequest,
 } from '../../../../../../src/core/server';
@@ -21,7 +21,7 @@ import { DeauthenticationResult } from '../deauthentication_result';
 import { OIDCAuthenticationProvider, OIDCLogin, ProviderLoginAttempt } from './oidc';
 
 function expectAuthenticateCall(
-  mockClusterClient: jest.Mocked<IClusterClient>,
+  mockClusterClient: jest.Mocked<ILegacyClusterClient>,
   scopeableRequest: ScopeableRequest
 ) {
   expect(mockClusterClient.asScoped).toHaveBeenCalledTimes(1);
@@ -468,7 +468,7 @@ describe('OIDCAuthenticationProvider', () => {
         if (scopeableRequest?.headers.authorization === `Bearer ${tokenPair.accessToken}`) {
           const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
           mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-            ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+            LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
           );
           return mockScopedClusterClient;
         }
@@ -516,7 +516,7 @@ describe('OIDCAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -556,7 +556,7 @@ describe('OIDCAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -604,7 +604,7 @@ describe('OIDCAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -633,7 +633,7 @@ describe('OIDCAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
diff --git a/x-pack/plugins/security/server/authentication/providers/pki.test.ts b/x-pack/plugins/security/server/authentication/providers/pki.test.ts
index a1279c9b9ca7f8..fd014e1a7cb814 100644
--- a/x-pack/plugins/security/server/authentication/providers/pki.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/pki.test.ts
@@ -17,8 +17,8 @@ import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.
 import { MockAuthenticationProviderOptions, mockAuthenticationProviderOptions } from './base.mock';
 
 import {
-  ElasticsearchErrorHelpers,
-  IClusterClient,
+  LegacyElasticsearchErrorHelpers,
+  ILegacyClusterClient,
   KibanaRequest,
   ScopeableRequest,
 } from '../../../../../../src/core/server';
@@ -64,7 +64,7 @@ function getMockSocket({
 }
 
 function expectAuthenticateCall(
-  mockClusterClient: jest.Mocked<IClusterClient>,
+  mockClusterClient: jest.Mocked<ILegacyClusterClient>,
   scopeableRequest: ScopeableRequest
 ) {
   expect(mockClusterClient.asScoped).toHaveBeenCalledTimes(1);
@@ -197,7 +197,7 @@ describe('PKIAuthenticationProvider', () => {
         }),
       });
 
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
+      const failureReason = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
       mockOptions.client.callAsInternalUser.mockRejectedValue(failureReason);
 
       await expect(operation(request)).resolves.toEqual(AuthenticationResult.failed(failureReason));
@@ -219,7 +219,7 @@ describe('PKIAuthenticationProvider', () => {
         }),
       });
 
-      const failureReason = ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
+      const failureReason = LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error());
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(failureReason);
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
@@ -395,7 +395,9 @@ describe('PKIAuthenticationProvider', () => {
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser
         // In response to call with an expired token.
-        .mockRejectedValueOnce(ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error()))
+        .mockRejectedValueOnce(
+          LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        )
         // In response to a call with a new token.
         .mockResolvedValueOnce(user);
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
@@ -436,7 +438,7 @@ describe('PKIAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValueOnce(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -454,7 +456,7 @@ describe('PKIAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
diff --git a/x-pack/plugins/security/server/authentication/providers/saml.test.ts b/x-pack/plugins/security/server/authentication/providers/saml.test.ts
index f7adaa24e9dbbd..e9af806b36f042 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.test.ts
@@ -12,8 +12,8 @@ import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.
 import { MockAuthenticationProviderOptions, mockAuthenticationProviderOptions } from './base.mock';
 
 import {
-  ElasticsearchErrorHelpers,
-  IClusterClient,
+  LegacyElasticsearchErrorHelpers,
+  ILegacyClusterClient,
   ScopeableRequest,
 } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
@@ -21,7 +21,7 @@ import { DeauthenticationResult } from '../deauthentication_result';
 import { SAMLAuthenticationProvider, SAMLLogin } from './saml';
 
 function expectAuthenticateCall(
-  mockClusterClient: jest.Mocked<IClusterClient>,
+  mockClusterClient: jest.Mocked<ILegacyClusterClient>,
   scopeableRequest: ScopeableRequest
 ) {
   expect(mockClusterClient.asScoped).toHaveBeenCalledTimes(1);
@@ -530,7 +530,7 @@ describe('SAMLAuthenticationProvider', () => {
         ['session is valid', Promise.resolve({ username: 'user' })],
         [
           'session is is expired',
-          Promise.reject(ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())),
+          Promise.reject(LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())),
         ],
       ] as Array<[string, Promise<any>]>) {
         it(`redirects to the home page if new SAML Response is for the same user if ${description}.`, async () => {
@@ -1115,7 +1115,7 @@ describe('SAMLAuthenticationProvider', () => {
         if (scopeableRequest?.headers.authorization === `Bearer ${state.accessToken}`) {
           const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
           mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-            ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+            LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
           );
           return mockScopedClusterClient;
         }
@@ -1167,7 +1167,7 @@ describe('SAMLAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -1201,7 +1201,7 @@ describe('SAMLAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -1233,7 +1233,7 @@ describe('SAMLAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -1265,7 +1265,7 @@ describe('SAMLAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -1306,7 +1306,7 @@ describe('SAMLAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
diff --git a/x-pack/plugins/security/server/authentication/providers/token.test.ts b/x-pack/plugins/security/server/authentication/providers/token.test.ts
index 84ff7d1f5a1ef7..ba0f23a3393ae6 100644
--- a/x-pack/plugins/security/server/authentication/providers/token.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/token.test.ts
@@ -12,8 +12,8 @@ import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.
 import { MockAuthenticationProviderOptions, mockAuthenticationProviderOptions } from './base.mock';
 
 import {
-  ElasticsearchErrorHelpers,
-  IClusterClient,
+  LegacyElasticsearchErrorHelpers,
+  ILegacyClusterClient,
   ScopeableRequest,
 } from '../../../../../../src/core/server';
 import { AuthenticationResult } from '../authentication_result';
@@ -21,7 +21,7 @@ import { DeauthenticationResult } from '../deauthentication_result';
 import { TokenAuthenticationProvider } from './token';
 
 function expectAuthenticateCall(
-  mockClusterClient: jest.Mocked<IClusterClient>,
+  mockClusterClient: jest.Mocked<ILegacyClusterClient>,
   scopeableRequest: ScopeableRequest
 ) {
   expect(mockClusterClient.asScoped).toHaveBeenCalledTimes(1);
@@ -215,7 +215,7 @@ describe('TokenAuthenticationProvider', () => {
         if (scopeableRequest?.headers.authorization === `Bearer ${tokenPair.accessToken}`) {
           const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
           mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-            ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+            LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
           );
           return mockScopedClusterClient;
         }
@@ -276,7 +276,7 @@ describe('TokenAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -302,7 +302,7 @@ describe('TokenAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -333,7 +333,7 @@ describe('TokenAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -364,7 +364,7 @@ describe('TokenAuthenticationProvider', () => {
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
       mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-        ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+        LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
       );
       mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
@@ -391,7 +391,7 @@ describe('TokenAuthenticationProvider', () => {
         if (scopeableRequest?.headers.authorization === `Bearer ${tokenPair.accessToken}`) {
           const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
           mockScopedClusterClient.callAsCurrentUser.mockRejectedValue(
-            ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
+            LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error())
           );
           return mockScopedClusterClient;
         }
diff --git a/x-pack/plugins/security/server/authentication/tokens.test.ts b/x-pack/plugins/security/server/authentication/tokens.test.ts
index b42018b93e73fd..8ad04672fdfade 100644
--- a/x-pack/plugins/security/server/authentication/tokens.test.ts
+++ b/x-pack/plugins/security/server/authentication/tokens.test.ts
@@ -8,12 +8,15 @@ import { errors } from 'elasticsearch';
 
 import { elasticsearchServiceMock, loggingSystemMock } from '../../../../../src/core/server/mocks';
 
-import { IClusterClient, ElasticsearchErrorHelpers } from '../../../../../src/core/server';
+import {
+  ILegacyClusterClient,
+  LegacyElasticsearchErrorHelpers,
+} from '../../../../../src/core/server';
 import { Tokens } from './tokens';
 
 describe('Tokens', () => {
   let tokens: Tokens;
-  let mockClusterClient: jest.Mocked<IClusterClient>;
+  let mockClusterClient: jest.Mocked<ILegacyClusterClient>;
   beforeEach(() => {
     mockClusterClient = elasticsearchServiceMock.createClusterClient();
 
@@ -39,7 +42,7 @@ describe('Tokens', () => {
 
     const expirationErrors = [
       { statusCode: 401 },
-      ElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error()),
+      LegacyElasticsearchErrorHelpers.decorateNotAuthorizedError(new Error()),
       new errors.AuthenticationException(),
     ];
     for (const error of expirationErrors) {
diff --git a/x-pack/plugins/security/server/authentication/tokens.ts b/x-pack/plugins/security/server/authentication/tokens.ts
index 9117c9a679a4a2..3918b0b190a154 100644
--- a/x-pack/plugins/security/server/authentication/tokens.ts
+++ b/x-pack/plugins/security/server/authentication/tokens.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IClusterClient, Logger } from '../../../../../src/core/server';
+import { ILegacyClusterClient, Logger } from '../../../../../src/core/server';
 import { getErrorStatusCode } from '../errors';
 
 /**
@@ -34,7 +34,9 @@ export class Tokens {
    */
   private readonly logger: Logger;
 
-  constructor(private readonly options: Readonly<{ client: IClusterClient; logger: Logger }>) {
+  constructor(
+    private readonly options: Readonly<{ client: ILegacyClusterClient; logger: Logger }>
+  ) {
     this.logger = options.logger;
   }
 
diff --git a/x-pack/plugins/security/server/authorization/authorization_service.ts b/x-pack/plugins/security/server/authorization/authorization_service.ts
index 989784a1436d26..cae273ecac3383 100644
--- a/x-pack/plugins/security/server/authorization/authorization_service.ts
+++ b/x-pack/plugins/security/server/authorization/authorization_service.ts
@@ -10,7 +10,7 @@ import { UICapabilities } from 'ui/capabilities';
 import {
   LoggerFactory,
   KibanaRequest,
-  IClusterClient,
+  ILegacyClusterClient,
   ServiceStatusLevels,
   Logger,
   StatusServiceSetup,
@@ -54,7 +54,7 @@ interface AuthorizationServiceSetupParams {
   http: HttpServiceSetup;
   status: StatusServiceSetup;
   capabilities: CapabilitiesSetup;
-  clusterClient: IClusterClient;
+  clusterClient: ILegacyClusterClient;
   license: SecurityLicense;
   loggers: LoggerFactory;
   features: FeaturesPluginSetup;
@@ -64,7 +64,7 @@ interface AuthorizationServiceSetupParams {
 
 interface AuthorizationServiceStartParams {
   features: FeaturesPluginStart;
-  clusterClient: IClusterClient;
+  clusterClient: ILegacyClusterClient;
 }
 
 export interface AuthorizationServiceSetup {
@@ -173,7 +173,7 @@ export class AuthorizationService {
     }
   }
 
-  private registerPrivileges(clusterClient: IClusterClient) {
+  private registerPrivileges(clusterClient: ILegacyClusterClient) {
     const RETRY_SCALE_DURATION = 100;
     const RETRY_TIMEOUT_MAX = 10000;
     const retries$ = new BehaviorSubject(0);
diff --git a/x-pack/plugins/security/server/authorization/check_privileges.ts b/x-pack/plugins/security/server/authorization/check_privileges.ts
index 44e9438bd07f5c..3129777a7881f6 100644
--- a/x-pack/plugins/security/server/authorization/check_privileges.ts
+++ b/x-pack/plugins/security/server/authorization/check_privileges.ts
@@ -5,7 +5,7 @@
  */
 
 import { pick, transform, uniq } from 'lodash';
-import { IClusterClient, KibanaRequest } from '../../../../../src/core/server';
+import { ILegacyClusterClient, KibanaRequest } from '../../../../../src/core/server';
 import { GLOBAL_RESOURCE } from '../../common/constants';
 import { ResourceSerializer } from './resource_serializer';
 import { HasPrivilegesResponse, HasPrivilegesResponseApplication } from './types';
@@ -45,7 +45,7 @@ export interface CheckPrivileges {
 
 export function checkPrivilegesWithRequestFactory(
   actions: CheckPrivilegesActions,
-  clusterClient: IClusterClient,
+  clusterClient: ILegacyClusterClient,
   applicationName: string
 ) {
   const hasIncompatibleVersion = (
diff --git a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts
index 8604e02b632766..0ce7eae932feae 100644
--- a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts
+++ b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IClusterClient, Logger } from 'kibana/server';
+import { ILegacyClusterClient, Logger } from 'kibana/server';
 import { RawKibanaPrivileges } from '../../common/model';
 import { registerPrivilegesWithCluster } from './register_privileges_with_cluster';
 
@@ -32,7 +32,7 @@ const registerPrivilegesWithClusterTest = (
   }
 ) => {
   const createExpectUpdatedPrivileges = (
-    mockClusterClient: jest.Mocked<IClusterClient>,
+    mockClusterClient: jest.Mocked<ILegacyClusterClient>,
     mockLogger: jest.Mocked<Logger>,
     error: Error
   ) => {
@@ -67,7 +67,7 @@ const registerPrivilegesWithClusterTest = (
   };
 
   const createExpectDidntUpdatePrivileges = (
-    mockClusterClient: jest.Mocked<IClusterClient>,
+    mockClusterClient: jest.Mocked<ILegacyClusterClient>,
     mockLogger: Logger,
     error: Error
   ) => {
diff --git a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.ts b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.ts
index 8e54794494a908..448b7b7e7ef484 100644
--- a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.ts
+++ b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.ts
@@ -5,7 +5,7 @@
  */
 
 import { isEqual, difference } from 'lodash';
-import { IClusterClient, Logger } from '../../../../../src/core/server';
+import { ILegacyClusterClient, Logger } from '../../../../../src/core/server';
 
 import { serializePrivileges } from './privileges_serializer';
 import { PrivilegesService } from './privileges';
@@ -14,7 +14,7 @@ export async function registerPrivilegesWithCluster(
   logger: Logger,
   privileges: PrivilegesService,
   application: string,
-  clusterClient: IClusterClient
+  clusterClient: ILegacyClusterClient
 ) {
   const arePrivilegesEqual = (
     existingPrivileges: Record<string, unknown>,
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index 627d1408673be5..64af6fc857273d 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -6,7 +6,7 @@
 
 import { of } from 'rxjs';
 import { ByteSizeValue } from '@kbn/config-schema';
-import { ICustomClusterClient } from '../../../../src/core/server';
+import { ILegacyCustomClusterClient } from '../../../../src/core/server';
 import { elasticsearchClientPlugin } from './elasticsearch_client_plugin';
 import { Plugin, PluginSetupDependencies } from './plugin';
 
@@ -15,7 +15,7 @@ import { coreMock, elasticsearchServiceMock } from '../../../../src/core/server/
 describe('Security Plugin', () => {
   let plugin: Plugin;
   let mockCoreSetup: ReturnType<typeof coreMock.createSetup>;
-  let mockClusterClient: jest.Mocked<ICustomClusterClient>;
+  let mockClusterClient: jest.Mocked<ILegacyCustomClusterClient>;
   let mockDependencies: PluginSetupDependencies;
   beforeEach(() => {
     plugin = new Plugin(
diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts
index a14617c8489ccb..c4b16c9eec8729 100644
--- a/x-pack/plugins/security/server/plugin.ts
+++ b/x-pack/plugins/security/server/plugin.ts
@@ -9,7 +9,7 @@ import { first, map } from 'rxjs/operators';
 import { TypeOf } from '@kbn/config-schema';
 import {
   deepFreeze,
-  ICustomClusterClient,
+  ILegacyCustomClusterClient,
   CoreSetup,
   CoreStart,
   Logger,
@@ -81,7 +81,7 @@ export interface PluginStartDependencies {
  */
 export class Plugin {
   private readonly logger: Logger;
-  private clusterClient?: ICustomClusterClient;
+  private clusterClient?: ILegacyCustomClusterClient;
   private spacesService?: SpacesService | symbol = Symbol('not accessed');
   private securityLicenseService?: SecurityLicenseService;
 
diff --git a/x-pack/plugins/security/server/routes/index.ts b/x-pack/plugins/security/server/routes/index.ts
index 5721a2699d15ce..82c0186898d383 100644
--- a/x-pack/plugins/security/server/routes/index.ts
+++ b/x-pack/plugins/security/server/routes/index.ts
@@ -8,7 +8,7 @@ import { Feature } from '../../../features/server';
 import {
   CoreSetup,
   HttpResources,
-  IClusterClient,
+  ILegacyClusterClient,
   IRouter,
   Logger,
 } from '../../../../../src/core/server';
@@ -34,7 +34,7 @@ export interface RouteDefinitionParams {
   basePath: CoreSetup['http']['basePath'];
   httpResources: HttpResources;
   logger: Logger;
-  clusterClient: IClusterClient;
+  clusterClient: ILegacyClusterClient;
   config: ConfigType;
   authc: Authentication;
   authz: AuthorizationServiceSetup;
diff --git a/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts b/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts
index 4fde93d0ad8596..8070b3371fcb38 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts
@@ -9,7 +9,7 @@ import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks'
 import {
   kibanaResponseFactory,
   RequestHandlerContext,
-  IClusterClient,
+  ILegacyClusterClient,
 } from '../../../../../../src/core/server';
 import { LicenseCheck } from '../../../../licensing/server';
 import { defineRoleMappingFeatureCheckRoute } from './feature_check';
@@ -19,7 +19,7 @@ interface TestOptions {
   canManageRoleMappings?: boolean;
   nodeSettingsResponse?: Record<string, any>;
   xpackUsageResponse?: Record<string, any>;
-  internalUserClusterClientImpl?: IClusterClient['callAsInternalUser'];
+  internalUserClusterClientImpl?: ILegacyClusterClient['callAsInternalUser'];
   asserts: { statusCode: number; result?: Record<string, any> };
 }
 
diff --git a/x-pack/plugins/security/server/routes/role_mapping/feature_check.ts b/x-pack/plugins/security/server/routes/role_mapping/feature_check.ts
index b056d9e358737d..88c7f193cea34b 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/feature_check.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/feature_check.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Logger, IClusterClient } from 'src/core/server';
+import { Logger, ILegacyClusterClient } from 'src/core/server';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 import { RouteDefinitionParams } from '..';
 
@@ -73,7 +73,7 @@ export function defineRoleMappingFeatureCheckRoute({
   );
 }
 
-async function getEnabledRoleMappingsFeatures(clusterClient: IClusterClient, logger: Logger) {
+async function getEnabledRoleMappingsFeatures(clusterClient: ILegacyClusterClient, logger: Logger) {
   logger.debug(`Retrieving role mappings features`);
 
   const nodeScriptSettingsPromise: Promise<NodeSettingsResponse> = clusterClient
diff --git a/x-pack/plugins/security/server/routes/users/change_password.test.ts b/x-pack/plugins/security/server/routes/users/change_password.test.ts
index c163ff4e256cd2..721c020c7431b5 100644
--- a/x-pack/plugins/security/server/routes/users/change_password.test.ts
+++ b/x-pack/plugins/security/server/routes/users/change_password.test.ts
@@ -7,9 +7,9 @@
 import { errors } from 'elasticsearch';
 import { ObjectType } from '@kbn/config-schema';
 import {
-  IClusterClient,
+  ILegacyClusterClient,
   IRouter,
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
   kibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
@@ -26,8 +26,8 @@ import { routeDefinitionParamsMock } from '../index.mock';
 describe('Change password', () => {
   let router: jest.Mocked<IRouter>;
   let authc: jest.Mocked<Authentication>;
-  let mockClusterClient: jest.Mocked<IClusterClient>;
-  let mockScopedClusterClient: jest.Mocked<IScopedClusterClient>;
+  let mockClusterClient: jest.Mocked<ILegacyClusterClient>;
+  let mockScopedClusterClient: jest.Mocked<ILegacyScopedClusterClient>;
   let routeHandler: RequestHandler<any, any, any>;
   let routeConfig: RouteConfig<any, any, any, any>;
   let mockContext: RequestHandlerContext;
diff --git a/x-pack/plugins/security_solution/common/constants.ts b/x-pack/plugins/security_solution/common/constants.ts
index 58431e405ea8b6..4aff1c81c40f71 100644
--- a/x-pack/plugins/security_solution/common/constants.ts
+++ b/x-pack/plugins/security_solution/common/constants.ts
@@ -158,6 +158,12 @@ export const showAllOthersBucket: string[] = [
 
 /**
  * CreateTemplateTimelineBtn
+ * https://github.com/elastic/kibana/pull/66613
  * Remove the comment here to enable template timeline
  */
-export const disableTemplate = true;
+export const disableTemplate = false;
+
+/*
+ * This should be set to true after https://github.com/elastic/kibana/pull/67496 is merged
+ */
+export const enableElasticFilter = false;
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 5af34b6a694e83..563e2e4ccc9f2b 100644
--- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
@@ -48,6 +48,8 @@ const Windows: OSFields[] = [
     name: 'windows 10.0',
     full: 'Windows 10',
     version: '10.0',
+    platform: 'Windows',
+    family: 'Windows',
     Ext: {
       variant: 'Windows Pro',
     },
@@ -56,6 +58,8 @@ const Windows: OSFields[] = [
     name: 'windows 10.0',
     full: 'Windows Server 2016',
     version: '10.0',
+    platform: 'Windows',
+    family: 'Windows',
     Ext: {
       variant: 'Windows Server',
     },
@@ -64,6 +68,8 @@ const Windows: OSFields[] = [
     name: 'windows 6.2',
     full: 'Windows Server 2012',
     version: '6.2',
+    platform: 'Windows',
+    family: 'Windows',
     Ext: {
       variant: 'Windows Server',
     },
@@ -72,6 +78,8 @@ const Windows: OSFields[] = [
     name: 'windows 6.3',
     full: 'Windows Server 2012R2',
     version: '6.3',
+    platform: 'Windows',
+    family: 'Windows',
     Ext: {
       variant: 'Windows Server Release 2',
     },
@@ -316,6 +324,7 @@ export class EndpointDocGenerator {
   }
 
   private createHostData(): HostInfo {
+    const hostName = this.randomHostname();
     return {
       agent: {
         version: this.randomVersion(),
@@ -329,7 +338,9 @@ export class EndpointDocGenerator {
       },
       host: {
         id: this.seededUUIDv4(),
-        hostname: this.randomHostname(),
+        hostname: hostName,
+        name: hostName,
+        architecture: this.randomString(10),
         ip: this.randomArray(3, () => this.randomIP()),
         mac: this.randomArray(3, () => this.randomMac()),
         os: this.randomChoice(OS),
@@ -1016,9 +1027,7 @@ export class EndpointDocGenerator {
       ecs: {
         version: '1.4.0',
       },
-      host: {
-        id: this.commonInfo.host.id,
-      },
+      host: this.commonInfo.host,
       Endpoint: {
         policy: {
           applied: {
diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/resolver.ts b/x-pack/plugins/security_solution/common/endpoint/schema/resolver.ts
index f5c3fd519c9c5a..398e2710b32531 100644
--- a/x-pack/plugins/security_solution/common/endpoint/schema/resolver.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/schema/resolver.ts
@@ -71,3 +71,19 @@ export const validateChildren = {
     legacyEndpointID: schema.maybe(schema.string()),
   }),
 };
+
+/**
+ * Used to validate GET requests for 'entities'
+ */
+export const validateEntities = {
+  query: schema.object({
+    /**
+     * Return the process entities related to the document w/ the matching `_id`.
+     */
+    _id: schema.string(),
+    /**
+     * Indices to search in.
+     */
+    indices: schema.arrayOf(schema.string()),
+  }),
+};
diff --git a/x-pack/plugins/security_solution/common/endpoint/types.ts b/x-pack/plugins/security_solution/common/endpoint/types.ts
index 42f5f4b220da95..72839a8370495a 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types.ts
@@ -179,6 +179,8 @@ export interface OSFields {
   full: string;
   name: string;
   version: string;
+  platform: string;
+  family: string;
   Ext: OSFieldsExt;
 }
 
@@ -195,8 +197,10 @@ export interface OSFieldsExt {
 export interface Host {
   id: string;
   hostname: string;
+  name: string;
   ip: string[];
   mac: string[];
+  architecture: string;
   os: OSFields;
 }
 
@@ -511,6 +515,11 @@ export interface EndpointEvent {
 
 export type ResolverEvent = EndpointEvent | LegacyEndpointEvent;
 
+/**
+ * The response body for the resolver '/entity' index API
+ */
+export type ResolverEntityIndex = Array<{ entity_id: string }>;
+
 /**
  * Takes a @kbn/config-schema 'schema' type and returns a type that represents valid inputs.
  * Similar to `TypeOf`, but allows strings as input for `schema.number()` (which is inline
diff --git a/x-pack/plugins/security_solution/common/types/timeline/index.ts b/x-pack/plugins/security_solution/common/types/timeline/index.ts
index 4f255bb6d68341..2cf5930a83bee2 100644
--- a/x-pack/plugins/security_solution/common/types/timeline/index.ts
+++ b/x-pack/plugins/security_solution/common/types/timeline/index.ts
@@ -137,11 +137,13 @@ const SavedSortRuntimeType = runtimeTypes.partial({
 export enum TimelineStatus {
   active = 'active',
   draft = 'draft',
+  immutable = 'immutable',
 }
 
 export const TimelineStatusLiteralRt = runtimeTypes.union([
   runtimeTypes.literal(TimelineStatus.active),
   runtimeTypes.literal(TimelineStatus.draft),
+  runtimeTypes.literal(TimelineStatus.immutable),
 ]);
 
 const TimelineStatusLiteralWithNullRt = unionWithNullType(TimelineStatusLiteralRt);
@@ -151,6 +153,29 @@ export type TimelineStatusLiteralWithNull = runtimeTypes.TypeOf<
   typeof TimelineStatusLiteralWithNullRt
 >;
 
+/**
+ * Template timeline type
+ */
+
+export enum TemplateTimelineType {
+  elastic = 'elastic',
+  custom = 'custom',
+}
+
+export const TemplateTimelineTypeLiteralRt = runtimeTypes.union([
+  runtimeTypes.literal(TemplateTimelineType.elastic),
+  runtimeTypes.literal(TemplateTimelineType.custom),
+]);
+
+export const TemplateTimelineTypeLiteralWithNullRt = unionWithNullType(
+  TemplateTimelineTypeLiteralRt
+);
+
+export type TemplateTimelineTypeLiteral = runtimeTypes.TypeOf<typeof TemplateTimelineTypeLiteralRt>;
+export type TemplateTimelineTypeLiteralWithNull = runtimeTypes.TypeOf<
+  typeof TemplateTimelineTypeLiteralWithNullRt
+>;
+
 /*
  *  Timeline Types
  */
@@ -273,6 +298,13 @@ export const TimelineResponseType = runtimeTypes.type({
   }),
 });
 
+export const TimelineErrorResponseType = runtimeTypes.type({
+  status_code: runtimeTypes.number,
+  message: runtimeTypes.string,
+});
+
+export interface TimelineErrorResponse
+  extends runtimeTypes.TypeOf<typeof TimelineErrorResponseType> {}
 export interface TimelineResponse extends runtimeTypes.TypeOf<typeof TimelineResponseType> {}
 
 /**
diff --git a/x-pack/plugins/security_solution/cypress/integration/detections.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts.spec.ts
similarity index 98%
rename from x-pack/plugins/security_solution/cypress/integration/detections.spec.ts
rename to x-pack/plugins/security_solution/cypress/integration/alerts.spec.ts
index 2e727be1fc9b45..c8c18696359f72 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detections.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts.spec.ts
@@ -9,7 +9,7 @@ import {
   SHOWING_ALERTS,
   ALERTS,
   TAKE_ACTION_POPOVER_BTN,
-} from '../screens/detections';
+} from '../screens/alerts';
 
 import {
   closeFirstAlert,
@@ -24,13 +24,13 @@ import {
   waitForAlertsToBeLoaded,
   markInProgressFirstAlert,
   goToInProgressAlerts,
-} from '../tasks/detections';
+} from '../tasks/alerts';
 import { esArchiverLoad } from '../tasks/es_archiver';
 import { loginAndWaitForPage } from '../tasks/login';
 
 import { ALERTS_URL } from '../urls/navigation';
 
-describe('Detections', () => {
+describe('Alerts', () => {
   context('Closing alerts', () => {
     beforeEach(() => {
       esArchiverLoad('alerts');
diff --git a/x-pack/plugins/security_solution/cypress/integration/signal_detection_rules.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules.spec.ts
similarity index 91%
rename from x-pack/plugins/security_solution/cypress/integration/signal_detection_rules.spec.ts
rename to x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules.spec.ts
index 72a86e3ffffc56..5cad0b9c3260c2 100644
--- a/x-pack/plugins/security_solution/cypress/integration/signal_detection_rules.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules.spec.ts
@@ -10,25 +10,25 @@ import {
   RULE_SWITCH,
   SECOND_RULE,
   SEVENTH_RULE,
-} from '../screens/alert_detection_rules';
+} from '../screens/alerts_detection_rules';
 
 import {
-  goToManageAlertDetectionRules,
+  goToManageAlertsDetectionRules,
   waitForAlertsPanelToBeLoaded,
   waitForAlertsIndexToBeCreated,
-} from '../tasks/detections';
-import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
-import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
+} from '../tasks/alerts';
 import {
   activateRule,
   sortByActivatedRules,
   waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded,
   waitForRuleToBeActivated,
-} from '../tasks/alert_detection_rules';
+} from '../tasks/alerts_detection_rules';
+import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
+import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
 
 import { ALERTS_URL } from '../urls/navigation';
 
-describe('Detection rules', () => {
+describe('Alerts detection rules', () => {
   before(() => {
     esArchiverLoad('prebuilt_rules_loaded');
   });
@@ -41,7 +41,7 @@ describe('Detection rules', () => {
     loginAndWaitForPageWithoutDateRange(ALERTS_URL);
     waitForAlertsPanelToBeLoaded();
     waitForAlertsIndexToBeCreated();
-    goToManageAlertDetectionRules();
+    goToManageAlertsDetectionRules();
     waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded();
     cy.get(RULE_NAME)
       .eq(FIFTH_RULE)
diff --git a/x-pack/plugins/security_solution/cypress/integration/signal_detection_rules_custom.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
similarity index 97%
rename from x-pack/plugins/security_solution/cypress/integration/signal_detection_rules_custom.spec.ts
rename to x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
index 48d0c2e7238cd4..9e9732a403f8fc 100644
--- a/x-pack/plugins/security_solution/cypress/integration/signal_detection_rules_custom.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
@@ -6,6 +6,15 @@
 
 import { newRule, totalNumberOfPrebuiltRulesInEsArchive } from '../objects/rule';
 
+import {
+  CUSTOM_RULES_BTN,
+  RISK_SCORE,
+  RULE_NAME,
+  RULES_ROW,
+  RULES_TABLE,
+  SEVERITY,
+  SHOWING_RULES_TEXT,
+} from '../screens/alerts_detection_rules';
 import {
   ABOUT_FALSE_POSITIVES,
   ABOUT_INVESTIGATION_NOTES,
@@ -28,26 +37,12 @@ import {
   SCHEDULE_RUNS,
   SCHEDULE_STEP,
 } from '../screens/rule_details';
-import {
-  CUSTOM_RULES_BTN,
-  RISK_SCORE,
-  RULE_NAME,
-  RULES_ROW,
-  RULES_TABLE,
-  SEVERITY,
-  SHOWING_RULES_TEXT,
-} from '../screens/alert_detection_rules';
 
 import {
-  createAndActivateRule,
-  fillAboutRuleAndContinue,
-  fillDefineCustomRuleWithImportedQueryAndContinue,
-} from '../tasks/create_new_rule';
-import {
-  goToManageAlertDetectionRules,
+  goToManageAlertsDetectionRules,
   waitForAlertsIndexToBeCreated,
   waitForAlertsPanelToBeLoaded,
-} from '../tasks/detections';
+} from '../tasks/alerts';
 import {
   changeToThreeHundredRowsPerPage,
   deleteFirstRule,
@@ -58,7 +53,12 @@ import {
   selectNumberOfRules,
   waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded,
   waitForRulesToBeLoaded,
-} from '../tasks/alert_detection_rules';
+} from '../tasks/alerts_detection_rules';
+import {
+  createAndActivateRule,
+  fillAboutRuleAndContinue,
+  fillDefineCustomRuleWithImportedQueryAndContinue,
+} from '../tasks/create_new_rule';
 import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
 import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
 
@@ -77,7 +77,7 @@ describe('Detection rules, custom', () => {
     loginAndWaitForPageWithoutDateRange(ALERTS_URL);
     waitForAlertsPanelToBeLoaded();
     waitForAlertsIndexToBeCreated();
-    goToManageAlertDetectionRules();
+    goToManageAlertsDetectionRules();
     waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded();
     goToCreateNewRule();
     fillDefineCustomRuleWithImportedQueryAndContinue(newRule);
@@ -172,7 +172,7 @@ describe('Deletes custom rules', () => {
     loginAndWaitForPageWithoutDateRange(ALERTS_URL);
     waitForAlertsPanelToBeLoaded();
     waitForAlertsIndexToBeCreated();
-    goToManageAlertDetectionRules();
+    goToManageAlertsDetectionRules();
   });
 
   after(() => {
diff --git a/x-pack/plugins/security_solution/cypress/integration/signal_detection_rules_export.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts
similarity index 88%
rename from x-pack/plugins/security_solution/cypress/integration/signal_detection_rules_export.spec.ts
rename to x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts
index edb559bf6a279e..25fc1fc3a7c110 100644
--- a/x-pack/plugins/security_solution/cypress/integration/signal_detection_rules_export.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts
@@ -5,13 +5,13 @@
  */
 
 import {
-  goToManageAlertDetectionRules,
+  goToManageAlertsDetectionRules,
   waitForAlertsIndexToBeCreated,
   waitForAlertsPanelToBeLoaded,
-} from '../tasks/detections';
+} from '../tasks/alerts';
+import { exportFirstRule } from '../tasks/alerts_detection_rules';
 import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
 import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
-import { exportFirstRule } from '../tasks/alert_detection_rules';
 
 import { ALERTS_URL } from '../urls/navigation';
 
@@ -35,7 +35,7 @@ describe('Export rules', () => {
     loginAndWaitForPageWithoutDateRange(ALERTS_URL);
     waitForAlertsPanelToBeLoaded();
     waitForAlertsIndexToBeCreated();
-    goToManageAlertDetectionRules();
+    goToManageAlertsDetectionRules();
     exportFirstRule();
     cy.wait('@export').then((xhr) => {
       cy.readFile(EXPECTED_EXPORTED_RULE_FILE_PATH).then(($expectedExportedJson) => {
diff --git a/x-pack/plugins/security_solution/cypress/integration/signal_detection_rules_ml.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_ml.spec.ts
similarity index 96%
rename from x-pack/plugins/security_solution/cypress/integration/signal_detection_rules_ml.spec.ts
rename to x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_ml.spec.ts
index 3e0fc2e1b37fd0..19957a53dd701f 100644
--- a/x-pack/plugins/security_solution/cypress/integration/signal_detection_rules_ml.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_ml.spec.ts
@@ -6,6 +6,15 @@
 
 import { machineLearningRule, totalNumberOfPrebuiltRulesInEsArchive } from '../objects/rule';
 
+import {
+  CUSTOM_RULES_BTN,
+  RISK_SCORE,
+  RULE_NAME,
+  RULE_SWITCH,
+  RULES_ROW,
+  RULES_TABLE,
+  SEVERITY,
+} from '../screens/alerts_detection_rules';
 import {
   ABOUT_FALSE_POSITIVES,
   ABOUT_MITRE,
@@ -26,27 +35,12 @@ import {
   SCHEDULE_STEP,
   RULE_TYPE,
 } from '../screens/rule_details';
-import {
-  CUSTOM_RULES_BTN,
-  RISK_SCORE,
-  RULE_NAME,
-  RULE_SWITCH,
-  RULES_ROW,
-  RULES_TABLE,
-  SEVERITY,
-} from '../screens/alert_detection_rules';
 
 import {
-  createAndActivateRule,
-  fillAboutRuleAndContinue,
-  fillDefineMachineLearningRuleAndContinue,
-  selectMachineLearningRuleType,
-} from '../tasks/create_new_rule';
-import {
-  goToManageAlertDetectionRules,
+  goToManageAlertsDetectionRules,
   waitForAlertsIndexToBeCreated,
   waitForAlertsPanelToBeLoaded,
-} from '../tasks/detections';
+} from '../tasks/alerts';
 import {
   changeToThreeHundredRowsPerPage,
   filterByCustomRules,
@@ -54,7 +48,13 @@ import {
   goToRuleDetails,
   waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded,
   waitForRulesToBeLoaded,
-} from '../tasks/alert_detection_rules';
+} from '../tasks/alerts_detection_rules';
+import {
+  createAndActivateRule,
+  fillAboutRuleAndContinue,
+  fillDefineMachineLearningRuleAndContinue,
+  selectMachineLearningRuleType,
+} from '../tasks/create_new_rule';
 import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
 import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
 
@@ -73,7 +73,7 @@ describe('Detection rules, machine learning', () => {
     loginAndWaitForPageWithoutDateRange(ALERTS_URL);
     waitForAlertsPanelToBeLoaded();
     waitForAlertsIndexToBeCreated();
-    goToManageAlertDetectionRules();
+    goToManageAlertsDetectionRules();
     waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded();
     goToCreateNewRule();
     selectMachineLearningRuleType();
diff --git a/x-pack/plugins/security_solution/cypress/integration/signal_detection_rules_prebuilt.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_prebuilt.spec.ts
similarity index 95%
rename from x-pack/plugins/security_solution/cypress/integration/signal_detection_rules_prebuilt.spec.ts
rename to x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_prebuilt.spec.ts
index f819c91a773749..d3cbb05d7fc17a 100644
--- a/x-pack/plugins/security_solution/cypress/integration/signal_detection_rules_prebuilt.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_prebuilt.spec.ts
@@ -10,8 +10,13 @@ import {
   RELOAD_PREBUILT_RULES_BTN,
   RULES_ROW,
   RULES_TABLE,
-} from '../screens/alert_detection_rules';
+} from '../screens/alerts_detection_rules';
 
+import {
+  goToManageAlertsDetectionRules,
+  waitForAlertsIndexToBeCreated,
+  waitForAlertsPanelToBeLoaded,
+} from '../tasks/alerts';
 import {
   changeToThreeHundredRowsPerPage,
   deleteFirstRule,
@@ -22,12 +27,7 @@ import {
   waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded,
   waitForPrebuiltDetectionRulesToBeLoaded,
   waitForRulesToBeLoaded,
-} from '../tasks/alert_detection_rules';
-import {
-  goToManageAlertDetectionRules,
-  waitForAlertsIndexToBeCreated,
-  waitForAlertsPanelToBeLoaded,
-} from '../tasks/detections';
+} from '../tasks/alerts_detection_rules';
 import { esArchiverLoadEmptyKibana, esArchiverUnloadEmptyKibana } from '../tasks/es_archiver';
 import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
 
@@ -35,7 +35,7 @@ import { ALERTS_URL } from '../urls/navigation';
 
 import { totalNumberOfPrebuiltRules } from '../objects/rule';
 
-describe('Detection rules, prebuilt rules', () => {
+describe('Alerts rules, prebuilt rules', () => {
   before(() => {
     esArchiverLoadEmptyKibana();
   });
@@ -51,7 +51,7 @@ describe('Detection rules, prebuilt rules', () => {
     loginAndWaitForPageWithoutDateRange(ALERTS_URL);
     waitForAlertsPanelToBeLoaded();
     waitForAlertsIndexToBeCreated();
-    goToManageAlertDetectionRules();
+    goToManageAlertsDetectionRules();
     waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded();
     loadPrebuiltDetectionRules();
     waitForPrebuiltDetectionRulesToBeLoaded();
@@ -76,7 +76,7 @@ describe('Deleting prebuilt rules', () => {
     loginAndWaitForPageWithoutDateRange(ALERTS_URL);
     waitForAlertsPanelToBeLoaded();
     waitForAlertsIndexToBeCreated();
-    goToManageAlertDetectionRules();
+    goToManageAlertsDetectionRules();
     waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded();
     loadPrebuiltDetectionRules();
     waitForPrebuiltDetectionRulesToBeLoaded();
diff --git a/x-pack/plugins/security_solution/cypress/integration/detections_timeline.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_timeline.spec.ts
similarity index 90%
rename from x-pack/plugins/security_solution/cypress/integration/detections_timeline.spec.ts
rename to x-pack/plugins/security_solution/cypress/integration/alerts_timeline.spec.ts
index 91617981ab14c4..10dc4fdd444869 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detections_timeline.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_timeline.spec.ts
@@ -4,20 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ALERT_ID } from '../screens/detections';
+import { ALERT_ID } from '../screens/alerts';
 import { PROVIDER_BADGE } from '../screens/timeline';
 
 import {
   expandFirstAlert,
   investigateFirstAlertInTimeline,
   waitForAlertsPanelToBeLoaded,
-} from '../tasks/detections';
+} from '../tasks/alerts';
 import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
 import { loginAndWaitForPage } from '../tasks/login';
 
 import { ALERTS_URL } from '../urls/navigation';
 
-describe('Detections timeline', () => {
+describe('Alerts timeline', () => {
   beforeEach(() => {
     esArchiverLoad('timeline_alerts');
     loginAndWaitForPage(ALERTS_URL);
diff --git a/x-pack/plugins/security_solution/cypress/integration/search_bar.spec.ts b/x-pack/plugins/security_solution/cypress/integration/search_bar.spec.ts
index 10759cc7de6e91..ce053d1ac76166 100644
--- a/x-pack/plugins/security_solution/cypress/integration/search_bar.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/search_bar.spec.ts
@@ -12,8 +12,7 @@ import { hostIpFilter } from '../objects/filter';
 import { HOSTS_URL } from '../urls/navigation';
 import { waitForAllHostsToBeLoaded } from '../tasks/hosts/all_hosts';
 
-// FAILING: https://github.com/elastic/kibana/issues/69595
-describe.skip('SearchBar', () => {
+describe('SearchBar', () => {
   before(() => {
     loginAndWaitForPage(HOSTS_URL);
     waitForAllHostsToBeLoaded();
diff --git a/x-pack/plugins/security_solution/cypress/integration/url_state.spec.ts b/x-pack/plugins/security_solution/cypress/integration/url_state.spec.ts
index 53460d1dfcbc6c..6c456c2f5e1003 100644
--- a/x-pack/plugins/security_solution/cypress/integration/url_state.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/url_state.spec.ts
@@ -234,7 +234,7 @@ describe('url state', () => {
     cy.get(KQL_INPUT).should('have.attr', 'value', 'source.ip: "10.142.0.9"');
   });
 
-  it.skip('sets and reads the url state for timeline by id', () => {
+  it('sets and reads the url state for timeline by id', () => {
     loginAndWaitForPage(HOSTS_URL);
     openTimeline();
     executeTimelineKQL('host.name: *');
@@ -258,7 +258,7 @@ describe('url state', () => {
       expect(matched).to.have.lengthOf(1);
       closeTimeline();
       cy.visit('/app/home');
-      cy.visit(`/app/security/timelines?timeline=(id:'${newTimelineId}',isOpen:!t)`);
+      cy.visit(`/app/security/timelines?timeline=(id:%27${newTimelineId}%27,isOpen:!t)`);
       cy.contains('a', 'Security');
       cy.get(DATE_PICKER_APPLY_BUTTON_TIMELINE).invoke('text').should('not.equal', 'Updating');
       cy.get(TIMELINE_TITLE).should('be.visible');
diff --git a/x-pack/plugins/security_solution/cypress/screens/detections.ts b/x-pack/plugins/security_solution/cypress/screens/alerts.ts
similarity index 100%
rename from x-pack/plugins/security_solution/cypress/screens/detections.ts
rename to x-pack/plugins/security_solution/cypress/screens/alerts.ts
diff --git a/x-pack/plugins/security_solution/cypress/screens/alert_detection_rules.ts b/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts
similarity index 100%
rename from x-pack/plugins/security_solution/cypress/screens/alert_detection_rules.ts
rename to x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts
diff --git a/x-pack/plugins/security_solution/cypress/tasks/detections.ts b/x-pack/plugins/security_solution/cypress/tasks/alerts.ts
similarity index 97%
rename from x-pack/plugins/security_solution/cypress/tasks/detections.ts
rename to x-pack/plugins/security_solution/cypress/tasks/alerts.ts
index 8b1e8b41b6da14..ebd37b522924fd 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/detections.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/alerts.ts
@@ -22,7 +22,7 @@ import {
   OPEN_SELECTED_ALERTS_BTN,
   MARK_ALERT_IN_PROGRESS_BTN,
   MARK_SELECTED_ALERTS_IN_PROGRESS_BTN,
-} from '../screens/detections';
+} from '../screens/alerts';
 import { REFRESH_BUTTON } from '../screens/security_header';
 
 export const closeFirstAlert = () => {
@@ -43,7 +43,7 @@ export const goToClosedAlerts = () => {
   cy.get(CLOSED_ALERTS_FILTER_BTN).click({ force: true });
 };
 
-export const goToManageAlertDetectionRules = () => {
+export const goToManageAlertsDetectionRules = () => {
   cy.get(MANAGE_ALERT_DETECTION_RULES_BTN).should('exist').click({ force: true });
 };
 
diff --git a/x-pack/plugins/security_solution/cypress/tasks/alert_detection_rules.ts b/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
similarity index 98%
rename from x-pack/plugins/security_solution/cypress/tasks/alert_detection_rules.ts
rename to x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
index 9710e0e808ac59..79756621ef5028 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/alert_detection_rules.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
@@ -24,7 +24,7 @@ import {
   SORT_RULES_BTN,
   THREE_HUNDRED_ROWS,
   EXPORT_ACTION_BTN,
-} from '../screens/alert_detection_rules';
+} from '../screens/alerts_detection_rules';
 
 export const activateRule = (rulePosition: number) => {
   cy.get(RULE_SWITCH).eq(rulePosition).click({ force: true });
diff --git a/x-pack/plugins/security_solution/cypress/tasks/search_bar.ts b/x-pack/plugins/security_solution/cypress/tasks/search_bar.ts
index 01d712460b4477..a32c38a97fce50 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/search_bar.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/search_bar.ts
@@ -23,6 +23,8 @@ export const openAddFilterPopover = () => {
 };
 
 export const fillAddFilterForm = ({ key, value }: SearchBarFilter) => {
+  cy.get(ADD_FILTER_FORM_FIELD_INPUT).should('exist');
+  cy.get(ADD_FILTER_FORM_FIELD_INPUT).should('be.visible');
   cy.get(ADD_FILTER_FORM_FIELD_INPUT).type(key);
   cy.get(ADD_FILTER_FORM_FIELD_INPUT).click();
   cy.get(ADD_FILTER_FORM_FIELD_OPTION(key)).click({ force: true });
diff --git a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/actions.test.tsx b/x-pack/plugins/security_solution/public/alerts/components/alerts_table/actions.test.tsx
index 2fa7cfeedcd155..bd62b79a3c54e6 100644
--- a/x-pack/plugins/security_solution/public/alerts/components/alerts_table/actions.test.tsx
+++ b/x-pack/plugins/security_solution/public/alerts/components/alerts_table/actions.test.tsx
@@ -215,8 +215,8 @@ describe('alert actions', () => {
               columnId: '@timestamp',
               sortDirection: 'desc',
             },
-            status: TimelineStatus.draft,
-            title: '',
+            status: TimelineStatus.active,
+            title: 'Test rule - Duplicate',
             timelineType: TimelineType.default,
             templateTimelineId: null,
             templateTimelineVersion: null,
diff --git a/x-pack/plugins/security_solution/public/common/components/add_filter_to_global_search_bar/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/add_filter_to_global_search_bar/index.test.tsx
index c7015ed81701ef..9c08e05ddfa399 100644
--- a/x-pack/plugins/security_solution/public/common/components/add_filter_to_global_search_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/add_filter_to_global_search_bar/index.test.tsx
@@ -12,6 +12,7 @@ import {
   mockGlobalState,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../mock';
 import { createStore, State } from '../../store';
@@ -35,10 +36,22 @@ jest.mock('../../lib/kibana', () => ({
 describe('AddFilterToGlobalSearchBar Component', () => {
   const state: State = mockGlobalState;
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
     mockAddFilters.mockClear();
   });
 
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.tsx
index d6d8859b280b85..a12611ea270357 100644
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.tsx
@@ -5,10 +5,10 @@
  */
 
 import React, { memo, MouseEventHandler } from 'react';
-import { EuiLink, EuiLinkProps } from '@elastic/eui';
+import { EuiLink, EuiLinkProps, EuiButton, EuiButtonProps } from '@elastic/eui';
 import { useNavigateToAppEventHandler } from '../../hooks/endpoint/use_navigate_to_app_event_handler';
 
-type LinkToAppProps = EuiLinkProps & {
+type LinkToAppProps = (EuiLinkProps | EuiButtonProps) & {
   /** the app id - normally the value of the `id` in that plugin's `kibana.json`  */
   appId: string;
   /** Any app specific path (route) */
@@ -16,6 +16,8 @@ type LinkToAppProps = EuiLinkProps & {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   appState?: any;
   onClick?: MouseEventHandler<HTMLButtonElement | HTMLAnchorElement>;
+  /** Uses an EuiButton element for styling */
+  asButton?: boolean;
 };
 
 /**
@@ -23,13 +25,22 @@ type LinkToAppProps = EuiLinkProps & {
  * a given app without causing a full browser refresh
  */
 export const LinkToApp = memo<LinkToAppProps>(
-  ({ appId, appPath: path, appState: state, onClick, children, ...otherProps }) => {
+  ({ appId, appPath: path, appState: state, onClick, asButton, children, ...otherProps }) => {
     const handleOnClick = useNavigateToAppEventHandler(appId, { path, state, onClick });
+
     return (
-      // eslint-disable-next-line @elastic/eui/href-or-on-click
-      <EuiLink {...otherProps} onClick={handleOnClick}>
-        {children}
-      </EuiLink>
+      <>
+        {asButton && asButton === true ? (
+          <EuiButton {...(otherProps as EuiButtonProps)} onClick={handleOnClick}>
+            {children}
+          </EuiButton>
+        ) : (
+          // eslint-disable-next-line @elastic/eui/href-or-on-click
+          <EuiLink {...otherProps} onClick={handleOnClick}>
+            {children}
+          </EuiLink>
+        )}
+      </>
     );
   }
 );
diff --git a/x-pack/plugins/security_solution/public/common/components/error_toast_dispatcher/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/error_toast_dispatcher/index.test.tsx
index 4bc77555f09bdd..45b75d0f33ac9c 100644
--- a/x-pack/plugins/security_solution/public/common/components/error_toast_dispatcher/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/error_toast_dispatcher/index.test.tsx
@@ -12,6 +12,7 @@ import {
   apolloClientObservable,
   mockGlobalState,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../mock';
 import { createStore } from '../../store/store';
@@ -22,10 +23,22 @@ import { State } from '../../store/types';
 describe('Error Toast Dispatcher', () => {
   const state: State = mockGlobalState;
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   describe('rendering', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/inspect/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/inspect/index.test.tsx
index 45397921a6651d..f2b7d45972625e 100644
--- a/x-pack/plugins/security_solution/public/common/components/inspect/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/inspect/index.test.tsx
@@ -14,6 +14,7 @@ import {
   mockGlobalState,
   apolloClientObservable,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../mock';
 import { createStore, State } from '../../store';
@@ -36,13 +37,25 @@ describe('Inspect Button', () => {
     state: state.inputs,
   };
 
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   describe('Render', () => {
     beforeEach(() => {
       const myState = cloneDeep(state);
       myState.inputs = upsertQuery(newQuery);
-      store = createStore(myState, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+      store = createStore(
+        myState,
+        SUB_PLUGINS_REDUCER,
+        apolloClientObservable,
+        kibanaObservable,
+        storage
+      );
     });
     test('Eui Empty Button', () => {
       const wrapper = mount(
@@ -146,7 +159,13 @@ describe('Inspect Button', () => {
         response: ['my response'],
       };
       myState.inputs = upsertQuery(myQuery);
-      store = createStore(myState, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+      store = createStore(
+        myState,
+        SUB_PLUGINS_REDUCER,
+        apolloClientObservable,
+        kibanaObservable,
+        storage
+      );
     });
     test('Open Inspect Modal', () => {
       const wrapper = mount(
diff --git a/x-pack/plugins/security_solution/public/common/components/stat_items/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/stat_items/index.test.tsx
index 50721ef3b26ad7..f548275b36e709 100644
--- a/x-pack/plugins/security_solution/public/common/components/stat_items/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/stat_items/index.test.tsx
@@ -34,6 +34,7 @@ import {
   mockGlobalState,
   apolloClientObservable,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../mock';
 import { State, createStore } from '../../store';
@@ -55,7 +56,13 @@ describe('Stat Items Component', () => {
   const theme = () => ({ eui: euiDarkVars, darkMode: true });
   const state: State = mockGlobalState;
   const { storage } = createSecuritySolutionStorageMock();
-  const store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  const store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   describe.each([
     [
diff --git a/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.test.tsx
index 19321622d75fa8..164ca177ee91ad 100644
--- a/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.test.tsx
@@ -14,6 +14,7 @@ import {
   apolloClientObservable,
   mockGlobalState,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../mock';
 import { createUseUiSetting$Mock } from '../../mock/kibana_react';
@@ -81,11 +82,23 @@ describe('SIEM Super Date Picker', () => {
   describe('#SuperDatePicker', () => {
     const state: State = mockGlobalState;
     const { storage } = createSecuritySolutionStorageMock();
-    let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    let store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
 
     beforeEach(() => {
       jest.clearAllMocks();
-      store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+      store = createStore(
+        state,
+        SUB_PLUGINS_REDUCER,
+        apolloClientObservable,
+        kibanaObservable,
+        storage
+      );
       mockUseUiSetting$.mockImplementation((key, defaultValue) => {
         const useUiSetting$Mock = createUseUiSetting$Mock();
 
diff --git a/x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx
index ae25e66b2af866..336f906b3bed04 100644
--- a/x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx
@@ -13,6 +13,7 @@ import {
   mockGlobalState,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../mock';
 import { createKibanaCoreStartMock } from '../../mock/kibana_core';
@@ -156,7 +157,13 @@ const state: State = {
 };
 
 const { storage } = createSecuritySolutionStorageMock();
-const store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+const store = createStore(
+  state,
+  SUB_PLUGINS_REDUCER,
+  apolloClientObservable,
+  kibanaObservable,
+  storage
+);
 
 describe('StatefulTopN', () => {
   // Suppress warnings about "react-beautiful-dnd"
diff --git a/x-pack/plugins/security_solution/public/common/lib/compose/kibana_compose.tsx b/x-pack/plugins/security_solution/public/common/lib/compose/kibana_compose.tsx
index 47834f148c9102..342db7f43943d4 100644
--- a/x-pack/plugins/security_solution/public/common/lib/compose/kibana_compose.tsx
+++ b/x-pack/plugins/security_solution/public/common/lib/compose/kibana_compose.tsx
@@ -9,10 +9,10 @@ import ApolloClient from 'apollo-client';
 import { ApolloLink } from 'apollo-link';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { CoreStart } from '../../../../../../../src/core/public';
 import introspectionQueryResultData from '../../../graphql/introspection.json';
 import { AppFrontendLibs } from '../lib';
 import { getLinks } from './helpers';
+import { CoreStart } from '../../../../../../../src/core/public';
 
 export function composeLibs(core: CoreStart): AppFrontendLibs {
   const cache = new InMemoryCache({
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
index 1db63897a88633..779d5eff0b971b 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
@@ -13,7 +13,7 @@ import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { StartPlugins } from '../../../types';
 import { depsStartMock } from './dependencies_start_mock';
 import { MiddlewareActionSpyHelper, createSpyMiddleware } from '../../store/test_utils';
-import { apolloClientObservable } from '../test_providers';
+import { apolloClientObservable, kibanaObservable } from '../test_providers';
 import { createStore, State, substateMiddlewareFactory } from '../../store';
 import { alertMiddlewareFactory } from '../../../endpoint_alerts/store/middleware';
 import { AppRootProvider } from './app_root_provider';
@@ -58,14 +58,21 @@ export const createAppRootMockRenderer = (): AppContextTestRender => {
   const middlewareSpy = createSpyMiddleware();
   const { storage } = createSecuritySolutionStorageMock();
 
-  const store = createStore(mockGlobalState, SUB_PLUGINS_REDUCER, apolloClientObservable, storage, [
-    substateMiddlewareFactory(
-      (globalState) => globalState.alertList,
-      alertMiddlewareFactory(coreStart, depsStart)
-    ),
-    ...managementMiddlewareFactory(coreStart, depsStart),
-    middlewareSpy.actionSpyMiddleware,
-  ]);
+  const store = createStore(
+    mockGlobalState,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage,
+    [
+      substateMiddlewareFactory(
+        (globalState) => globalState.alertList,
+        alertMiddlewareFactory(coreStart, depsStart)
+      ),
+      ...managementMiddlewareFactory(coreStart, depsStart),
+      middlewareSpy.actionSpyMiddleware,
+    ]
+  );
 
   const MockKibanaContextProvider = createKibanaContextProviderMock();
 
diff --git a/x-pack/plugins/security_solution/public/common/mock/kibana_react.ts b/x-pack/plugins/security_solution/public/common/mock/kibana_react.ts
index 2b639bfdc14f5d..c5d50e1379482b 100644
--- a/x-pack/plugins/security_solution/public/common/mock/kibana_react.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/kibana_react.ts
@@ -26,6 +26,7 @@ import {
   DEFAULT_INDEX_PATTERN,
 } from '../../../common/constants';
 import { createKibanaCoreStartMock, createKibanaPluginsStartMock } from './kibana_core';
+import { StartServices } from '../../types';
 import { createSecuritySolutionStorageMock } from './mock_local_storage';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -71,6 +72,8 @@ export const createUseUiSetting$Mock = () => {
   ): [T, () => void] | undefined => [useUiSettingMock(key, defaultValue), jest.fn()];
 };
 
+export const createKibanaObservable$Mock = createKibanaCoreStartMock;
+
 export const createUseKibanaMock = () => {
   const core = createKibanaCoreStartMock();
   const plugins = createKibanaPluginsStartMock();
@@ -90,6 +93,36 @@ export const createUseKibanaMock = () => {
   return () => ({ services });
 };
 
+export const createStartServices = () => {
+  const core = createKibanaCoreStartMock();
+  const plugins = createKibanaPluginsStartMock();
+  const security = {
+    authc: {
+      getCurrentUser: jest.fn(),
+      areAPIKeysEnabled: jest.fn(),
+    },
+    sessionTimeout: {
+      start: jest.fn(),
+      stop: jest.fn(),
+      extend: jest.fn(),
+    },
+    license: {
+      isEnabled: jest.fn(),
+      getFeatures: jest.fn(),
+      features$: jest.fn(),
+    },
+    __legacyCompat: { logoutUrl: 'logoutUrl', tenant: 'tenant' },
+  };
+
+  const services = ({
+    ...core,
+    ...plugins,
+    security,
+  } as unknown) as StartServices;
+
+  return services;
+};
+
 export const createWithKibanaMock = () => {
   const kibana = createUseKibanaMock()();
 
diff --git a/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx b/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
index 0573f049c35c53..297dc235a2a50b 100644
--- a/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
+++ b/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
@@ -19,7 +19,7 @@ import { ThemeProvider } from 'styled-components';
 
 import { createStore, State } from '../store';
 import { mockGlobalState } from './global_state';
-import { createKibanaContextProviderMock } from './kibana_react';
+import { createKibanaContextProviderMock, createStartServices } from './kibana_react';
 import { FieldHook, useForm } from '../../shared_imports';
 import { SUB_PLUGINS_REDUCER } from './utils';
 import { createSecuritySolutionStorageMock, localStorageMock } from './mock_local_storage';
@@ -38,6 +38,7 @@ export const apolloClient = new ApolloClient({
 });
 
 export const apolloClientObservable = new BehaviorSubject(apolloClient);
+export const kibanaObservable = new BehaviorSubject(createStartServices());
 
 Object.defineProperty(window, 'localStorage', {
   value: localStorageMock(),
@@ -49,7 +50,13 @@ const { storage } = createSecuritySolutionStorageMock();
 /** A utility for wrapping children in the providers required to run most tests */
 const TestProvidersComponent: React.FC<Props> = ({
   children,
-  store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage),
+  store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  ),
   onDragEnd = jest.fn(),
 }) => (
   <I18nProvider>
@@ -69,7 +76,13 @@ export const TestProviders = React.memo(TestProvidersComponent);
 
 const TestProviderWithoutDragAndDropComponent: React.FC<Props> = ({
   children,
-  store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage),
+  store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  ),
 }) => (
   <I18nProvider>
     <ReduxStoreProvider store={store}>{children}</ReduxStoreProvider>
diff --git a/x-pack/plugins/security_solution/public/common/store/store.ts b/x-pack/plugins/security_solution/public/common/store/store.ts
index 5f53724b287df8..a39c9f18bcdb8d 100644
--- a/x-pack/plugins/security_solution/public/common/store/store.ts
+++ b/x-pack/plugins/security_solution/public/common/store/store.ts
@@ -29,6 +29,7 @@ import { AppAction } from './actions';
 import { Immutable } from '../../../common/endpoint/types';
 import { State } from './types';
 import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { CoreStart } from '../../../../../../src/core/public';
 
 type ComposeType = typeof compose;
 declare global {
@@ -49,6 +50,7 @@ export const createStore = (
   state: PreloadedState<State>,
   pluginsReducer: SubPluginsInitReducer,
   apolloClient: Observable<AppApolloClient>,
+  kibana: Observable<CoreStart>,
   storage: Storage,
   additionalMiddleware?: Array<Middleware<{}, State, Dispatch<AppAction | Immutable<AppAction>>>>
 ): Store<State, Action> => {
@@ -56,6 +58,7 @@ export const createStore = (
 
   const middlewareDependencies = {
     apolloClient$: apolloClient,
+    kibana$: kibana,
     selectAllTimelineQuery: inputsSelectors.globalQueryByIdSelector,
     selectNotesByIdSelector: appSelectors.selectNotesByIdSelector,
     timelineByIdSelector: timelineSelectors.timelineByIdSelector,
diff --git a/x-pack/plugins/security_solution/public/common/store/types.ts b/x-pack/plugins/security_solution/public/common/store/types.ts
index 2b92451e30119b..d1e8df0f982c4f 100644
--- a/x-pack/plugins/security_solution/public/common/store/types.ts
+++ b/x-pack/plugins/security_solution/public/common/store/types.ts
@@ -19,23 +19,22 @@ import { NetworkPluginState } from '../../network/store';
 import { EndpointAlertsPluginState } from '../../endpoint_alerts';
 import { ManagementPluginState } from '../../management';
 
+export type StoreState = HostsPluginState &
+  NetworkPluginState &
+  TimelinePluginState &
+  EndpointAlertsPluginState &
+  ManagementPluginState & {
+    app: AppState;
+    dragAndDrop: DragAndDropState;
+    inputs: InputsState;
+  };
 /**
  * The redux `State` type for the Security App.
  * We use `CombinedState` to wrap our shape because we create our reducer using `combineReducers`.
  * `combineReducers` returns a type wrapped in `CombinedState`.
  * `CombinedState` is required for redux to know what keys to make optional when preloaded state into a store.
  */
-export type State = CombinedState<
-  HostsPluginState &
-    NetworkPluginState &
-    TimelinePluginState &
-    EndpointAlertsPluginState &
-    ManagementPluginState & {
-      app: AppState;
-      dragAndDrop: DragAndDropState;
-      inputs: InputsState;
-    }
->;
+export type State = CombinedState<StoreState>;
 
 export type KueryFilterQueryKind = 'kuery' | 'lucene';
 
diff --git a/x-pack/plugins/security_solution/public/endpoint_alerts/view/alert_details.test.tsx b/x-pack/plugins/security_solution/public/endpoint_alerts/view/alert_details.test.tsx
deleted file mode 100644
index de939ad4f54c65..00000000000000
--- a/x-pack/plugins/security_solution/public/endpoint_alerts/view/alert_details.test.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as reactTestingLibrary from '@testing-library/react';
-import { MemoryHistory } from 'history';
-import { Store } from 'redux';
-
-import { mockAlertDetailsResult } from '../store/mock_alert_result_list';
-import { alertPageTestRender } from './test_helpers/render_alert_page';
-import { AppAction } from '../../common/store/actions';
-import { State } from '../../common/store/types';
-
-describe('when the alert details flyout is open', () => {
-  let render: () => reactTestingLibrary.RenderResult;
-  let history: MemoryHistory<never>;
-  let store: Store<State>;
-
-  beforeEach(async () => {
-    // Creates the render elements for the tests to use
-    ({ render, history, store } = alertPageTestRender());
-  });
-  describe('when the alerts details flyout is open', () => {
-    beforeEach(() => {
-      reactTestingLibrary.act(() => {
-        history.push({
-          search: '?selected_alert=1',
-        });
-      });
-    });
-    describe('when the data loads', () => {
-      beforeEach(() => {
-        reactTestingLibrary.act(() => {
-          const action: AppAction = {
-            type: 'serverReturnedAlertDetailsData',
-            payload: mockAlertDetailsResult(),
-          };
-          store.dispatch(action);
-        });
-      });
-      it('should display take action button', async () => {
-        await render().findByTestId('alertDetailTakeActionDropdownButton');
-      });
-      describe('when the user clicks the take action button on the flyout', () => {
-        let renderResult: reactTestingLibrary.RenderResult;
-        beforeEach(async () => {
-          renderResult = render();
-          const takeActionButton = await renderResult.findByTestId(
-            'alertDetailTakeActionDropdownButton'
-          );
-          if (takeActionButton) {
-            reactTestingLibrary.fireEvent.click(takeActionButton);
-          }
-        });
-        it('should display the correct fields in the dropdown', async () => {
-          await renderResult.findByTestId('alertDetailTakeActionCloseAlertButton');
-          await renderResult.findByTestId('alertDetailTakeActionWhitelistButton');
-        });
-      });
-      describe('when the user navigates to the resolver tab', () => {
-        beforeEach(() => {
-          reactTestingLibrary.act(() => {
-            history.push({
-              ...history.location,
-              search: '?selected_alert=1&active_details_tab=overviewResolver',
-            });
-          });
-        });
-        it('should show the resolver view', async () => {
-          const resolver = await render().findByTestId('alertResolver');
-          expect(resolver).toBeInTheDocument();
-        });
-      });
-      describe('when the user navigates to the overview tab', () => {
-        let renderResult: reactTestingLibrary.RenderResult;
-        beforeEach(async () => {
-          renderResult = render();
-          const overviewTab = await renderResult.findByTestId('overviewMetadata');
-          if (overviewTab) {
-            reactTestingLibrary.fireEvent.click(overviewTab);
-          }
-        });
-        it('should render all accordion panels', async () => {
-          await renderResult.findAllByTestId('alertDetailsAlertAccordion');
-          await renderResult.findAllByTestId('alertDetailsHostAccordion');
-          await renderResult.findAllByTestId('alertDetailsFileAccordion');
-          await renderResult.findAllByTestId('alertDetailsHashAccordion');
-          await renderResult.findAllByTestId('alertDetailsSourceProcessAccordion');
-          await renderResult.findAllByTestId('alertDetailsSourceProcessTokenAccordion');
-        });
-      });
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/endpoint_alerts/view/details/overview/index.tsx b/x-pack/plugins/security_solution/public/endpoint_alerts/view/details/overview/index.tsx
index 86c8e00c0a56fc..60adea44ab0ab1 100644
--- a/x-pack/plugins/security_solution/public/endpoint_alerts/view/details/overview/index.tsx
+++ b/x-pack/plugins/security_solution/public/endpoint_alerts/view/details/overview/index.tsx
@@ -20,8 +20,6 @@ import { useAlertListSelector } from '../../hooks/use_alerts_selector';
 import * as selectors from '../../../store/selectors';
 import { MetadataPanel } from './metadata_panel';
 import { FormattedDate } from '../../formatted_date';
-import { AlertDetailResolver } from '../../resolver';
-import { ResolverEvent } from '../../../../../common/endpoint/types';
 import { TakeActionDropdown } from './take_action_dropdown';
 import { urlFromQueryParams } from '../../url_from_query_params';
 
@@ -65,12 +63,11 @@ const AlertDetailsOverviewComponent = memo(() => {
         content: (
           <>
             <EuiSpacer />
-            <AlertDetailResolver selectedEvent={(alertDetailsData as unknown) as ResolverEvent} />
           </>
         ),
       },
     ];
-  }, [alertDetailsData]);
+  }, []);
 
   /* eslint-disable-next-line react-hooks/rules-of-hooks */
   const activeTab = useMemo(
diff --git a/x-pack/plugins/security_solution/public/endpoint_alerts/view/resolver.tsx b/x-pack/plugins/security_solution/public/endpoint_alerts/view/resolver.tsx
deleted file mode 100644
index 92213a8bd3925b..00000000000000
--- a/x-pack/plugins/security_solution/public/endpoint_alerts/view/resolver.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import styled from 'styled-components';
-import { Provider } from 'react-redux';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { ResolverEvent } from '../../../common/endpoint/types';
-import { StartServices } from '../../types';
-import { storeFactory } from '../../resolver/store';
-import { Resolver } from '../../resolver/view';
-
-const AlertDetailResolverComponents = React.memo(
-  ({ className, selectedEvent }: { className?: string; selectedEvent?: ResolverEvent }) => {
-    const context = useKibana<StartServices>();
-    const { store } = storeFactory(context);
-
-    return (
-      <div className={className} data-test-subj="alertResolver">
-        <Provider store={store}>
-          <Resolver selectedEvent={selectedEvent} />
-        </Provider>
-      </div>
-    );
-  }
-);
-
-AlertDetailResolverComponents.displayName = 'AlertDetailResolver';
-
-export const AlertDetailResolver = styled(AlertDetailResolverComponents)`
-  height: 100%;
-  width: 100%;
-  display: flex;
-  flex-grow: 1;
-  min-height: calc(100vh - 505px);
-`;
diff --git a/x-pack/plugins/security_solution/public/endpoint_alerts/view/test_helpers/render_alert_page.tsx b/x-pack/plugins/security_solution/public/endpoint_alerts/view/test_helpers/render_alert_page.tsx
index acfe3f228c21fb..f03c72518305d3 100644
--- a/x-pack/plugins/security_solution/public/endpoint_alerts/view/test_helpers/render_alert_page.tsx
+++ b/x-pack/plugins/security_solution/public/endpoint_alerts/view/test_helpers/render_alert_page.tsx
@@ -19,6 +19,7 @@ import {
   SUB_PLUGINS_REDUCER,
   mockGlobalState,
   apolloClientObservable,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 
@@ -31,7 +32,13 @@ export const alertPageTestRender = () => {
    * Create a store, with the middleware disabled. We don't want side effects being created by our code in this test.
    */
   const { storage } = createSecuritySolutionStorageMock();
-  const store = createStore(mockGlobalState, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  const store = createStore(
+    mockGlobalState,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   const depsStart = depsStartMock();
   depsStart.data.ui.SearchBar.mockImplementation(() => <div />);
diff --git a/x-pack/plugins/security_solution/public/graphql/introspection.json b/x-pack/plugins/security_solution/public/graphql/introspection.json
index 48547212bb6c01..69356f8fc8aa74 100644
--- a/x-pack/plugins/security_solution/public/graphql/introspection.json
+++ b/x-pack/plugins/security_solution/public/graphql/introspection.json
@@ -255,6 +255,18 @@
                 "description": "",
                 "type": { "kind": "ENUM", "name": "TimelineType", "ofType": null },
                 "defaultValue": null
+              },
+              {
+                "name": "templateTimelineType",
+                "description": "",
+                "type": { "kind": "ENUM", "name": "TemplateTimelineType", "ofType": null },
+                "defaultValue": null
+              },
+              {
+                "name": "status",
+                "description": "",
+                "type": { "kind": "ENUM", "name": "TimelineStatus", "ofType": null },
+                "defaultValue": null
               }
             ],
             "type": {
@@ -10405,7 +10417,13 @@
         "interfaces": null,
         "enumValues": [
           { "name": "active", "description": "", "isDeprecated": false, "deprecationReason": null },
-          { "name": "draft", "description": "", "isDeprecated": false, "deprecationReason": null }
+          { "name": "draft", "description": "", "isDeprecated": false, "deprecationReason": null },
+          {
+            "name": "immutable",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
         ],
         "possibleTypes": null
       },
@@ -10529,6 +10547,24 @@
         ],
         "possibleTypes": null
       },
+      {
+        "kind": "ENUM",
+        "name": "TemplateTimelineType",
+        "description": "",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "elastic",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          { "name": "custom", "description": "", "isDeprecated": false, "deprecationReason": null }
+        ],
+        "possibleTypes": null
+      },
       {
         "kind": "OBJECT",
         "name": "ResponseTimelines",
@@ -10557,6 +10593,46 @@
             "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "defaultTimelineCount",
+            "description": "",
+            "args": [],
+            "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "templateTimelineCount",
+            "description": "",
+            "args": [],
+            "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "elasticTemplateTimelineCount",
+            "description": "",
+            "args": [],
+            "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "customTemplateTimelineCount",
+            "description": "",
+            "args": [],
+            "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "favoriteCount",
+            "description": "",
+            "args": [],
+            "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
diff --git a/x-pack/plugins/security_solution/public/graphql/types.ts b/x-pack/plugins/security_solution/public/graphql/types.ts
index b5088fe51b446b..1171e937935368 100644
--- a/x-pack/plugins/security_solution/public/graphql/types.ts
+++ b/x-pack/plugins/security_solution/public/graphql/types.ts
@@ -345,6 +345,7 @@ export enum TlsFields {
 export enum TimelineStatus {
   active = 'active',
   draft = 'draft',
+  immutable = 'immutable',
 }
 
 export enum TimelineType {
@@ -359,6 +360,11 @@ export enum SortFieldTimeline {
   created = 'created',
 }
 
+export enum TemplateTimelineType {
+  elastic = 'elastic',
+  custom = 'custom',
+}
+
 export enum NetworkDirectionEcs {
   inbound = 'inbound',
   outbound = 'outbound',
@@ -2117,6 +2123,16 @@ export interface ResponseTimelines {
   timeline: (Maybe<TimelineResult>)[];
 
   totalCount?: Maybe<number>;
+
+  defaultTimelineCount?: Maybe<number>;
+
+  templateTimelineCount?: Maybe<number>;
+
+  elasticTemplateTimelineCount?: Maybe<number>;
+
+  customTemplateTimelineCount?: Maybe<number>;
+
+  favoriteCount?: Maybe<number>;
 }
 
 export interface Mutation {
@@ -2254,6 +2270,10 @@ export interface GetAllTimelineQueryArgs {
   onlyUserFavorite?: Maybe<boolean>;
 
   timelineType?: Maybe<TimelineType>;
+
+  templateTimelineType?: Maybe<TemplateTimelineType>;
+
+  status?: Maybe<TimelineStatus>;
 }
 export interface AuthenticationsSourceArgs {
   timerange: TimerangeInput;
@@ -4315,6 +4335,8 @@ export namespace GetAllTimeline {
     sort?: Maybe<SortTimeline>;
     onlyUserFavorite?: Maybe<boolean>;
     timelineType?: Maybe<TimelineType>;
+    templateTimelineType?: Maybe<TemplateTimelineType>;
+    status?: Maybe<TimelineStatus>;
   };
 
   export type Query = {
@@ -4328,6 +4350,16 @@ export namespace GetAllTimeline {
 
     totalCount: Maybe<number>;
 
+    defaultTimelineCount: Maybe<number>;
+
+    templateTimelineCount: Maybe<number>;
+
+    elasticTemplateTimelineCount: Maybe<number>;
+
+    customTemplateTimelineCount: Maybe<number>;
+
+    favoriteCount: Maybe<number>;
+
     timeline: (Maybe<Timeline>)[];
   };
 
diff --git a/x-pack/plugins/security_solution/public/hosts/components/authentications_table/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/authentications_table/index.test.tsx
index 3809d848759cc3..9603f30615a123 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/authentications_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/authentications_table/index.test.tsx
@@ -13,6 +13,7 @@ import {
   apolloClientObservable,
   mockGlobalState,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { createStore, State } from '../../../common/store';
@@ -26,10 +27,22 @@ describe('Authentication Table Component', () => {
   const state: State = mockGlobalState;
 
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   describe('rendering', () => {
diff --git a/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.test.tsx
index 1231c35f214603..ab00e77a4fa433 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.test.tsx
@@ -15,6 +15,7 @@ import {
   mockGlobalState,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
@@ -40,11 +41,23 @@ describe('Hosts Table', () => {
   const state: State = mockGlobalState;
   const { storage } = createSecuritySolutionStorageMock();
 
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
   const mount = useMountAppended();
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   describe('rendering', () => {
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/hosts.test.tsx b/x-pack/plugins/security_solution/public/hosts/pages/hosts.test.tsx
index ea0b32137eb395..1ea3a3020a1d5d 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/hosts.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/hosts.test.tsx
@@ -16,6 +16,7 @@ import {
   TestProviders,
   mockGlobalState,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../common/mock';
 import { SiemNavigation } from '../../common/components/navigation';
@@ -154,7 +155,13 @@ describe('Hosts - rendering', () => {
     });
     const myState: State = mockGlobalState;
     const { storage } = createSecuritySolutionStorageMock();
-    const myStore = createStore(myState, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    const myStore = createStore(
+      myState,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
     const wrapper = mount(
       <TestProviders store={myStore}>
         <Router history={mockHistory}>
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx
index 7b4dc36def1335..df1591bf78778a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/configure_datasource.tsx
@@ -6,8 +6,8 @@
 
 import React, { memo } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiEmptyPrompt, EuiText } from '@elastic/eui';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { EuiCallOut, EuiText, EuiTitle, EuiSpacer } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { LinkToApp } from '../../../../../common/components/endpoint/link_to_app';
 import {
   CustomConfigureDatasourceContent,
@@ -21,43 +21,65 @@ import { getPolicyDetailPath } from '../../../../common/routing';
  */
 export const ConfigureEndpointDatasource = memo<CustomConfigureDatasourceContent>(
   ({ from, datasourceId }: CustomConfigureDatasourceProps) => {
-    const { services } = useKibana();
     let policyUrl = '';
     if (from === 'edit' && datasourceId) {
       policyUrl = getPolicyDetailPath(datasourceId);
     }
 
     return (
-      <EuiEmptyPrompt
-        data-test-subj={`endpointDatasourceConfig_${from === 'edit' ? 'edit' : 'create'}`}
-        body={
-          <EuiText>
+      <>
+        <EuiTitle size="xs">
+          <h4>
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.ingestManager.policyConfiguration"
+              defaultMessage="Policy Configuration"
+            />
+          </h4>
+        </EuiTitle>
+        <EuiSpacer size="m" />
+        <EuiCallOut
+          data-test-subj={`endpointDatasourceConfig_${from === 'edit' ? 'edit' : 'create'}`}
+          iconType="iInCircle"
+          title={i18n.translate(
+            'xpack.securitySolution.endpoint.ingestManager.policyConfiguration.calloutTitle',
+            {
+              defaultMessage: 'Manage Policy configuration in the Security app',
+            }
+          )}
+        >
+          <EuiText size="s">
             <p>
               {from === 'edit' ? (
-                <LinkToApp
-                  data-test-subj="editLinkToPolicyDetails"
-                  appId="securitySolution:management"
-                  appPath={policyUrl}
-                  // Cannot use formalUrl here since the code is called in Ingest, which does not use redux
-                  href={`${services.application.getUrlForApp(
-                    'securitySolution:management'
-                  )}${policyUrl}`}
-                >
+                <>
                   <FormattedMessage
-                    id="xpack.securitySolution.endpoint.ingestManager.editDatasource.stepConfigure"
-                    defaultMessage="View and configure Security Policy"
+                    id="xpack.securitySolution.endpoint.ingestManager.editDatasource.endpointConfiguration"
+                    defaultMessage="You can make changes to the Policy Configuration in the Security app. Fleet will deploy changes to your agents whenever your Policy changes."
                   />
-                </LinkToApp>
+                  <EuiSpacer />
+                  <LinkToApp
+                    data-test-subj="editLinkToPolicyDetails"
+                    asButton={true}
+                    appId="securitySolution:management"
+                    className="editLinkToPolicyDetails"
+                    appPath={policyUrl}
+                    // Cannot use formalUrl here since the code is called in Ingest, which does not use redux
+                  >
+                    <FormattedMessage
+                      id="xpack.securitySolution.endpoint.ingestManager.editDatasource.configurePolicyLink"
+                      defaultMessage="Configure Policy"
+                    />
+                  </LinkToApp>
+                </>
               ) : (
                 <FormattedMessage
-                  id="xpack.securitySolution.endpoint.ingestManager.createDatasource.stepConfigure"
-                  defaultMessage="The recommended Security Policy has been associated with this data source. The Security Policy can be edited in the Security application once your data source has been saved."
+                  id="xpack.securitySolution.endpoint.ingestManager.createDatasource.endpointConfiguration"
+                  defaultMessage="Any agents that use this agent configuration will use a basic policy. You can make changes to this policy in the Security app, and Fleet will deploy those changes to your agents."
                 />
               )}
             </p>
           </EuiText>
-        }
-      />
+        </EuiCallOut>
+      </>
     );
   }
 );
diff --git a/x-pack/plugins/security_solution/public/network/components/ip_overview/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/ip_overview/index.test.tsx
index 553cb8c63db987..b8d97f06bf85f8 100644
--- a/x-pack/plugins/security_solution/public/network/components/ip_overview/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/ip_overview/index.test.tsx
@@ -14,6 +14,7 @@ import {
   mockGlobalState,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { createStore, State } from '../../../common/store';
@@ -28,10 +29,22 @@ describe('IP Overview Component', () => {
   const state: State = mockGlobalState;
 
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   describe('rendering', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/kpi_network/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/kpi_network/index.test.tsx
index 580a5420f1c345..8acd17d2ce7676 100644
--- a/x-pack/plugins/security_solution/public/network/components/kpi_network/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/kpi_network/index.test.tsx
@@ -12,6 +12,7 @@ import {
   apolloClientObservable,
   mockGlobalState,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { createStore, State } from '../../../common/store';
@@ -25,10 +26,22 @@ describe('KpiNetwork Component', () => {
   const narrowDateRange = jest.fn();
 
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   describe('rendering', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/network_dns_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/network_dns_table/index.test.tsx
index 036ebedd6b88ef..bbbe56715d345e 100644
--- a/x-pack/plugins/security_solution/public/network/components/network_dns_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/network_dns_table/index.test.tsx
@@ -15,6 +15,7 @@ import {
   mockGlobalState,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { State, createStore } from '../../../common/store';
@@ -28,11 +29,23 @@ describe('NetworkTopNFlow Table Component', () => {
   const loadPage = jest.fn();
   const state: State = mockGlobalState;
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
   const mount = useMountAppended();
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   describe('rendering', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/network_http_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/network_http_table/index.test.tsx
index ac37aaf3091552..72c932c575be33 100644
--- a/x-pack/plugins/security_solution/public/network/components/network_http_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/network_http_table/index.test.tsx
@@ -15,6 +15,7 @@ import {
   mockGlobalState,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
@@ -31,11 +32,23 @@ describe('NetworkHttp Table Component', () => {
   const state: State = mockGlobalState;
 
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
   const mount = useMountAppended();
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   describe('rendering', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.test.tsx
index 8b1dbc8c558b6e..a1ee0574d8b055 100644
--- a/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.test.tsx
@@ -17,6 +17,7 @@ import {
   mockIndexPattern,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
@@ -32,10 +33,22 @@ describe('NetworkTopCountries Table Component', () => {
   const mount = useMountAppended();
 
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   describe('rendering', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/network_top_n_flow_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/network_top_n_flow_table/index.test.tsx
index b14d411810dee0..100ecaa51f4ae7 100644
--- a/x-pack/plugins/security_solution/public/network/components/network_top_n_flow_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/network_top_n_flow_table/index.test.tsx
@@ -16,6 +16,7 @@ import {
   mockGlobalState,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
@@ -31,11 +32,23 @@ describe('NetworkTopNFlow Table Component', () => {
   const state: State = mockGlobalState;
 
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
   const mount = useMountAppended();
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   describe('rendering', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/tls_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/tls_table/index.test.tsx
index acbe974f914d7e..cd2dc926c03bcc 100644
--- a/x-pack/plugins/security_solution/public/network/components/tls_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/tls_table/index.test.tsx
@@ -15,6 +15,7 @@ import {
   mockGlobalState,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
@@ -28,11 +29,23 @@ describe('Tls Table Component', () => {
   const state: State = mockGlobalState;
 
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
   const mount = useMountAppended();
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   describe('Rendering', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/users_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/users_table/index.test.tsx
index f0d4d7fbeefc60..3f1762cadd652a 100644
--- a/x-pack/plugins/security_solution/public/network/components/users_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/users_table/index.test.tsx
@@ -16,6 +16,7 @@ import {
   mockGlobalState,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
@@ -30,11 +31,23 @@ describe('Users Table Component', () => {
   const state: State = mockGlobalState;
 
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
   const mount = useMountAppended();
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   describe('Rendering', () => {
diff --git a/x-pack/plugins/security_solution/public/network/pages/ip_details/index.test.tsx b/x-pack/plugins/security_solution/public/network/pages/ip_details/index.test.tsx
index a87eb3d0574479..962a6269f84882 100644
--- a/x-pack/plugins/security_solution/public/network/pages/ip_details/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/ip_details/index.test.tsx
@@ -18,6 +18,7 @@ import {
   mockGlobalState,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
@@ -90,7 +91,6 @@ const getMockProps = (ip: string) => ({
 
 describe('Ip Details', () => {
   const mount = useMountAppended();
-
   beforeAll(() => {
     (useWithSource as jest.Mock).mockReturnValue({
       indicesExist: false,
@@ -107,15 +107,27 @@ describe('Ip Details', () => {
   });
 
   afterAll(() => {
-    delete (global as GlobalWithFetch).fetch;
+    jest.resetAllMocks();
   });
 
   const state: State = mockGlobalState;
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/network/pages/network.test.tsx b/x-pack/plugins/security_solution/public/network/pages/network.test.tsx
index 7cdfdbf0af69a6..af84e1d42b45b9 100644
--- a/x-pack/plugins/security_solution/public/network/pages/network.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/network.test.tsx
@@ -16,6 +16,7 @@ import {
   mockGlobalState,
   apolloClientObservable,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../common/mock';
 import { State, createStore } from '../../common/store';
@@ -139,7 +140,13 @@ describe('rendering - rendering', () => {
     });
     const myState: State = mockGlobalState;
     const { storage } = createSecuritySolutionStorageMock();
-    const myStore = createStore(myState, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    const myStore = createStore(
+      myState,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
     const wrapper = mount(
       <TestProviders store={myStore}>
         <Router history={mockHistory}>
diff --git a/x-pack/plugins/security_solution/public/overview/components/overview_host/index.test.tsx b/x-pack/plugins/security_solution/public/overview/components/overview_host/index.test.tsx
index d29efa2d44c15c..2b21385004a739 100644
--- a/x-pack/plugins/security_solution/public/overview/components/overview_host/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/overview_host/index.test.tsx
@@ -14,6 +14,7 @@ import {
   mockGlobalState,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 
@@ -95,11 +96,23 @@ describe('OverviewHost', () => {
   const state: State = mockGlobalState;
 
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   beforeEach(() => {
     const myState = cloneDeep(state);
-    store = createStore(myState, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      myState,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   test('it renders the expected widget title', () => {
diff --git a/x-pack/plugins/security_solution/public/overview/components/overview_network/index.test.tsx b/x-pack/plugins/security_solution/public/overview/components/overview_network/index.test.tsx
index b4b685465dbda4..7a9834ee3ea9a8 100644
--- a/x-pack/plugins/security_solution/public/overview/components/overview_network/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/overview_network/index.test.tsx
@@ -14,6 +14,7 @@ import {
   TestProviders,
   SUB_PLUGINS_REDUCER,
   createSecuritySolutionStorageMock,
+  kibanaObservable,
 } from '../../../common/mock';
 
 import { OverviewNetwork } from '.';
@@ -86,11 +87,23 @@ describe('OverviewNetwork', () => {
   const state: State = mockGlobalState;
 
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   beforeEach(() => {
     const myState = cloneDeep(state);
-    store = createStore(myState, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      myState,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
   });
 
   test('it renders the expected widget title', () => {
diff --git a/x-pack/plugins/security_solution/public/overview/components/recent_timelines/index.tsx b/x-pack/plugins/security_solution/public/overview/components/recent_timelines/index.tsx
index 9c149a850bec9d..8f2b3c7495f0d7 100644
--- a/x-pack/plugins/security_solution/public/overview/components/recent_timelines/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/recent_timelines/index.tsx
@@ -24,6 +24,7 @@ import { RecentTimelines } from './recent_timelines';
 import * as i18n from './translations';
 import { FilterMode } from './types';
 import { LoadingPlaceholders } from '../loading_placeholders';
+import { useTimelineStatus } from '../../../timelines/components/open_timeline/use_timeline_status';
 import { useKibana } from '../../../common/lib/kibana';
 import { SecurityPageName } from '../../../app/types';
 import { APP_ID } from '../../../../common/constants';
@@ -83,25 +84,25 @@ const StatefulRecentTimelinesComponent = React.memo<Props>(
     );
 
     const { fetchAllTimeline, timelines, loading } = useGetAllTimeline();
-
-    useEffect(
-      () =>
-        fetchAllTimeline({
-          pageInfo: {
-            pageIndex: 1,
-            pageSize: PAGE_SIZE,
-          },
-          search: '',
-          sort: {
-            sortField: SortFieldTimeline.updated,
-            sortOrder: Direction.desc,
-          },
-          onlyUserFavorite: filterBy === 'favorites',
-          timelineType: TimelineType.default,
-        }),
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      [filterBy]
-    );
+    const timelineType = TimelineType.default;
+    const { templateTimelineType, timelineStatus } = useTimelineStatus({ timelineType });
+    useEffect(() => {
+      fetchAllTimeline({
+        pageInfo: {
+          pageIndex: 1,
+          pageSize: PAGE_SIZE,
+        },
+        search: '',
+        sort: {
+          sortField: SortFieldTimeline.updated,
+          sortOrder: Direction.desc,
+        },
+        onlyUserFavorite: filterBy === 'favorites',
+        status: timelineStatus,
+        timelineType,
+        templateTimelineType,
+      });
+    }, [fetchAllTimeline, filterBy, timelineStatus, timelineType, templateTimelineType]);
 
     return (
       <>
diff --git a/x-pack/plugins/security_solution/public/plugin.tsx b/x-pack/plugins/security_solution/public/plugin.tsx
index b247170a4a5db7..d7e29a466cbf2e 100644
--- a/x-pack/plugins/security_solution/public/plugin.tsx
+++ b/x-pack/plugins/security_solution/public/plugin.tsx
@@ -23,7 +23,14 @@ import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
 import { initTelemetry } from './common/lib/telemetry';
 import { KibanaServices } from './common/lib/kibana/services';
 import { serviceNowActionType, jiraActionType } from './common/lib/connectors';
-import { PluginSetup, PluginStart, SetupPlugins, StartPlugins, StartServices } from './types';
+import {
+  PluginSetup,
+  PluginStart,
+  SetupPlugins,
+  StartPlugins,
+  StartServices,
+  AppObservableLibs,
+} from './types';
 import {
   APP_ID,
   APP_ICON,
@@ -120,6 +127,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
           this.downloadAssets(),
           this.downloadSubPlugins(),
         ]);
+
         return renderApp({
           ...composeLibs(coreStart),
           ...params,
@@ -396,8 +404,9 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
       endpointAlertsSubPlugin,
       managementSubPlugin,
     } = await this.downloadSubPlugins();
-
-    const libs$ = new BehaviorSubject(composeLibs(coreStart));
+    const { apolloClient } = composeLibs(coreStart);
+    const appLibs: AppObservableLibs = { apolloClient, kibana: coreStart };
+    const libs$ = new BehaviorSubject(appLibs);
 
     const alertsStart = alertsSubPlugin.start(storage);
     const hostsStart = hostsSubPlugin.start(storage);
@@ -434,6 +443,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
         ...managementSubPluginStart.store.reducer,
       },
       libs$.pipe(pluck('apolloClient')),
+      libs$.pipe(pluck('kibana')),
       storage,
       [
         ...(endpointAlertsStart.store.middleware ?? []),
diff --git a/x-pack/plugins/security_solution/public/resolver/lib/transformation.test.ts b/x-pack/plugins/security_solution/public/resolver/lib/transformation.test.ts
index 3fe6941279bc53..3280bad4a81ff6 100644
--- a/x-pack/plugins/security_solution/public/resolver/lib/transformation.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/lib/transformation.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { applyMatrix3 } from './vector2';
+import { applyMatrix3 } from '../models/vector2';
 import { scalingTransformation } from './transformation';
 
 describe('transforms', () => {
diff --git a/x-pack/plugins/security_solution/public/resolver/lib/tree_sequencers.ts b/x-pack/plugins/security_solution/public/resolver/lib/tree_sequencers.ts
index 219c58d6efc9c5..843126c0eef5a6 100644
--- a/x-pack/plugins/security_solution/public/resolver/lib/tree_sequencers.ts
+++ b/x-pack/plugins/security_solution/public/resolver/lib/tree_sequencers.ts
@@ -4,20 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-/**
- * Sequences a tree, yielding children returned by the `children` function. Sequencing is done in 'depth first preorder' fashion. See https://en.wikipedia.org/wiki/Tree_traversal#Pre-order_(NLR)
- */
-export function* depthFirstPreorder<T>(root: T, children: (parent: T) => T[]): Iterable<T> {
-  const nodesToVisit = [root];
-  while (nodesToVisit.length !== 0) {
-    const currentNode = nodesToVisit.shift();
-    if (currentNode !== undefined) {
-      nodesToVisit.unshift(...(children(currentNode) || []));
-      yield currentNode;
-    }
-  }
-}
-
 /**
  * Sequences a tree, yielding children returned by the `children` function. Sequencing is done in 'level order' fashion.
  */
diff --git a/x-pack/plugins/security_solution/public/resolver/models/aabb.test.ts b/x-pack/plugins/security_solution/public/resolver/models/aabb.test.ts
new file mode 100644
index 00000000000000..ce7d9eda6cca6e
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/models/aabb.test.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { isEqual } from './aabb';
+import { AABB } from '../types';
+
+describe('AABB', () => {
+  const minimumX = 0;
+  const minimumY = 0;
+  const maximumX = 0;
+  const maximumY = 0;
+
+  let aabb: AABB;
+
+  beforeEach(() => {
+    aabb = { minimum: [minimumX, minimumY], maximum: [maximumX, maximumY] };
+  });
+  it('should be equal to an AABB with the same values', () => {
+    expect(isEqual(aabb, { minimum: [minimumX, minimumY], maximum: [maximumX, maximumY] })).toBe(
+      true
+    );
+  });
+
+  it('should not be equal to an AABB with a different minimum X value', () => {
+    expect(
+      isEqual(aabb, { minimum: [minimumX + 1, minimumY], maximum: [maximumX, maximumY] })
+    ).toBe(false);
+  });
+  it('should not be equal to an AABB with a different minimum Y value', () => {
+    expect(
+      isEqual(aabb, { minimum: [minimumX, minimumY + 1], maximum: [maximumX, maximumY] })
+    ).toBe(false);
+  });
+  it('should not be equal to an AABB with a different maximum X value', () => {
+    expect(
+      isEqual(aabb, { minimum: [minimumX, minimumY], maximum: [maximumX + 1, maximumY] })
+    ).toBe(false);
+  });
+  it('should not be equal to an AABB with a different maximum Y value', () => {
+    expect(
+      isEqual(aabb, { minimum: [minimumX, minimumY], maximum: [maximumX, maximumY + 1] })
+    ).toBe(false);
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/resolver/lib/aabb.ts b/x-pack/plugins/security_solution/public/resolver/models/aabb.ts
similarity index 100%
rename from x-pack/plugins/security_solution/public/resolver/lib/aabb.ts
rename to x-pack/plugins/security_solution/public/resolver/models/aabb.ts
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/__snapshots__/graphing.test.ts.snap b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/__snapshots__/isometric_taxi_layout.test.ts.snap
similarity index 83%
rename from x-pack/plugins/security_solution/public/resolver/store/data/__snapshots__/graphing.test.ts.snap
rename to x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/__snapshots__/isometric_taxi_layout.test.ts.snap
index 8525ccd7b1548d..74efb41c4c595f 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/__snapshots__/graphing.test.ts.snap
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/__snapshots__/isometric_taxi_layout.test.ts.snap
@@ -56,12 +56,12 @@ Object {
       },
       "points": Array [
         Array [
-          0,
-          -229.43553924069099,
+          -98.99494936611666,
+          -286.5902999056318,
         ],
         Array [
-          395.9797974644666,
-          -0.8164965809277259,
+          593.9696961966999,
+          113.49302474895391,
         ],
       ],
     },
@@ -71,12 +71,12 @@ Object {
       },
       "points": Array [
         Array [
-          0,
-          -229.43553924069099,
+          -98.99494936611666,
+          -286.5902999056318,
         ],
         Array [
-          197.9898987322333,
-          -343.7450605705726,
+          98.99494936611666,
+          -400.8998212355134,
         ],
       ],
     },
@@ -86,12 +86,27 @@ Object {
       },
       "points": Array [
         Array [
-          395.9797974644666,
-          -0.8164965809277259,
+          296.98484809834997,
+          -57.97125724586854,
         ],
+        Array [
+          494.9747468305833,
+          -172.28077857575016,
+        ],
+      ],
+    },
+    Object {
+      "metadata": Object {
+        "uniqueId": "",
+      },
+      "points": Array [
         Array [
           593.9696961966999,
-          -115.12601791080935,
+          113.49302474895391,
+        ],
+        Array [
+          791.9595949289333,
+          -0.8164965809277259,
         ],
       ],
     },
@@ -101,12 +116,12 @@ Object {
       },
       "points": Array [
         Array [
-          197.9898987322333,
-          -343.7450605705726,
+          98.99494936611666,
+          -400.8998212355134,
         ],
         Array [
-          395.9797974644666,
-          -458.05458190045425,
+          296.98484809834997,
+          -515.2093425653951,
         ],
       ],
     },
@@ -116,12 +131,12 @@ Object {
       },
       "points": Array [
         Array [
-          296.98484809834997,
-          -515.2093425653951,
+          197.9898987322333,
+          -572.3641032303359,
         ],
         Array [
-          494.9747468305833,
-          -400.8998212355134,
+          395.9797974644666,
+          -458.05458190045425,
         ],
       ],
     },
@@ -131,12 +146,12 @@ Object {
       },
       "points": Array [
         Array [
-          296.98484809834997,
-          -515.2093425653951,
+          197.9898987322333,
+          -572.3641032303359,
         ],
         Array [
-          494.9747468305833,
-          -629.5188638952767,
+          395.9797974644666,
+          -686.6736245602175,
         ],
       ],
     },
@@ -146,12 +161,12 @@ Object {
       },
       "points": Array [
         Array [
-          494.9747468305833,
-          -400.8998212355134,
+          395.9797974644666,
+          -458.05458190045425,
         ],
         Array [
-          692.9646455628166,
-          -515.2093425653951,
+          593.9696961966999,
+          -572.3641032303359,
         ],
       ],
     },
@@ -161,12 +176,12 @@ Object {
       },
       "points": Array [
         Array [
-          593.9696961966999,
-          -115.12601791080935,
+          494.9747468305833,
+          -172.28077857575016,
         ],
         Array [
-          791.9595949289333,
-          -229.43553924069096,
+          692.9646455628166,
+          -286.5902999056318,
         ],
       ],
     },
@@ -176,12 +191,12 @@ Object {
       },
       "points": Array [
         Array [
-          692.9646455628166,
-          -286.5902999056318,
+          593.9696961966999,
+          -343.7450605705726,
         ],
         Array [
-          890.9545442950499,
-          -172.28077857575016,
+          791.9595949289333,
+          -229.43553924069096,
         ],
       ],
     },
@@ -191,12 +206,12 @@ Object {
       },
       "points": Array [
         Array [
-          692.9646455628166,
-          -286.5902999056318,
+          593.9696961966999,
+          -343.7450605705726,
         ],
         Array [
-          890.9545442950499,
-          -400.89982123551346,
+          791.9595949289333,
+          -458.05458190045425,
         ],
       ],
     },
@@ -206,12 +221,12 @@ Object {
       },
       "points": Array [
         Array [
-          890.9545442950499,
-          -172.28077857575016,
+          791.9595949289333,
+          -229.43553924069096,
         ],
         Array [
-          1088.9444430272833,
-          -286.5902999056318,
+          989.9494936611666,
+          -343.7450605705726,
         ],
       ],
     },
@@ -221,12 +236,12 @@ Object {
       },
       "points": Array [
         Array [
-          1088.9444430272833,
-          -286.5902999056318,
+          989.9494936611666,
+          -343.7450605705726,
         ],
         Array [
-          1286.9343417595164,
-          -400.89982123551346,
+          1187.9393923933999,
+          -458.05458190045425,
         ],
       ],
     },
@@ -263,8 +278,8 @@ Object {
         "unique_ppid": 0,
       },
     } => Array [
-      197.9898987322333,
-      -343.7450605705726,
+      98.99494936611666,
+      -400.8998212355134,
     ],
     Object {
       "@timestamp": 1582233383000,
@@ -280,8 +295,25 @@ Object {
         "unique_ppid": 0,
       },
     } => Array [
-      593.9696961966999,
-      -115.12601791080935,
+      494.9747468305833,
+      -172.28077857575016,
+    ],
+    Object {
+      "@timestamp": 1582233383000,
+      "agent": Object {
+        "id": "",
+        "type": "",
+        "version": "",
+      },
+      "endgame": Object {
+        "event_subtype_full": "termination_event",
+        "event_type_full": "process_event",
+        "unique_pid": 8,
+        "unique_ppid": 0,
+      },
+    } => Array [
+      791.9595949289333,
+      -0.8164965809277259,
     ],
     Object {
       "@timestamp": 1582233383000,
@@ -297,8 +329,8 @@ Object {
         "unique_ppid": 1,
       },
     } => Array [
-      494.9747468305833,
-      -629.5188638952767,
+      395.9797974644666,
+      -686.6736245602175,
     ],
     Object {
       "@timestamp": 1582233383000,
@@ -314,8 +346,8 @@ Object {
         "unique_ppid": 1,
       },
     } => Array [
-      692.9646455628166,
-      -515.2093425653951,
+      593.9696961966999,
+      -572.3641032303359,
     ],
     Object {
       "@timestamp": 1582233383000,
@@ -331,8 +363,8 @@ Object {
         "unique_ppid": 2,
       },
     } => Array [
-      890.9545442950499,
-      -400.89982123551346,
+      791.9595949289333,
+      -458.05458190045425,
     ],
     Object {
       "@timestamp": 1582233383000,
@@ -348,8 +380,8 @@ Object {
         "unique_ppid": 2,
       },
     } => Array [
-      1088.9444430272833,
-      -286.5902999056318,
+      989.9494936611666,
+      -343.7450605705726,
     ],
     Object {
       "@timestamp": 1582233383000,
@@ -365,8 +397,8 @@ Object {
         "unique_ppid": 6,
       },
     } => Array [
-      1286.9343417595164,
-      -400.89982123551346,
+      1187.9393923933999,
+      -458.05458190045425,
     ],
   },
 }
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree.ts b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.ts
similarity index 95%
rename from x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree.ts
rename to x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.ts
index db00ca2d599687..b322de0f345263 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree.ts
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { uniquePidForProcess, uniqueParentPidForProcess } from './process_event';
-import { IndexedProcessTree, AdjacentProcessMap } from '../types';
-import { ResolverEvent } from '../../../common/endpoint/types';
-import { levelOrder as baseLevelOrder } from '../lib/tree_sequencers';
+import { uniquePidForProcess, uniqueParentPidForProcess } from '../process_event';
+import { IndexedProcessTree, AdjacentProcessMap } from '../../types';
+import { ResolverEvent } from '../../../../common/endpoint/types';
+import { levelOrder as baseLevelOrder } from '../../lib/tree_sequencers';
 
 /**
  * Create a new IndexedProcessTree from an array of ProcessEvents
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.test.ts b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.test.ts
new file mode 100644
index 00000000000000..72d8e878465f74
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.test.ts
@@ -0,0 +1,152 @@
+/*
+ * 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 { IsometricTaxiLayout } from '../../types';
+import { LegacyEndpointEvent } from '../../../../common/endpoint/types';
+import { isometricTaxiLayout } from './isometric_taxi_layout';
+import { mockProcessEvent } from '../../models/process_event_test_helpers';
+import { factory } from './index';
+
+describe('resolver graph layout', () => {
+  let processA: LegacyEndpointEvent;
+  let processB: LegacyEndpointEvent;
+  let processC: LegacyEndpointEvent;
+  let processD: LegacyEndpointEvent;
+  let processE: LegacyEndpointEvent;
+  let processF: LegacyEndpointEvent;
+  let processG: LegacyEndpointEvent;
+  let processH: LegacyEndpointEvent;
+  let processI: LegacyEndpointEvent;
+  let events: LegacyEndpointEvent[];
+  let layout: () => IsometricTaxiLayout;
+
+  beforeEach(() => {
+    /*
+     *          A
+     *      ____|____
+     *     |         |
+     *     B         C
+     *  ___|___   ___|___
+     * |       | |       |
+     * D       E F       G
+     *                   |
+     *                   H
+     *
+     */
+    processA = mockProcessEvent({
+      endgame: {
+        process_name: '',
+        event_type_full: 'process_event',
+        event_subtype_full: 'creation_event',
+        unique_pid: 0,
+      },
+    });
+    processB = mockProcessEvent({
+      endgame: {
+        event_type_full: 'process_event',
+        event_subtype_full: 'already_running',
+        unique_pid: 1,
+        unique_ppid: 0,
+      },
+    });
+    processC = mockProcessEvent({
+      endgame: {
+        event_type_full: 'process_event',
+        event_subtype_full: 'creation_event',
+        unique_pid: 2,
+        unique_ppid: 0,
+      },
+    });
+    processD = mockProcessEvent({
+      endgame: {
+        event_type_full: 'process_event',
+        event_subtype_full: 'creation_event',
+        unique_pid: 3,
+        unique_ppid: 1,
+      },
+    });
+    processE = mockProcessEvent({
+      endgame: {
+        event_type_full: 'process_event',
+        event_subtype_full: 'creation_event',
+        unique_pid: 4,
+        unique_ppid: 1,
+      },
+    });
+    processF = mockProcessEvent({
+      endgame: {
+        event_type_full: 'process_event',
+        event_subtype_full: 'creation_event',
+        unique_pid: 5,
+        unique_ppid: 2,
+      },
+    });
+    processG = mockProcessEvent({
+      endgame: {
+        event_type_full: 'process_event',
+        event_subtype_full: 'creation_event',
+        unique_pid: 6,
+        unique_ppid: 2,
+      },
+    });
+    processH = mockProcessEvent({
+      endgame: {
+        event_type_full: 'process_event',
+        event_subtype_full: 'creation_event',
+        unique_pid: 7,
+        unique_ppid: 6,
+      },
+    });
+    processI = mockProcessEvent({
+      endgame: {
+        event_type_full: 'process_event',
+        event_subtype_full: 'termination_event',
+        unique_pid: 8,
+        unique_ppid: 0,
+      },
+    });
+    layout = () => isometricTaxiLayout(factory(events));
+    events = [];
+  });
+  describe('when rendering no nodes', () => {
+    it('renders right', () => {
+      expect(layout()).toMatchSnapshot();
+    });
+  });
+  describe('when rendering one node', () => {
+    beforeEach(() => {
+      events = [processA];
+    });
+    it('renders right', () => {
+      expect(layout()).toMatchSnapshot();
+    });
+  });
+  describe('when rendering two nodes, one being the parent of the other', () => {
+    beforeEach(() => {
+      events = [processA, processB];
+    });
+    it('renders right', () => {
+      expect(layout()).toMatchSnapshot();
+    });
+  });
+  describe('when rendering two forks, and one fork has an extra long tine', () => {
+    beforeEach(() => {
+      events = [
+        processA,
+        processB,
+        processC,
+        processD,
+        processE,
+        processF,
+        processG,
+        processH,
+        processI,
+      ];
+    });
+    it('renders right', () => {
+      expect(layout()).toMatchSnapshot();
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts
new file mode 100644
index 00000000000000..61363ffa05d949
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts
@@ -0,0 +1,453 @@
+/*
+ * 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 * as vector2 from '../../models/vector2';
+import {
+  IndexedProcessTree,
+  Vector2,
+  EdgeLineSegment,
+  ProcessWidths,
+  ProcessPositions,
+  EdgeLineMetadata,
+  ProcessWithWidthMetadata,
+  Matrix3,
+  IsometricTaxiLayout,
+} from '../../types';
+import * as event from '../../../../common/endpoint/models/event';
+import { ResolverEvent } from '../../../../common/endpoint/types';
+import * as model from './index';
+import { getFriendlyElapsedTime as elapsedTime } from '../../lib/date';
+
+/**
+ * Graph the process tree
+ */
+export function isometricTaxiLayout(indexedProcessTree: IndexedProcessTree): IsometricTaxiLayout {
+  /**
+   * Walk the tree in reverse level order, calculating the 'width' of subtrees.
+   */
+  const widths = widthsOfProcessSubtrees(indexedProcessTree);
+
+  /**
+   * Walk the tree in level order. Using the precalculated widths, calculate the position of nodes.
+   * Nodes are positioned relative to their parents and preceding siblings.
+   */
+  const positions = processPositions(indexedProcessTree, widths);
+
+  /**
+   * With the widths and positions precalculated, we calculate edge line segments (arrays of vector2s)
+   * which connect them in a 'pitchfork' design.
+   */
+  const edgeLineSegments = processEdgeLineSegments(indexedProcessTree, widths, positions);
+
+  /**
+   * Transform the positions of nodes and edges so they seem like they are on an isometric grid.
+   */
+  const transformedEdgeLineSegments: EdgeLineSegment[] = [];
+  const transformedPositions = new Map<ResolverEvent, Vector2>();
+
+  for (const [processEvent, position] of positions) {
+    transformedPositions.set(
+      processEvent,
+      vector2.applyMatrix3(position, isometricTransformMatrix)
+    );
+  }
+
+  for (const edgeLineSegment of edgeLineSegments) {
+    const {
+      points: [startPoint, endPoint],
+    } = edgeLineSegment;
+
+    const transformedSegment: EdgeLineSegment = {
+      ...edgeLineSegment,
+      points: [
+        vector2.applyMatrix3(startPoint, isometricTransformMatrix),
+        vector2.applyMatrix3(endPoint, isometricTransformMatrix),
+      ],
+    };
+
+    transformedEdgeLineSegments.push(transformedSegment);
+  }
+
+  return {
+    processNodePositions: transformedPositions,
+    edgeLineSegments: transformedEdgeLineSegments,
+  };
+}
+
+/**
+ * In laying out the graph, we precalculate the 'width' of each subtree. The 'width' of the subtree is determined by its
+ * descedants and the rule that each process node must be at least 1 unit apart. Enforcing that all nodes are at least
+ * 1 unit apart on the x axis makes it easy to prevent the UI components from overlapping. There will always be space.
+ *
+ * Example widths:
+ *
+ *    A and B each have a width of 0
+ *
+ *          A
+ *          |
+ *          B
+ *
+ *    A has a width of 1. B and C have a width of 0.
+ *    B and C must be 1 unit apart, so the A subtree has a width of 1.
+ *
+ *          A
+ *      ____|____
+ *     |         |
+ *     B         C
+ *
+ *
+ *    D, E, F, G, H all have a width of 0.
+ *    B has a width of 1 since D->E must be 1 unit apart.
+ *    Similarly, C has a width of 1 since F->G must be 1 unit apart.
+ *    A has width of 3, since B has a width of 1, and C has a width of 1, and E->F must be at least
+ *    1 unit apart.
+ *          A
+ *      ____|____
+ *     |         |
+ *     B         C
+ *  ___|___   ___|___
+ * |       | |       |
+ * D       E F       G
+ *                   |
+ *                   H
+ *
+ */
+function widthsOfProcessSubtrees(indexedProcessTree: IndexedProcessTree): ProcessWidths {
+  const widths = new Map<ResolverEvent, number>();
+
+  if (model.size(indexedProcessTree) === 0) {
+    return widths;
+  }
+
+  const processesInReverseLevelOrder = [...model.levelOrder(indexedProcessTree)].reverse();
+
+  for (const process of processesInReverseLevelOrder) {
+    const children = model.children(indexedProcessTree, process);
+
+    const sumOfWidthOfChildren = function sumOfWidthOfChildren() {
+      return children.reduce(function sum(currentValue, child) {
+        /**
+         * `widths.get` will always return a number in this case.
+         * This loop sequences a tree in reverse level order. Width values are set for each node.
+         * Therefore a parent can always find a width for its children, since all of its children
+         * will have been handled already.
+         */
+        return currentValue + widths.get(child)!;
+      }, 0);
+    };
+
+    const width = sumOfWidthOfChildren() + Math.max(0, children.length - 1) * distanceBetweenNodes;
+    widths.set(process, width);
+  }
+
+  return widths;
+}
+
+function processEdgeLineSegments(
+  indexedProcessTree: IndexedProcessTree,
+  widths: ProcessWidths,
+  positions: ProcessPositions
+): EdgeLineSegment[] {
+  const edgeLineSegments: EdgeLineSegment[] = [];
+  for (const metadata of levelOrderWithWidths(indexedProcessTree, widths)) {
+    const edgeLineMetadata: EdgeLineMetadata = { uniqueId: '' };
+    /**
+     * We only handle children, drawing lines back to their parents. The root has no parent, so we skip it
+     */
+    if (metadata.parent === null) {
+      // eslint-disable-next-line no-continue
+      continue;
+    }
+    const { process, parent, parentWidth } = metadata;
+    const position = positions.get(process);
+    const parentPosition = positions.get(parent);
+    const parentId = event.entityId(parent);
+    const processEntityId = event.entityId(process);
+    const edgeLineId = parentId ? parentId + processEntityId : parentId;
+
+    if (position === undefined || parentPosition === undefined) {
+      /**
+       * All positions have been precalculated, so if any are missing, it's an error. This will never happen.
+       */
+      throw new Error();
+    }
+
+    const parentTime = event.eventTimestamp(parent);
+    const processTime = event.eventTimestamp(process);
+    if (parentTime && processTime) {
+      edgeLineMetadata.elapsedTime = elapsedTime(parentTime, processTime) ?? undefined;
+    }
+    edgeLineMetadata.uniqueId = edgeLineId;
+
+    /**
+     * The point halfway between the parent and child on the y axis, we sometimes have a hard angle here in the edge line
+     */
+    const midwayY = parentPosition[1] + (position[1] - parentPosition[1]) / 2;
+
+    /**
+     * When drawing edge lines between a parent and children (when there are multiple children) we draw a pitchfork type
+     * design. The 'midway' line, runs along the x axis and joins all the children with a single descendant line from the parent.
+     * See the ascii diagram below. The underscore characters would be the midway line.
+     *
+     *          A
+     *      ____|____
+     *     |         |
+     *     B         C
+     */
+    const lineFromProcessToMidwayLine: EdgeLineSegment = {
+      points: [[position[0], midwayY], position],
+      metadata: edgeLineMetadata,
+    };
+
+    const siblings = model.children(indexedProcessTree, parent);
+    const isFirstChild = process === siblings[0];
+
+    if (metadata.isOnlyChild) {
+      // add a single line segment directly from parent to child. We don't do the 'pitchfork' in this case.
+      edgeLineSegments.push({ points: [parentPosition, position], metadata: edgeLineMetadata });
+    } else if (isFirstChild) {
+      /**
+       * If the parent has multiple children, we draw the 'midway' line, and the line from the
+       * parent to the midway line, while handling the first child.
+       *
+       * Consider A the parent, and B the first child. We would draw somemthing like what's in the below diagram. The line from the
+       * midway line to C would be drawn when we handle C.
+       *
+       *          A
+       *      ____|____
+       *     |
+       *     B         C
+       */
+      const { firstChildWidth, lastChildWidth } = metadata;
+
+      const lineFromParentToMidwayLine: EdgeLineSegment = {
+        points: [parentPosition, [parentPosition[0], midwayY]],
+        metadata: { uniqueId: `parentToMid${edgeLineId}` },
+      };
+
+      const widthOfMidline = parentWidth - firstChildWidth / 2 - lastChildWidth / 2;
+
+      const minX = parentWidth / -2 + firstChildWidth / 2;
+      const maxX = minX + widthOfMidline;
+
+      const midwayLine: EdgeLineSegment = {
+        points: [
+          [
+            // Position line relative to the parent's x component
+            parentPosition[0] + minX,
+            midwayY,
+          ],
+          [
+            // Position line relative to the parent's x component
+            parentPosition[0] + maxX,
+            midwayY,
+          ],
+        ],
+        metadata: { uniqueId: `midway${edgeLineId}` },
+      };
+
+      edgeLineSegments.push(
+        /* line from parent to midway line */
+        lineFromParentToMidwayLine,
+        midwayLine,
+        lineFromProcessToMidwayLine
+      );
+    } else {
+      // If this isn't the first child, it must have siblings (the first of which drew the midway line and line
+      // from the parent to the midway line
+      edgeLineSegments.push(lineFromProcessToMidwayLine);
+    }
+  }
+  return edgeLineSegments;
+}
+
+function processPositions(
+  indexedProcessTree: IndexedProcessTree,
+  widths: ProcessWidths
+): ProcessPositions {
+  const positions = new Map<ResolverEvent, Vector2>();
+  /**
+   * This algorithm iterates the tree in level order. It keeps counters that are reset for each parent.
+   * By keeping track of the last parent node, we can know when we are dealing with a new set of siblings and
+   * reset the counters.
+   */
+  let lastProcessedParentNode: ResolverEvent | undefined;
+  /**
+   * Nodes are positioned relative to their siblings. We walk this in level order, so we handle
+   * children left -> right.
+   *
+   * The width of preceding siblings is used to left align the node.
+   * The number of preceding siblings is important because each sibling must be 1 unit apart
+   * on the x axis.
+   */
+  let numberOfPrecedingSiblings = 0;
+  let runningWidthOfPrecedingSiblings = 0;
+
+  for (const metadata of levelOrderWithWidths(indexedProcessTree, widths)) {
+    // Handle root node
+    if (metadata.parent === null) {
+      const { process } = metadata;
+      /**
+       * Place the root node at (0, 0) for now.
+       */
+      positions.set(process, [0, 0]);
+    } else {
+      const { process, parent, isOnlyChild, width, parentWidth } = metadata;
+
+      // Reinit counters when parent changes
+      if (lastProcessedParentNode !== parent) {
+        numberOfPrecedingSiblings = 0;
+        runningWidthOfPrecedingSiblings = 0;
+
+        // keep track of this so we know when to reinitialize
+        lastProcessedParentNode = parent;
+      }
+
+      const parentPosition = positions.get(parent);
+
+      if (parentPosition === undefined) {
+        /**
+         * Since this algorithm populates the `positions` map in level order,
+         * the parent node will have been processed already and the parent position
+         * will always be available.
+         *
+         * This will never happen.
+         */
+        throw new Error();
+      }
+
+      /**
+       * The x 'offset' is added to the x value of the parent to determine the position of the node.
+       * We add `parentWidth / -2` in order to align the left side of this node with the left side of its parent.
+       * We add `numberOfPrecedingSiblings * distanceBetweenNodes` in order to keep each node 1 apart on the x axis.
+       * We add `runningWidthOfPrecedingSiblings` so that we don't overlap with our preceding siblings. We stack em up.
+       * We add `width / 2` so that we center the node horizontally (in case it has non-0 width.)
+       */
+      const xOffset =
+        parentWidth / -2 +
+        numberOfPrecedingSiblings * distanceBetweenNodes +
+        runningWidthOfPrecedingSiblings +
+        width / 2;
+
+      /**
+       * The y axis gains `-distanceBetweenNodes` as we move down the screen 1 unit at a time.
+       */
+      let yDistanceBetweenNodes = -distanceBetweenNodes;
+
+      if (!isOnlyChild) {
+        // Make space on leaves to show elapsed time
+        yDistanceBetweenNodes *= 2;
+      }
+
+      const position = vector2.add([xOffset, yDistanceBetweenNodes], parentPosition);
+
+      positions.set(process, position);
+
+      numberOfPrecedingSiblings += 1;
+      runningWidthOfPrecedingSiblings += width;
+    }
+  }
+
+  return positions;
+}
+function* levelOrderWithWidths(
+  tree: IndexedProcessTree,
+  widths: ProcessWidths
+): Iterable<ProcessWithWidthMetadata> {
+  for (const process of model.levelOrder(tree)) {
+    const parent = model.parent(tree, process);
+    const width = widths.get(process);
+
+    if (width === undefined) {
+      /**
+       * All widths have been precalcluated, so this will not happen.
+       */
+      throw new Error();
+    }
+
+    /** If the parent is undefined, we are processing the root. */
+    if (parent === undefined) {
+      yield {
+        process,
+        width,
+        parent: null,
+        parentWidth: null,
+        isOnlyChild: null,
+        firstChildWidth: null,
+        lastChildWidth: null,
+      };
+    } else {
+      const parentWidth = widths.get(parent);
+
+      if (parentWidth === undefined) {
+        /**
+         * All widths have been precalcluated, so this will not happen.
+         */
+        throw new Error();
+      }
+
+      const metadata: Partial<ProcessWithWidthMetadata> = {
+        process,
+        width,
+        parent,
+        parentWidth,
+      };
+
+      const siblings = model.children(tree, parent);
+      if (siblings.length === 1) {
+        metadata.isOnlyChild = true;
+        metadata.lastChildWidth = width;
+        metadata.firstChildWidth = width;
+      } else {
+        const firstChildWidth = widths.get(siblings[0]);
+        const lastChildWidth = widths.get(siblings[siblings.length - 1]);
+        if (firstChildWidth === undefined || lastChildWidth === undefined) {
+          /**
+           * All widths have been precalcluated, so this will not happen.
+           */
+          throw new Error();
+        }
+        metadata.isOnlyChild = false;
+        metadata.firstChildWidth = firstChildWidth;
+        metadata.lastChildWidth = lastChildWidth;
+      }
+
+      yield metadata as ProcessWithWidthMetadata;
+    }
+  }
+}
+
+/**
+ * An isometric projection is a method for representing three dimensional objects in 2 dimensions.
+ * More information about isometric projections can be found here https://en.wikipedia.org/wiki/Isometric_projection.
+ * In our case, we obtain the isometric projection by rotating the objects 45 degrees in the plane of the screen
+ * and arctan(1/sqrt(2)) (~35.3 degrees) through the horizontal axis.
+ *
+ * A rotation by 45 degrees in the plane of the screen is given by:
+ * [ sqrt(2)/2   -sqrt(2)/2   0
+ *   sqrt(2)/2    sqrt(2)/2   0
+ *   0            0           1]
+ *
+ * A rotation by arctan(1/sqrt(2)) through the horizantal axis is given by:
+ * [ 1      0          0
+ *   0      sqrt(3)/3  -sqrt(6)/3
+ *   0      sqrt(6)/3  sqrt(3)/3]
+ *
+ * We can multiply both of these matrices to get the final transformation below.
+ */
+/* prettier-ignore */
+const isometricTransformMatrix: Matrix3 = [
+  Math.sqrt(2) / 2,   -(Math.sqrt(2) / 2),  0,
+  Math.sqrt(6) / 6,   Math.sqrt(6) / 6,     -(Math.sqrt(6) / 3),
+  0,                  0,                    1,
+]
+
+const unit = 140;
+const distanceBetweenNodesInUnits = 2;
+
+/**
+ * The distance in pixels (at scale 1) between nodes. Change this to space out nodes more
+ */
+const distanceBetweenNodes = distanceBetweenNodesInUnits * unit;
diff --git a/x-pack/plugins/security_solution/public/resolver/lib/matrix3.test.ts b/x-pack/plugins/security_solution/public/resolver/models/matrix3.test.ts
similarity index 100%
rename from x-pack/plugins/security_solution/public/resolver/lib/matrix3.test.ts
rename to x-pack/plugins/security_solution/public/resolver/models/matrix3.test.ts
diff --git a/x-pack/plugins/security_solution/public/resolver/lib/matrix3.ts b/x-pack/plugins/security_solution/public/resolver/models/matrix3.ts
similarity index 100%
rename from x-pack/plugins/security_solution/public/resolver/lib/matrix3.ts
rename to x-pack/plugins/security_solution/public/resolver/models/matrix3.ts
diff --git a/x-pack/plugins/security_solution/public/resolver/models/resolver_tree.ts b/x-pack/plugins/security_solution/public/resolver/models/resolver_tree.ts
new file mode 100644
index 00000000000000..cf32988a856b2c
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/models/resolver_tree.ts
@@ -0,0 +1,125 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  ResolverTree,
+  ResolverEvent,
+  ResolverNodeStats,
+  ResolverLifecycleNode,
+} from '../../../common/endpoint/types';
+import { uniquePidForProcess } from './process_event';
+
+/**
+ * ResolverTree is a type returned by the server.
+ */
+
+/**
+ * This returns the 'LifecycleNodes' of the tree. These nodes have
+ * the entityID and stats for a process. Used by `relatedEventsStats`.
+ */
+function lifecycleNodes(tree: ResolverTree): ResolverLifecycleNode[] {
+  return [tree, ...tree.children.childNodes, ...tree.ancestry.ancestors];
+}
+
+/**
+ * All the process events
+ */
+export function lifecycleEvents(tree: ResolverTree) {
+  const events: ResolverEvent[] = [...tree.lifecycle];
+  for (const { lifecycle } of tree.children.childNodes) {
+    events.push(...lifecycle);
+  }
+  for (const { lifecycle } of tree.ancestry.ancestors) {
+    events.push(...lifecycle);
+  }
+  return events;
+}
+
+/**
+ * This returns a map of entity_ids to stats for the related events and alerts.
+ */
+export function relatedEventsStats(tree: ResolverTree): Map<string, ResolverNodeStats> {
+  const nodeStats: Map<string, ResolverNodeStats> = new Map();
+  for (const node of lifecycleNodes(tree)) {
+    if (node.stats) {
+      nodeStats.set(node.entityID, node.stats);
+    }
+  }
+  return nodeStats;
+}
+
+/**
+ * ResolverTree type is returned by the server. It organizes events into a complex structure. The
+ * organization of events in the tree is done to associate metadata with the events. The client does not
+ * use this metadata. Instead, the client flattens the tree into an array. Therefore we can safely
+ * make a malformed ResolverTree for the purposes of the tests, so long as it is flattened in a predictable way.
+ */
+export function mock({
+  events,
+  cursors = { childrenNextChild: null, ancestryNextAncestor: null },
+}: {
+  /**
+   * Events represented by the ResolverTree.
+   */
+  events: ResolverEvent[];
+  /**
+   * Optionally provide cursors for the 'children' and 'ancestry' edges.
+   */
+  cursors?: { childrenNextChild: string | null; ancestryNextAncestor: string | null };
+}): ResolverTree | null {
+  if (events.length === 0) {
+    return null;
+  }
+  const first = events[0];
+  return {
+    entityID: uniquePidForProcess(first),
+    // Required
+    children: {
+      childNodes: [],
+      nextChild: cursors.childrenNextChild,
+    },
+    // Required
+    relatedEvents: {
+      events: [],
+      nextEvent: null,
+    },
+    // Required
+    relatedAlerts: {
+      alerts: [],
+      nextAlert: null,
+    },
+    // Required
+    ancestry: {
+      ancestors: [],
+      nextAncestor: cursors.ancestryNextAncestor,
+    },
+    // Normally, this would have only certain events, but for testing purposes, it will have all events, since
+    // the position of events in the ResolverTree is irrelevant.
+    lifecycle: events,
+    // Required
+    stats: {
+      events: {
+        total: 0,
+        byCategory: {},
+      },
+      totalAlerts: 0,
+    },
+  };
+}
+
+/**
+ * `true` if there are more children to fetch.
+ */
+export function hasMoreChildren(resolverTree: ResolverTree): boolean {
+  return resolverTree.children.nextChild !== null;
+}
+
+/**
+ * `true` if there are more ancestors to fetch.
+ */
+export function hasMoreAncestors(resolverTree: ResolverTree): boolean {
+  return resolverTree.ancestry.nextAncestor !== null;
+}
diff --git a/x-pack/plugins/security_solution/public/resolver/lib/vector2.ts b/x-pack/plugins/security_solution/public/resolver/models/vector2.ts
similarity index 100%
rename from x-pack/plugins/security_solution/public/resolver/lib/vector2.ts
rename to x-pack/plugins/security_solution/public/resolver/models/vector2.ts
diff --git a/x-pack/plugins/security_solution/public/resolver/store/actions.ts b/x-pack/plugins/security_solution/public/resolver/store/actions.ts
index ae302d0e609116..5292cbb6445dce 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/actions.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/actions.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { CameraAction } from './camera';
-import { DataAction } from './data';
 import { ResolverEvent } from '../../../common/endpoint/types';
+import { DataAction } from './data/action';
 
 /**
  * When the user wants to bring a process node front-and-center on the map.
@@ -53,26 +53,6 @@ interface AppDetectedNewIdFromQueryParams {
   };
 }
 
-/**
- * Used when the alert list selects an alert and the flyout shows resolver.
- */
-interface UserChangedSelectedEvent {
-  readonly type: 'userChangedSelectedEvent';
-  readonly payload: {
-    /**
-     * Optional because they could have unselected the event.
-     */
-    readonly selectedEvent?: ResolverEvent;
-  };
-}
-
-/**
- * Triggered by middleware when the data for resolver needs to be loaded. Used to set state in redux to 'loading'.
- */
-interface AppRequestedResolverData {
-  readonly type: 'appRequestedResolverData';
-}
-
 /**
  * The action dispatched when the app requests related event data for one
  * subject (whose entity_id should be included as `payload`)
@@ -145,8 +125,6 @@ export type ResolverAction =
   | CameraAction
   | DataAction
   | UserBroughtProcessIntoView
-  | UserChangedSelectedEvent
-  | AppRequestedResolverData
   | UserFocusedOnResolverNode
   | UserSelectedResolverNode
   | UserRequestedRelatedEventData
diff --git a/x-pack/plugins/security_solution/public/resolver/store/camera/animation.test.ts b/x-pack/plugins/security_solution/public/resolver/store/camera/animation.test.ts
index 92cbd95bcf5a86..50f4ffd0137dc1 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/camera/animation.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/camera/animation.test.ts
@@ -6,10 +6,11 @@
 
 import { createStore, Store, Reducer } from 'redux';
 import { cameraReducer, cameraInitialState } from './reducer';
-import { CameraState, Vector2, ResolverAction } from '../../types';
+import { CameraState, Vector2 } from '../../types';
 import * as selectors from './selectors';
 import { animatePanning } from './methods';
 import { lerp } from '../../lib/math';
+import { ResolverAction } from '../actions';
 
 type TestAction =
   | ResolverAction
diff --git a/x-pack/plugins/security_solution/public/resolver/store/camera/inverse_projection_matrix.test.ts b/x-pack/plugins/security_solution/public/resolver/store/camera/inverse_projection_matrix.test.ts
index 000dbb8d52841d..4eda0743636477 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/camera/inverse_projection_matrix.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/camera/inverse_projection_matrix.test.ts
@@ -9,7 +9,7 @@ import { CameraAction } from './action';
 import { CameraState } from '../../types';
 import { cameraReducer } from './reducer';
 import { inverseProjectionMatrix } from './selectors';
-import { applyMatrix3 } from '../../lib/vector2';
+import { applyMatrix3 } from '../../models/vector2';
 import { scaleToZoom } from './scale_to_zoom';
 
 describe('inverseProjectionMatrix', () => {
diff --git a/x-pack/plugins/security_solution/public/resolver/store/camera/methods.ts b/x-pack/plugins/security_solution/public/resolver/store/camera/methods.ts
index 3288b91ffbb508..a1410430049c44 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/camera/methods.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/camera/methods.ts
@@ -6,7 +6,7 @@
 
 import { translation } from './selectors';
 import { CameraState, Vector2 } from '../../types';
-import { distance } from '../../lib/vector2';
+import { distance } from '../../models/vector2';
 
 /**
  * Return a new `CameraState` with the `animation` property
diff --git a/x-pack/plugins/security_solution/public/resolver/store/camera/projection_matrix.test.ts b/x-pack/plugins/security_solution/public/resolver/store/camera/projection_matrix.test.ts
index e868424d06c94d..63abb57626e93c 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/camera/projection_matrix.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/camera/projection_matrix.test.ts
@@ -9,7 +9,7 @@ import { CameraAction } from './action';
 import { CameraState } from '../../types';
 import { cameraReducer } from './reducer';
 import { projectionMatrix } from './selectors';
-import { applyMatrix3 } from '../../lib/vector2';
+import { applyMatrix3 } from '../../models/vector2';
 import { scaleToZoom } from './scale_to_zoom';
 
 describe('projectionMatrix', () => {
diff --git a/x-pack/plugins/security_solution/public/resolver/store/camera/reducer.ts b/x-pack/plugins/security_solution/public/resolver/store/camera/reducer.ts
index 0f6ae1b7d904a8..03b0e3e11c4fc0 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/camera/reducer.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/camera/reducer.ts
@@ -7,12 +7,13 @@
 import { Reducer } from 'redux';
 import { unitsPerNudge, nudgeAnimationDuration } from './scaling_constants';
 import { animatePanning } from './methods';
-import * as vector2 from '../../lib/vector2';
+import * as vector2 from '../../models/vector2';
 import * as selectors from './selectors';
 import { clamp } from '../../lib/math';
 
-import { CameraState, ResolverAction, Vector2 } from '../../types';
+import { CameraState, Vector2 } from '../../types';
 import { scaleToZoom } from './scale_to_zoom';
+import { ResolverAction } from '../actions';
 
 /**
  * Used in tests.
diff --git a/x-pack/plugins/security_solution/public/resolver/store/camera/selectors.ts b/x-pack/plugins/security_solution/public/resolver/store/camera/selectors.ts
index 49c157ec8e0f50..86d934bd956637 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/camera/selectors.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/camera/selectors.ts
@@ -7,8 +7,8 @@
 import { createSelector, defaultMemoize } from 'reselect';
 import { easing } from 'ts-easing';
 import { clamp, lerp } from '../../lib/math';
-import * as vector2 from '../../lib/vector2';
-import { multiply, add as addMatrix } from '../../lib/matrix3';
+import * as vector2 from '../../models/vector2';
+import { multiply, add as addMatrix } from '../../models/matrix3';
 import {
   inverseOrthographicProjection,
   scalingTransformation,
diff --git a/x-pack/plugins/security_solution/public/resolver/store/camera/zooming.test.ts b/x-pack/plugins/security_solution/public/resolver/store/camera/zooming.test.ts
index ff03b0baf01aaf..3b6749cf841fae 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/camera/zooming.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/camera/zooming.test.ts
@@ -11,7 +11,7 @@ import { CameraState, AABB } from '../../types';
 import { viewableBoundingBox, inverseProjectionMatrix, scalingFactor } from './selectors';
 import { expectVectorsToBeClose } from './test_helpers';
 import { scaleToZoom } from './scale_to_zoom';
-import { applyMatrix3 } from '../../lib/vector2';
+import { applyMatrix3 } from '../../models/vector2';
 
 describe('zooming', () => {
   let store: Store<CameraState, CameraAction>;
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/action.ts b/x-pack/plugins/security_solution/public/resolver/store/data/action.ts
index 3de6f08f5e0154..0d2a6936b4873d 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/action.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/action.ts
@@ -4,23 +4,44 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  ResolverEvent,
-  ResolverNodeStats,
-  ResolverRelatedEvents,
-} from '../../../../common/endpoint/types';
+import { ResolverRelatedEvents, ResolverTree } from '../../../../common/endpoint/types';
 
 interface ServerReturnedResolverData {
   readonly type: 'serverReturnedResolverData';
   readonly payload: {
-    readonly events: Readonly<ResolverEvent[]>;
-    readonly stats: Readonly<Map<string, ResolverNodeStats>>;
-    readonly lineageLimits: { readonly children: string | null; readonly ancestors: string | null };
+    /**
+     * The result of fetching data
+     */
+    result: ResolverTree;
+    /**
+     * The database document ID that was used to fetch the resolver tree
+     */
+    databaseDocumentID: string;
   };
 }
 
+interface AppRequestedResolverData {
+  readonly type: 'appRequestedResolverData';
+  /**
+   * entity ID used to make the request.
+   */
+  readonly payload: string;
+}
+
 interface ServerFailedToReturnResolverData {
   readonly type: 'serverFailedToReturnResolverData';
+  /**
+   * entity ID used to make the failed request
+   */
+  readonly payload: string;
+}
+
+interface AppAbortedResolverDataRequest {
+  readonly type: 'appAbortedResolverDataRequest';
+  /**
+   * entity ID used to make the aborted request
+   */
+  readonly payload: string;
 }
 
 /**
@@ -39,8 +60,29 @@ interface ServerReturnedRelatedEventData {
   readonly payload: ResolverRelatedEvents;
 }
 
+/**
+ * Used by `useStateSyncingActions` hook.
+ * This is dispatched when external sources provide new parameters for Resolver.
+ * When the component receives a new 'databaseDocumentID' prop, this is fired.
+ */
+interface AppReceivedNewExternalProperties {
+  type: 'appReceivedNewExternalProperties';
+  /**
+   * Defines the externally provided properties that Resolver acknowledges.
+   */
+  payload: {
+    /**
+     * the `_id` of an ES document. This defines the origin of the Resolver graph.
+     */
+    databaseDocumentID?: string;
+  };
+}
+
 export type DataAction =
   | ServerReturnedResolverData
   | ServerFailedToReturnResolverData
   | ServerFailedToReturnRelatedEventData
-  | ServerReturnedRelatedEventData;
+  | ServerReturnedRelatedEventData
+  | AppReceivedNewExternalProperties
+  | AppRequestedResolverData
+  | AppAbortedResolverDataRequest;
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/graphing.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/graphing.test.ts
deleted file mode 100644
index 163846e0414dbf..00000000000000
--- a/x-pack/plugins/security_solution/public/resolver/store/data/graphing.test.ts
+++ /dev/null
@@ -1,251 +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 { Store, createStore } from 'redux';
-import { DataAction } from './action';
-import { dataReducer } from './reducer';
-import { DataState } from '../../types';
-import { LegacyEndpointEvent, ResolverEvent } from '../../../../common/endpoint/types';
-import {
-  graphableProcesses,
-  processNodePositionsAndEdgeLineSegments,
-  limitsReached,
-} from './selectors';
-import { mockProcessEvent } from '../../models/process_event_test_helpers';
-import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
-
-describe('resolver graph layout', () => {
-  let processA: LegacyEndpointEvent;
-  let processB: LegacyEndpointEvent;
-  let processC: LegacyEndpointEvent;
-  let processD: LegacyEndpointEvent;
-  let processE: LegacyEndpointEvent;
-  let processF: LegacyEndpointEvent;
-  let processG: LegacyEndpointEvent;
-  let processH: LegacyEndpointEvent;
-  let processI: LegacyEndpointEvent;
-  let store: Store<DataState, DataAction>;
-
-  beforeEach(() => {
-    /*
-     *          A
-     *      ____|____
-     *     |         |
-     *     B         C
-     *  ___|___   ___|___
-     * |       | |       |
-     * D       E F       G
-     *                   |
-     *                   H
-     *
-     */
-    processA = mockProcessEvent({
-      endgame: {
-        process_name: '',
-        event_type_full: 'process_event',
-        event_subtype_full: 'creation_event',
-        unique_pid: 0,
-      },
-    });
-    processB = mockProcessEvent({
-      endgame: {
-        event_type_full: 'process_event',
-        event_subtype_full: 'already_running',
-        unique_pid: 1,
-        unique_ppid: 0,
-      },
-    });
-    processC = mockProcessEvent({
-      endgame: {
-        event_type_full: 'process_event',
-        event_subtype_full: 'creation_event',
-        unique_pid: 2,
-        unique_ppid: 0,
-      },
-    });
-    processD = mockProcessEvent({
-      endgame: {
-        event_type_full: 'process_event',
-        event_subtype_full: 'creation_event',
-        unique_pid: 3,
-        unique_ppid: 1,
-      },
-    });
-    processE = mockProcessEvent({
-      endgame: {
-        event_type_full: 'process_event',
-        event_subtype_full: 'creation_event',
-        unique_pid: 4,
-        unique_ppid: 1,
-      },
-    });
-    processF = mockProcessEvent({
-      endgame: {
-        event_type_full: 'process_event',
-        event_subtype_full: 'creation_event',
-        unique_pid: 5,
-        unique_ppid: 2,
-      },
-    });
-    processG = mockProcessEvent({
-      endgame: {
-        event_type_full: 'process_event',
-        event_subtype_full: 'creation_event',
-        unique_pid: 6,
-        unique_ppid: 2,
-      },
-    });
-    processH = mockProcessEvent({
-      endgame: {
-        event_type_full: 'process_event',
-        event_subtype_full: 'creation_event',
-        unique_pid: 7,
-        unique_ppid: 6,
-      },
-    });
-    processI = mockProcessEvent({
-      endgame: {
-        event_type_full: 'process_event',
-        event_subtype_full: 'termination_event',
-        unique_pid: 8,
-        unique_ppid: 0,
-      },
-    });
-    store = createStore(dataReducer, undefined);
-  });
-  describe('when rendering no nodes', () => {
-    beforeEach(() => {
-      const events: ResolverEvent[] = [];
-      const action: DataAction = {
-        type: 'serverReturnedResolverData',
-        payload: { events, stats: new Map(), lineageLimits: { children: null, ancestors: null } },
-      };
-      store.dispatch(action);
-    });
-    it('the graphableProcesses list should only include nothing', () => {
-      const actual = graphableProcesses(store.getState());
-      expect(actual).toEqual([]);
-    });
-    it('renders right', () => {
-      expect(processNodePositionsAndEdgeLineSegments(store.getState())).toMatchSnapshot();
-    });
-  });
-  describe('when rendering one node', () => {
-    beforeEach(() => {
-      const events = [processA];
-      const action: DataAction = {
-        type: 'serverReturnedResolverData',
-        payload: { events, stats: new Map(), lineageLimits: { children: null, ancestors: null } },
-      };
-      store.dispatch(action);
-    });
-    it('the graphableProcesses list should only include nothing', () => {
-      const actual = graphableProcesses(store.getState());
-      expect(actual).toEqual([processA]);
-    });
-    it('renders right', () => {
-      expect(processNodePositionsAndEdgeLineSegments(store.getState())).toMatchSnapshot();
-    });
-  });
-  describe('when rendering two nodes, one being the parent of the other', () => {
-    beforeEach(() => {
-      const events = [processA, processB];
-      const action: DataAction = {
-        type: 'serverReturnedResolverData',
-        payload: { events, stats: new Map(), lineageLimits: { children: null, ancestors: null } },
-      };
-      store.dispatch(action);
-    });
-    it('the graphableProcesses list should only include nothing', () => {
-      const actual = graphableProcesses(store.getState());
-      expect(actual).toEqual([processA, processB]);
-    });
-    it('renders right', () => {
-      expect(processNodePositionsAndEdgeLineSegments(store.getState())).toMatchSnapshot();
-    });
-  });
-  describe('when rendering two forks, and one fork has an extra long tine', () => {
-    beforeEach(() => {
-      const events = [
-        processA,
-        processB,
-        processC,
-        processD,
-        processE,
-        processF,
-        processG,
-        processH,
-        processI,
-      ];
-      const action: DataAction = {
-        type: 'serverReturnedResolverData',
-        payload: { events, stats: new Map(), lineageLimits: { children: null, ancestors: null } },
-      };
-      store.dispatch(action);
-    });
-    it("the graphableProcesses list should only include events with 'processCreated' an 'processRan' eventType", () => {
-      const actual = graphableProcesses(store.getState());
-      expect(actual).toEqual([
-        processA,
-        processB,
-        processC,
-        processD,
-        processE,
-        processF,
-        processG,
-        processH,
-      ]);
-    });
-    it('renders right', () => {
-      expect(processNodePositionsAndEdgeLineSegments(store.getState())).toMatchSnapshot();
-    });
-  });
-});
-
-describe('resolver graph with too much lineage', () => {
-  let generator: EndpointDocGenerator;
-  let store: Store<DataState, DataAction>;
-  let allEvents: ResolverEvent[];
-  let childrenCursor: string;
-  let ancestorCursor: string;
-
-  beforeEach(() => {
-    generator = new EndpointDocGenerator('seed');
-    allEvents = generator.generateTree({ ancestors: 1, generations: 2, children: 2 }).allEvents;
-    childrenCursor = 'aValidChildursor';
-    ancestorCursor = 'aValidAncestorCursor';
-    store = createStore(dataReducer, undefined);
-  });
-
-  describe('should select from state properly', () => {
-    it('should indicate there are too many ancestors', () => {
-      const action: DataAction = {
-        type: 'serverReturnedResolverData',
-        payload: {
-          events: allEvents,
-          stats: new Map(),
-          lineageLimits: { children: childrenCursor, ancestors: ancestorCursor },
-        },
-      };
-      store.dispatch(action);
-      const { ancestors } = limitsReached(store.getState());
-      expect(ancestors).toEqual(true);
-    });
-    it('should indicate there are too many children', () => {
-      const action: DataAction = {
-        type: 'serverReturnedResolverData',
-        payload: {
-          events: allEvents,
-          stats: new Map(),
-          lineageLimits: { children: childrenCursor, ancestors: ancestorCursor },
-        },
-      };
-      store.dispatch(action);
-      const { children } = limitsReached(store.getState());
-      expect(children).toEqual(true);
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts
new file mode 100644
index 00000000000000..e6cd72ae0924be
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { createStore, Store } from 'redux';
+import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
+import { mock as mockResolverTree } from '../../models/resolver_tree';
+import { dataReducer } from './reducer';
+import * as selectors from './selectors';
+import { DataState } from '../../types';
+import { DataAction } from './action';
+
+/**
+ * Test the data reducer and selector.
+ */
+describe('Resolver Data Middleware', () => {
+  let store: Store<DataState, DataAction>;
+
+  beforeEach(() => {
+    store = createStore(dataReducer, undefined);
+  });
+
+  describe('when data was received and the ancestry and children edges had cursors', () => {
+    beforeEach(() => {
+      const generator = new EndpointDocGenerator('seed');
+      const tree = mockResolverTree({
+        events: generator.generateTree({ ancestors: 1, generations: 2, children: 2 }).allEvents,
+        cursors: {
+          childrenNextChild: 'aValidChildursor',
+          ancestryNextAncestor: 'aValidAncestorCursor',
+        },
+      });
+      if (tree) {
+        const action: DataAction = {
+          type: 'serverReturnedResolverData',
+          payload: {
+            result: tree,
+            databaseDocumentID: '',
+          },
+        };
+        store.dispatch(action);
+      }
+    });
+    it('should indicate there are additional ancestor', () => {
+      expect(selectors.hasMoreAncestors(store.getState())).toBe(true);
+    });
+    it('should indicate there are additional children', () => {
+      expect(selectors.hasMoreChildren(store.getState())).toBe(true);
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/reducer.ts b/x-pack/plugins/security_solution/public/resolver/store/data/reducer.ts
index a36d43b70b87d7..45bf214005872c 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/reducer.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/reducer.ts
@@ -5,41 +5,72 @@
  */
 
 import { Reducer } from 'redux';
-import { DataState, ResolverAction } from '../../types';
+import { DataState } from '../../types';
+import { ResolverAction } from '../actions';
 
-function initialState(): DataState {
-  return {
-    results: [],
-    relatedEventsStats: new Map(),
-    relatedEvents: new Map(),
-    relatedEventsReady: new Map(),
-    lineageLimits: { children: null, ancestors: null },
-    isLoading: false,
-    hasError: false,
-  };
-}
+const initialState: DataState = {
+  relatedEventsStats: new Map(),
+  relatedEvents: new Map(),
+  relatedEventsReady: new Map(),
+};
 
-export const dataReducer: Reducer<DataState, ResolverAction> = (state = initialState(), action) => {
-  if (action.type === 'serverReturnedResolverData') {
-    return {
+export const dataReducer: Reducer<DataState, ResolverAction> = (state = initialState, action) => {
+  if (action.type === 'appReceivedNewExternalProperties') {
+    const nextState: DataState = {
       ...state,
-      results: action.payload.events,
-      relatedEventsStats: action.payload.stats,
-      lineageLimits: action.payload.lineageLimits,
-      isLoading: false,
-      hasError: false,
+      databaseDocumentID: action.payload.databaseDocumentID,
     };
+    return nextState;
   } else if (action.type === 'appRequestedResolverData') {
+    // keep track of what we're requesting, this way we know when to request and when not to.
     return {
       ...state,
-      isLoading: true,
-      hasError: false,
+      pendingRequestDatabaseDocumentID: action.payload,
     };
-  } else if (action.type === 'serverFailedToReturnResolverData') {
-    return {
+  } else if (action.type === 'appAbortedResolverDataRequest') {
+    if (action.payload === state.pendingRequestDatabaseDocumentID) {
+      // the request we were awaiting was aborted
+      return {
+        ...state,
+        pendingRequestDatabaseDocumentID: undefined,
+      };
+    } else {
+      return state;
+    }
+  } else if (action.type === 'serverReturnedResolverData') {
+    /** Only handle this if we are expecting a response */
+    const nextState: DataState = {
       ...state,
-      hasError: true,
+
+      /**
+       * Store the last received data, as well as the databaseDocumentID it relates to.
+       */
+      lastResponse: {
+        result: action.payload.result,
+        databaseDocumentID: action.payload.databaseDocumentID,
+        successful: true,
+      },
+
+      // This assumes that if we just received something, there is no longer a pending request.
+      // This cannot model multiple in-flight requests
+      pendingRequestDatabaseDocumentID: undefined,
     };
+    return nextState;
+  } else if (action.type === 'serverFailedToReturnResolverData') {
+    /** Only handle this if we are expecting a response */
+    if (state.pendingRequestDatabaseDocumentID !== undefined) {
+      const nextState: DataState = {
+        ...state,
+        pendingRequestDatabaseDocumentID: undefined,
+        lastResponse: {
+          databaseDocumentID: state.pendingRequestDatabaseDocumentID,
+          successful: false,
+        },
+      };
+      return nextState;
+    } else {
+      return state;
+    }
   } else if (
     action.type === 'userRequestedRelatedEventData' ||
     action.type === 'appDetectedMissingEventData'
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
new file mode 100644
index 00000000000000..630dfe555548f3
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
@@ -0,0 +1,253 @@
+/*
+ * 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 * as selectors from './selectors';
+import { DataState } from '../../types';
+import { dataReducer } from './reducer';
+import { DataAction } from './action';
+import { createStore } from 'redux';
+describe('data state', () => {
+  let actions: DataAction[] = [];
+
+  /**
+   * Get state, given an ordered collection of actions.
+   */
+  const state: () => DataState = () => {
+    const store = createStore(dataReducer);
+    for (const action of actions) {
+      store.dispatch(action);
+    }
+    return store.getState();
+  };
+
+  /**
+   * This prints out all of the properties of the data state.
+   * This way we can see the overall behavior of the selector easily.
+   */
+  const viewAsAString = (dataState: DataState) => {
+    return [
+      ['is loading', selectors.isLoading(dataState)],
+      ['has an error', selectors.hasError(dataState)],
+      ['has more children', selectors.hasMoreChildren(dataState)],
+      ['has more ancestors', selectors.hasMoreAncestors(dataState)],
+      ['document to fetch', selectors.databaseDocumentIDToFetch(dataState)],
+      ['requires a pending request to be aborted', selectors.databaseDocumentIDToAbort(dataState)],
+    ]
+      .map(([message, value]) => `${message}: ${JSON.stringify(value)}`)
+      .join('\n');
+  };
+
+  it(`shouldn't initially be loading, or have an error, or have more children or ancestors, or have a document to fetch, or have a pending request that needs to be aborted.`, () => {
+    expect(viewAsAString(state())).toMatchInlineSnapshot(`
+      "is loading: false
+      has an error: false
+      has more children: false
+      has more ancestors: false
+      document to fetch: null
+      requires a pending request to be aborted: null"
+    `);
+  });
+
+  describe('when there is a databaseDocumentID but no pending request', () => {
+    const databaseDocumentID = 'databaseDocumentID';
+    beforeEach(() => {
+      actions = [
+        {
+          type: 'appReceivedNewExternalProperties',
+          payload: { databaseDocumentID },
+        },
+      ];
+    });
+    it('should need to fetch the databaseDocumentID', () => {
+      expect(selectors.databaseDocumentIDToFetch(state())).toBe(databaseDocumentID);
+    });
+    it('should not be loading, have an error, have more children or ancestors, or have a pending request that needs to be aborted.', () => {
+      expect(viewAsAString(state())).toMatchInlineSnapshot(`
+        "is loading: false
+        has an error: false
+        has more children: false
+        has more ancestors: false
+        document to fetch: \\"databaseDocumentID\\"
+        requires a pending request to be aborted: null"
+      `);
+    });
+  });
+  describe('when there is a pending request but no databaseDocumentID', () => {
+    const databaseDocumentID = 'databaseDocumentID';
+    beforeEach(() => {
+      actions = [
+        {
+          type: 'appRequestedResolverData',
+          payload: databaseDocumentID,
+        },
+      ];
+    });
+    it('should be loading', () => {
+      expect(selectors.isLoading(state())).toBe(true);
+    });
+    it('should have a request to abort', () => {
+      expect(selectors.databaseDocumentIDToAbort(state())).toBe(databaseDocumentID);
+    });
+    it('should not have an error, more children, more ancestors, or a document to fetch.', () => {
+      expect(viewAsAString(state())).toMatchInlineSnapshot(`
+        "is loading: true
+        has an error: false
+        has more children: false
+        has more ancestors: false
+        document to fetch: null
+        requires a pending request to be aborted: \\"databaseDocumentID\\""
+      `);
+    });
+  });
+  describe('when there is a pending request for the current databaseDocumentID', () => {
+    const databaseDocumentID = 'databaseDocumentID';
+    beforeEach(() => {
+      actions = [
+        {
+          type: 'appReceivedNewExternalProperties',
+          payload: { databaseDocumentID },
+        },
+        {
+          type: 'appRequestedResolverData',
+          payload: databaseDocumentID,
+        },
+      ];
+    });
+    it('should be loading', () => {
+      expect(selectors.isLoading(state())).toBe(true);
+    });
+    it('should not have a request to abort', () => {
+      expect(selectors.databaseDocumentIDToAbort(state())).toBe(null);
+    });
+    it('should not have an error, more children, more ancestors, a document to begin fetching, or a pending request that should be aborted.', () => {
+      expect(viewAsAString(state())).toMatchInlineSnapshot(`
+        "is loading: true
+        has an error: false
+        has more children: false
+        has more ancestors: false
+        document to fetch: null
+        requires a pending request to be aborted: null"
+      `);
+    });
+    describe('when the pending request fails', () => {
+      beforeEach(() => {
+        actions.push({
+          type: 'serverFailedToReturnResolverData',
+          payload: databaseDocumentID,
+        });
+      });
+      it('should not be loading', () => {
+        expect(selectors.isLoading(state())).toBe(false);
+      });
+      it('should have an error', () => {
+        expect(selectors.hasError(state())).toBe(true);
+      });
+      it('should not be loading, have more children, have more ancestors, have a document to fetch, or have a pending request that needs to be aborted.', () => {
+        expect(viewAsAString(state())).toMatchInlineSnapshot(`
+          "is loading: false
+          has an error: true
+          has more children: false
+          has more ancestors: false
+          document to fetch: null
+          requires a pending request to be aborted: null"
+        `);
+      });
+    });
+  });
+  describe('when there is a pending request for a different databaseDocumentID than the current one', () => {
+    const firstDatabaseDocumentID = 'first databaseDocumentID';
+    const secondDatabaseDocumentID = 'second databaseDocumentID';
+    beforeEach(() => {
+      actions = [
+        // receive the document ID, this would cause the middleware to starts the request
+        {
+          type: 'appReceivedNewExternalProperties',
+          payload: { databaseDocumentID: firstDatabaseDocumentID },
+        },
+        // this happens when the middleware starts the request
+        {
+          type: 'appRequestedResolverData',
+          payload: firstDatabaseDocumentID,
+        },
+        // receive a different databaseDocumentID. this should cause the middleware to abort the existing request and start a new one
+        {
+          type: 'appReceivedNewExternalProperties',
+          payload: { databaseDocumentID: secondDatabaseDocumentID },
+        },
+      ];
+    });
+    it('should be loading', () => {
+      expect(selectors.isLoading(state())).toBe(true);
+    });
+    it('should need to fetch the second databaseDocumentID', () => {
+      expect(selectors.databaseDocumentIDToFetch(state())).toBe(secondDatabaseDocumentID);
+    });
+    it('should need to abort the request for the databaseDocumentID', () => {
+      expect(selectors.databaseDocumentIDToFetch(state())).toBe(secondDatabaseDocumentID);
+    });
+    it('should not have an error, more children, or more ancestors.', () => {
+      expect(viewAsAString(state())).toMatchInlineSnapshot(`
+        "is loading: true
+        has an error: false
+        has more children: false
+        has more ancestors: false
+        document to fetch: \\"second databaseDocumentID\\"
+        requires a pending request to be aborted: \\"first databaseDocumentID\\""
+      `);
+    });
+    describe('and when the old request was aborted', () => {
+      beforeEach(() => {
+        actions.push({
+          type: 'appAbortedResolverDataRequest',
+          payload: firstDatabaseDocumentID,
+        });
+      });
+      it('should not require a pending request to be aborted', () => {
+        expect(selectors.databaseDocumentIDToAbort(state())).toBe(null);
+      });
+      it('should have a document to fetch', () => {
+        expect(selectors.databaseDocumentIDToFetch(state())).toBe(secondDatabaseDocumentID);
+      });
+      it('should not be loading', () => {
+        expect(selectors.isLoading(state())).toBe(false);
+      });
+      it('should not have an error, more children, or more ancestors.', () => {
+        expect(viewAsAString(state())).toMatchInlineSnapshot(`
+          "is loading: false
+          has an error: false
+          has more children: false
+          has more ancestors: false
+          document to fetch: \\"second databaseDocumentID\\"
+          requires a pending request to be aborted: null"
+        `);
+      });
+      describe('and when the next request starts', () => {
+        beforeEach(() => {
+          actions.push({
+            type: 'appRequestedResolverData',
+            payload: secondDatabaseDocumentID,
+          });
+        });
+        it('should not have a document ID to fetch', () => {
+          expect(selectors.databaseDocumentIDToFetch(state())).toBe(null);
+        });
+        it('should be loading', () => {
+          expect(selectors.isLoading(state())).toBe(true);
+        });
+        it('should not have an error, more children, more ancestors, or a pending request that needs to be aborted.', () => {
+          expect(viewAsAString(state())).toMatchInlineSnapshot(`
+            "is loading: true
+            has an error: false
+            has more children: false
+            has more ancestors: false
+            document to fetch: null
+            requires a pending request to be aborted: null"
+          `);
+        });
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts
index 5654f1ca423f33..e45101e97e6c13 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts
@@ -8,449 +8,92 @@ import rbush from 'rbush';
 import { createSelector } from 'reselect';
 import {
   DataState,
-  IndexedProcessTree,
-  ProcessWidths,
-  ProcessPositions,
-  EdgeLineSegment,
-  ProcessWithWidthMetadata,
-  Matrix3,
   AdjacentProcessMap,
   Vector2,
-  EdgeLineMetadata,
   IndexedEntity,
   IndexedEdgeLineSegment,
   IndexedProcessNode,
   AABB,
   VisibleEntites,
 } from '../../types';
-import { ResolverEvent } from '../../../../common/endpoint/types';
-import * as event from '../../../../common/endpoint/models/event';
-import { add as vector2Add, applyMatrix3 } from '../../lib/vector2';
 import {
   isGraphableProcess,
   isTerminatedProcess,
   uniquePidForProcess,
 } from '../../models/process_event';
-import {
-  factory as indexedProcessTreeFactory,
-  children as indexedProcessTreeChildren,
-  parent as indexedProcessTreeParent,
-  size,
-  levelOrder,
-} from '../../models/indexed_process_tree';
-import { getFriendlyElapsedTime } from '../../lib/date';
-import { isEqual } from '../../lib/aabb';
-
-const unit = 140;
-const distanceBetweenNodesInUnits = 2;
-
-export function isLoading(state: DataState) {
-  return state.isLoading;
-}
+import { factory as indexedProcessTreeFactory } from '../../models/indexed_process_tree';
+import { isEqual } from '../../models/aabb';
 
-export function hasError(state: DataState) {
-  return state.hasError;
-}
+import {
+  ResolverEvent,
+  ResolverTree,
+  ResolverNodeStats,
+  ResolverRelatedEvents,
+} from '../../../../common/endpoint/types';
+import * as resolverTreeModel from '../../models/resolver_tree';
+import { isometricTaxiLayout } from '../../models/indexed_process_tree/isometric_taxi_layout';
 
 /**
- * An isometric projection is a method for representing three dimensional objects in 2 dimensions.
- * More information about isometric projections can be found here https://en.wikipedia.org/wiki/Isometric_projection.
- * In our case, we obtain the isometric projection by rotating the objects 45 degrees in the plane of the screen
- * and arctan(1/sqrt(2)) (~35.3 degrees) through the horizontal axis.
- *
- * A rotation by 45 degrees in the plane of the screen is given by:
- * [ sqrt(2)/2   -sqrt(2)/2   0
- *   sqrt(2)/2    sqrt(2)/2   0
- *   0            0           1]
- *
- * A rotation by arctan(1/sqrt(2)) through the horizantal axis is given by:
- * [ 1      0          0
- *   0      sqrt(3)/3  -sqrt(6)/3
- *   0      sqrt(6)/3  sqrt(3)/3]
- *
- * We can multiply both of these matrices to get the final transformation below.
+ * If there is currently a request.
  */
-/* prettier-ignore */
-const isometricTransformMatrix: Matrix3 = [
-  Math.sqrt(2) / 2,   -(Math.sqrt(2) / 2),  0,
-  Math.sqrt(6) / 6,   Math.sqrt(6) / 6,     -(Math.sqrt(6) / 3),
-  0,                  0,                    1,
-]
+export function isLoading(state: DataState): boolean {
+  return state.pendingRequestDatabaseDocumentID !== undefined;
+}
 
 /**
- * The distance in pixels (at scale 1) between nodes. Change this to space out nodes more
+ * If a request was made and it threw an error or returned a failure response code.
  */
-const distanceBetweenNodes = distanceBetweenNodesInUnits * unit;
+export function hasError(state: DataState): boolean {
+  if (state.lastResponse && state.lastResponse.successful === false) {
+    return true;
+  } else {
+    return false;
+  }
+}
 
 /**
- * Process events that will be graphed.
+ * The last ResolverTree we received, if any. It may be stale (it might not be for the same databaseDocumentID that
+ * we're currently interested in.
  */
-export const graphableProcesses = createSelector(
-  ({ results }: DataState) => results,
-  function (results: DataState['results']) {
-    return results.filter(isGraphableProcess);
+const resolverTree = (state: DataState): ResolverTree | undefined => {
+  if (state.lastResponse && state.lastResponse.successful) {
+    return state.lastResponse.result;
+  } else {
+    return undefined;
   }
-);
+};
 
 /**
  * Process events that will be displayed as terminated.
  */
-export const terminatedProcesses = createSelector(
-  ({ results }: DataState) => results,
-  function (results: DataState['results']) {
-    return new Set(
-      results.filter(isTerminatedProcess).map((terminatedEvent) => {
+export const terminatedProcesses = createSelector(resolverTree, function (tree?: ResolverTree) {
+  if (!tree) {
+    return new Set();
+  }
+  return new Set(
+    resolverTreeModel
+      .lifecycleEvents(tree)
+      .filter(isTerminatedProcess)
+      .map((terminatedEvent) => {
         return uniquePidForProcess(terminatedEvent);
       })
-    );
-  }
-);
+  );
+});
 
 /**
- * In laying out the graph, we precalculate the 'width' of each subtree. The 'width' of the subtree is determined by its
- * descedants and the rule that each process node must be at least 1 unit apart. Enforcing that all nodes are at least
- * 1 unit apart on the x axis makes it easy to prevent the UI components from overlapping. There will always be space.
- *
- * Example widths:
- *
- *    A and B each have a width of 0
- *
- *          A
- *          |
- *          B
- *
- *    A has a width of 1. B and C have a width of 0.
- *    B and C must be 1 unit apart, so the A subtree has a width of 1.
- *
- *          A
- *      ____|____
- *     |         |
- *     B         C
- *
- *
- *    D, E, F, G, H all have a width of 0.
- *    B has a width of 1 since D->E must be 1 unit apart.
- *    Similarly, C has a width of 1 since F->G must be 1 unit apart.
- *    A has width of 3, since B has a width of 1, and C has a width of 1, and E->F must be at least
- *    1 unit apart.
- *          A
- *      ____|____
- *     |         |
- *     B         C
- *  ___|___   ___|___
- * |       | |       |
- * D       E F       G
- *                   |
- *                   H
- *
+ * Process events that will be graphed.
  */
-function widthsOfProcessSubtrees(indexedProcessTree: IndexedProcessTree): ProcessWidths {
-  const widths = new Map<ResolverEvent, number>();
-
-  if (size(indexedProcessTree) === 0) {
-    return widths;
-  }
-
-  const processesInReverseLevelOrder = [...levelOrder(indexedProcessTree)].reverse();
-
-  for (const process of processesInReverseLevelOrder) {
-    const children = indexedProcessTreeChildren(indexedProcessTree, process);
-
-    const sumOfWidthOfChildren = function sumOfWidthOfChildren() {
-      return children.reduce(function sum(currentValue, child) {
-        /**
-         * `widths.get` will always return a number in this case.
-         * This loop sequences a tree in reverse level order. Width values are set for each node.
-         * Therefore a parent can always find a width for its children, since all of its children
-         * will have been handled already.
-         */
-        return currentValue + widths.get(child)!;
-      }, 0);
-    };
-
-    const width = sumOfWidthOfChildren() + Math.max(0, children.length - 1) * distanceBetweenNodes;
-    widths.set(process, width);
-  }
-
-  return widths;
-}
-
-function processEdgeLineSegments(
-  indexedProcessTree: IndexedProcessTree,
-  widths: ProcessWidths,
-  positions: ProcessPositions
-): EdgeLineSegment[] {
-  const edgeLineSegments: EdgeLineSegment[] = [];
-  for (const metadata of levelOrderWithWidths(indexedProcessTree, widths)) {
-    const edgeLineMetadata: EdgeLineMetadata = { uniqueId: '' };
-    /**
-     * We only handle children, drawing lines back to their parents. The root has no parent, so we skip it
-     */
-    if (metadata.parent === null) {
-      // eslint-disable-next-line no-continue
-      continue;
-    }
-    const { process, parent, parentWidth } = metadata;
-    const position = positions.get(process);
-    const parentPosition = positions.get(parent);
-    const parentId = event.entityId(parent);
-    const processEntityId = event.entityId(process);
-    const edgeLineId = parentId ? parentId + processEntityId : parentId;
-
-    if (position === undefined || parentPosition === undefined) {
-      /**
-       * All positions have been precalculated, so if any are missing, it's an error. This will never happen.
-       */
-      throw new Error();
-    }
-
-    const parentTime = event.eventTimestamp(parent);
-    const processTime = event.eventTimestamp(process);
-    if (parentTime && processTime) {
-      const elapsedTime = getFriendlyElapsedTime(parentTime, processTime);
-      if (elapsedTime) edgeLineMetadata.elapsedTime = elapsedTime;
-    }
-    edgeLineMetadata.uniqueId = edgeLineId;
-
-    /**
-     * The point halfway between the parent and child on the y axis, we sometimes have a hard angle here in the edge line
-     */
-    const midwayY = parentPosition[1] + (position[1] - parentPosition[1]) / 2;
-
-    /**
-     * When drawing edge lines between a parent and children (when there are multiple children) we draw a pitchfork type
-     * design. The 'midway' line, runs along the x axis and joins all the children with a single descendant line from the parent.
-     * See the ascii diagram below. The underscore characters would be the midway line.
-     *
-     *          A
-     *      ____|____
-     *     |         |
-     *     B         C
-     */
-    const lineFromProcessToMidwayLine: EdgeLineSegment = {
-      points: [[position[0], midwayY], position],
-      metadata: edgeLineMetadata,
-    };
-
-    const siblings = indexedProcessTreeChildren(indexedProcessTree, parent);
-    const isFirstChild = process === siblings[0];
-
-    if (metadata.isOnlyChild) {
-      // add a single line segment directly from parent to child. We don't do the 'pitchfork' in this case.
-      edgeLineSegments.push({ points: [parentPosition, position], metadata: edgeLineMetadata });
-    } else if (isFirstChild) {
-      /**
-       * If the parent has multiple children, we draw the 'midway' line, and the line from the
-       * parent to the midway line, while handling the first child.
-       *
-       * Consider A the parent, and B the first child. We would draw somemthing like what's in the below diagram. The line from the
-       * midway line to C would be drawn when we handle C.
-       *
-       *          A
-       *      ____|____
-       *     |
-       *     B         C
-       */
-      const { firstChildWidth, lastChildWidth } = metadata;
-
-      const lineFromParentToMidwayLine: EdgeLineSegment = {
-        points: [parentPosition, [parentPosition[0], midwayY]],
-        metadata: { uniqueId: `parentToMid${edgeLineId}` },
-      };
-
-      const widthOfMidline = parentWidth - firstChildWidth / 2 - lastChildWidth / 2;
-
-      const minX = parentWidth / -2 + firstChildWidth / 2;
-      const maxX = minX + widthOfMidline;
-
-      const midwayLine: EdgeLineSegment = {
-        points: [
-          [
-            // Position line relative to the parent's x component
-            parentPosition[0] + minX,
-            midwayY,
-          ],
-          [
-            // Position line relative to the parent's x component
-            parentPosition[0] + maxX,
-            midwayY,
-          ],
-        ],
-        metadata: { uniqueId: `midway${edgeLineId}` },
-      };
-
-      edgeLineSegments.push(
-        /* line from parent to midway line */
-        lineFromParentToMidwayLine,
-        midwayLine,
-        lineFromProcessToMidwayLine
-      );
-    } else {
-      // If this isn't the first child, it must have siblings (the first of which drew the midway line and line
-      // from the parent to the midway line
-      edgeLineSegments.push(lineFromProcessToMidwayLine);
-    }
-  }
-  return edgeLineSegments;
-}
-
-function* levelOrderWithWidths(
-  tree: IndexedProcessTree,
-  widths: ProcessWidths
-): Iterable<ProcessWithWidthMetadata> {
-  for (const process of levelOrder(tree)) {
-    const parent = indexedProcessTreeParent(tree, process);
-    const width = widths.get(process);
-
-    if (width === undefined) {
-      /**
-       * All widths have been precalcluated, so this will not happen.
-       */
-      throw new Error();
-    }
-
-    /** If the parent is undefined, we are processing the root. */
-    if (parent === undefined) {
-      yield {
-        process,
-        width,
-        parent: null,
-        parentWidth: null,
-        isOnlyChild: null,
-        firstChildWidth: null,
-        lastChildWidth: null,
-      };
-    } else {
-      const parentWidth = widths.get(parent);
-
-      if (parentWidth === undefined) {
-        /**
-         * All widths have been precalcluated, so this will not happen.
-         */
-        throw new Error();
-      }
-
-      const metadata: Partial<ProcessWithWidthMetadata> = {
-        process,
-        width,
-        parent,
-        parentWidth,
-      };
-
-      const siblings = indexedProcessTreeChildren(tree, parent);
-      if (siblings.length === 1) {
-        metadata.isOnlyChild = true;
-        metadata.lastChildWidth = width;
-        metadata.firstChildWidth = width;
-      } else {
-        const firstChildWidth = widths.get(siblings[0]);
-        const lastChildWidth = widths.get(siblings[siblings.length - 1]);
-        if (firstChildWidth === undefined || lastChildWidth === undefined) {
-          /**
-           * All widths have been precalcluated, so this will not happen.
-           */
-          throw new Error();
-        }
-        metadata.isOnlyChild = false;
-        metadata.firstChildWidth = firstChildWidth;
-        metadata.lastChildWidth = lastChildWidth;
-      }
-
-      yield metadata as ProcessWithWidthMetadata;
-    }
-  }
-}
-
-function processPositions(
-  indexedProcessTree: IndexedProcessTree,
-  widths: ProcessWidths
-): ProcessPositions {
-  const positions = new Map<ResolverEvent, Vector2>();
-  /**
-   * This algorithm iterates the tree in level order. It keeps counters that are reset for each parent.
-   * By keeping track of the last parent node, we can know when we are dealing with a new set of siblings and
-   * reset the counters.
-   */
-  let lastProcessedParentNode: ResolverEvent | undefined;
-  /**
-   * Nodes are positioned relative to their siblings. We walk this in level order, so we handle
-   * children left -> right.
-   *
-   * The width of preceding siblings is used to left align the node.
-   * The number of preceding siblings is important because each sibling must be 1 unit apart
-   * on the x axis.
-   */
-  let numberOfPrecedingSiblings = 0;
-  let runningWidthOfPrecedingSiblings = 0;
-
-  for (const metadata of levelOrderWithWidths(indexedProcessTree, widths)) {
-    // Handle root node
-    if (metadata.parent === null) {
-      const { process } = metadata;
-      /**
-       * Place the root node at (0, 0) for now.
-       */
-      positions.set(process, [0, 0]);
-    } else {
-      const { process, parent, isOnlyChild, width, parentWidth } = metadata;
-
-      // Reinit counters when parent changes
-      if (lastProcessedParentNode !== parent) {
-        numberOfPrecedingSiblings = 0;
-        runningWidthOfPrecedingSiblings = 0;
-
-        // keep track of this so we know when to reinitialize
-        lastProcessedParentNode = parent;
-      }
-
-      const parentPosition = positions.get(parent);
-
-      if (parentPosition === undefined) {
-        /**
-         * Since this algorithm populates the `positions` map in level order,
-         * the parent node will have been processed already and the parent position
-         * will always be available.
-         *
-         * This will never happen.
-         */
-        throw new Error();
-      }
-
-      /**
-       * The x 'offset' is added to the x value of the parent to determine the position of the node.
-       * We add `parentWidth / -2` in order to align the left side of this node with the left side of its parent.
-       * We add `numberOfPrecedingSiblings * distanceBetweenNodes` in order to keep each node 1 apart on the x axis.
-       * We add `runningWidthOfPrecedingSiblings` so that we don't overlap with our preceding siblings. We stack em up.
-       * We add `width / 2` so that we center the node horizontally (in case it has non-0 width.)
-       */
-      const xOffset =
-        parentWidth / -2 +
-        numberOfPrecedingSiblings * distanceBetweenNodes +
-        runningWidthOfPrecedingSiblings +
-        width / 2;
-
-      /**
-       * The y axis gains `-distanceBetweenNodes` as we move down the screen 1 unit at a time.
-       */
-      let yDistanceBetweenNodes = -distanceBetweenNodes;
-
-      if (!isOnlyChild) {
-        // Make space on leaves to show elapsed time
-        yDistanceBetweenNodes *= 2;
-      }
-
-      const position = vector2Add([xOffset, yDistanceBetweenNodes], parentPosition);
-
-      positions.set(process, position);
-
-      numberOfPrecedingSiblings += 1;
-      runningWidthOfPrecedingSiblings += width;
-    }
+export const graphableProcesses = createSelector(resolverTree, function (tree?) {
+  if (tree) {
+    return resolverTreeModel.lifecycleEvents(tree).filter(isGraphableProcess);
+  } else {
+    return [];
   }
+});
 
-  return positions;
-}
-
+/**
+ * The 'indexed process tree' contains the tree data, indexed in helpful ways. Used for O(1) access to stuff during graph layout.
+ */
 export const indexedProcessTree = createSelector(graphableProcesses, function indexedTree(
   /* eslint-disable no-shadow */
   graphableProcesses
@@ -462,22 +105,28 @@ export const indexedProcessTree = createSelector(graphableProcesses, function in
 /**
  * This returns a map of entity_ids to stats about the related events and alerts.
  */
-export function relatedEventsStats(data: DataState) {
-  return data.relatedEventsStats;
-}
+export const relatedEventsStats: (
+  state: DataState
+) => Map<string, ResolverNodeStats> | null = createSelector(resolverTree, (tree?: ResolverTree) => {
+  if (tree) {
+    return resolverTreeModel.relatedEventsStats(tree);
+  } else {
+    return null;
+  }
+});
 
 /**
- * returns {Map<string, ResolverRelatedEvents>} a map of entity_ids to related event data.
+ * returns a map of entity_ids to related event data.
  */
-export function relatedEventsByEntityId(data: DataState) {
+export function relatedEventsByEntityId(data: DataState): Map<string, ResolverRelatedEvents> {
   return data.relatedEvents;
 }
 
 /**
- * returns {Map<string, boolean>} a map of entity_ids to booleans indicating if it is waiting on related event
+ * returns a map of entity_ids to booleans indicating if it is waiting on related event
  * A value of `undefined` can be interpreted as `not yet requested`
  */
-export function relatedEventsReady(data: DataState) {
+export function relatedEventsReady(data: DataState): Map<string, boolean> {
   return data.relatedEventsReady;
 }
 
@@ -502,6 +151,39 @@ export const processAdjacencies = createSelector(
   }
 );
 
+/**
+ * `true` if there were more children than we got in the last request.
+ */
+export function hasMoreChildren(state: DataState): boolean {
+  const tree = resolverTree(state);
+  return tree ? resolverTreeModel.hasMoreChildren(tree) : false;
+}
+
+/**
+ * `true` if there were more ancestors than we got in the last request.
+ */
+export function hasMoreAncestors(state: DataState): boolean {
+  const tree = resolverTree(state);
+  return tree ? resolverTreeModel.hasMoreAncestors(tree) : false;
+}
+
+/**
+ * If we need to fetch, this is the ID to fetch.
+ */
+export function databaseDocumentIDToFetch(state: DataState): string | null {
+  // If there is an ID, it must match either the last received version, or the pending version.
+  // Otherwise, we need to fetch it
+  // NB: this technique will not allow for refreshing of data.
+  if (
+    state.databaseDocumentID !== undefined &&
+    state.databaseDocumentID !== state.pendingRequestDatabaseDocumentID &&
+    state.databaseDocumentID !== state.lastResponse?.databaseDocumentID
+  ) {
+    return state.databaseDocumentID;
+  } else {
+    return null;
+  }
+}
 export const processNodePositionsAndEdgeLineSegments = createSelector(
   indexedProcessTree,
   function processNodePositionsAndEdgeLineSegments(
@@ -509,53 +191,7 @@ export const processNodePositionsAndEdgeLineSegments = createSelector(
     indexedProcessTree
     /* eslint-enable no-shadow */
   ) {
-    /**
-     * Walk the tree in reverse level order, calculating the 'width' of subtrees.
-     */
-    const widths = widthsOfProcessSubtrees(indexedProcessTree);
-
-    /**
-     * Walk the tree in level order. Using the precalculated widths, calculate the position of nodes.
-     * Nodes are positioned relative to their parents and preceding siblings.
-     */
-    const positions = processPositions(indexedProcessTree, widths);
-
-    /**
-     * With the widths and positions precalculated, we calculate edge line segments (arrays of vector2s)
-     * which connect them in a 'pitchfork' design.
-     */
-    const edgeLineSegments = processEdgeLineSegments(indexedProcessTree, widths, positions);
-
-    /**
-     * Transform the positions of nodes and edges so they seem like they are on an isometric grid.
-     */
-    const transformedEdgeLineSegments: EdgeLineSegment[] = [];
-    const transformedPositions = new Map<ResolverEvent, Vector2>();
-
-    for (const [processEvent, position] of positions) {
-      transformedPositions.set(processEvent, applyMatrix3(position, isometricTransformMatrix));
-    }
-
-    for (const edgeLineSegment of edgeLineSegments) {
-      const {
-        points: [startPoint, endPoint],
-      } = edgeLineSegment;
-
-      const transformedSegment: EdgeLineSegment = {
-        ...edgeLineSegment,
-        points: [
-          applyMatrix3(startPoint, isometricTransformMatrix),
-          applyMatrix3(endPoint, isometricTransformMatrix),
-        ],
-      };
-
-      transformedEdgeLineSegments.push(transformedSegment);
-    }
-
-    return {
-      processNodePositions: transformedPositions,
-      edgeLineSegments: transformedEdgeLineSegments,
-    };
+    return isometricTaxiLayout(indexedProcessTree);
   }
 );
 
@@ -650,13 +286,18 @@ export const visibleProcessNodePositionsAndEdgeLineSegments = createSelector(
   }
 );
 /**
- * Returns the `children` and `ancestors` limits for the current graph, if any.
- *
- * @param state {DataState} the DataState from the reducer
+ * If there is a pending request that's for a entity ID that doesn't matche the `entityID`, then we should cancel it.
  */
-export const limitsReached = (state: DataState): { children: boolean; ancestors: boolean } => {
-  return {
-    children: state.lineageLimits.children !== null,
-    ancestors: state.lineageLimits.ancestors !== null,
-  };
-};
+export function databaseDocumentIDToAbort(state: DataState): string | null {
+  /**
+   * If there is a pending request, and its not for the current databaseDocumentID (even, if the current databaseDocumentID is undefined) then we should abort the request.
+   */
+  if (
+    state.pendingRequestDatabaseDocumentID !== undefined &&
+    state.pendingRequestDatabaseDocumentID !== state.databaseDocumentID
+  ) {
+    return state.pendingRequestDatabaseDocumentID;
+  } else {
+    return null;
+  }
+}
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/visible_entities.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/visible_entities.test.ts
index f10cfe0ba466a8..eb2b402a694a55 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/visible_entities.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/visible_entities.test.ts
@@ -11,6 +11,7 @@ import { ResolverState } from '../../types';
 import { LegacyEndpointEvent, ResolverEvent } from '../../../../common/endpoint/types';
 import { visibleProcessNodePositionsAndEdgeLineSegments } from '../selectors';
 import { mockProcessEvent } from '../../models/process_event_test_helpers';
+import { mock as mockResolverTree } from '../../models/resolver_tree';
 
 describe('resolver visible entities', () => {
   let processA: LegacyEndpointEvent;
@@ -111,7 +112,7 @@ describe('resolver visible entities', () => {
       ];
       const action: ResolverAction = {
         type: 'serverReturnedResolverData',
-        payload: { events, stats: new Map(), lineageLimits: { children: '', ancestors: '' } },
+        payload: { result: mockResolverTree({ events })!, databaseDocumentID: '' },
       };
       const cameraAction: ResolverAction = { type: 'userSetRasterSize', payload: [300, 200] };
       store.dispatch(action);
@@ -143,7 +144,7 @@ describe('resolver visible entities', () => {
       ];
       const action: ResolverAction = {
         type: 'serverReturnedResolverData',
-        payload: { events, stats: new Map(), lineageLimits: { children: '', ancestors: '' } },
+        payload: { result: mockResolverTree({ events })!, databaseDocumentID: '' },
       };
       const cameraAction: ResolverAction = { type: 'userSetRasterSize', payload: [2000, 2000] };
       store.dispatch(action);
diff --git a/x-pack/plugins/security_solution/public/resolver/store/index.ts b/x-pack/plugins/security_solution/public/resolver/store/index.ts
index 203ecccb1d3696..9809e443d2d137 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/index.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/index.ts
@@ -7,14 +7,15 @@
 import { createStore, applyMiddleware, Store } from 'redux';
 import { composeWithDevTools } from 'redux-devtools-extension/developmentOnly';
 import { KibanaReactContextValue } from '../../../../../../src/plugins/kibana_react/public';
-import { ResolverAction, ResolverState } from '../types';
+import { ResolverState } from '../types';
 import { StartServices } from '../../types';
 import { resolverReducer } from './reducer';
 import { resolverMiddlewareFactory } from './middleware';
+import { ResolverAction } from './actions';
 
 export const storeFactory = (
   context?: KibanaReactContextValue<StartServices>
-): { store: Store<ResolverState, ResolverAction> } => {
+): Store<ResolverState, ResolverAction> => {
   const actionsBlacklist: Array<ResolverAction['type']> = ['userMovedPointer'];
   const composeEnhancers = composeWithDevTools({
     name: 'Resolver',
@@ -22,8 +23,5 @@ export const storeFactory = (
   });
   const middlewareEnhancer = applyMiddleware(resolverMiddlewareFactory(context));
 
-  const store = createStore(resolverReducer, composeEnhancers(middlewareEnhancer));
-  return {
-    store,
-  };
+  return createStore(resolverReducer, composeEnhancers(middlewareEnhancer));
 };
diff --git a/x-pack/plugins/security_solution/public/resolver/store/middleware.ts b/x-pack/plugins/security_solution/public/resolver/store/middleware.ts
deleted file mode 100644
index a1807255b5eafc..00000000000000
--- a/x-pack/plugins/security_solution/public/resolver/store/middleware.ts
+++ /dev/null
@@ -1,127 +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 { Dispatch, MiddlewareAPI } from 'redux';
-import { KibanaReactContextValue } from '../../../../../../src/plugins/kibana_react/public';
-import { StartServices } from '../../types';
-import { ResolverState, ResolverAction } from '../types';
-import {
-  ResolverEvent,
-  ResolverChildren,
-  ResolverAncestry,
-  ResolverLifecycleNode,
-  ResolverNodeStats,
-  ResolverRelatedEvents,
-} from '../../../common/endpoint/types';
-import * as event from '../../../common/endpoint/models/event';
-
-type MiddlewareFactory<S = ResolverState> = (
-  context?: KibanaReactContextValue<StartServices>
-) => (
-  api: MiddlewareAPI<Dispatch<ResolverAction>, S>
-) => (next: Dispatch<ResolverAction>) => (action: ResolverAction) => unknown;
-
-function getLifecycleEventsAndStats(
-  nodes: ResolverLifecycleNode[],
-  stats: Map<string, ResolverNodeStats>
-): ResolverEvent[] {
-  return nodes.reduce((flattenedEvents: ResolverEvent[], currentNode: ResolverLifecycleNode) => {
-    if (currentNode.lifecycle && currentNode.lifecycle.length > 0) {
-      flattenedEvents.push(...currentNode.lifecycle);
-    }
-
-    if (currentNode.stats) {
-      stats.set(currentNode.entityID, currentNode.stats);
-    }
-
-    return flattenedEvents;
-  }, []);
-}
-
-export const resolverMiddlewareFactory: MiddlewareFactory = (context) => {
-  return (api) => (next) => async (action: ResolverAction) => {
-    next(action);
-    if (action.type === 'userChangedSelectedEvent') {
-      /**
-       * concurrently fetches a process's details, its ancestors, and its related events.
-       */
-      if (context?.services.http && action.payload.selectedEvent) {
-        api.dispatch({ type: 'appRequestedResolverData' });
-        try {
-          let lifecycle: ResolverEvent[];
-          let children: ResolverChildren;
-          let ancestry: ResolverAncestry;
-          let entityId: string;
-          let stats: ResolverNodeStats;
-          if (event.isLegacyEvent(action.payload.selectedEvent)) {
-            entityId = action.payload.selectedEvent?.endgame?.unique_pid.toString();
-            const legacyEndpointID = action.payload.selectedEvent?.agent?.id;
-            [{ lifecycle, children, ancestry, stats }] = await Promise.all([
-              context.services.http.get(`/api/endpoint/resolver/${entityId}`, {
-                query: { legacyEndpointID, children: 5, ancestors: 5 },
-              }),
-            ]);
-          } else {
-            entityId = action.payload.selectedEvent.process.entity_id;
-            [{ lifecycle, children, ancestry, stats }] = await Promise.all([
-              context.services.http.get(`/api/endpoint/resolver/${entityId}`, {
-                query: {
-                  children: 5,
-                  ancestors: 5,
-                },
-              }),
-            ]);
-          }
-          const nodeStats: Map<string, ResolverNodeStats> = new Map();
-          nodeStats.set(entityId, stats);
-          const lineageLimits = { children: children.nextChild, ancestors: ancestry.nextAncestor };
-
-          const events = [
-            ...lifecycle,
-            ...getLifecycleEventsAndStats(children.childNodes, nodeStats),
-            ...getLifecycleEventsAndStats(ancestry.ancestors, nodeStats),
-          ];
-          api.dispatch({
-            type: 'serverReturnedResolverData',
-            payload: {
-              events,
-              stats: nodeStats,
-              lineageLimits,
-            },
-          });
-        } catch (error) {
-          api.dispatch({
-            type: 'serverFailedToReturnResolverData',
-          });
-        }
-      }
-    } else if (
-      (action.type === 'userRequestedRelatedEventData' ||
-        action.type === 'appDetectedMissingEventData') &&
-      context
-    ) {
-      const entityIdToFetchFor = action.payload;
-      let result: ResolverRelatedEvents;
-      try {
-        result = await context.services.http.get(
-          `/api/endpoint/resolver/${entityIdToFetchFor}/events`,
-          {
-            query: { events: 100 },
-          }
-        );
-        api.dispatch({
-          type: 'serverReturnedRelatedEventData',
-          payload: result,
-        });
-      } catch (e) {
-        api.dispatch({
-          type: 'serverFailedToReturnRelatedEventData',
-          payload: action.payload,
-        });
-      }
-    }
-  };
-};
diff --git a/x-pack/plugins/security_solution/public/resolver/store/middleware/index.ts b/x-pack/plugins/security_solution/public/resolver/store/middleware/index.ts
new file mode 100644
index 00000000000000..194b50256c6310
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/store/middleware/index.ts
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Dispatch, MiddlewareAPI } from 'redux';
+import { KibanaReactContextValue } from '../../../../../../../src/plugins/kibana_react/public';
+import { StartServices } from '../../../types';
+import { ResolverState } from '../../types';
+import { ResolverRelatedEvents } from '../../../../common/endpoint/types';
+import { ResolverTreeFetcher } from './resolver_tree_fetcher';
+import { ResolverAction } from '../actions';
+
+type MiddlewareFactory<S = ResolverState> = (
+  context?: KibanaReactContextValue<StartServices>
+) => (
+  api: MiddlewareAPI<Dispatch<ResolverAction>, S>
+) => (next: Dispatch<ResolverAction>) => (action: ResolverAction) => unknown;
+
+/**
+ * The redux middleware that the app uses to trigger side effects.
+ * All data fetching should be done here.
+ * For actions that the app triggers directly, use `app` as a prefix for the type.
+ * For actions that are triggered as a result of server interaction, use `server` as a prefix for the type.
+ */
+export const resolverMiddlewareFactory: MiddlewareFactory = (context) => {
+  return (api) => (next) => {
+    // This cannot work w/o `context`.
+    if (!context) {
+      return async (action: ResolverAction) => {
+        next(action);
+      };
+    }
+    const resolverTreeFetcher = ResolverTreeFetcher(context, api);
+    return async (action: ResolverAction) => {
+      next(action);
+
+      resolverTreeFetcher();
+
+      if (
+        action.type === 'userRequestedRelatedEventData' ||
+        action.type === 'appDetectedMissingEventData'
+      ) {
+        const entityIdToFetchFor = action.payload;
+        let result: ResolverRelatedEvents;
+        try {
+          result = await context.services.http.get(
+            `/api/endpoint/resolver/${entityIdToFetchFor}/events`,
+            {
+              query: { events: 100 },
+            }
+          );
+
+          api.dispatch({
+            type: 'serverReturnedRelatedEventData',
+            payload: result,
+          });
+        } catch (e) {
+          api.dispatch({
+            type: 'serverFailedToReturnRelatedEventData',
+            payload: action.payload,
+          });
+        }
+      }
+    };
+  };
+};
diff --git a/x-pack/plugins/security_solution/public/resolver/store/middleware/resolver_tree_fetcher.ts b/x-pack/plugins/security_solution/public/resolver/store/middleware/resolver_tree_fetcher.ts
new file mode 100644
index 00000000000000..59e944d95e04b6
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/store/middleware/resolver_tree_fetcher.ts
@@ -0,0 +1,103 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable no-duplicate-imports */
+
+import { Dispatch, MiddlewareAPI } from 'redux';
+import { ResolverTree, ResolverEntityIndex } from '../../../../common/endpoint/types';
+
+import { KibanaReactContextValue } from '../../../../../../../src/plugins/kibana_react/public';
+import { ResolverState } from '../../types';
+import * as selectors from '../selectors';
+import { StartServices } from '../../../types';
+import { DEFAULT_INDEX_KEY as defaultIndexKey } from '../../../../common/constants';
+import { ResolverAction } from '../actions';
+/**
+ * A function that handles syncing ResolverTree data w/ the current entity ID.
+ * This will make a request anytime the entityID changes (to something other than undefined.)
+ * If the entity ID changes while a request is in progress, the in-progress request will be cancelled.
+ * Call the returned function after each state transition.
+ * This is a factory because it is stateful and keeps that state in closure.
+ */
+export function ResolverTreeFetcher(
+  context: KibanaReactContextValue<StartServices>,
+  api: MiddlewareAPI<Dispatch<ResolverAction>, ResolverState>
+): () => void {
+  let lastRequestAbortController: AbortController | undefined;
+
+  // Call this after each state change.
+  // This fetches the ResolverTree for the current entityID
+  // if the entityID changes while
+  return async () => {
+    const state = api.getState();
+    const databaseDocumentIDToFetch = selectors.databaseDocumentIDToFetch(state);
+
+    if (selectors.databaseDocumentIDToAbort(state) && lastRequestAbortController) {
+      lastRequestAbortController.abort();
+      // calling abort will cause an action to be fired
+    } else if (databaseDocumentIDToFetch !== null) {
+      lastRequestAbortController = new AbortController();
+      let result: ResolverTree | undefined;
+      // Inform the state that we've made the request. Without this, the middleware will try to make the request again
+      // immediately.
+      api.dispatch({
+        type: 'appRequestedResolverData',
+        payload: databaseDocumentIDToFetch,
+      });
+      try {
+        const indices: string[] = context.services.uiSettings.get(defaultIndexKey);
+        const matchingEntities: ResolverEntityIndex = await context.services.http.get(
+          '/api/endpoint/resolver/entity',
+          {
+            signal: lastRequestAbortController.signal,
+            query: {
+              _id: databaseDocumentIDToFetch,
+              indices,
+            },
+          }
+        );
+        if (matchingEntities.length < 1) {
+          // If no entity_id could be found for the _id, bail out with a failure.
+          api.dispatch({
+            type: 'serverFailedToReturnResolverData',
+            payload: databaseDocumentIDToFetch,
+          });
+          return;
+        }
+        const entityIDToFetch = matchingEntities[0].entity_id;
+        result = await context.services.http.get(`/api/endpoint/resolver/${entityIDToFetch}`, {
+          signal: lastRequestAbortController.signal,
+          query: {
+            children: 5,
+            ancestors: 5,
+          },
+        });
+      } catch (error) {
+        // https://developer.mozilla.org/en-US/docs/Web/API/DOMException#exception-AbortError
+        if (error instanceof DOMException && error.name === 'AbortError') {
+          api.dispatch({
+            type: 'appAbortedResolverDataRequest',
+            payload: databaseDocumentIDToFetch,
+          });
+        } else {
+          api.dispatch({
+            type: 'serverFailedToReturnResolverData',
+            payload: databaseDocumentIDToFetch,
+          });
+        }
+      }
+      if (result !== undefined) {
+        api.dispatch({
+          type: 'serverReturnedResolverData',
+          payload: {
+            result,
+            databaseDocumentID: databaseDocumentIDToFetch,
+          },
+        });
+      }
+    }
+  };
+}
diff --git a/x-pack/plugins/security_solution/public/resolver/store/reducer.ts b/x-pack/plugins/security_solution/public/resolver/store/reducer.ts
index 77dffd79ea094a..65e53eb28549f9 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/reducer.ts
@@ -8,7 +8,8 @@ import { htmlIdGenerator } from '@elastic/eui';
 import { animateProcessIntoView } from './methods';
 import { cameraReducer } from './camera/reducer';
 import { dataReducer } from './data/reducer';
-import { ResolverState, ResolverAction, ResolverUIState } from '../types';
+import { ResolverAction } from './actions';
+import { ResolverState, ResolverUIState } from '../types';
 import { uniquePidForProcess } from '../models/process_event';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/resolver/store/selectors.ts b/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
index 5599b7e8ab6138..55e0072c5227f9 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
@@ -56,6 +56,19 @@ export const processNodePositionsAndEdgeLineSegments = composeSelectors(
   dataSelectors.processNodePositionsAndEdgeLineSegments
 );
 
+/**
+ * If we need to fetch, this is the entity ID to fetch.
+ */
+export const databaseDocumentIDToFetch = composeSelectors(
+  dataStateSelector,
+  dataSelectors.databaseDocumentIDToFetch
+);
+
+export const databaseDocumentIDToAbort = composeSelectors(
+  dataStateSelector,
+  dataSelectors.databaseDocumentIDToAbort
+);
+
 export const processAdjacencies = composeSelectors(
   dataStateSelector,
   dataSelectors.processAdjacencies
@@ -158,15 +171,6 @@ export const graphableProcesses = composeSelectors(
   dataSelectors.graphableProcesses
 );
 
-/**
- * Select the `ancestors` and `children` limits that were reached or exceeded
- * during the request for the current tree.
- */
-export const lineageLimitsReached = composeSelectors(
-  dataStateSelector,
-  dataSelectors.limitsReached
-);
-
 /**
  * Calls the `secondSelector` with the result of the `selector`. Use this when re-exporting a
  * concern-specific selector. `selector` should return the concern-specific state.
diff --git a/x-pack/plugins/security_solution/public/resolver/types.ts b/x-pack/plugins/security_solution/public/resolver/types.ts
index 0742fa2e305604..fe5b2276603a8c 100644
--- a/x-pack/plugins/security_solution/public/resolver/types.ts
+++ b/x-pack/plugins/security_solution/public/resolver/types.ts
@@ -7,11 +7,11 @@
 import { Store } from 'redux';
 import { BBox } from 'rbush';
 import { ResolverAction } from './store/actions';
-export { ResolverAction } from './store/actions';
 import {
   ResolverEvent,
   ResolverNodeStats,
   ResolverRelatedEvents,
+  ResolverTree,
 } from '../../common/endpoint/types';
 
 /**
@@ -176,15 +176,49 @@ export interface VisibleEntites {
  * State for `data` reducer which handles receiving Resolver data from the backend.
  */
 export interface DataState {
-  readonly results: readonly ResolverEvent[];
-  readonly relatedEventsStats: Readonly<Map<string, ResolverNodeStats>>;
+  readonly relatedEventsStats: Map<string, ResolverNodeStats>;
   readonly relatedEvents: Map<string, ResolverRelatedEvents>;
   readonly relatedEventsReady: Map<string, boolean>;
-  readonly lineageLimits: Readonly<{ children: string | null; ancestors: string | null }>;
-  isLoading: boolean;
-  hasError: boolean;
+  /**
+   * The `_id` for an ES document. Used to select a process that we'll show the graph for.
+   */
+  readonly databaseDocumentID?: string;
+  /**
+   * The id used for the pending request, if there is one.
+   */
+  readonly pendingRequestDatabaseDocumentID?: string;
+
+  /**
+   * The parameters and response from the last successful request.
+   */
+  readonly lastResponse?: {
+    /**
+     * The id used in the request.
+     */
+    readonly databaseDocumentID: string;
+  } & (
+    | {
+        /**
+         * If a response with a success code was received, this is `true`.
+         */
+        readonly successful: true;
+        /**
+         * The ResolverTree parsed from the response.
+         */
+        readonly result: ResolverTree;
+      }
+    | {
+        /**
+         * If the request threw an exception or the response had a failure code, this will be false.
+         */
+        readonly successful: false;
+      }
+  );
 }
 
+/**
+ * Represents an ordered pair. Used for x-y coordinates and the like.
+ */
 export type Vector2 = readonly [number, number];
 
 /**
@@ -416,3 +450,17 @@ export type ResolverProcessType =
   | 'unknownEvent';
 
 export type ResolverStore = Store<ResolverState, ResolverAction>;
+
+/**
+ * Describes the basic Resolver graph layout.
+ */
+export interface IsometricTaxiLayout {
+  /**
+   * A map of events to position. each event represents its own node.
+   */
+  processNodePositions: Map<ResolverEvent, Vector2>;
+  /**
+   * A map of edgline segments, which graphically connect nodes.
+   */
+  edgeLineSegments: EdgeLineSegment[];
+}
diff --git a/x-pack/plugins/security_solution/public/resolver/view/edge_line.tsx b/x-pack/plugins/security_solution/public/resolver/view/edge_line.tsx
index 4eccb4f5602209..65c70f94432c79 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/edge_line.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/edge_line.tsx
@@ -7,7 +7,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { applyMatrix3, distance, angle } from '../lib/vector2';
+import { applyMatrix3, distance, angle } from '../models/vector2';
 import { Vector2, Matrix3, EdgeLineMetadata } from '../types';
 import { useResolverTheme, calculateResolverFontSize } from './assets';
 
diff --git a/x-pack/plugins/security_solution/public/resolver/view/graph_controls.tsx b/x-pack/plugins/security_solution/public/resolver/view/graph_controls.tsx
index 67c091627741ad..c2a7bbaacbf1d4 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/graph_controls.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/graph_controls.tsx
@@ -11,9 +11,10 @@ import styled from 'styled-components';
 import { EuiRange, EuiPanel, EuiIcon } from '@elastic/eui';
 import { useSelector, useDispatch } from 'react-redux';
 import { SideEffectContext } from './side_effect_context';
-import { ResolverAction, Vector2 } from '../types';
+import { Vector2 } from '../types';
 import * as selectors from '../store/selectors';
 import { useResolverTheme } from './assets';
+import { ResolverAction } from '../store/actions';
 
 interface StyledGraphControls {
   graphControlsBackground: string;
diff --git a/x-pack/plugins/security_solution/public/resolver/view/index.tsx b/x-pack/plugins/security_solution/public/resolver/view/index.tsx
index 5c188fdc711560..205180a40d62a4 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/index.tsx
@@ -3,164 +3,44 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+/* eslint-disable react/display-name */
 
-import React, { useLayoutEffect, useContext } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-import styled from 'styled-components';
-import { EuiLoadingSpinner } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import * as selectors from '../store/selectors';
-import { EdgeLine } from './edge_line';
-import { Panel } from './panel';
-import { GraphControls } from './graph_controls';
-import { ProcessEventDot } from './process_event_dot';
-import { useCamera } from './use_camera';
-import { SymbolDefinitions, useResolverTheme } from './assets';
-import { entityId } from '../../../common/endpoint/models/event';
-import { ResolverAction } from '../types';
-import { ResolverEvent } from '../../../common/endpoint/types';
-import { SideEffectContext } from './side_effect_context';
+import React, { useMemo } from 'react';
+import { Provider } from 'react-redux';
+import { ResolverMap } from './map';
+import { storeFactory } from '../store';
+import { StartServices } from '../../types';
+import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 
-interface StyledResolver {
-  backgroundColor: string;
-}
-
-const StyledResolver = styled.div<StyledResolver>`
-  /**
-   * Take up all availble space
-   */
-  &,
-  .resolver-graph {
-    display: flex;
-    flex-grow: 1;
-  }
-  .loading-container {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-grow: 1;
-  }
+/**
+ * The top level, unconnected, Resolver component.
+ */
+export const Resolver = React.memo(function ({
+  className,
+  databaseDocumentID,
+}: {
   /**
-   * The placeholder components use absolute positioning.
+   * Used by `styled-components`.
    */
-  position: relative;
+  className?: string;
   /**
-   * Prevent partially visible components from showing up outside the bounds of Resolver.
+   * The `_id` value of an event in ES.
+   * Used as the origin of the Resolver graph.
    */
-  overflow: hidden;
-  contain: strict;
-  background-color: ${(props) => props.backgroundColor};
-`;
-
-const StyledPanel = styled(Panel)`
-  position: absolute;
-  left: 0;
-  top: 0;
-  bottom: 0;
-  overflow: auto;
-  width: 25em;
-  max-width: 50%;
-`;
-
-const StyledResolverContainer = styled.div`
-  display: flex;
-  flex-grow: 1;
-  contain: layout;
-`;
-
-export const Resolver = React.memo(function Resolver({
-  className,
-  selectedEvent,
-}: {
-  className?: string;
-  selectedEvent?: ResolverEvent;
+  databaseDocumentID?: string;
 }) {
-  const { timestamp } = useContext(SideEffectContext);
-
-  const { processNodePositions, connectingEdgeLineSegments } = useSelector(
-    selectors.visibleProcessNodePositionsAndEdgeLineSegments
-  )(timestamp());
-
-  const dispatch: (action: ResolverAction) => unknown = useDispatch();
-  const { processToAdjacencyMap } = useSelector(selectors.processAdjacencies);
-  const { projectionMatrix, ref, onMouseDown } = useCamera();
-  const isLoading = useSelector(selectors.isLoading);
-  const hasError = useSelector(selectors.hasError);
-  const relatedEventsStats = useSelector(selectors.relatedEventsStats);
-  const activeDescendantId = useSelector(selectors.uiActiveDescendantId);
-  const terminatedProcesses = useSelector(selectors.terminatedProcesses);
-  const { colorMap } = useResolverTheme();
-
-  useLayoutEffect(() => {
-    dispatch({
-      type: 'userChangedSelectedEvent',
-      payload: { selectedEvent },
-    });
-  }, [dispatch, selectedEvent]);
+  const context = useKibana<StartServices>();
+  const store = useMemo(() => {
+    return storeFactory(context);
+  }, [context]);
 
+  /**
+   * Setup the store and use `Provider` here. This allows the ResolverMap component to
+   * dispatch actions and read from state.
+   */
   return (
-    <StyledResolver
-      data-test-subj="resolverEmbeddable"
-      className={className}
-      backgroundColor={colorMap.resolverBackground}
-    >
-      {isLoading ? (
-        <div className="loading-container">
-          <EuiLoadingSpinner size="xl" />
-        </div>
-      ) : hasError ? (
-        <div className="loading-container">
-          <div>
-            {' '}
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.resolver.loadingError"
-              defaultMessage="Error loading data."
-            />
-          </div>
-        </div>
-      ) : (
-        <StyledResolverContainer
-          className="resolver-graph kbn-resetFocusState"
-          onMouseDown={onMouseDown}
-          ref={ref}
-          role="tree"
-          tabIndex={0}
-          aria-activedescendant={activeDescendantId || undefined}
-        >
-          {connectingEdgeLineSegments.map(({ points: [startPosition, endPosition], metadata }) => (
-            <EdgeLine
-              edgeLineMetadata={metadata}
-              key={metadata.uniqueId}
-              startPosition={startPosition}
-              endPosition={endPosition}
-              projectionMatrix={projectionMatrix}
-            />
-          ))}
-          {[...processNodePositions].map(([processEvent, position]) => {
-            const adjacentNodeMap = processToAdjacencyMap.get(processEvent);
-            const processEntityId = entityId(processEvent);
-            if (!adjacentNodeMap) {
-              // This should never happen
-              throw new Error('Issue calculating adjacency node map.');
-            }
-            return (
-              <ProcessEventDot
-                key={processEntityId}
-                position={position}
-                projectionMatrix={projectionMatrix}
-                event={processEvent}
-                adjacentNodeMap={adjacentNodeMap}
-                relatedEventsStats={relatedEventsStats.get(entityId(processEvent))}
-                isProcessTerminated={terminatedProcesses.has(processEntityId)}
-                isProcessOrigin={false}
-              />
-            );
-          })}
-        </StyledResolverContainer>
-      )}
-      <StyledPanel />
-      <GraphControls />
-      <SymbolDefinitions />
-    </StyledResolver>
+    <Provider store={store}>
+      <ResolverMap className={className} databaseDocumentID={databaseDocumentID} />
+    </Provider>
   );
 });
diff --git a/x-pack/plugins/security_solution/public/resolver/view/map.tsx b/x-pack/plugins/security_solution/public/resolver/view/map.tsx
new file mode 100644
index 00000000000000..9022932c1594f9
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/view/map.tsx
@@ -0,0 +1,125 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable no-duplicate-imports */
+
+/* eslint-disable react/display-name */
+
+import React, { useContext } from 'react';
+import { useSelector } from 'react-redux';
+import { EuiLoadingSpinner } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import * as selectors from '../store/selectors';
+import { EdgeLine } from './edge_line';
+import { GraphControls } from './graph_controls';
+import { ProcessEventDot } from './process_event_dot';
+import { useCamera } from './use_camera';
+import { SymbolDefinitions, useResolverTheme } from './assets';
+import { useStateSyncingActions } from './use_state_syncing_actions';
+import { StyledMapContainer, StyledPanel, GraphContainer } from './styles';
+import { entityId } from '../../../common/endpoint/models/event';
+import { SideEffectContext } from './side_effect_context';
+
+/**
+ * The highest level connected Resolver component. Needs a `Provider` in its ancestry to work.
+ */
+export const ResolverMap = React.memo(function ({
+  className,
+  databaseDocumentID,
+}: {
+  /**
+   * Used by `styled-components`.
+   */
+  className?: string;
+  /**
+   * The `_id` value of an event in ES.
+   * Used as the origin of the Resolver graph.
+   */
+  databaseDocumentID?: string;
+}) {
+  /**
+   * This is responsible for dispatching actions that include any external data.
+   * `databaseDocumentID`
+   */
+  useStateSyncingActions({ databaseDocumentID });
+
+  const { timestamp } = useContext(SideEffectContext);
+  const { processNodePositions, connectingEdgeLineSegments } = useSelector(
+    selectors.visibleProcessNodePositionsAndEdgeLineSegments
+  )(timestamp());
+  const { processToAdjacencyMap } = useSelector(selectors.processAdjacencies);
+  const relatedEventsStats = useSelector(selectors.relatedEventsStats);
+  const terminatedProcesses = useSelector(selectors.terminatedProcesses);
+  const { projectionMatrix, ref, onMouseDown } = useCamera();
+  const isLoading = useSelector(selectors.isLoading);
+  const hasError = useSelector(selectors.hasError);
+  const activeDescendantId = useSelector(selectors.uiActiveDescendantId);
+  const { colorMap } = useResolverTheme();
+
+  return (
+    <StyledMapContainer className={className} backgroundColor={colorMap.resolverBackground}>
+      {isLoading ? (
+        <div className="loading-container">
+          <EuiLoadingSpinner size="xl" />
+        </div>
+      ) : hasError ? (
+        <div className="loading-container">
+          <div>
+            {' '}
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.resolver.loadingError"
+              defaultMessage="Error loading data."
+            />
+          </div>
+        </div>
+      ) : (
+        <GraphContainer
+          className="resolver-graph kbn-resetFocusState"
+          onMouseDown={onMouseDown}
+          ref={ref}
+          role="tree"
+          tabIndex={0}
+          aria-activedescendant={activeDescendantId || undefined}
+        >
+          {connectingEdgeLineSegments.map(({ points: [startPosition, endPosition], metadata }) => (
+            <EdgeLine
+              edgeLineMetadata={metadata}
+              key={metadata.uniqueId}
+              startPosition={startPosition}
+              endPosition={endPosition}
+              projectionMatrix={projectionMatrix}
+            />
+          ))}
+          {[...processNodePositions].map(([processEvent, position]) => {
+            const adjacentNodeMap = processToAdjacencyMap.get(processEvent);
+            const processEntityId = entityId(processEvent);
+            if (!adjacentNodeMap) {
+              // This should never happen
+              throw new Error('Issue calculating adjacency node map.');
+            }
+            return (
+              <ProcessEventDot
+                key={processEntityId}
+                position={position}
+                projectionMatrix={projectionMatrix}
+                event={processEvent}
+                adjacentNodeMap={adjacentNodeMap}
+                relatedEventsStats={
+                  relatedEventsStats ? relatedEventsStats.get(entityId(processEvent)) : undefined
+                }
+                isProcessTerminated={terminatedProcesses.has(processEntityId)}
+                isProcessOrigin={false}
+              />
+            );
+          })}
+        </GraphContainer>
+      )}
+      <StyledPanel />
+      <GraphControls />
+      <SymbolDefinitions />
+    </StyledMapContainer>
+  );
+});
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panel.tsx b/x-pack/plugins/security_solution/public/resolver/view/panel.tsx
index c8f6512077a6f5..2a2e7e87394a99 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panel.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panel.tsx
@@ -22,7 +22,7 @@ import { displayNameRecord } from './process_event_dot';
 import * as selectors from '../store/selectors';
 import { useResolverDispatch } from './use_resolver_dispatch';
 import * as event from '../../../common/endpoint/models/event';
-import { ResolverEvent } from '../../../common/endpoint/types';
+import { ResolverEvent, ResolverNodeStats } from '../../../common/endpoint/types';
 import { SideEffectContext } from './side_effect_context';
 import { ProcessEventListNarrowedByType } from './panels/panel_content_related_list';
 import { EventCountsForProcess } from './panels/panel_content_related_counts';
@@ -141,15 +141,10 @@ const PanelContent = memo(function PanelContent() {
     [history, urlSearch]
   );
 
-  // GO JONNY GO
   const relatedEventStats = useSelector(selectors.relatedEventsStats);
   const { crumbId, crumbEvent } = queryParams;
-  const relatedStatsForIdFromParams = useMemo(() => {
-    if (idFromParams) {
-      return relatedEventStats.get(idFromParams);
-    }
-    return undefined;
-  }, [relatedEventStats, idFromParams]);
+  const relatedStatsForIdFromParams: ResolverNodeStats | undefined =
+    idFromParams && relatedEventStats ? relatedEventStats.get(idFromParams) : undefined;
 
   /**
    * Determine which set of breadcrumbs to display based on the query parameters
diff --git a/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx b/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx
index a2249e1920bc4f..9df9ed84f3010d 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx
@@ -13,7 +13,7 @@ import { useHistory } from 'react-router-dom';
 // eslint-disable-next-line import/no-nodejs-modules
 import querystring from 'querystring';
 import { NodeSubMenu, subMenuAssets } from './submenu';
-import { applyMatrix3 } from '../lib/vector2';
+import { applyMatrix3 } from '../models/vector2';
 import { Vector2, Matrix3, AdjacentProcessMap } from '../types';
 import { SymbolIds, useResolverTheme, calculateResolverFontSize } from './assets';
 import { ResolverEvent, ResolverNodeStats } from '../../../common/endpoint/types';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/styles.tsx b/x-pack/plugins/security_solution/public/resolver/view/styles.tsx
new file mode 100644
index 00000000000000..2a1e67f4a9fdce
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/view/styles.tsx
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import styled from 'styled-components';
+import { Panel } from './panel';
+
+/**
+ * The top level DOM element for Resolver
+ * NB: `styled-components` may be used to wrap this.
+ */
+export const StyledMapContainer = styled.div<{ backgroundColor: string }>`
+  /**
+   * Take up all availble space
+   */
+  &,
+  .resolver-graph {
+    display: flex;
+    flex-grow: 1;
+  }
+  .loading-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-grow: 1;
+  }
+  /**
+   * The placeholder components use absolute positioning.
+   */
+  position: relative;
+  /**
+   * Prevent partially visible components from showing up outside the bounds of Resolver.
+   */
+  overflow: hidden;
+  contain: strict;
+  background-color: ${(props) => props.backgroundColor};
+`;
+
+/**
+ * The Panel, styled for use in `ResolverMap`.
+ */
+export const StyledPanel = styled(Panel)`
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  overflow: auto;
+  width: 25em;
+  max-width: 50%;
+`;
+
+/**
+ * Used by ResolverMap to contain the lines and nodes.
+ */
+export const GraphContainer = styled.div`
+  display: flex;
+  flex-grow: 1;
+  contain: layout;
+`;
diff --git a/x-pack/plugins/security_solution/public/resolver/view/use_camera.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/use_camera.test.tsx
index dc7cb9a2ab1991..3476764a887330 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/use_camera.test.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/use_camera.test.tsx
@@ -11,12 +11,14 @@ import { useCamera, useAutoUpdatingClientRect } from './use_camera';
 import { Provider } from 'react-redux';
 import * as selectors from '../store/selectors';
 import { storeFactory } from '../store';
-import { Matrix3, ResolverAction, ResolverStore, SideEffectSimulator } from '../types';
+import { Matrix3, ResolverStore, SideEffectSimulator } from '../types';
 import { ResolverEvent } from '../../../common/endpoint/types';
 import { SideEffectContext } from './side_effect_context';
-import { applyMatrix3 } from '../lib/vector2';
+import { applyMatrix3 } from '../models/vector2';
 import { sideEffectSimulator } from './side_effect_simulator';
 import { mockProcessEvent } from '../models/process_event_test_helpers';
+import { mock as mockResolverTree } from '../models/resolver_tree';
+import { ResolverAction } from '../store/actions';
 
 describe('useCamera on an unpainted element', () => {
   let element: HTMLElement;
@@ -27,7 +29,7 @@ describe('useCamera on an unpainted element', () => {
   let simulator: SideEffectSimulator;
 
   beforeEach(async () => {
-    ({ store } = storeFactory());
+    store = storeFactory();
 
     const Test = function Test() {
       const camera = useCamera();
@@ -159,7 +161,7 @@ describe('useCamera on an unpainted element', () => {
       let process: ResolverEvent;
       beforeEach(() => {
         const events: ResolverEvent[] = [];
-        const numberOfEvents: number = Math.floor(Math.random() * 10 + 1);
+        const numberOfEvents: number = 10;
 
         for (let index = 0; index < numberOfEvents; index++) {
           const uniquePpid = index === 0 ? undefined : index - 1;
@@ -174,23 +176,27 @@ describe('useCamera on an unpainted element', () => {
             })
           );
         }
-        const serverResponseAction: ResolverAction = {
-          type: 'serverReturnedResolverData',
-          payload: {
-            events,
-            stats: new Map(),
-            lineageLimits: { children: null, ancestors: null },
-          },
-        };
-        act(() => {
-          store.dispatch(serverResponseAction);
-        });
+        const tree = mockResolverTree({ events });
+        if (tree !== null) {
+          const serverResponseAction: ResolverAction = {
+            type: 'serverReturnedResolverData',
+            payload: { result: tree, databaseDocumentID: '' },
+          };
+          act(() => {
+            store.dispatch(serverResponseAction);
+          });
+        } else {
+          throw new Error('failed to create tree');
+        }
         const processes: ResolverEvent[] = [
           ...selectors
             .processNodePositionsAndEdgeLineSegments(store.getState())
             .processNodePositions.keys(),
         ];
         process = processes[processes.length - 1];
+        if (!process) {
+          throw new Error('missing the process to bring into view');
+        }
         simulator.controls.time = 0;
         const cameraAction: ResolverAction = {
           type: 'userBroughtProcessIntoView',
diff --git a/x-pack/plugins/security_solution/public/resolver/view/use_resolver_dispatch.ts b/x-pack/plugins/security_solution/public/resolver/view/use_resolver_dispatch.ts
index a993a4ed595e1b..90c3dadc56ba5a 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/use_resolver_dispatch.ts
+++ b/x-pack/plugins/security_solution/public/resolver/view/use_resolver_dispatch.ts
@@ -5,7 +5,7 @@
  */
 
 import { useDispatch } from 'react-redux';
-import { ResolverAction } from '../types';
+import { ResolverAction } from '../store/actions';
 
 /**
  * Call `useDispatch`, but only accept `ResolverAction` actions.
diff --git a/x-pack/plugins/security_solution/public/resolver/view/use_state_syncing_actions.ts b/x-pack/plugins/security_solution/public/resolver/view/use_state_syncing_actions.ts
new file mode 100644
index 00000000000000..b8ea2049f5c49a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/view/use_state_syncing_actions.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useLayoutEffect } from 'react';
+import { useResolverDispatch } from './use_resolver_dispatch';
+
+/**
+ * This is a hook that is meant to be used once at the top level of Resolver.
+ * It dispatches actions that keep the store in sync with external properties.
+ */
+export function useStateSyncingActions({
+  databaseDocumentID,
+}: {
+  /**
+   * The `_id` of an event in ES. Used to determine the origin of the Resolver graph.
+   */
+  databaseDocumentID?: string;
+}) {
+  const dispatch = useResolverDispatch();
+  useLayoutEffect(() => {
+    dispatch({
+      type: 'appReceivedNewExternalProperties',
+      payload: { databaseDocumentID },
+    });
+  }, [dispatch, databaseDocumentID]);
+}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
index 9fe48cd2f0190b..8e34e11e85729b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
@@ -41,6 +41,7 @@ const StatefulFlyoutHeader = React.memo<Props>(
     notesById,
     status,
     timelineId,
+    timelineType,
     title,
     toggleLock,
     updateDescription,
@@ -66,6 +67,7 @@ const StatefulFlyoutHeader = React.memo<Props>(
         noteIds={noteIds}
         status={status}
         timelineId={timelineId}
+        timelineType={timelineType}
         title={title}
         toggleLock={toggleLock}
         updateDescription={updateDescription}
@@ -100,6 +102,7 @@ const makeMapStateToProps = () => {
       title = '',
       noteIds = emptyNotesId,
       status,
+      timelineType,
     } = timeline;
 
     const history = emptyHistory; // TODO: get history from store via selector
@@ -116,6 +119,7 @@ const makeMapStateToProps = () => {
       notesById: getNotesByIds(state),
       status,
       title,
+      timelineType,
     };
   };
   return mapStateToProps;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/header_with_close_button/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/flyout/header_with_close_button/__snapshots__/index.test.tsx.snap
index df96f2a1f7eba9..d0d7a1cd7f5d78 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/header_with_close_button/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/header_with_close_button/__snapshots__/index.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`FlyoutHeaderWithCloseButton renders correctly against snapshot 1`] = `
 <FlyoutHeaderWithCloseButton
   onClose={[MockFunction]}
   timelineId="test"
+  timelineType="default"
   usersViewing={
     Array [
       "elastic",
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/header_with_close_button/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/header_with_close_button/index.test.tsx
index 3ddc1efe9a47f8..9b7d4c3266c56f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/header_with_close_button/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/header_with_close_button/index.test.tsx
@@ -7,6 +7,7 @@
 import { mount, shallow } from 'enzyme';
 import React from 'react';
 
+import { TimelineType } from '../../../../../common/types/timeline';
 import { TestProviders } from '../../../../common/mock';
 import { FlyoutHeaderWithCloseButton } from '.';
 
@@ -40,14 +41,16 @@ jest.mock('../../../../common/lib/kibana', () => {
 });
 
 describe('FlyoutHeaderWithCloseButton', () => {
+  const props = {
+    onClose: jest.fn(),
+    timelineId: 'test',
+    timelineType: TimelineType.default,
+    usersViewing: ['elastic'],
+  };
   test('renders correctly against snapshot', () => {
     const EmptyComponent = shallow(
       <TestProviders>
-        <FlyoutHeaderWithCloseButton
-          onClose={jest.fn()}
-          timelineId={'test'}
-          usersViewing={['elastic']}
-        />
+        <FlyoutHeaderWithCloseButton {...props} />
       </TestProviders>
     );
     expect(EmptyComponent.find('FlyoutHeaderWithCloseButton')).toMatchSnapshot();
@@ -55,13 +58,13 @@ describe('FlyoutHeaderWithCloseButton', () => {
 
   test('it should invoke onClose when the close button is clicked', () => {
     const closeMock = jest.fn();
+    const testProps = {
+      ...props,
+      onClose: closeMock,
+    };
     const wrapper = mount(
       <TestProviders>
-        <FlyoutHeaderWithCloseButton
-          onClose={closeMock}
-          timelineId={'test'}
-          usersViewing={['elastic']}
-        />
+        <FlyoutHeaderWithCloseButton {...testProps} />
       </TestProviders>
     );
     wrapper.find('[data-test-subj="close-timeline"] button').first().simulate('click');
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/index.test.tsx
index 932cde32f3d43c..50578ef0a8e42e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/index.test.tsx
@@ -14,6 +14,7 @@ import {
   mockGlobalState,
   TestProviders,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { createStore, State } from '../../../common/store';
@@ -62,6 +63,7 @@ describe('Flyout', () => {
         stateShowIsTrue,
         SUB_PLUGINS_REDUCER,
         apolloClientObservable,
+        kibanaObservable,
         storage
       );
 
@@ -86,6 +88,7 @@ describe('Flyout', () => {
         stateWithDataProviders,
         SUB_PLUGINS_REDUCER,
         apolloClientObservable,
+        kibanaObservable,
         storage
       );
 
@@ -108,6 +111,7 @@ describe('Flyout', () => {
         stateWithDataProviders,
         SUB_PLUGINS_REDUCER,
         apolloClientObservable,
+        kibanaObservable,
         storage
       );
 
@@ -142,6 +146,7 @@ describe('Flyout', () => {
         stateWithDataProviders,
         SUB_PLUGINS_REDUCER,
         apolloClientObservable,
+        kibanaObservable,
         storage
       );
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx
index fe38dd79176a5c..1c414246929ab4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx
@@ -4,13 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  EuiButtonEmpty,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiHorizontalRule,
-  EuiTitle,
-} from '@elastic/eui';
+import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiHorizontalRule } from '@elastic/eui';
 import { noop } from 'lodash/fp';
 import React, { useCallback, useState } from 'react';
 import { connect, ConnectedProps, useDispatch, useSelector } from 'react-redux';
@@ -31,6 +25,7 @@ import {
   setInsertTimeline,
   updateTimelineGraphEventId,
 } from '../../../timelines/store/timeline/actions';
+import { Resolver } from '../../../resolver/view';
 
 import * as i18n from './translations';
 
@@ -39,6 +34,10 @@ const OverlayContainer = styled.div<{ bodyHeight?: number }>`
   width: 100%;
 `;
 
+const StyledResolver = styled(Resolver)`
+  height: 100%;
+`;
+
 interface OwnProps {
   bodyHeight?: number;
   graphEventId?: string;
@@ -117,9 +116,7 @@ const GraphOverlayComponent = ({
       </EuiFlexGroup>
 
       <EuiHorizontalRule margin="none" />
-      <EuiTitle>
-        <>{`Resolver graph for event _id ${graphEventId}`}</>
-      </EuiTitle>
+      <StyledResolver databaseDocumentID={graphEventId} />
       <AllCasesModal
         onCloseCaseModal={onCloseCaseModal}
         showCaseModal={showCaseModal}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/notes/add_note/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/notes/add_note/index.test.tsx
index 1ddf298110a5de..570c0028e0f516 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/notes/add_note/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/notes/add_note/index.test.tsx
@@ -8,52 +8,39 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { AddNote } from '.';
+import { TimelineStatus } from '../../../../../common/types/timeline';
 
 describe('AddNote', () => {
   const note = 'The contents of a new note';
+  const props = {
+    associateNote: jest.fn(),
+    getNewNoteId: jest.fn(),
+    newNote: note,
+    onCancelAddNote: jest.fn(),
+    updateNewNote: jest.fn(),
+    updateNote: jest.fn(),
+    status: TimelineStatus.active,
+  };
 
   test('renders correctly', () => {
-    const wrapper = shallow(
-      <AddNote
-        associateNote={jest.fn()}
-        getNewNoteId={jest.fn()}
-        newNote={note}
-        onCancelAddNote={jest.fn()}
-        updateNewNote={jest.fn()}
-        updateNote={jest.fn()}
-      />
-    );
+    const wrapper = shallow(<AddNote {...props} />);
     expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the Cancel button when onCancelAddNote is provided', () => {
-    const wrapper = mount(
-      <AddNote
-        associateNote={jest.fn()}
-        getNewNoteId={jest.fn()}
-        newNote={note}
-        onCancelAddNote={jest.fn()}
-        updateNewNote={jest.fn()}
-        updateNote={jest.fn()}
-      />
-    );
+    const wrapper = mount(<AddNote {...props} />);
 
     expect(wrapper.find('[data-test-subj="cancel"]').exists()).toEqual(true);
   });
 
   test('it invokes onCancelAddNote when the Cancel button is clicked', () => {
     const onCancelAddNote = jest.fn();
+    const testProps = {
+      ...props,
+      onCancelAddNote,
+    };
 
-    const wrapper = mount(
-      <AddNote
-        associateNote={jest.fn()}
-        getNewNoteId={jest.fn()}
-        newNote={note}
-        onCancelAddNote={onCancelAddNote}
-        updateNewNote={jest.fn()}
-        updateNote={jest.fn()}
-      />
-    );
+    const wrapper = mount(<AddNote {...testProps} />);
 
     wrapper.find('[data-test-subj="cancel"]').first().simulate('click');
 
@@ -62,17 +49,12 @@ describe('AddNote', () => {
 
   test('it does NOT invoke associateNote when the Cancel button is clicked', () => {
     const associateNote = jest.fn();
+    const testProps = {
+      ...props,
+      associateNote,
+    };
 
-    const wrapper = mount(
-      <AddNote
-        associateNote={associateNote}
-        getNewNoteId={jest.fn()}
-        newNote={note}
-        onCancelAddNote={jest.fn()}
-        updateNewNote={jest.fn()}
-        updateNote={jest.fn()}
-      />
-    );
+    const wrapper = mount(<AddNote {...testProps} />);
 
     wrapper.find('[data-test-subj="cancel"]').first().simulate('click');
 
@@ -80,47 +62,29 @@ describe('AddNote', () => {
   });
 
   test('it does NOT render the Cancel button when onCancelAddNote is NOT provided', () => {
-    const wrapper = mount(
-      <AddNote
-        associateNote={jest.fn()}
-        getNewNoteId={jest.fn()}
-        newNote={note}
-        updateNewNote={jest.fn()}
-        updateNote={jest.fn()}
-      />
-    );
+    const testProps = {
+      ...props,
+      onCancelAddNote: undefined,
+    };
+    const wrapper = mount(<AddNote {...testProps} />);
 
     expect(wrapper.find('[data-test-subj="cancel"]').exists()).toEqual(false);
   });
 
   test('it renders the contents of the note', () => {
-    const wrapper = mount(
-      <AddNote
-        associateNote={jest.fn()}
-        getNewNoteId={jest.fn()}
-        newNote={note}
-        onCancelAddNote={jest.fn()}
-        updateNewNote={jest.fn()}
-        updateNote={jest.fn()}
-      />
-    );
+    const wrapper = mount(<AddNote {...props} />);
 
     expect(wrapper.find('[data-test-subj="add-a-note"]').first().text()).toEqual(note);
   });
 
   test('it invokes associateNote when the Add Note button is clicked', () => {
     const associateNote = jest.fn();
-
-    const wrapper = mount(
-      <AddNote
-        associateNote={associateNote}
-        getNewNoteId={jest.fn()}
-        newNote={note}
-        onCancelAddNote={jest.fn()}
-        updateNewNote={jest.fn()}
-        updateNote={jest.fn()}
-      />
-    );
+    const testProps = {
+      ...props,
+      newNote: note,
+      associateNote,
+    };
+    const wrapper = mount(<AddNote {...testProps} />);
 
     wrapper.find('[data-test-subj="add-note"]').first().simulate('click');
 
@@ -129,17 +93,12 @@ describe('AddNote', () => {
 
   test('it invokes getNewNoteId when the Add Note button is clicked', () => {
     const getNewNoteId = jest.fn();
+    const testProps = {
+      ...props,
+      getNewNoteId,
+    };
 
-    const wrapper = mount(
-      <AddNote
-        associateNote={jest.fn()}
-        getNewNoteId={getNewNoteId}
-        newNote={note}
-        onCancelAddNote={jest.fn()}
-        updateNewNote={jest.fn()}
-        updateNote={jest.fn()}
-      />
-    );
+    const wrapper = mount(<AddNote {...testProps} />);
 
     wrapper.find('[data-test-subj="add-note"]').first().simulate('click');
 
@@ -148,17 +107,12 @@ describe('AddNote', () => {
 
   test('it invokes updateNewNote when the Add Note button is clicked', () => {
     const updateNewNote = jest.fn();
+    const testProps = {
+      ...props,
+      updateNewNote,
+    };
 
-    const wrapper = mount(
-      <AddNote
-        associateNote={jest.fn()}
-        getNewNoteId={jest.fn()}
-        newNote={note}
-        onCancelAddNote={jest.fn()}
-        updateNewNote={updateNewNote}
-        updateNote={jest.fn()}
-      />
-    );
+    const wrapper = mount(<AddNote {...testProps} />);
 
     wrapper.find('[data-test-subj="add-note"]').first().simulate('click');
 
@@ -167,17 +121,11 @@ describe('AddNote', () => {
 
   test('it invokes updateNote when the Add Note button is clicked', () => {
     const updateNote = jest.fn();
-
-    const wrapper = mount(
-      <AddNote
-        associateNote={jest.fn()}
-        getNewNoteId={jest.fn()}
-        newNote={note}
-        onCancelAddNote={jest.fn()}
-        updateNewNote={jest.fn()}
-        updateNote={updateNote}
-      />
-    );
+    const testProps = {
+      ...props,
+      updateNote,
+    };
+    const wrapper = mount(<AddNote {...testProps} />);
 
     wrapper.find('[data-test-subj="add-note"]').first().simulate('click');
 
@@ -185,16 +133,11 @@ describe('AddNote', () => {
   });
 
   test('it does NOT display the markdown formatting hint when a note has NOT been entered', () => {
-    const wrapper = mount(
-      <AddNote
-        associateNote={jest.fn()}
-        getNewNoteId={jest.fn()}
-        newNote={''}
-        onCancelAddNote={jest.fn()}
-        updateNewNote={jest.fn()}
-        updateNote={jest.fn()}
-      />
-    );
+    const testProps = {
+      ...props,
+      newNote: '',
+    };
+    const wrapper = mount(<AddNote {...testProps} />);
 
     expect(wrapper.find('[data-test-subj="markdown-hint"]').first()).toHaveStyleRule(
       'visibility',
@@ -203,16 +146,11 @@ describe('AddNote', () => {
   });
 
   test('it displays the markdown formatting hint when a note has been entered', () => {
-    const wrapper = mount(
-      <AddNote
-        associateNote={jest.fn()}
-        getNewNoteId={jest.fn()}
-        newNote={'We should see a formatting hint now'}
-        onCancelAddNote={jest.fn()}
-        updateNewNote={jest.fn()}
-        updateNote={jest.fn()}
-      />
-    );
+    const testProps = {
+      ...props,
+      newNote: 'We should see a formatting hint now',
+    };
+    const wrapper = mount(<AddNote {...testProps} />);
 
     expect(wrapper.find('[data-test-subj="markdown-hint"]').first()).toHaveStyleRule(
       'visibility',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/notes/add_note/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/notes/add_note/index.tsx
index d3db1a619600f9..7c211aafdf8c63 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/notes/add_note/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/notes/add_note/index.tsx
@@ -61,7 +61,6 @@ export const AddNote = React.memo<{
       }),
     [associateNote, getNewNoteId, newNote, updateNewNote, updateNote]
   );
-
   return (
     <AddNotesContainer alignItems="flexEnd" direction="column" gutterSize="none">
       <NewNote note={newNote} noteInputHeight={200} updateNewNote={updateNewNote} />
diff --git a/x-pack/plugins/security_solution/public/timelines/components/notes/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/notes/index.tsx
index 42f28f03406798..957b37a0bd1c27 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/notes/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/notes/index.tsx
@@ -21,12 +21,14 @@ import { AddNote } from './add_note';
 import { columns } from './columns';
 import { AssociateNote, GetNewNoteId, NotesCount, search, UpdateNote } from './helpers';
 import { NOTES_PANEL_WIDTH, NOTES_PANEL_HEIGHT } from '../timeline/properties/notes_size';
+import { TimelineStatusLiteral, TimelineStatus } from '../../../../common/types/timeline';
 
 interface Props {
   associateNote: AssociateNote;
   getNotesByIds: (noteIds: string[]) => Note[];
   getNewNoteId: GetNewNoteId;
   noteIds: string[];
+  status: TimelineStatusLiteral;
   updateNote: UpdateNote;
 }
 
@@ -53,8 +55,9 @@ InMemoryTable.displayName = 'InMemoryTable';
 
 /** A view for entering and reviewing notes */
 export const Notes = React.memo<Props>(
-  ({ associateNote, getNotesByIds, getNewNoteId, noteIds, updateNote }) => {
+  ({ associateNote, getNotesByIds, getNewNoteId, noteIds, status, updateNote }) => {
     const [newNote, setNewNote] = useState('');
+    const isImmutable = status === TimelineStatus.immutable;
 
     return (
       <NotesPanel>
@@ -63,13 +66,15 @@ export const Notes = React.memo<Props>(
         </EuiModalHeader>
 
         <EuiModalBody>
-          <AddNote
-            associateNote={associateNote}
-            getNewNoteId={getNewNoteId}
-            newNote={newNote}
-            updateNewNote={setNewNote}
-            updateNote={updateNote}
-          />
+          {!isImmutable && (
+            <AddNote
+              associateNote={associateNote}
+              getNewNoteId={getNewNoteId}
+              newNote={newNote}
+              updateNewNote={setNewNote}
+              updateNote={updateNote}
+            />
+          )}
           <EuiSpacer size="s" />
           <InMemoryTable
             data-test-subj="notes-table"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.test.tsx
index fa63eb625f2839..952295d0858eea 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.test.tsx
@@ -12,6 +12,7 @@ import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { Note } from '../../../../common/lib/note';
 
 import { NoteCards } from '.';
+import { TimelineStatus } from '../../../../../common/types/timeline';
 
 describe('NoteCards', () => {
   const noteIds = ['abc', 'def'];
@@ -38,18 +39,21 @@ describe('NoteCards', () => {
     },
   ];
 
+  const props = {
+    associateNote: jest.fn(),
+    getNotesByIds,
+    getNewNoteId: jest.fn(),
+    noteIds,
+    showAddNote: true,
+    status: TimelineStatus.active,
+    toggleShowAddNote: jest.fn(),
+    updateNote: jest.fn(),
+  };
+
   test('it renders the notes column when noteIds are specified', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
-        <NoteCards
-          associateNote={jest.fn()}
-          getNotesByIds={getNotesByIds}
-          getNewNoteId={jest.fn()}
-          noteIds={noteIds}
-          showAddNote={true}
-          toggleShowAddNote={jest.fn()}
-          updateNote={jest.fn()}
-        />
+        <NoteCards {...props} />
       </ThemeProvider>
     );
 
@@ -57,17 +61,10 @@ describe('NoteCards', () => {
   });
 
   test('it does NOT render the notes column when noteIds are NOT specified', () => {
+    const testProps = { ...props, noteIds: [] };
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
-        <NoteCards
-          associateNote={jest.fn()}
-          getNotesByIds={getNotesByIds}
-          getNewNoteId={jest.fn()}
-          noteIds={[]}
-          showAddNote={true}
-          toggleShowAddNote={jest.fn()}
-          updateNote={jest.fn()}
-        />
+        <NoteCards {...testProps} />
       </ThemeProvider>
     );
 
@@ -77,15 +74,7 @@ describe('NoteCards', () => {
   test('renders note cards', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
-        <NoteCards
-          associateNote={jest.fn()}
-          getNotesByIds={getNotesByIds}
-          getNewNoteId={jest.fn()}
-          noteIds={noteIds}
-          showAddNote={true}
-          toggleShowAddNote={jest.fn()}
-          updateNote={jest.fn()}
-        />
+        <NoteCards {...props} />
       </ThemeProvider>
     );
 
@@ -102,15 +91,7 @@ describe('NoteCards', () => {
   test('it shows controls for adding notes when showAddNote is true', () => {
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
-        <NoteCards
-          associateNote={jest.fn()}
-          getNotesByIds={getNotesByIds}
-          getNewNoteId={jest.fn()}
-          noteIds={noteIds}
-          showAddNote={true}
-          toggleShowAddNote={jest.fn()}
-          updateNote={jest.fn()}
-        />
+        <NoteCards {...props} />
       </ThemeProvider>
     );
 
@@ -118,17 +99,11 @@ describe('NoteCards', () => {
   });
 
   test('it does NOT show controls for adding notes when showAddNote is false', () => {
+    const testProps = { ...props, showAddNote: false };
+
     const wrapper = mountWithIntl(
       <ThemeProvider theme={theme}>
-        <NoteCards
-          associateNote={jest.fn()}
-          getNotesByIds={getNotesByIds}
-          getNewNoteId={jest.fn()}
-          noteIds={noteIds}
-          showAddNote={false}
-          toggleShowAddNote={jest.fn()}
-          updateNote={jest.fn()}
-        />
+        <NoteCards {...testProps} />
       </ThemeProvider>
     );
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.tsx
index 3c8fc50e93b893..9d9055e3ad748a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.tsx
@@ -12,6 +12,7 @@ import { Note } from '../../../../common/lib/note';
 import { AddNote } from '../add_note';
 import { AssociateNote, GetNewNoteId, UpdateNote } from '../helpers';
 import { NoteCard } from '../note_card';
+import { TimelineStatusLiteral } from '../../../../../common/types/timeline';
 
 const AddNoteContainer = styled.div``;
 AddNoteContainer.displayName = 'AddNoteContainer';
@@ -49,6 +50,7 @@ interface Props {
   getNewNoteId: GetNewNoteId;
   noteIds: string[];
   showAddNote: boolean;
+  status: TimelineStatusLiteral;
   toggleShowAddNote: () => void;
   updateNote: UpdateNote;
 }
@@ -61,6 +63,7 @@ export const NoteCards = React.memo<Props>(
     getNewNoteId,
     noteIds,
     showAddNote,
+    status,
     toggleShowAddNote,
     updateNote,
   }) => {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/edit_timeline_batch_actions.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/edit_timeline_batch_actions.tsx
index 4d45b74e9b1b49..15c078e1753553 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/edit_timeline_batch_actions.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/edit_timeline_batch_actions.tsx
@@ -6,7 +6,9 @@
 
 import { EuiContextMenuPanel, EuiContextMenuItem, EuiBasicTable } from '@elastic/eui';
 import React, { useCallback, useMemo } from 'react';
-import { isEmpty } from 'lodash/fp';
+
+import { TimelineStatus } from '../../../../common/types/timeline';
+
 import * as i18n from './translations';
 import { DeleteTimelines, OpenTimelineResult } from './types';
 import { EditTimelineActions } from './export_timeline';
@@ -63,7 +65,7 @@ export const useEditTimelineBatchActions = ({
 
   const getBatchItemsPopoverContent = useCallback(
     (closePopover: () => void) => {
-      const isDisabled = isEmpty(selectedItems);
+      const disabled = selectedItems?.some((item) => item.status === TimelineStatus.immutable);
       return (
         <>
           <EditTimelineActions
@@ -82,7 +84,7 @@ export const useEditTimelineBatchActions = ({
           <EuiContextMenuPanel
             items={[
               <EuiContextMenuItem
-                disabled={isDisabled}
+                disabled={disabled}
                 icon="exportAction"
                 key="ExportItemKey"
                 onClick={handleEnableExportTimelineDownloader}
@@ -90,7 +92,7 @@ export const useEditTimelineBatchActions = ({
                 {i18n.EXPORT_SELECTED}
               </EuiContextMenuItem>,
               <EuiContextMenuItem
-                disabled={isDisabled}
+                disabled={disabled}
                 icon="trash"
                 key="DeleteItemKey"
                 onClick={handleOnOpenDeleteTimelineModal}
@@ -102,6 +104,7 @@ export const useEditTimelineBatchActions = ({
         </>
       );
     },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       deleteTimelines,
       isEnableDownloader,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx
index d377b10a55c213..b8a7cfd59d2225 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx
@@ -8,7 +8,6 @@ import React from 'react';
 import { TimelineDownloader } from './export_timeline';
 import { mockSelectedTimeline } from './mocks';
 import { ReactWrapper, mount } from 'enzyme';
-import { useExportTimeline } from '.';
 
 jest.mock('../translations', () => {
   return {
@@ -32,19 +31,6 @@ describe('TimelineDownloader', () => {
     onComplete: jest.fn(),
   };
   describe('should not render a downloader', () => {
-    beforeAll(() => {
-      ((useExportTimeline as unknown) as jest.Mock).mockReturnValue({
-        enableDownloader: false,
-        setEnableDownloader: jest.fn(),
-        exportedIds: {},
-        getExportedData: jest.fn(),
-      });
-    });
-
-    afterAll(() => {
-      ((useExportTimeline as unknown) as jest.Mock).mockReset();
-    });
-
     test('Without exportedIds', () => {
       const testProps = {
         ...defaultTestProps,
@@ -65,19 +51,6 @@ describe('TimelineDownloader', () => {
   });
 
   describe('should render a downloader', () => {
-    beforeAll(() => {
-      ((useExportTimeline as unknown) as jest.Mock).mockReturnValue({
-        enableDownloader: false,
-        setEnableDownloader: jest.fn(),
-        exportedIds: {},
-        getExportedData: jest.fn(),
-      });
-    });
-
-    afterAll(() => {
-      ((useExportTimeline as unknown) as jest.Mock).mockReset();
-    });
-
     test('With selectedItems and exportedIds is given and isEnableDownloader is true', () => {
       const testProps = {
         ...defaultTestProps,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/index.test.tsx
index 674cd6dad5f76f..72f149174253aa 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/index.test.tsx
@@ -5,31 +5,41 @@
  */
 
 import React from 'react';
-import { mount } from 'enzyme';
-import { useExportTimeline, ExportTimeline } from '.';
+import { shallow } from 'enzyme';
+import { EditTimelineActionsComponent } from '.';
 
-describe('useExportTimeline', () => {
-  describe('call with selected timelines', () => {
-    let exportTimelineRes: ExportTimeline;
-    const TestHook = () => {
-      exportTimelineRes = useExportTimeline();
-      return <div />;
+describe('EditTimelineActionsComponent', () => {
+  describe('render', () => {
+    const props = {
+      deleteTimelines: jest.fn(),
+      ids: ['id1'],
+      isEnableDownloader: false,
+      isDeleteTimelineModalOpen: false,
+      onComplete: jest.fn(),
+      title: 'mockTitle',
     };
 
-    beforeAll(() => {
-      mount(<TestHook />);
-    });
+    test('should render timelineDownloader', () => {
+      const wrapper = shallow(<EditTimelineActionsComponent {...props} />);
 
-    test('Downloader should be disabled by default', () => {
-      expect(exportTimelineRes.isEnableDownloader).toBeFalsy();
+      expect(wrapper.find('[data-test-subj="TimelineDownloader"]').exists()).toBeTruthy();
     });
 
-    test('Should include disableExportTimelineDownloader in return value', () => {
-      expect(exportTimelineRes).toHaveProperty('disableExportTimelineDownloader');
+    test('Should render DeleteTimelineModalOverlay if deleteTimelines is given', () => {
+      const wrapper = shallow(<EditTimelineActionsComponent {...props} />);
+
+      expect(wrapper.find('[data-test-subj="DeleteTimelineModalOverlay"]').exists()).toBeTruthy();
     });
 
-    test('Should include enableExportTimelineDownloader in return value', () => {
-      expect(exportTimelineRes).toHaveProperty('enableExportTimelineDownloader');
+    test('Should not render DeleteTimelineModalOverlay if deleteTimelines is not given', () => {
+      const newProps = {
+        ...props,
+        deleteTimelines: undefined,
+      };
+      const wrapper = shallow(<EditTimelineActionsComponent {...newProps} />);
+      expect(
+        wrapper.find('[data-test-subj="DeleteTimelineModalOverlay"]').exists()
+      ).not.toBeTruthy();
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/index.tsx
index 7bac3229c81732..2ad4aa9d208cb6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useState, useCallback } from 'react';
+import React from 'react';
 import { DeleteTimelines } from '../types';
 
 import { TimelineDownloader } from './export_timeline';
@@ -17,25 +17,7 @@ export interface ExportTimeline {
   isEnableDownloader: boolean;
 }
 
-export const useExportTimeline = (): ExportTimeline => {
-  const [isEnableDownloader, setIsEnableDownloader] = useState(false);
-
-  const enableExportTimelineDownloader = useCallback(() => {
-    setIsEnableDownloader(true);
-  }, []);
-
-  const disableExportTimelineDownloader = useCallback(() => {
-    setIsEnableDownloader(false);
-  }, []);
-
-  return {
-    disableExportTimelineDownloader,
-    enableExportTimelineDownloader,
-    isEnableDownloader,
-  };
-};
-
-const EditTimelineActionsComponent: React.FC<{
+export const EditTimelineActionsComponent: React.FC<{
   deleteTimelines: DeleteTimelines | undefined;
   ids: string[];
   isEnableDownloader: boolean;
@@ -52,6 +34,7 @@ const EditTimelineActionsComponent: React.FC<{
 }) => (
   <>
     <TimelineDownloader
+      data-test-subj="TimelineDownloader"
       exportedIds={ids}
       getExportedData={exportSelectedTimeline}
       isEnableDownloader={isEnableDownloader}
@@ -59,6 +42,7 @@ const EditTimelineActionsComponent: React.FC<{
     />
     {deleteTimelines != null && (
       <DeleteTimelineModalOverlay
+        data-test-subj="DeleteTimelineModalOverlay"
         deleteTimelines={deleteTimelines}
         isModalOpen={isDeleteTimelineModalOpen}
         onComplete={onComplete}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
index 520215cde4862c..e841718c8119b8 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
@@ -10,7 +10,17 @@ import { Action } from 'typescript-fsa';
 import uuid from 'uuid';
 import { Dispatch } from 'redux';
 import { oneTimelineQuery } from '../../containers/one/index.gql_query';
-import { TimelineResult, GetOneTimeline, NoteResult } from '../../../graphql/types';
+import {
+  TimelineResult,
+  GetOneTimeline,
+  NoteResult,
+  FilterTimelineResult,
+  ColumnHeaderResult,
+  PinnedEvent,
+} from '../../../graphql/types';
+
+import { TimelineStatus, TimelineType } from '../../../../common/types/timeline';
+
 import {
   addNotes as dispatchAddNotes,
   updateNote as dispatchUpdateNote,
@@ -22,9 +32,9 @@ import {
   addTimeline as dispatchAddTimeline,
   addNote as dispatchAddGlobalTimelineNote,
 } from '../../../timelines/store/timeline/actions';
-
 import { ColumnHeaderOptions, TimelineModel } from '../../../timelines/store/timeline/model';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
+
 import {
   defaultColumnHeaderType,
   defaultHeaders,
@@ -77,103 +87,115 @@ const parseString = (params: string) => {
   }
 };
 
+const setTimelineColumn = (col: ColumnHeaderResult) => {
+  const timelineCols: ColumnHeaderOptions = {
+    ...col,
+    columnHeaderType: defaultColumnHeaderType,
+    id: col.id != null ? col.id : 'unknown',
+    placeholder: col.placeholder != null ? col.placeholder : undefined,
+    category: col.category != null ? col.category : undefined,
+    description: col.description != null ? col.description : undefined,
+    example: col.example != null ? col.example : undefined,
+    type: col.type != null ? col.type : undefined,
+    aggregatable: col.aggregatable != null ? col.aggregatable : undefined,
+    width: col.id === '@timestamp' ? DEFAULT_DATE_COLUMN_MIN_WIDTH : DEFAULT_COLUMN_MIN_WIDTH,
+  };
+  return timelineCols;
+};
+
+const setTimelineFilters = (filter: FilterTimelineResult) => ({
+  $state: {
+    store: 'appState',
+  },
+  meta: {
+    ...filter.meta,
+    ...(filter.meta && filter.meta.field != null ? { params: parseString(filter.meta.field) } : {}),
+    ...(filter.meta && filter.meta.params != null
+      ? { params: parseString(filter.meta.params) }
+      : {}),
+    ...(filter.meta && filter.meta.value != null ? { value: parseString(filter.meta.value) } : {}),
+  },
+  ...(filter.exists != null ? { exists: parseString(filter.exists) } : {}),
+  ...(filter.match_all != null ? { exists: parseString(filter.match_all) } : {}),
+  ...(filter.missing != null ? { exists: parseString(filter.missing) } : {}),
+  ...(filter.query != null ? { query: parseString(filter.query) } : {}),
+  ...(filter.range != null ? { range: parseString(filter.range) } : {}),
+  ...(filter.script != null ? { exists: parseString(filter.script) } : {}),
+});
+
+const setEventIdToNoteIds = (
+  duplicate: boolean,
+  eventIdToNoteIds: NoteResult[] | null | undefined
+) =>
+  duplicate
+    ? {}
+    : eventIdToNoteIds != null
+    ? eventIdToNoteIds.reduce((acc, note) => {
+        if (note.eventId != null) {
+          const eventNotes = getOr([], note.eventId, acc);
+          return { ...acc, [note.eventId]: [...eventNotes, note.noteId] };
+        }
+        return acc;
+      }, {})
+    : {};
+
+const setPinnedEventsSaveObject = (
+  duplicate: boolean,
+  pinnedEventsSaveObject: PinnedEvent[] | null | undefined
+) =>
+  duplicate
+    ? {}
+    : pinnedEventsSaveObject != null
+    ? pinnedEventsSaveObject.reduce(
+        (acc, pinnedEvent) => ({
+          ...acc,
+          ...(pinnedEvent.eventId != null ? { [pinnedEvent.eventId]: pinnedEvent } : {}),
+        }),
+        {}
+      )
+    : {};
+
+const setPinnedEventIds = (duplicate: boolean, pinnedEventIds: string[] | null | undefined) =>
+  duplicate
+    ? {}
+    : pinnedEventIds != null
+    ? pinnedEventIds.reduce((acc, pinnedEventId) => ({ ...acc, [pinnedEventId]: true }), {})
+    : {};
+
+// eslint-disable-next-line complexity
 export const defaultTimelineToTimelineModel = (
   timeline: TimelineResult,
   duplicate: boolean
 ): TimelineModel => {
-  return Object.entries({
+  const isTemplate = timeline.timelineType === TimelineType.template;
+  const timelineEntries = {
     ...timeline,
-    columns:
-      timeline.columns != null
-        ? timeline.columns.map((col) => {
-            const timelineCols: ColumnHeaderOptions = {
-              ...col,
-              columnHeaderType: defaultColumnHeaderType,
-              id: col.id != null ? col.id : 'unknown',
-              placeholder: col.placeholder != null ? col.placeholder : undefined,
-              category: col.category != null ? col.category : undefined,
-              description: col.description != null ? col.description : undefined,
-              example: col.example != null ? col.example : undefined,
-              type: col.type != null ? col.type : undefined,
-              aggregatable: col.aggregatable != null ? col.aggregatable : undefined,
-              width:
-                col.id === '@timestamp' ? DEFAULT_DATE_COLUMN_MIN_WIDTH : DEFAULT_COLUMN_MIN_WIDTH,
-            };
-            return timelineCols;
-          })
-        : defaultHeaders,
-    eventIdToNoteIds: duplicate
-      ? {}
-      : timeline.eventIdToNoteIds != null
-      ? timeline.eventIdToNoteIds.reduce((acc, note) => {
-          if (note.eventId != null) {
-            const eventNotes = getOr([], note.eventId, acc);
-            return { ...acc, [note.eventId]: [...eventNotes, note.noteId] };
-          }
-          return acc;
-        }, {})
-      : {},
-    filters:
-      timeline.filters != null
-        ? timeline.filters.map((filter) => ({
-            $state: {
-              store: 'appState',
-            },
-            meta: {
-              ...filter.meta,
-              ...(filter.meta && filter.meta.field != null
-                ? { params: parseString(filter.meta.field) }
-                : {}),
-              ...(filter.meta && filter.meta.params != null
-                ? { params: parseString(filter.meta.params) }
-                : {}),
-              ...(filter.meta && filter.meta.value != null
-                ? { value: parseString(filter.meta.value) }
-                : {}),
-            },
-            ...(filter.exists != null ? { exists: parseString(filter.exists) } : {}),
-            ...(filter.match_all != null ? { exists: parseString(filter.match_all) } : {}),
-            ...(filter.missing != null ? { exists: parseString(filter.missing) } : {}),
-            ...(filter.query != null ? { query: parseString(filter.query) } : {}),
-            ...(filter.range != null ? { range: parseString(filter.range) } : {}),
-            ...(filter.script != null ? { exists: parseString(filter.script) } : {}),
-          }))
-        : [],
+    columns: timeline.columns != null ? timeline.columns.map(setTimelineColumn) : defaultHeaders,
+    eventIdToNoteIds: setEventIdToNoteIds(duplicate, timeline.eventIdToNoteIds),
+    filters: timeline.filters != null ? timeline.filters.map(setTimelineFilters) : [],
     isFavorite: duplicate
       ? false
       : timeline.favorite != null
       ? timeline.favorite.length > 0
       : false,
     noteIds: duplicate ? [] : timeline.noteIds != null ? timeline.noteIds : [],
-    pinnedEventIds: duplicate
-      ? {}
-      : timeline.pinnedEventIds != null
-      ? timeline.pinnedEventIds.reduce(
-          (acc, pinnedEventId) => ({ ...acc, [pinnedEventId]: true }),
-          {}
-        )
-      : {},
-    pinnedEventsSaveObject: duplicate
-      ? {}
-      : timeline.pinnedEventsSaveObject != null
-      ? timeline.pinnedEventsSaveObject.reduce(
-          (acc, pinnedEvent) => ({
-            ...acc,
-            ...(pinnedEvent.eventId != null ? { [pinnedEvent.eventId]: pinnedEvent } : {}),
-          }),
-          {}
-        )
-      : {},
+    pinnedEventIds: setPinnedEventIds(duplicate, timeline.pinnedEventIds),
+    pinnedEventsSaveObject: setPinnedEventsSaveObject(duplicate, timeline.pinnedEventsSaveObject),
     id: duplicate ? '' : timeline.savedObjectId,
+    status: duplicate ? TimelineStatus.active : timeline.status,
     savedObjectId: duplicate ? null : timeline.savedObjectId,
     version: duplicate ? null : timeline.version,
-    title: duplicate ? '' : timeline.title || '',
-    templateTimelineId: duplicate ? null : timeline.templateTimelineId,
-    templateTimelineVersion: duplicate ? null : timeline.templateTimelineVersion,
-  }).reduce((acc: TimelineModel, [key, value]) => (value != null ? set(key, value, acc) : acc), {
-    ...timelineDefaults,
-    id: '',
-  });
+    title: duplicate ? `${timeline.title} - Duplicate` : timeline.title || '',
+    templateTimelineId: duplicate && isTemplate ? uuid.v4() : timeline.templateTimelineId,
+    templateTimelineVersion: duplicate && isTemplate ? 1 : timeline.templateTimelineVersion,
+  };
+  return Object.entries(timelineEntries).reduce(
+    (acc: TimelineModel, [key, value]) => (value != null ? set(key, value, acc) : acc),
+    {
+      ...timelineDefaults,
+      id: '',
+    }
+  );
 };
 
 export const formatTimelineResultToModel = (
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
index 24dee1460810fa..ea63f2b7b0710a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
@@ -9,9 +9,9 @@ import React, { useEffect, useState, useCallback } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { Dispatch } from 'redux';
-import { defaultHeaders } from '../timeline/body/column_headers/default_headers';
-import { deleteTimelineMutation } from '../../containers/delete/persist.gql_query';
-import { useGetAllTimeline } from '../../containers/all';
+
+import { disableTemplate } from '../../../../common/constants';
+
 import { DeleteTimelineMutation, SortFieldTimeline, Direction } from '../../../graphql/types';
 import { State } from '../../../common/store';
 import { ColumnHeaderOptions, TimelineModel } from '../../../timelines/store/timeline/model';
@@ -21,6 +21,12 @@ import {
   createTimeline as dispatchCreateNewTimeline,
   updateIsLoading as dispatchUpdateIsLoading,
 } from '../../../timelines/store/timeline/actions';
+
+import { deleteTimelineMutation } from '../../containers/delete/persist.gql_query';
+import { useGetAllTimeline } from '../../containers/all';
+
+import { defaultHeaders } from '../timeline/body/column_headers/default_headers';
+
 import { OpenTimeline } from './open_timeline';
 import { OPEN_TIMELINE_CLASS_NAME, queryTimelineById, dispatchUpdateTimeline } from './helpers';
 import { OpenTimelineModalBody } from './open_timeline_modal/open_timeline_modal_body';
@@ -42,7 +48,7 @@ import {
 } from './types';
 import { DEFAULT_SORT_FIELD, DEFAULT_SORT_DIRECTION } from './constants';
 import { useTimelineTypes } from './use_timeline_types';
-import { disableTemplate } from '../../../../common/constants';
+import { useTimelineStatus } from './use_timeline_status';
 
 interface OwnProps<TCache = object> {
   apolloClient: ApolloClient<TCache>;
@@ -106,28 +112,54 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
     /** The requested field to sort on */
     const [sortField, setSortField] = useState(DEFAULT_SORT_FIELD);
 
-    const { timelineType, timelineTabs, timelineFilters } = useTimelineTypes();
-    const { fetchAllTimeline, timelines, loading, totalCount } = useGetAllTimeline();
-
-    const refetch = useCallback(
-      () =>
-        fetchAllTimeline({
-          pageInfo: {
-            pageIndex: pageIndex + 1,
-            pageSize,
-          },
-          search,
-          sort: {
-            sortField: sortField as SortFieldTimeline,
-            sortOrder: sortDirection as Direction,
-          },
-          onlyUserFavorite: onlyFavorites,
-          timelineType,
-        }),
-
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      [pageIndex, pageSize, search, sortField, sortDirection, timelineType, onlyFavorites]
-    );
+    const {
+      customTemplateTimelineCount,
+      defaultTimelineCount,
+      elasticTemplateTimelineCount,
+      favoriteCount,
+      fetchAllTimeline,
+      timelines,
+      loading,
+      totalCount,
+      templateTimelineCount,
+    } = useGetAllTimeline();
+    const { timelineType, timelineTabs, timelineFilters } = useTimelineTypes({
+      defaultTimelineCount,
+      templateTimelineCount,
+    });
+    const { timelineStatus, templateTimelineType, templateTimelineFilter } = useTimelineStatus({
+      timelineType,
+      customTemplateTimelineCount,
+      elasticTemplateTimelineCount,
+    });
+    const refetch = useCallback(() => {
+      fetchAllTimeline({
+        pageInfo: {
+          pageIndex: pageIndex + 1,
+          pageSize,
+        },
+        search,
+        sort: {
+          sortField: sortField as SortFieldTimeline,
+          sortOrder: sortDirection as Direction,
+        },
+        onlyUserFavorite: onlyFavorites,
+        timelineType,
+        templateTimelineType,
+        status: timelineStatus,
+      });
+    }, [
+      fetchAllTimeline,
+      pageIndex,
+      pageSize,
+      search,
+      sortField,
+      sortDirection,
+      timelineType,
+      timelineStatus,
+      templateTimelineType,
+      onlyFavorites,
+    ]);
 
     /** Invoked when the user presses enters to submit the text in the search input */
     const onQueryChange: OnQueryChange = useCallback((query: EuiSearchBarQuery) => {
@@ -264,6 +296,7 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
         data-test-subj={'open-timeline'}
         deleteTimelines={onDeleteOneTimeline}
         defaultPageSize={defaultPageSize}
+        favoriteCount={favoriteCount}
         isLoading={loading}
         itemIdToExpandedNotesRowMap={itemIdToExpandedNotesRowMap}
         importDataModalToggle={importDataModalToggle}
@@ -285,7 +318,9 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
         selectedItems={selectedItems}
         sortDirection={sortDirection}
         sortField={sortField}
-        tabs={!disableTemplate ? timelineTabs : undefined}
+        templateTimelineFilter={!disableTemplate ? templateTimelineFilter : null}
+        timelineType={timelineType}
+        timelineFilter={!disableTemplate ? timelineTabs : null}
         title={title}
         totalSearchResultsCount={totalCount}
       />
@@ -294,6 +329,7 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
         data-test-subj={'open-timeline-modal'}
         deleteTimelines={onDeleteOneTimeline}
         defaultPageSize={defaultPageSize}
+        favoriteCount={favoriteCount}
         hideActions={hideActions}
         isLoading={loading}
         itemIdToExpandedNotesRowMap={itemIdToExpandedNotesRowMap}
@@ -312,7 +348,9 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
         selectedItems={selectedItems}
         sortDirection={sortDirection}
         sortField={sortField}
-        tabs={!disableTemplate ? timelineFilters : undefined}
+        templateTimelineFilter={!disableTemplate ? templateTimelineFilter : null}
+        timelineType={timelineType}
+        timelineFilter={!disableTemplate ? timelineFilters : null}
         title={title}
         totalSearchResultsCount={totalCount}
       />
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.test.tsx
index a331c62ec47545..f42914c86f46b2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.test.tsx
@@ -16,6 +16,7 @@ import { TimelinesTableProps } from './timelines_table';
 import { mockTimelineResults } from '../../../common/mock/timeline_results';
 import { OpenTimeline } from './open_timeline';
 import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from './constants';
+import { TimelineType } from '../../../../common/types/timeline';
 
 jest.mock('../../../common/lib/kibana');
 
@@ -46,8 +47,9 @@ describe('OpenTimeline', () => {
     selectedItems: [],
     sortDirection: DEFAULT_SORT_DIRECTION,
     sortField: DEFAULT_SORT_FIELD,
-    tabs: <div />,
     title,
+    timelineType: TimelineType.default,
+    templateTimelineFilter: [<div />],
     totalSearchResultsCount: mockSearchResults.length,
   });
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx
index 4894b1b2577a9b..849143894efe0b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx
@@ -4,17 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiPanel, EuiBasicTable } from '@elastic/eui';
+import { EuiPanel, EuiBasicTable, EuiCallOut, EuiSpacer } from '@elastic/eui';
 import React, { useCallback, useMemo, useRef } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { OPEN_TIMELINE_CLASS_NAME } from './helpers';
-import { OpenTimelineProps, OpenTimelineResult, ActionTimelineToShow } from './types';
-import { SearchRow } from './search_row';
-import { TimelinesTable } from './timelines_table';
-import { ImportDataModal } from '../../../common/components/import_data_modal';
-import * as i18n from './translations';
-import { importTimelines } from '../../containers/api';
 
+import { ImportDataModal } from '../../../common/components/import_data_modal';
 import {
   UtilityBarGroup,
   UtilityBarText,
@@ -22,14 +16,23 @@ import {
   UtilityBarSection,
   UtilityBarAction,
 } from '../../../common/components/utility_bar';
+
+import { importTimelines } from '../../containers/api';
+
 import { useEditTimelineBatchActions } from './edit_timeline_batch_actions';
 import { useEditTimelineActions } from './edit_timeline_actions';
 import { EditOneTimelineAction } from './export_timeline';
+import { SearchRow } from './search_row';
+import { TimelinesTable } from './timelines_table';
+import * as i18n from './translations';
+import { OPEN_TIMELINE_CLASS_NAME } from './helpers';
+import { OpenTimelineProps, OpenTimelineResult, ActionTimelineToShow } from './types';
 
 export const OpenTimeline = React.memo<OpenTimelineProps>(
   ({
     deleteTimelines,
     defaultPageSize,
+    favoriteCount,
     isLoading,
     itemIdToExpandedNotesRowMap,
     importDataModalToggle,
@@ -51,11 +54,12 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
     sortDirection,
     setImportDataModalToggle,
     sortField,
-    tabs,
+    timelineType,
+    timelineFilter,
+    templateTimelineFilter,
     totalSearchResultsCount,
   }) => {
     const tableRef = useRef<EuiBasicTable<OpenTimelineResult>>();
-
     const {
       actionItem,
       enableExportTimelineDownloader,
@@ -124,6 +128,8 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
       [onDeleteSelected, deleteTimelines]
     );
 
+    const SearchRowContent = useMemo(() => <>{templateTimelineFilter}</>, [templateTimelineFilter]);
+
     return (
       <>
         <EditOneTimelineAction
@@ -151,15 +157,20 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
         />
 
         <EuiPanel className={OPEN_TIMELINE_CLASS_NAME}>
-          {!!tabs && tabs}
+          <EuiCallOut size="s" title={i18n.TEMPLATE_CALL_OUT_MESSAGE} />
+          <EuiSpacer size="m" />
+          {!!timelineFilter && timelineFilter}
           <SearchRow
             data-test-subj="search-row"
+            favoriteCount={favoriteCount}
             onlyFavorites={onlyFavorites}
             onQueryChange={onQueryChange}
             onToggleOnlyFavorites={onToggleOnlyFavorites}
             query={query}
             totalSearchResultsCount={totalSearchResultsCount}
-          />
+          >
+            {SearchRowContent}
+          </SearchRow>
 
           <UtilityBar border>
             <UtilityBarSection>
@@ -206,6 +217,7 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
             showExtendedColumns={true}
             sortDirection={sortDirection}
             sortField={sortField}
+            timelineType={timelineType}
             tableRef={tableRef}
             totalSearchResultsCount={totalSearchResultsCount}
           />
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
index 42a3f9a44d4b6f..1d08f0296ce0de 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
@@ -16,6 +16,7 @@ import { TimelinesTableProps } from '../timelines_table';
 import { mockTimelineResults } from '../../../../common/mock/timeline_results';
 import { OpenTimelineModalBody } from './open_timeline_modal_body';
 import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from '../constants';
+import { TimelineType } from '../../../../../common/types/timeline';
 
 jest.mock('../../../../common/lib/kibana');
 
@@ -45,7 +46,8 @@ describe('OpenTimelineModal', () => {
     selectedItems: [],
     sortDirection: DEFAULT_SORT_DIRECTION,
     sortField: DEFAULT_SORT_FIELD,
-    tabs: <div />,
+    timelineType: TimelineType.default,
+    templateTimelineFilter: [<div />],
     title,
     totalSearchResultsCount: mockSearchResults.length,
   });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx
index 9eab64d6fcf525..bf66d9a52ff2ff 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx
@@ -23,6 +23,7 @@ export const OpenTimelineModalBody = memo<OpenTimelineProps>(
   ({
     deleteTimelines,
     defaultPageSize,
+    favoriteCount,
     hideActions = [],
     isLoading,
     itemIdToExpandedNotesRowMap,
@@ -42,7 +43,9 @@ export const OpenTimelineModalBody = memo<OpenTimelineProps>(
     selectedItems,
     sortDirection,
     sortField,
-    tabs,
+    timelineFilter,
+    timelineType,
+    templateTimelineFilter,
     title,
     totalSearchResultsCount,
   }) => {
@@ -54,6 +57,16 @@ export const OpenTimelineModalBody = memo<OpenTimelineProps>(
       return actions.filter((action) => !hideActions.includes(action));
     }, [onDeleteSelected, deleteTimelines, hideActions]);
 
+    const SearchRowContent = useMemo(
+      () => (
+        <>
+          {!!timelineFilter && timelineFilter}
+          {!!templateTimelineFilter && templateTimelineFilter}
+        </>
+      ),
+      [timelineFilter, templateTimelineFilter]
+    );
+
     return (
       <>
         <EuiModalHeader>
@@ -67,13 +80,15 @@ export const OpenTimelineModalBody = memo<OpenTimelineProps>(
             <>
               <SearchRow
                 data-test-subj="search-row"
+                favoriteCount={favoriteCount}
                 onlyFavorites={onlyFavorites}
                 onQueryChange={onQueryChange}
                 onToggleOnlyFavorites={onToggleOnlyFavorites}
                 query={query}
-                tabs={tabs}
                 totalSearchResultsCount={totalSearchResultsCount}
-              />
+              >
+                {SearchRowContent}
+              </SearchRow>
             </>
           </HeaderContainer>
         </EuiModalHeader>
@@ -96,6 +111,7 @@ export const OpenTimelineModalBody = memo<OpenTimelineProps>(
             showExtendedColumns={false}
             sortDirection={sortDirection}
             sortField={sortField}
+            timelineType={timelineType}
             totalSearchResultsCount={totalSearchResultsCount}
           />
         </EuiModalBody>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/search_row/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/search_row/index.tsx
index 557649aa3aa43f..6f9178664ccf0a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/search_row/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/search_row/index.tsx
@@ -34,8 +34,13 @@ SearchRowFlexGroup.displayName = 'SearchRowFlexGroup';
 
 type Props = Pick<
   OpenTimelineProps,
-  'onlyFavorites' | 'onQueryChange' | 'onToggleOnlyFavorites' | 'query' | 'totalSearchResultsCount'
-> & { tabs?: JSX.Element };
+  | 'favoriteCount'
+  | 'onlyFavorites'
+  | 'onQueryChange'
+  | 'onToggleOnlyFavorites'
+  | 'query'
+  | 'totalSearchResultsCount'
+> & { children?: JSX.Element | null };
 
 const searchBox = {
   placeholder: i18n.SEARCH_PLACEHOLDER,
@@ -47,12 +52,13 @@ const searchBox = {
  */
 export const SearchRow = React.memo<Props>(
   ({
+    favoriteCount,
     onlyFavorites,
     onQueryChange,
     onToggleOnlyFavorites,
     query,
     totalSearchResultsCount,
-    tabs,
+    children,
   }) => {
     return (
       <SearchRowContainer>
@@ -68,10 +74,11 @@ export const SearchRow = React.memo<Props>(
                   data-test-subj="only-favorites-toggle"
                   hasActiveFilters={onlyFavorites}
                   onClick={onToggleOnlyFavorites}
+                  numFilters={favoriteCount ?? undefined}
                 >
                   {i18n.ONLY_FAVORITES}
                 </EuiFilterButton>
-                {tabs}
+                {!!children && children}
               </>
             </EuiFilterGroup>
           </EuiFlexItem>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/actions_columns.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/actions_columns.tsx
index c92e241c0fe799..5b8eb8fd0365c4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/actions_columns.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/actions_columns.tsx
@@ -16,6 +16,7 @@ import {
   TimelineActionsOverflowColumns,
 } from '../types';
 import * as i18n from '../translations';
+import { TimelineStatus } from '../../../../../common/types/timeline';
 
 /**
  * Returns the action columns (e.g. delete, open duplicate timeline)
@@ -54,7 +55,9 @@ export const getActionsColumns = ({
     onClick: (selectedTimeline: OpenTimelineResult) => {
       if (enableExportTimelineDownloader != null) enableExportTimelineDownloader(selectedTimeline);
     },
-    enabled: ({ savedObjectId }: OpenTimelineResult) => savedObjectId != null,
+    enabled: (timeline: OpenTimelineResult) => {
+      return timeline.savedObjectId != null && timeline.status !== TimelineStatus.immutable;
+    },
     description: i18n.EXPORT_SELECTED,
     'data-test-subj': 'export-timeline',
   };
@@ -65,7 +68,8 @@ export const getActionsColumns = ({
     onClick: (selectedTimeline: OpenTimelineResult) => {
       if (onOpenDeleteTimelineModal != null) onOpenDeleteTimelineModal(selectedTimeline);
     },
-    enabled: ({ savedObjectId }: OpenTimelineResult) => savedObjectId != null,
+    enabled: ({ savedObjectId, status }: OpenTimelineResult) =>
+      savedObjectId != null && status !== TimelineStatus.immutable,
     description: i18n.DELETE_SELECTED,
     'data-test-subj': 'delete-timeline',
   };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/icon_header_columns.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/icon_header_columns.tsx
index 5b0f3ded7d71bd..e07c6b6b461491 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/icon_header_columns.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/icon_header_columns.tsx
@@ -13,55 +13,68 @@ import { ACTION_COLUMN_WIDTH } from './common_styles';
 import { getNotesCount, getPinnedEventCount } from '../helpers';
 import * as i18n from '../translations';
 import { FavoriteTimelineResult, OpenTimelineResult } from '../types';
+import { TimelineTypeLiteralWithNull, TimelineType } from '../../../../../common/types/timeline';
 
 /**
  * Returns the columns that have icon headers
  */
-export const getIconHeaderColumns = () => [
-  {
-    align: 'center',
-    field: 'pinnedEventIds',
-    name: (
-      <EuiToolTip content={i18n.PINNED_EVENTS}>
-        <EuiIcon data-test-subj="pinned-event-header-icon" size="m" type="pin" />
-      </EuiToolTip>
-    ),
-    render: (_: Record<string, boolean> | null | undefined, timelineResult: OpenTimelineResult) => (
-      <span data-test-subj="pinned-event-count">{`${getPinnedEventCount(timelineResult)}`}</span>
-    ),
-    sortable: false,
-    width: ACTION_COLUMN_WIDTH,
-  },
-  {
-    align: 'center',
-    field: 'eventIdToNoteIds',
-    name: (
-      <EuiToolTip content={i18n.NOTES}>
-        <EuiIcon data-test-subj="notes-count-header-icon" size="m" type="editorComment" />
-      </EuiToolTip>
-    ),
-    render: (
-      _: Record<string, string[]> | null | undefined,
-      timelineResult: OpenTimelineResult
-    ) => <span data-test-subj="notes-count">{getNotesCount(timelineResult)}</span>,
-    sortable: false,
-    width: ACTION_COLUMN_WIDTH,
-  },
-  {
-    align: 'center',
-    field: 'favorite',
-    name: (
-      <EuiToolTip content={i18n.FAVORITES}>
-        <EuiIcon data-test-subj="favorites-header-icon" size="m" type="starEmpty" />
-      </EuiToolTip>
-    ),
-    render: (favorite: FavoriteTimelineResult[] | null | undefined) => {
-      const isFavorite = favorite != null && favorite.length > 0;
-      const fill = isFavorite ? 'starFilled' : 'starEmpty';
+export const getIconHeaderColumns = ({
+  timelineType,
+}: {
+  timelineType: TimelineTypeLiteralWithNull;
+}) => {
+  const columns = {
+    note: {
+      align: 'center',
+      field: 'eventIdToNoteIds',
+      name: (
+        <EuiToolTip content={i18n.NOTES}>
+          <EuiIcon data-test-subj="notes-count-header-icon" size="m" type="editorComment" />
+        </EuiToolTip>
+      ),
+      render: (
+        _: Record<string, string[]> | null | undefined,
+        timelineResult: OpenTimelineResult
+      ) => <span data-test-subj="notes-count">{getNotesCount(timelineResult)}</span>,
+      sortable: false,
+      width: ACTION_COLUMN_WIDTH,
+    },
+    pinnedEvent: {
+      align: 'center',
+      field: 'pinnedEventIds',
+      name: (
+        <EuiToolTip content={i18n.PINNED_EVENTS}>
+          <EuiIcon data-test-subj="pinned-event-header-icon" size="m" type="pin" />
+        </EuiToolTip>
+      ),
+      render: (
+        _: Record<string, boolean> | null | undefined,
+        timelineResult: OpenTimelineResult
+      ) => (
+        <span data-test-subj="pinned-event-count">{`${getPinnedEventCount(timelineResult)}`}</span>
+      ),
+      sortable: false,
+      width: ACTION_COLUMN_WIDTH,
+    },
+    favorite: {
+      align: 'center',
+      field: 'favorite',
+      name: (
+        <EuiToolTip content={i18n.FAVORITES}>
+          <EuiIcon data-test-subj="favorites-header-icon" size="m" type="starEmpty" />
+        </EuiToolTip>
+      ),
+      render: (favorite: FavoriteTimelineResult[] | null | undefined) => {
+        const isFavorite = favorite != null && favorite.length > 0;
+        const fill = isFavorite ? 'starFilled' : 'starEmpty';
 
-      return <EuiIcon data-test-subj={`favorite-${fill}-star`} type={fill} size="m" />;
+        return <EuiIcon data-test-subj={`favorite-${fill}-star`} type={fill} size="m" />;
+      },
+      sortable: false,
+      width: ACTION_COLUMN_WIDTH,
     },
-    sortable: false,
-    width: ACTION_COLUMN_WIDTH,
-  },
-];
+  };
+  const templateColumns = [columns.note, columns.favorite];
+  const defaultColumns = [columns.pinnedEvent, columns.note, columns.favorite];
+  return timelineType === TimelineType.template ? templateColumns : defaultColumns;
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/index.tsx
index 7091ef1f0a1f9c..fdba3247afb38f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/index.tsx
@@ -24,6 +24,7 @@ import { getActionsColumns } from './actions_columns';
 import { getCommonColumns } from './common_columns';
 import { getExtendedColumns } from './extended_columns';
 import { getIconHeaderColumns } from './icon_header_columns';
+import { TimelineTypeLiteralWithNull } from '../../../../../common/types/timeline';
 
 // there are a number of type mismatches across this file
 const EuiBasicTable: any = _EuiBasicTable; // eslint-disable-line @typescript-eslint/no-explicit-any
@@ -58,6 +59,7 @@ export const getTimelinesTableColumns = ({
   onOpenTimeline,
   onToggleShowNotes,
   showExtendedColumns,
+  timelineType,
 }: {
   actionTimelineToShow: ActionTimelineToShow[];
   deleteTimelines?: DeleteTimelines;
@@ -68,6 +70,7 @@ export const getTimelinesTableColumns = ({
   onSelectionChange: OnSelectionChange;
   onToggleShowNotes: OnToggleShowNotes;
   showExtendedColumns: boolean;
+  timelineType: TimelineTypeLiteralWithNull;
 }) => {
   return [
     ...getCommonColumns({
@@ -76,7 +79,7 @@ export const getTimelinesTableColumns = ({
       onToggleShowNotes,
     }),
     ...getExtendedColumnsIfEnabled(showExtendedColumns),
-    ...getIconHeaderColumns(),
+    ...getIconHeaderColumns({ timelineType }),
     ...getActionsColumns({
       actionTimelineToShow,
       deleteTimelines,
@@ -105,6 +108,7 @@ export interface TimelinesTableProps {
   showExtendedColumns: boolean;
   sortDirection: 'asc' | 'desc';
   sortField: string;
+  timelineType: TimelineTypeLiteralWithNull;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   tableRef?: React.MutableRefObject<_EuiBasicTable<any> | undefined>;
   totalSearchResultsCount: number;
@@ -134,6 +138,7 @@ export const TimelinesTable = React.memo<TimelinesTableProps>(
     sortField,
     sortDirection,
     tableRef,
+    timelineType,
     totalSearchResultsCount,
   }) => {
     const pagination = {
@@ -174,6 +179,7 @@ export const TimelinesTable = React.memo<TimelinesTableProps>(
           onSelectionChange,
           onToggleShowNotes,
           showExtendedColumns,
+          timelineType,
         })}
         compressed
         data-test-subj="timelines-table"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/mocks.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/mocks.ts
index 78ca898cc407e8..0770f460794a6a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/mocks.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/timelines_table/mocks.ts
@@ -7,6 +7,7 @@ import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines_page';
 import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from '../constants';
 import { OpenTimelineResult } from '../types';
 import { TimelinesTableProps } from '.';
+import { TimelineType } from '../../../../../common/types/timeline';
 
 export const getMockTimelinesTableProps = (
   mockOpenTimelineResults: OpenTimelineResult[]
@@ -28,5 +29,6 @@ export const getMockTimelinesTableProps = (
   showExtendedColumns: true,
   sortDirection: DEFAULT_SORT_DIRECTION,
   sortField: DEFAULT_SORT_FIELD,
+  timelineType: TimelineType.default,
   totalSearchResultsCount: mockOpenTimelineResults.length,
 });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts
index edd77330f50841..7b07548af67ae3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts
@@ -220,6 +220,20 @@ export const TAB_TEMPLATES = i18n.translate(
   }
 );
 
+export const FILTER_ELASTIC_TIMELINES = i18n.translate(
+  'xpack.securitySolution.timelines.components.templateFilter.elasticTitle',
+  {
+    defaultMessage: 'Elastic templates',
+  }
+);
+
+export const FILTER_CUSTOM_TIMELINES = i18n.translate(
+  'xpack.securitySolution.timelines.components.templateFilter.customizedTitle',
+  {
+    defaultMessage: 'Custom templates',
+  }
+);
+
 export const IMPORT_TIMELINE_BTN_TITLE = i18n.translate(
   'xpack.securitySolution.timelines.components.importTimelineModal.importTimelineTitle',
   {
@@ -230,7 +244,7 @@ export const IMPORT_TIMELINE_BTN_TITLE = i18n.translate(
 export const SELECT_TIMELINE = i18n.translate(
   'xpack.securitySolution.timelines.components.importTimelineModal.selectTimelineDescription',
   {
-    defaultMessage: 'Select a SIEM timeline (as exported from the Timeline view) to import',
+    defaultMessage: 'Select a Security timeline (as exported from the Timeline view) to import',
   }
 );
 
@@ -280,3 +294,10 @@ export const IMPORT_FAILED_DETAILED = (id: string, statusCode: number, message:
       defaultMessage: 'Timeline ID: {id}\n Status Code: {statusCode}\n Message: {message}',
     }
   );
+
+export const TEMPLATE_CALL_OUT_MESSAGE = i18n.translate(
+  'xpack.securitySolution.timelines.components.templateCallOutMessageTitle',
+  {
+    defaultMessage: 'Now you can add timeline templates and link it to rules.',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/types.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/types.ts
index e1515a3a79254d..8811d5452e0396 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/types.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/types.ts
@@ -8,7 +8,12 @@ import { SetStateAction, Dispatch } from 'react';
 import { AllTimelinesVariables } from '../../containers/all';
 import { TimelineModel } from '../../store/timeline/model';
 import { NoteResult } from '../../../graphql/types';
-import { TimelineTypeLiteral } from '../../../../common/types/timeline';
+import {
+  TimelineTypeLiteral,
+  TimelineTypeLiteralWithNull,
+  TimelineStatus,
+  TemplateTimelineTypeLiteral,
+} from '../../../../common/types/timeline';
 
 /** The users who added a timeline to favorites */
 export interface FavoriteTimelineResult {
@@ -46,6 +51,7 @@ export interface OpenTimelineResult {
   notes?: TimelineResultNote[] | null;
   pinnedEventIds?: Readonly<Record<string, boolean>> | null;
   savedObjectId?: string | null;
+  status?: TimelineStatus | null;
   title?: string | null;
   templateTimelineId?: string | null;
   type?: TimelineTypeLiteral;
@@ -118,6 +124,8 @@ export interface OpenTimelineProps {
   deleteTimelines?: DeleteTimelines;
   /** The default requested size of each page of search results */
   defaultPageSize: number;
+  /** The number of favorite timeline*/
+  favoriteCount?: number | null | undefined;
   /** Displays an indicator that data is loading when true */
   isLoading: boolean;
   /** Required by EuiTable for expandable rows: a map of `TimelineResult.savedObjectId` to rendered notes */
@@ -160,8 +168,12 @@ export interface OpenTimelineProps {
   sortDirection: 'asc' | 'desc';
   /** the requested field to sort on */
   sortField: string;
+  /** this affects timeline's behaviour like editable / duplicatible */
+  timelineType: TimelineTypeLiteralWithNull;
+  /** when timelineType === template, templatetimelineFilter is a JSX.Element */
+  templateTimelineFilter: JSX.Element[] | null;
   /** timeline / template timeline */
-  tabs?: JSX.Element;
+  timelineFilter?: JSX.Element | JSX.Element[] | null;
   /** The title of the Open Timeline component  */
   title: string;
   /** The total (server-side) count of the search results */
@@ -196,9 +208,19 @@ export enum TimelineTabsStyle {
 }
 
 export interface TimelineTab {
-  id: TimelineTypeLiteral;
-  name: string;
+  count: number | undefined;
   disabled: boolean;
   href: string;
+  id: TimelineTypeLiteral;
+  name: string;
   onClick: (ev: { preventDefault: () => void }) => void;
+  withNext: boolean;
+}
+
+export interface TemplateTimelineFilter {
+  id: TemplateTimelineTypeLiteral;
+  name: string;
+  disabled: boolean;
+  withNext: boolean;
+  count: number | undefined;
 }
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_status.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_status.tsx
new file mode 100644
index 00000000000000..f17f6aebaddf6a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_status.tsx
@@ -0,0 +1,110 @@
+/*
+ * 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 React, { useState, useCallback, useMemo } from 'react';
+import { EuiFilterButton } from '@elastic/eui';
+
+import {
+  TimelineStatus,
+  TimelineType,
+  TimelineTypeLiteralWithNull,
+  TemplateTimelineType,
+  TemplateTimelineTypeLiteralWithNull,
+  TimelineStatusLiteralWithNull,
+} from '../../../../common/types/timeline';
+
+import * as i18n from './translations';
+import { TemplateTimelineFilter } from './types';
+import { disableTemplate } from '../../../../common/constants';
+
+export const useTimelineStatus = ({
+  timelineType,
+  elasticTemplateTimelineCount,
+  customTemplateTimelineCount,
+}: {
+  timelineType: TimelineTypeLiteralWithNull;
+  elasticTemplateTimelineCount?: number | null;
+  customTemplateTimelineCount?: number | null;
+}): {
+  timelineStatus: TimelineStatusLiteralWithNull;
+  templateTimelineType: TemplateTimelineTypeLiteralWithNull;
+  templateTimelineFilter: JSX.Element[] | null;
+} => {
+  const [selectedTab, setSelectedTab] = useState<TemplateTimelineTypeLiteralWithNull>(
+    disableTemplate ? null : TemplateTimelineType.elastic
+  );
+  const isTemplateFilterEnabled = useMemo(() => timelineType === TimelineType.template, [
+    timelineType,
+  ]);
+
+  const templateTimelineType = useMemo(
+    () => (disableTemplate || !isTemplateFilterEnabled ? null : selectedTab),
+    [selectedTab, isTemplateFilterEnabled]
+  );
+
+  const timelineStatus = useMemo(
+    () =>
+      templateTimelineType == null
+        ? null
+        : templateTimelineType === TemplateTimelineType.elastic
+        ? TimelineStatus.immutable
+        : TimelineStatus.active,
+    [templateTimelineType]
+  );
+
+  const filters = useMemo(
+    () => [
+      {
+        id: TemplateTimelineType.elastic,
+        name: i18n.FILTER_ELASTIC_TIMELINES,
+        disabled: !isTemplateFilterEnabled,
+        withNext: true,
+        count: elasticTemplateTimelineCount ?? undefined,
+      },
+      {
+        id: TemplateTimelineType.custom,
+        name: i18n.FILTER_CUSTOM_TIMELINES,
+        disabled: !isTemplateFilterEnabled,
+        withNext: false,
+        count: customTemplateTimelineCount ?? undefined,
+      },
+    ],
+    [customTemplateTimelineCount, elasticTemplateTimelineCount, isTemplateFilterEnabled]
+  );
+
+  const onFilterClicked = useCallback(
+    (tabId) => {
+      if (selectedTab === tabId) {
+        setSelectedTab(null);
+      } else {
+        setSelectedTab(tabId);
+      }
+    },
+    [setSelectedTab, selectedTab]
+  );
+
+  const templateTimelineFilter = useMemo(() => {
+    return isTemplateFilterEnabled
+      ? filters.map((tab: TemplateTimelineFilter) => (
+          <EuiFilterButton
+            hasActiveFilters={tab.id === templateTimelineType}
+            key={`template-timeline-filter-${tab.id}`}
+            numFilters={tab.count}
+            onClick={onFilterClicked.bind(null, tab.id)}
+            withNext={tab.withNext}
+            isDisabled={tab.disabled}
+          >
+            {tab.name}
+          </EuiFilterButton>
+        ))
+      : null;
+  }, [templateTimelineType, filters, isTemplateFilterEnabled, onFilterClicked]);
+
+  return {
+    timelineStatus,
+    templateTimelineType,
+    templateTimelineFilter,
+  };
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.tsx
index 56c67b0c294a22..bee94db3488724 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.tsx
@@ -13,10 +13,16 @@ import { getTimelineTabsUrl, useFormatUrl } from '../../../common/components/lin
 import * as i18n from './translations';
 import { TimelineTabsStyle, TimelineTab } from './types';
 
-export const useTimelineTypes = (): {
+export const useTimelineTypes = ({
+  defaultTimelineCount,
+  templateTimelineCount,
+}: {
+  defaultTimelineCount?: number | null;
+  templateTimelineCount?: number | null;
+}): {
   timelineType: TimelineTypeLiteralWithNull;
   timelineTabs: JSX.Element;
-  timelineFilters: JSX.Element;
+  timelineFilters: JSX.Element[];
 } => {
   const history = useHistory();
   const { formatUrl, search: urlSearch } = useFormatUrl(SecurityPageName.timelines);
@@ -40,35 +46,52 @@ export const useTimelineTypes = (): {
     },
     [history, urlSearch]
   );
-
-  const getFilterOrTabs: (timelineTabsStyle: TimelineTabsStyle) => TimelineTab[] = (
-    timelineTabsStyle: TimelineTabsStyle
-  ) => [
-    {
-      id: TimelineType.default,
-      name:
-        timelineTabsStyle === TimelineTabsStyle.filter
-          ? i18n.FILTER_TIMELINES(i18n.TAB_TIMELINES)
-          : i18n.TAB_TIMELINES,
-      href: formatUrl(getTimelineTabsUrl(TimelineType.default, urlSearch)),
-      disabled: false,
-      onClick: goToTimeline,
-    },
-    {
-      id: TimelineType.template,
-      name:
-        timelineTabsStyle === TimelineTabsStyle.filter
-          ? i18n.FILTER_TIMELINES(i18n.TAB_TEMPLATES)
-          : i18n.TAB_TEMPLATES,
-      href: formatUrl(getTimelineTabsUrl(TimelineType.template, urlSearch)),
-      disabled: false,
-      onClick: goToTemplateTimeline,
-    },
-  ];
+  const getFilterOrTabs: (timelineTabsStyle: TimelineTabsStyle) => TimelineTab[] = useCallback(
+    (timelineTabsStyle: TimelineTabsStyle) => [
+      {
+        id: TimelineType.default,
+        name:
+          timelineTabsStyle === TimelineTabsStyle.filter
+            ? i18n.FILTER_TIMELINES(i18n.TAB_TIMELINES)
+            : i18n.TAB_TIMELINES,
+        href: formatUrl(getTimelineTabsUrl(TimelineType.default, urlSearch)),
+        disabled: false,
+        withNext: true,
+        count:
+          timelineTabsStyle === TimelineTabsStyle.filter
+            ? defaultTimelineCount ?? undefined
+            : undefined,
+        onClick: goToTimeline,
+      },
+      {
+        id: TimelineType.template,
+        name:
+          timelineTabsStyle === TimelineTabsStyle.filter
+            ? i18n.FILTER_TIMELINES(i18n.TAB_TEMPLATES)
+            : i18n.TAB_TEMPLATES,
+        href: formatUrl(getTimelineTabsUrl(TimelineType.template, urlSearch)),
+        disabled: false,
+        withNext: false,
+        count:
+          timelineTabsStyle === TimelineTabsStyle.filter
+            ? templateTimelineCount ?? undefined
+            : undefined,
+        onClick: goToTemplateTimeline,
+      },
+    ],
+    [
+      defaultTimelineCount,
+      templateTimelineCount,
+      urlSearch,
+      formatUrl,
+      goToTimeline,
+      goToTemplateTimeline,
+    ]
+  );
 
   const onFilterClicked = useCallback(
-    (timelineTabsStyle, tabId) => {
-      if (timelineTabsStyle === TimelineTabsStyle.filter && tabId === timelineType) {
+    (tabId) => {
+      if (tabId === timelineType) {
         setTimelineTypes(null);
       } else {
         setTimelineTypes(tabId);
@@ -89,7 +112,7 @@ export const useTimelineTypes = (): {
               href={tab.href}
               onClick={(ev) => {
                 tab.onClick(ev);
-                onFilterClicked(TimelineTabsStyle.tab, tab.id);
+                onFilterClicked(tab.id);
               }}
             >
               {tab.name}
@@ -103,24 +126,21 @@ export const useTimelineTypes = (): {
   }, [tabName]);
 
   const timelineFilters = useMemo(() => {
-    return (
-      <>
-        {getFilterOrTabs(TimelineTabsStyle.tab).map((tab: TimelineTab) => (
-          <EuiFilterButton
-            hasActiveFilters={tab.id === timelineType}
-            key={`timeline-${TimelineTabsStyle.filter}-${tab.id}`}
-            onClick={(ev: { preventDefault: () => void }) => {
-              tab.onClick(ev);
-              onFilterClicked.bind(null, TimelineTabsStyle.filter, tab.id);
-            }}
-          >
-            {tab.name}
-          </EuiFilterButton>
-        ))}
-      </>
-    );
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [timelineType]);
+    return getFilterOrTabs(TimelineTabsStyle.filter).map((tab: TimelineTab) => (
+      <EuiFilterButton
+        hasActiveFilters={tab.id === timelineType}
+        key={`timeline-${TimelineTabsStyle.filter}-${tab.id}`}
+        numFilters={tab.count}
+        onClick={(ev: { preventDefault: () => void }) => {
+          tab.onClick(ev);
+          onFilterClicked(tab.id);
+        }}
+        withNext={tab.withNext}
+      >
+        {tab.name}
+      </EuiFilterButton>
+    ));
+  }, [timelineType, getFilterOrTabs, onFilterClicked]);
 
   return {
     timelineType,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/__snapshots__/timeline.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/__snapshots__/timeline.test.tsx.snap
index 92782252719303..012cfd66317de7 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/__snapshots__/timeline.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/__snapshots__/timeline.test.tsx.snap
@@ -926,6 +926,7 @@ In other use cases the message field can be used to concatenate different values
                 }
               }
               start={1521830963132}
+              status="active"
               toggleColumn={[MockFunction]}
               usersViewing={
                 Array [
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
index a50e7e56661f22..53b018fb00adf6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
@@ -5,13 +5,24 @@
  */
 import { mount } from 'enzyme';
 import React from 'react';
+import { useSelector } from 'react-redux';
 
-import { TestProviders } from '../../../../../common/mock';
+import { TestProviders, mockTimelineModel } from '../../../../../common/mock';
 import { DEFAULT_ACTIONS_COLUMN_WIDTH } from '../constants';
 
 import { Actions } from '.';
 
+jest.mock('react-redux', () => {
+  const origin = jest.requireActual('react-redux');
+  return {
+    ...origin,
+    useSelector: jest.fn(),
+  };
+});
+
 describe('Actions', () => {
+  (useSelector as jest.Mock).mockReturnValue(mockTimelineModel);
+
   test('it renders a checkbox for selecting the event when `showCheckboxes` is `true`', () => {
     const wrapper = mount(
       <TestProviders>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
index b478070b315783..d343c3db04da6e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
@@ -3,10 +3,15 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { EuiButtonIcon, EuiCheckbox, EuiLoadingSpinner, EuiToolTip } from '@elastic/eui';
 import React from 'react';
+import { useSelector } from 'react-redux';
+import { EuiButtonIcon, EuiCheckbox, EuiLoadingSpinner, EuiToolTip } from '@elastic/eui';
 
 import { Note } from '../../../../../common/lib/note';
+import { StoreState } from '../../../../../common/store/types';
+
+import { TimelineModel } from '../../../../store/timeline/model';
+
 import { AssociateNote, UpdateNote } from '../../../notes/helpers';
 import { Pin } from '../../pin';
 import { NotesButton } from '../../properties/helpers';
@@ -79,92 +84,101 @@ export const Actions = React.memo<Props>(
     showNotes,
     toggleShowNotes,
     updateNote,
-  }) => (
-    <EventsTdGroupActions
-      actionsColumnWidth={actionsColumnWidth}
-      data-test-subj="event-actions-container"
-    >
-      {showCheckboxes && (
-        <EventsTd data-test-subj="select-event-container">
+  }) => {
+    const timeline = useSelector<StoreState, TimelineModel>((state) => {
+      return state.timeline.timelineById['timeline-1'];
+    });
+    return (
+      <EventsTdGroupActions
+        actionsColumnWidth={actionsColumnWidth}
+        data-test-subj="event-actions-container"
+      >
+        {showCheckboxes && (
+          <EventsTd data-test-subj="select-event-container">
+            <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
+              {loadingEventIds.includes(eventId) ? (
+                <EuiLoadingSpinner size="m" data-test-subj="event-loader" />
+              ) : (
+                <EuiCheckbox
+                  data-test-subj="select-event"
+                  id={eventId}
+                  checked={checked}
+                  onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                    onRowSelected({
+                      eventIds: [eventId],
+                      isSelected: event.currentTarget.checked,
+                    });
+                  }}
+                />
+              )}
+            </EventsTdContent>
+          </EventsTd>
+        )}
+
+        <EventsTd>
           <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
-            {loadingEventIds.includes(eventId) ? (
-              <EuiLoadingSpinner size="m" data-test-subj="event-loader" />
-            ) : (
-              <EuiCheckbox
-                data-test-subj="select-event"
+            {loading && <EventsLoading />}
+
+            {!loading && (
+              <EuiButtonIcon
+                aria-label={expanded ? i18n.COLLAPSE : i18n.EXPAND}
+                data-test-subj="expand-event"
+                iconType={expanded ? 'arrowDown' : 'arrowRight'}
                 id={eventId}
-                checked={checked}
-                onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
-                  onRowSelected({
-                    eventIds: [eventId],
-                    isSelected: event.currentTarget.checked,
-                  });
-                }}
+                onClick={onEventToggled}
               />
             )}
           </EventsTdContent>
         </EventsTd>
-      )}
 
-      <EventsTd>
-        <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
-          {loading && <EventsLoading />}
+        <>{additionalActions}</>
 
-          {!loading && (
-            <EuiButtonIcon
-              aria-label={expanded ? i18n.COLLAPSE : i18n.EXPAND}
-              data-test-subj="expand-event"
-              iconType={expanded ? 'arrowDown' : 'arrowRight'}
-              id={eventId}
-              onClick={onEventToggled}
-            />
-          )}
-        </EventsTdContent>
-      </EventsTd>
+        {!isEventViewer && (
+          <>
+            <EventsTd>
+              <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
+                <EuiToolTip
+                  data-test-subj="timeline-action-pin-tool-tip"
+                  content={getPinTooltip({
+                    isPinned: eventIsPinned,
+                    eventHasNotes: eventHasNotes(noteIds),
+                    timelineType: timeline.timelineType,
+                  })}
+                >
+                  <Pin
+                    allowUnpinning={!eventHasNotes(noteIds)}
+                    data-test-subj="pin-event"
+                    onClick={onPinClicked}
+                    pinned={eventIsPinned}
+                    timelineType={timeline.timelineType}
+                  />
+                </EuiToolTip>
+              </EventsTdContent>
+            </EventsTd>
 
-      <>{additionalActions}</>
-
-      {!isEventViewer && (
-        <>
-          <EventsTd>
-            <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
-              <EuiToolTip
-                data-test-subj="timeline-action-pin-tool-tip"
-                content={getPinTooltip({
-                  isPinned: eventIsPinned,
-                  eventHasNotes: eventHasNotes(noteIds),
-                })}
-              >
-                <Pin
-                  allowUnpinning={!eventHasNotes(noteIds)}
-                  data-test-subj="pin-event"
-                  onClick={onPinClicked}
-                  pinned={eventIsPinned}
+            <EventsTd>
+              <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
+                <NotesButton
+                  animate={false}
+                  associateNote={associateNote}
+                  data-test-subj="add-note"
+                  getNotesByIds={getNotesByIds}
+                  noteIds={noteIds || emptyNotes}
+                  showNotes={showNotes}
+                  size="s"
+                  status={timeline.status}
+                  timelineType={timeline.timelineType}
+                  toggleShowNotes={toggleShowNotes}
+                  toolTip={timeline.timelineType ? i18n.NOTES_DISABLE_TOOLTIP : i18n.NOTES_TOOLTIP}
+                  updateNote={updateNote}
                 />
-              </EuiToolTip>
-            </EventsTdContent>
-          </EventsTd>
-
-          <EventsTd>
-            <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
-              <NotesButton
-                animate={false}
-                associateNote={associateNote}
-                data-test-subj="add-note"
-                getNotesByIds={getNotesByIds}
-                noteIds={noteIds || emptyNotes}
-                showNotes={showNotes}
-                size="s"
-                toggleShowNotes={toggleShowNotes}
-                toolTip={i18n.NOTES_TOOLTIP}
-                updateNote={updateNote}
-              />
-            </EventsTdContent>
-          </EventsTd>
-        </>
-      )}
-    </EventsTdGroupActions>
-  ),
+              </EventsTdContent>
+            </EventsTd>
+          </>
+        )}
+      </EventsTdGroupActions>
+    );
+  },
   (nextProps, prevProps) => {
     return (
       prevProps.actionsColumnWidth === nextProps.actionsColumnWidth &&
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
index cf76cd3ddb8d42..d2175c728aa2a4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
@@ -5,6 +5,7 @@
  */
 
 import React, { useEffect, useRef, useState, useCallback } from 'react';
+import { useSelector } from 'react-redux';
 import uuid from 'uuid';
 import VisibilitySensor from 'react-visibility-sensor';
 
@@ -13,7 +14,7 @@ import { TimelineDetailsQuery } from '../../../../containers/details';
 import { TimelineItem, DetailItem, TimelineNonEcsData } from '../../../../../graphql/types';
 import { requestIdleCallbackViaScheduler } from '../../../../../common/lib/helpers/scheduler';
 import { Note } from '../../../../../common/lib/note';
-import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model';
+import { ColumnHeaderOptions, TimelineModel } from '../../../../../timelines/store/timeline/model';
 import { AddNoteToEvent, UpdateNote } from '../../../notes/helpers';
 import { SkeletonRow } from '../../skeleton_row';
 import {
@@ -33,6 +34,7 @@ import { getEventType } from '../helpers';
 import { NoteCards } from '../../../notes/note_cards';
 import { useEventDetailsWidthContext } from '../../../../../common/components/events_viewer/event_details_width_context';
 import { EventColumnView } from './event_column_view';
+import { StoreState } from '../../../../../common/store';
 
 interface Props {
   actionsColumnWidth: number;
@@ -128,7 +130,9 @@ const StatefulEventComponent: React.FC<Props> = ({
   const [expanded, setExpanded] = useState<{ [eventId: string]: boolean }>({});
   const [initialRender, setInitialRender] = useState(false);
   const [showNotes, setShowNotes] = useState<{ [eventId: string]: boolean }>({});
-
+  const timeline = useSelector<StoreState, TimelineModel>((state) => {
+    return state.timeline.timelineById['timeline-1'];
+  });
   const divElement = useRef<HTMLDivElement | null>(null);
 
   const onToggleShowNotes = useCallback(() => {
@@ -251,6 +255,7 @@ const StatefulEventComponent: React.FC<Props> = ({
                         getNotesByIds={getNotesByIds}
                         noteIds={eventIdToNoteIds[event._id] || emptyNotes}
                         showAddNote={!!showNotes[event._id]}
+                        status={timeline.status}
                         toggleShowAddNote={onToggleShowNotes}
                         updateNote={updateNote}
                       />
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.test.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.test.ts
index e237e99df9ada4..7ecd7ec5ed35c7 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.test.ts
@@ -7,6 +7,7 @@
 import { Ecs } from '../../../../graphql/types';
 
 import { eventHasNotes, eventIsPinned, getPinTooltip, stringifyEvent } from './helpers';
+import { TimelineType } from '../../../../../common/types/timeline';
 
 describe('helpers', () => {
   describe('stringifyEvent', () => {
@@ -192,21 +193,37 @@ describe('helpers', () => {
 
   describe('getPinTooltip', () => {
     test('it indicates the event may NOT be unpinned when `isPinned` is `true` and the event has notes', () => {
-      expect(getPinTooltip({ isPinned: true, eventHasNotes: true })).toEqual(
-        'This event cannot be unpinned because it has notes'
-      );
+      expect(
+        getPinTooltip({ isPinned: true, eventHasNotes: true, timelineType: TimelineType.default })
+      ).toEqual('This event cannot be unpinned because it has notes');
     });
 
     test('it indicates the event is pinned when `isPinned` is `true` and the event does NOT have notes', () => {
-      expect(getPinTooltip({ isPinned: true, eventHasNotes: false })).toEqual('Pinned event');
+      expect(
+        getPinTooltip({ isPinned: true, eventHasNotes: false, timelineType: TimelineType.default })
+      ).toEqual('Pinned event');
     });
 
     test('it indicates the event is NOT pinned when `isPinned` is `false` and the event has notes', () => {
-      expect(getPinTooltip({ isPinned: false, eventHasNotes: true })).toEqual('Unpinned event');
+      expect(
+        getPinTooltip({ isPinned: false, eventHasNotes: true, timelineType: TimelineType.default })
+      ).toEqual('Unpinned event');
     });
 
     test('it indicates the event is NOT pinned when `isPinned` is `false` and the event does NOT have notes', () => {
-      expect(getPinTooltip({ isPinned: false, eventHasNotes: false })).toEqual('Unpinned event');
+      expect(
+        getPinTooltip({ isPinned: false, eventHasNotes: false, timelineType: TimelineType.default })
+      ).toEqual('Unpinned event');
+    });
+
+    test('it indicates the event is disabled if timelineType is template', () => {
+      expect(
+        getPinTooltip({
+          isPinned: false,
+          eventHasNotes: false,
+          timelineType: TimelineType.template,
+        })
+      ).toEqual('This event cannot be pinned because it is filtered by a timeline template');
     });
   });
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.ts
index bdc8c66ec3aa65..52bbccbba58e70 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.ts
@@ -15,6 +15,7 @@ import { OnPinEvent, OnUnPinEvent } from '../events';
 import { TimelineRowAction, TimelineRowActionOnClick } from './actions';
 
 import * as i18n from './translations';
+import { TimelineTypeLiteral, TimelineType } from '../../../../../common/types/timeline';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const omitTypenameAndEmpty = (k: string, v: any): any | undefined =>
@@ -28,10 +29,19 @@ export const getPinTooltip = ({
   isPinned,
   // eslint-disable-next-line no-shadow
   eventHasNotes,
+  timelineType,
 }: {
   isPinned: boolean;
   eventHasNotes: boolean;
-}) => (isPinned && eventHasNotes ? i18n.PINNED_WITH_NOTES : isPinned ? i18n.PINNED : i18n.UNPINNED);
+  timelineType: TimelineTypeLiteral;
+}) =>
+  timelineType === TimelineType.template
+    ? i18n.DISABLE_PIN
+    : isPinned && eventHasNotes
+    ? i18n.PINNED_WITH_NOTES
+    : isPinned
+    ? i18n.PINNED
+    : i18n.UNPINNED;
 
 export interface IsPinnedParams {
   eventId: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx
index 9b96e0c49c73d7..51bf883ed2d611 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx
@@ -5,10 +5,11 @@
  */
 
 import React from 'react';
+import { useSelector } from 'react-redux';
 
 import { mockBrowserFields } from '../../../../common/containers/source/mock';
 import { Direction } from '../../../../graphql/types';
-import { defaultHeaders, mockTimelineData } from '../../../../common/mock';
+import { defaultHeaders, mockTimelineData, mockTimelineModel } from '../../../../common/mock';
 import { TestProviders } from '../../../../common/mock/test_providers';
 
 import { Body, BodyProps } from '.';
@@ -24,6 +25,13 @@ const mockSort: Sort = {
   sortDirection: Direction.desc,
 };
 
+jest.mock('react-redux', () => {
+  const origin = jest.requireActual('react-redux');
+  return {
+    ...origin,
+    useSelector: jest.fn(),
+  };
+});
 jest.mock('../../../../common/components/link_to');
 
 jest.mock(
@@ -41,41 +49,43 @@ jest.mock('../../../../common/lib/helpers/scheduler', () => ({
 
 describe('Body', () => {
   const mount = useMountAppended();
+  const props: BodyProps = {
+    addNoteToEvent: jest.fn(),
+    browserFields: mockBrowserFields,
+    columnHeaders: defaultHeaders,
+    columnRenderers,
+    data: mockTimelineData,
+    eventIdToNoteIds: {},
+    height: testBodyHeight,
+    id: 'timeline-test',
+    isSelectAllChecked: false,
+    getNotesByIds: mockGetNotesByIds,
+    loadingEventIds: [],
+    onColumnRemoved: jest.fn(),
+    onColumnResized: jest.fn(),
+    onColumnSorted: jest.fn(),
+    onFilterChange: jest.fn(),
+    onPinEvent: jest.fn(),
+    onRowSelected: jest.fn(),
+    onSelectAll: jest.fn(),
+    onUnPinEvent: jest.fn(),
+    onUpdateColumns: jest.fn(),
+    pinnedEventIds: {},
+    rowRenderers,
+    selectedEventIds: {},
+    show: true,
+    sort: mockSort,
+    showCheckboxes: false,
+    toggleColumn: jest.fn(),
+    updateNote: jest.fn(),
+  };
+  (useSelector as jest.Mock).mockReturnValue(mockTimelineModel);
 
   describe('rendering', () => {
     test('it renders the column headers', () => {
       const wrapper = mount(
         <TestProviders>
-          <Body
-            addNoteToEvent={jest.fn()}
-            browserFields={mockBrowserFields}
-            columnHeaders={defaultHeaders}
-            columnRenderers={columnRenderers}
-            data={mockTimelineData}
-            eventIdToNoteIds={{}}
-            height={testBodyHeight}
-            id={'timeline-test'}
-            isSelectAllChecked={false}
-            getNotesByIds={mockGetNotesByIds}
-            loadingEventIds={[]}
-            onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
-            onColumnSorted={jest.fn()}
-            onFilterChange={jest.fn()}
-            onPinEvent={jest.fn()}
-            onRowSelected={jest.fn()}
-            onSelectAll={jest.fn()}
-            onUnPinEvent={jest.fn()}
-            onUpdateColumns={jest.fn()}
-            pinnedEventIds={{}}
-            rowRenderers={rowRenderers}
-            selectedEventIds={{}}
-            show={true}
-            sort={mockSort}
-            showCheckboxes={false}
-            toggleColumn={jest.fn()}
-            updateNote={jest.fn()}
-          />
+          <Body {...props} />
         </TestProviders>
       );
 
@@ -85,36 +95,7 @@ describe('Body', () => {
     test('it renders the scroll container', () => {
       const wrapper = mount(
         <TestProviders>
-          <Body
-            addNoteToEvent={jest.fn()}
-            browserFields={mockBrowserFields}
-            columnHeaders={defaultHeaders}
-            columnRenderers={columnRenderers}
-            data={mockTimelineData}
-            eventIdToNoteIds={{}}
-            height={testBodyHeight}
-            id={'timeline-test'}
-            isSelectAllChecked={false}
-            getNotesByIds={mockGetNotesByIds}
-            loadingEventIds={[]}
-            onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
-            onColumnSorted={jest.fn()}
-            onFilterChange={jest.fn()}
-            onPinEvent={jest.fn()}
-            onRowSelected={jest.fn()}
-            onSelectAll={jest.fn()}
-            onUnPinEvent={jest.fn()}
-            onUpdateColumns={jest.fn()}
-            pinnedEventIds={{}}
-            rowRenderers={rowRenderers}
-            selectedEventIds={{}}
-            show={true}
-            sort={mockSort}
-            showCheckboxes={false}
-            toggleColumn={jest.fn()}
-            updateNote={jest.fn()}
-          />
+          <Body {...props} />
         </TestProviders>
       );
 
@@ -124,36 +105,7 @@ describe('Body', () => {
     test('it renders events', () => {
       const wrapper = mount(
         <TestProviders>
-          <Body
-            addNoteToEvent={jest.fn()}
-            browserFields={mockBrowserFields}
-            columnHeaders={defaultHeaders}
-            columnRenderers={columnRenderers}
-            data={mockTimelineData}
-            eventIdToNoteIds={{}}
-            height={testBodyHeight}
-            id={'timeline-test'}
-            isSelectAllChecked={false}
-            getNotesByIds={mockGetNotesByIds}
-            loadingEventIds={[]}
-            onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
-            onColumnSorted={jest.fn()}
-            onFilterChange={jest.fn()}
-            onPinEvent={jest.fn()}
-            onRowSelected={jest.fn()}
-            onSelectAll={jest.fn()}
-            onUnPinEvent={jest.fn()}
-            onUpdateColumns={jest.fn()}
-            pinnedEventIds={{}}
-            rowRenderers={rowRenderers}
-            selectedEventIds={{}}
-            show={true}
-            sort={mockSort}
-            showCheckboxes={false}
-            toggleColumn={jest.fn()}
-            updateNote={jest.fn()}
-          />
+          <Body {...props} />
         </TestProviders>
       );
 
@@ -162,39 +114,10 @@ describe('Body', () => {
 
     test('it renders a tooltip for timestamp', async () => {
       const headersJustTimestamp = defaultHeaders.filter((h) => h.id === '@timestamp');
-
+      const testProps = { ...props, columnHeaders: headersJustTimestamp };
       const wrapper = mount(
         <TestProviders>
-          <Body
-            addNoteToEvent={jest.fn()}
-            browserFields={mockBrowserFields}
-            columnHeaders={headersJustTimestamp}
-            columnRenderers={columnRenderers}
-            data={mockTimelineData}
-            eventIdToNoteIds={{}}
-            height={testBodyHeight}
-            id={'timeline-test'}
-            isSelectAllChecked={false}
-            getNotesByIds={mockGetNotesByIds}
-            loadingEventIds={[]}
-            onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
-            onColumnSorted={jest.fn()}
-            onFilterChange={jest.fn()}
-            onPinEvent={jest.fn()}
-            onRowSelected={jest.fn()}
-            onSelectAll={jest.fn()}
-            onUnPinEvent={jest.fn()}
-            onUpdateColumns={jest.fn()}
-            pinnedEventIds={{}}
-            rowRenderers={rowRenderers}
-            selectedEventIds={{}}
-            show={true}
-            sort={mockSort}
-            showCheckboxes={false}
-            toggleColumn={jest.fn()}
-            updateNote={jest.fn()}
-          />
+          <Body {...testProps} />
         </TestProviders>
       );
       wrapper.update();
@@ -215,6 +138,11 @@ describe('Body', () => {
   describe('action on event', () => {
     const dispatchAddNoteToEvent = jest.fn();
     const dispatchOnPinEvent = jest.fn();
+    const testProps = {
+      ...props,
+      addNoteToEvent: dispatchAddNoteToEvent,
+      onPinEvent: dispatchOnPinEvent,
+    };
 
     const addaNoteToEvent = (wrapper: ReturnType<typeof mount>, note: string) => {
       wrapper.find('[data-test-subj="add-note"]').first().find('button').simulate('click');
@@ -251,36 +179,7 @@ describe('Body', () => {
     test('Add a Note to an event', () => {
       const wrapper = mount(
         <TestProviders>
-          <Body
-            addNoteToEvent={dispatchAddNoteToEvent}
-            browserFields={mockBrowserFields}
-            columnHeaders={defaultHeaders}
-            columnRenderers={columnRenderers}
-            data={mockTimelineData}
-            eventIdToNoteIds={{}}
-            height={testBodyHeight}
-            id={'timeline-test'}
-            isSelectAllChecked={false}
-            getNotesByIds={mockGetNotesByIds}
-            loadingEventIds={[]}
-            onColumnRemoved={jest.fn()}
-            onColumnResized={jest.fn()}
-            onColumnSorted={jest.fn()}
-            onFilterChange={jest.fn()}
-            onPinEvent={dispatchOnPinEvent}
-            onRowSelected={jest.fn()}
-            onSelectAll={jest.fn()}
-            onUnPinEvent={jest.fn()}
-            onUpdateColumns={jest.fn()}
-            pinnedEventIds={{}}
-            rowRenderers={rowRenderers}
-            selectedEventIds={{}}
-            show={true}
-            sort={mockSort}
-            showCheckboxes={false}
-            toggleColumn={jest.fn()}
-            updateNote={jest.fn()}
-          />
+          <Body {...testProps} />
         </TestProviders>
       );
       addaNoteToEvent(wrapper, 'hello world');
@@ -290,44 +189,13 @@ describe('Body', () => {
     });
 
     test('Add two Note to an event', () => {
-      const Proxy = (props: BodyProps) => (
+      const Proxy = (proxyProps: BodyProps) => (
         <TestProviders>
-          <Body {...props} />
+          <Body {...proxyProps} />
         </TestProviders>
       );
 
-      const wrapper = mount(
-        <Proxy
-          addNoteToEvent={dispatchAddNoteToEvent}
-          browserFields={mockBrowserFields}
-          columnHeaders={defaultHeaders}
-          columnRenderers={columnRenderers}
-          data={mockTimelineData}
-          eventIdToNoteIds={{}}
-          height={testBodyHeight}
-          id={'timeline-test'}
-          isSelectAllChecked={false}
-          getNotesByIds={mockGetNotesByIds}
-          loadingEventIds={[]}
-          onColumnRemoved={jest.fn()}
-          onColumnResized={jest.fn()}
-          onColumnSorted={jest.fn()}
-          onFilterChange={jest.fn()}
-          onPinEvent={dispatchOnPinEvent}
-          onRowSelected={jest.fn()}
-          onSelectAll={jest.fn()}
-          onUnPinEvent={jest.fn()}
-          onUpdateColumns={jest.fn()}
-          pinnedEventIds={{}}
-          rowRenderers={rowRenderers}
-          selectedEventIds={{}}
-          show={true}
-          sort={mockSort}
-          showCheckboxes={false}
-          toggleColumn={jest.fn()}
-          updateNote={jest.fn()}
-        />
-      );
+      const wrapper = mount(<Proxy {...testProps} />);
       addaNoteToEvent(wrapper, 'hello world');
       dispatchAddNoteToEvent.mockClear();
       dispatchOnPinEvent.mockClear();
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/translations.ts
index 63b92d6b316cc8..ef7ee26cd3ecf5 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/translations.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/translations.ts
@@ -13,6 +13,13 @@ export const NOTES_TOOLTIP = i18n.translate(
   }
 );
 
+export const NOTES_DISABLE_TOOLTIP = i18n.translate(
+  'xpack.securitySolution.timeline.body.notes.disableEventTooltip',
+  {
+    defaultMessage: 'Add notes for event filtered by a timeline template is not allowed',
+  }
+);
+
 export const COPY_TO_CLIPBOARD = i18n.translate(
   'xpack.securitySolution.timeline.body.copyToClipboardButtonLabel',
   {
@@ -38,6 +45,13 @@ export const PINNED_WITH_NOTES = i18n.translate(
   }
 );
 
+export const DISABLE_PIN = i18n.translate(
+  'xpack.securitySolution.timeline.body.pinning.disablePinnnedTooltip',
+  {
+    defaultMessage: 'This event cannot be pinned because it is filtered by a timeline template',
+  }
+);
+
 export const EXPAND = i18n.translate(
   'xpack.securitySolution.timeline.body.actions.expandAriaLabel',
   {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx
index 6fb2443486f811..922148535d1265 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx
@@ -15,6 +15,7 @@ import { mockDataProviders } from '../data_providers/mock/mock_data_providers';
 import { useMountAppended } from '../../../../common/utils/use_mount_appended';
 
 import { TimelineHeader } from '.';
+import { TimelineStatus } from '../../../../../common/types/timeline';
 
 const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;
 
@@ -23,43 +24,32 @@ jest.mock('../../../../common/lib/kibana');
 describe('Header', () => {
   const indexPattern = mockIndexPattern;
   const mount = useMountAppended();
+  const props = {
+    browserFields: {},
+    dataProviders: mockDataProviders,
+    filterManager: new FilterManager(mockUiSettingsForFilterManager),
+    id: 'foo',
+    indexPattern,
+    onDataProviderEdited: jest.fn(),
+    onDataProviderRemoved: jest.fn(),
+    onToggleDataProviderEnabled: jest.fn(),
+    onToggleDataProviderExcluded: jest.fn(),
+    show: true,
+    showCallOutUnauthorizedMsg: false,
+    status: TimelineStatus.active,
+  };
 
   describe('rendering', () => {
     test('renders correctly against snapshot', () => {
-      const wrapper = shallow(
-        <TimelineHeader
-          browserFields={{}}
-          dataProviders={mockDataProviders}
-          filterManager={new FilterManager(mockUiSettingsForFilterManager)}
-          id="foo"
-          indexPattern={indexPattern}
-          onDataProviderEdited={jest.fn()}
-          onDataProviderRemoved={jest.fn()}
-          onToggleDataProviderEnabled={jest.fn()}
-          onToggleDataProviderExcluded={jest.fn()}
-          show={true}
-          showCallOutUnauthorizedMsg={false}
-        />
-      );
+      const wrapper = shallow(<TimelineHeader {...props} />);
       expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the data providers when show is true', () => {
+      const testProps = { ...props, show: true };
       const wrapper = mount(
         <TestProviders>
-          <TimelineHeader
-            browserFields={{}}
-            dataProviders={mockDataProviders}
-            filterManager={new FilterManager(mockUiSettingsForFilterManager)}
-            id="foo"
-            indexPattern={indexPattern}
-            onDataProviderEdited={jest.fn()}
-            onDataProviderRemoved={jest.fn()}
-            onToggleDataProviderEnabled={jest.fn()}
-            onToggleDataProviderExcluded={jest.fn()}
-            show={true}
-            showCallOutUnauthorizedMsg={false}
-          />
+          <TimelineHeader {...testProps} />
         </TestProviders>
       );
 
@@ -67,21 +57,11 @@ describe('Header', () => {
     });
 
     test('it does NOT render the data providers when show is false', () => {
+      const testProps = { ...props, show: false };
+
       const wrapper = mount(
         <TestProviders>
-          <TimelineHeader
-            browserFields={{}}
-            dataProviders={mockDataProviders}
-            filterManager={new FilterManager(mockUiSettingsForFilterManager)}
-            id="foo"
-            indexPattern={indexPattern}
-            onDataProviderEdited={jest.fn()}
-            onDataProviderRemoved={jest.fn()}
-            onToggleDataProviderEnabled={jest.fn()}
-            onToggleDataProviderExcluded={jest.fn()}
-            show={false}
-            showCallOutUnauthorizedMsg={false}
-          />
+          <TimelineHeader {...testProps} />
         </TestProviders>
       );
 
@@ -89,21 +69,15 @@ describe('Header', () => {
     });
 
     test('it renders the unauthorized call out providers', () => {
+      const testProps = {
+        ...props,
+        filterManager: new FilterManager(mockUiSettingsForFilterManager),
+        showCallOutUnauthorizedMsg: true,
+      };
+
       const wrapper = mount(
         <TestProviders>
-          <TimelineHeader
-            browserFields={{}}
-            dataProviders={mockDataProviders}
-            filterManager={new FilterManager(mockUiSettingsForFilterManager)}
-            id="foo"
-            indexPattern={indexPattern}
-            onDataProviderEdited={jest.fn()}
-            onDataProviderRemoved={jest.fn()}
-            onToggleDataProviderEnabled={jest.fn()}
-            onToggleDataProviderExcluded={jest.fn()}
-            show={true}
-            showCallOutUnauthorizedMsg={true}
-          />
+          <TimelineHeader {...testProps} />
         </TestProviders>
       );
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx
index e8f1e73719234d..0541dee4b1e52e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx
@@ -22,6 +22,10 @@ import { StatefulSearchOrFilter } from '../search_or_filter';
 import { BrowserFields } from '../../../../common/containers/source';
 
 import * as i18n from './translations';
+import {
+  TimelineStatus,
+  TimelineStatusLiteralWithNull,
+} from '../../../../../common/types/timeline';
 
 interface Props {
   browserFields: BrowserFields;
@@ -36,6 +40,7 @@ interface Props {
   onToggleDataProviderExcluded: OnToggleDataProviderExcluded;
   show: boolean;
   showCallOutUnauthorizedMsg: boolean;
+  status: TimelineStatusLiteralWithNull;
 }
 
 const TimelineHeaderComponent: React.FC<Props> = ({
@@ -51,6 +56,7 @@ const TimelineHeaderComponent: React.FC<Props> = ({
   onToggleDataProviderExcluded,
   show,
   showCallOutUnauthorizedMsg,
+  status,
 }) => (
   <>
     {showCallOutUnauthorizedMsg && (
@@ -62,7 +68,15 @@ const TimelineHeaderComponent: React.FC<Props> = ({
         size="s"
       />
     )}
-
+    {status === TimelineStatus.immutable && (
+      <EuiCallOut
+        data-test-subj="timelineImmutableCallOut"
+        title={i18n.CALL_OUT_IMMUTIABLE}
+        color="primary"
+        iconType="info"
+        size="s"
+      />
+    )}
     {show && !showGraphView(graphEventId) && (
       <>
         <DataProviders
@@ -100,5 +114,6 @@ export const TimelineHeader = React.memo(
     prevProps.onToggleDataProviderEnabled === nextProps.onToggleDataProviderEnabled &&
     prevProps.onToggleDataProviderExcluded === nextProps.onToggleDataProviderExcluded &&
     prevProps.show === nextProps.show &&
-    prevProps.showCallOutUnauthorizedMsg === nextProps.showCallOutUnauthorizedMsg
+    prevProps.showCallOutUnauthorizedMsg === nextProps.showCallOutUnauthorizedMsg &&
+    prevProps.status === nextProps.status
 );
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/translations.ts
index c3c11289037a24..dd945d345aad87 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/translations.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/translations.ts
@@ -13,3 +13,11 @@ export const CALL_OUT_UNAUTHORIZED_MSG = i18n.translate(
       'You can use Timeline to investigate events, but you do not have the required permissions to save timelines for future use. If you need to save timelines, contact your Kibana administrator.',
   }
 );
+
+export const CALL_OUT_IMMUTIABLE = i18n.translate(
+  'xpack.securitySolution.timeline.callOut.immutable.message.description',
+  {
+    defaultMessage:
+      'This timeline is immutable, therefore not allowed to save it within the security application, though you may continue to use the timeline to search and filter security events',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx
index 83ac1a421958be..296b24cff43adb 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx
@@ -25,6 +25,7 @@ import { Sort } from './body/sort';
 import { mockDataProviders } from './data_providers/mock/mock_data_providers';
 import { StatefulTimeline, Props as StatefulTimelineProps } from './index';
 import { Timeline } from './timeline';
+import { TimelineType, TimelineStatus } from '../../../../common/types/timeline';
 
 jest.mock('../../../common/lib/kibana', () => {
   const originalModule = jest.requireActual('../../../common/lib/kibana');
@@ -88,6 +89,8 @@ describe('StatefulTimeline', () => {
       showCallOutUnauthorizedMsg: false,
       sort,
       start: startDate,
+      status: TimelineStatus.active,
+      timelineType: TimelineType.default,
       updateColumns: timelineActions.updateColumns,
       updateDataProviderEnabled: timelineActions.updateDataProviderEnabled,
       updateDataProviderExcluded: timelineActions.updateDataProviderExcluded,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
index a66c01d0b5d0b9..35622eddc359c0 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
@@ -57,6 +57,8 @@ const StatefulTimelineComponent = React.memo<Props>(
     showCallOutUnauthorizedMsg,
     sort,
     start,
+    status,
+    timelineType,
     updateDataProviderEnabled,
     updateDataProviderExcluded,
     updateItemsPerPage,
@@ -189,6 +191,7 @@ const StatefulTimelineComponent = React.memo<Props>(
         showCallOutUnauthorizedMsg={showCallOutUnauthorizedMsg}
         sort={sort!}
         start={start}
+        status={status}
         toggleColumn={toggleColumn}
         usersViewing={usersViewing}
       />
@@ -207,6 +210,8 @@ const StatefulTimelineComponent = React.memo<Props>(
       prevProps.show === nextProps.show &&
       prevProps.showCallOutUnauthorizedMsg === nextProps.showCallOutUnauthorizedMsg &&
       prevProps.start === nextProps.start &&
+      prevProps.timelineType === nextProps.timelineType &&
+      prevProps.status === nextProps.status &&
       deepEqual(prevProps.columns, nextProps.columns) &&
       deepEqual(prevProps.dataProviders, nextProps.dataProviders) &&
       deepEqual(prevProps.filters, nextProps.filters) &&
@@ -238,11 +243,12 @@ const makeMapStateToProps = () => {
       kqlMode,
       show,
       sort,
+      status,
+      timelineType,
     } = timeline;
     const kqlQueryExpression = getKqlQueryTimeline(state, id)!;
 
     const timelineFilter = kqlMode === 'filter' ? filters || [] : [];
-
     return {
       columns,
       dataProviders,
@@ -261,6 +267,8 @@ const makeMapStateToProps = () => {
       showCallOutUnauthorizedMsg: getShowCallOutUnauthorizedMsg(state),
       sort,
       start: input.timerange.from,
+      status,
+      timelineType,
     };
   };
   return mapStateToProps;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/pin/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/pin/index.tsx
index 800ea814fdd509..30fe8ae0ca1f66 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/pin/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/pin/index.tsx
@@ -8,6 +8,8 @@ import { EuiButtonIcon, IconSize } from '@elastic/eui';
 import { noop } from 'lodash/fp';
 import React from 'react';
 
+import { TimelineType, TimelineTypeLiteral } from '../../../../../common/types/timeline';
+
 import * as i18n from '../body/translations';
 
 export type PinIcon = 'pin' | 'pinFilled';
@@ -17,21 +19,25 @@ export const getPinIcon = (pinned: boolean): PinIcon => (pinned ? 'pinFilled' :
 interface Props {
   allowUnpinning: boolean;
   iconSize?: IconSize;
+  timelineType?: TimelineTypeLiteral;
   onClick?: () => void;
   pinned: boolean;
 }
 
 export const Pin = React.memo<Props>(
-  ({ allowUnpinning, iconSize = 'm', onClick = noop, pinned }) => (
-    <EuiButtonIcon
-      aria-label={pinned ? i18n.PINNED : i18n.UNPINNED}
-      data-test-subj="pin"
-      iconSize={iconSize}
-      iconType={getPinIcon(pinned)}
-      isDisabled={allowUnpinning ? false : true}
-      onClick={onClick}
-    />
-  )
+  ({ allowUnpinning, iconSize = 'm', onClick = noop, pinned, timelineType }) => {
+    const isTemplate = timelineType === TimelineType.template;
+    return (
+      <EuiButtonIcon
+        aria-label={pinned ? i18n.PINNED : i18n.UNPINNED}
+        data-test-subj="pin"
+        iconSize={iconSize}
+        iconType={getPinIcon(pinned)}
+        onClick={onClick}
+        isDisabled={isTemplate}
+      />
+    );
+  }
 );
 
 Pin.displayName = 'Pin';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
index 528af23191ee9b..21140d668d7167 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
@@ -27,6 +27,7 @@ import {
   TimelineTypeLiteral,
   TimelineStatus,
   TimelineType,
+  TimelineStatusLiteral,
   TimelineId,
 } from '../../../../../common/types/timeline';
 import { SecurityPageName } from '../../../../app/types';
@@ -262,11 +263,13 @@ interface NotesButtonProps {
   getNotesByIds: (noteIds: string[]) => Note[];
   noteIds: string[];
   size: 's' | 'l';
+  status: TimelineStatusLiteral;
   showNotes: boolean;
   toggleShowNotes: () => void;
   text?: string;
   toolTip?: string;
   updateNote: UpdateNote;
+  timelineType: TimelineTypeLiteral;
 }
 
 const getNewNoteId = (): string => uuid.v4();
@@ -303,16 +306,24 @@ LargeNotesButton.displayName = 'LargeNotesButton';
 interface SmallNotesButtonProps {
   noteIds: string[];
   toggleShowNotes: () => void;
+  timelineType: TimelineTypeLiteral;
 }
 
-const SmallNotesButton = React.memo<SmallNotesButtonProps>(({ noteIds, toggleShowNotes }) => (
-  <EuiButtonIcon
-    aria-label={i18n.NOTES}
-    data-test-subj="timeline-notes-button-small"
-    iconType="editorComment"
-    onClick={() => toggleShowNotes()}
-  />
-));
+const SmallNotesButton = React.memo<SmallNotesButtonProps>(
+  ({ noteIds, toggleShowNotes, timelineType }) => {
+    const isTemplate = timelineType === TimelineType.template;
+
+    return (
+      <EuiButtonIcon
+        aria-label={i18n.NOTES}
+        data-test-subj="timeline-notes-button-small"
+        iconType="editorComment"
+        onClick={() => toggleShowNotes()}
+        isDisabled={isTemplate}
+      />
+    );
+  }
+);
 SmallNotesButton.displayName = 'SmallNotesButton';
 
 /**
@@ -326,25 +337,32 @@ const NotesButtonComponent = React.memo<NotesButtonProps>(
     noteIds,
     showNotes,
     size,
+    status,
     toggleShowNotes,
     text,
     updateNote,
+    timelineType,
   }) => (
     <ButtonContainer animate={animate} data-test-subj="timeline-notes-button-container">
       <>
         {size === 'l' ? (
           <LargeNotesButton noteIds={noteIds} text={text} toggleShowNotes={toggleShowNotes} />
         ) : (
-          <SmallNotesButton noteIds={noteIds} toggleShowNotes={toggleShowNotes} />
+          <SmallNotesButton
+            noteIds={noteIds}
+            toggleShowNotes={toggleShowNotes}
+            timelineType={timelineType}
+          />
         )}
         {size === 'l' && showNotes ? (
           <EuiOverlayMask>
             <EuiModal maxWidth={NOTES_PANEL_WIDTH} onClose={toggleShowNotes}>
               <Notes
                 associateNote={associateNote}
+                getNewNoteId={getNewNoteId}
                 getNotesByIds={getNotesByIds}
+                status={status}
                 noteIds={noteIds}
-                getNewNoteId={getNewNoteId}
                 updateNote={updateNote}
               />
             </EuiModal>
@@ -364,6 +382,8 @@ export const NotesButton = React.memo<NotesButtonProps>(
     noteIds,
     showNotes,
     size,
+    status,
+    timelineType,
     toggleShowNotes,
     toolTip,
     text,
@@ -377,9 +397,11 @@ export const NotesButton = React.memo<NotesButtonProps>(
         noteIds={noteIds}
         showNotes={showNotes}
         size={size}
+        status={status}
         toggleShowNotes={toggleShowNotes}
         text={text}
         updateNote={updateNote}
+        timelineType={timelineType}
       />
     ) : (
       <EuiToolTip content={toolTip || ''} data-test-subj="timeline-notes-tool-tip">
@@ -390,9 +412,11 @@ export const NotesButton = React.memo<NotesButtonProps>(
           noteIds={noteIds}
           showNotes={showNotes}
           size={size}
+          status={status}
           toggleShowNotes={toggleShowNotes}
           text={text}
           updateNote={updateNote}
+          timelineType={timelineType}
         />
       </EuiToolTip>
     )
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/index.test.tsx
index 1b76db409484f4..cd089d10d5d4cb 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/index.test.tsx
@@ -6,13 +6,14 @@
 
 import { mount } from 'enzyme';
 import React from 'react';
-import { TimelineStatus } from '../../../../../common/types/timeline';
+import { TimelineStatus, TimelineType } from '../../../../../common/types/timeline';
 import {
   mockGlobalState,
   apolloClientObservable,
   SUB_PLUGINS_REDUCER,
   createSecuritySolutionStorageMock,
   TestProviders,
+  kibanaObservable,
 } from '../../../../common/mock';
 import { createStore, State } from '../../../../common/store';
 import { useThrottledResizeObserver } from '../../../../common/components/utils';
@@ -86,6 +87,7 @@ const defaultProps = {
   isDatepickerLocked: false,
   isFavorite: false,
   title: '',
+  timelineType: TimelineType.default,
   description: '',
   getNotesByIds: jest.fn(),
   noteIds: [],
@@ -103,11 +105,23 @@ describe('Properties', () => {
   const { storage } = createSecuritySolutionStorageMock();
   let mockedWidth = 1000;
 
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   beforeEach(() => {
     jest.clearAllMocks();
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
     (useThrottledResizeObserver as jest.Mock).mockReturnValue({ width: mockedWidth });
   });
 
@@ -130,9 +144,10 @@ describe('Properties', () => {
   });
 
   test('renders correctly draft timeline', () => {
+    const testProps = { ...defaultProps, status: TimelineStatus.draft };
     const wrapper = mount(
       <TestProviders store={store}>
-        <Properties {...{ ...defaultProps, status: TimelineStatus.draft }} />
+        <Properties {...testProps} />
       </TestProviders>
     );
 
@@ -157,9 +172,11 @@ describe('Properties', () => {
   });
 
   test('it renders a filled star icon when it is a favorite', () => {
+    const testProps = { ...defaultProps, isFavorite: true };
+
     const wrapper = mount(
       <TestProviders store={store}>
-        <Properties {...{ ...defaultProps, isFavorite: true }} />
+        <Properties {...testProps} />
       </TestProviders>
     );
 
@@ -168,10 +185,10 @@ describe('Properties', () => {
 
   test('it renders the title of the timeline', () => {
     const title = 'foozle';
-
+    const testProps = { ...defaultProps, title };
     const wrapper = mount(
       <TestProviders store={store}>
-        <Properties {...{ ...defaultProps, title }} />
+        <Properties {...testProps} />
       </TestProviders>
     );
 
@@ -194,9 +211,11 @@ describe('Properties', () => {
   });
 
   test('it renders the lock icon when isDatepickerLocked is true', () => {
+    const testProps = { ...defaultProps, isDatepickerLocked: true };
+
     const wrapper = mount(
       <TestProviders store={store}>
-        <Properties {...{ ...defaultProps, isDatepickerLocked: true }} />
+        <Properties {...testProps} />
       </TestProviders>
     );
     expect(
@@ -223,13 +242,16 @@ describe('Properties', () => {
 
   test('it renders a description on the left when the width is at least as wide as the threshold', () => {
     const description = 'strange';
+    const testProps = { ...defaultProps, description };
+
+    // mockedWidth = showDescriptionThreshold;
 
     (useThrottledResizeObserver as jest.Mock).mockReset();
     (useThrottledResizeObserver as jest.Mock).mockReturnValue({ width: showDescriptionThreshold });
 
     const wrapper = mount(
       <TestProviders store={store}>
-        <Properties {...{ ...defaultProps, description }} />
+        <Properties {...testProps} />
       </TestProviders>
     );
 
@@ -244,6 +266,9 @@ describe('Properties', () => {
 
   test('it does NOT render a description on the left when the width is less than the threshold', () => {
     const description = 'strange';
+    const testProps = { ...defaultProps, description };
+
+    // mockedWidth = showDescriptionThreshold - 1;
 
     (useThrottledResizeObserver as jest.Mock).mockReset();
     (useThrottledResizeObserver as jest.Mock).mockReturnValue({
@@ -252,7 +277,7 @@ describe('Properties', () => {
 
     const wrapper = mount(
       <TestProviders store={store}>
-        <Properties {...{ ...defaultProps, description }} />
+        <Properties {...testProps} />
       </TestProviders>
     );
 
@@ -313,10 +338,11 @@ describe('Properties', () => {
 
   test('it renders an avatar for the current user viewing the timeline when it has a title', () => {
     const title = 'port scan';
+    const testProps = { ...defaultProps, title };
 
     const wrapper = mount(
       <TestProviders store={store}>
-        <Properties {...{ ...defaultProps, title }} />
+        <Properties {...testProps} />
       </TestProviders>
     );
 
@@ -334,9 +360,11 @@ describe('Properties', () => {
   });
 
   test('insert timeline - new case', async () => {
+    const testProps = { ...defaultProps, title: 'coolness' };
+
     const wrapper = mount(
       <TestProviders store={store}>
-        <Properties {...{ ...defaultProps, title: 'coolness' }} />
+        <Properties {...testProps} />
       </TestProviders>
     );
     wrapper.find('[data-test-subj="settings-gear"]').at(0).simulate('click');
@@ -352,9 +380,11 @@ describe('Properties', () => {
   });
 
   test('insert timeline - existing case', async () => {
+    const testProps = { ...defaultProps, title: 'coolness' };
+
     const wrapper = mount(
       <TestProviders store={store}>
-        <Properties {...{ ...defaultProps, title: 'coolness' }} />
+        <Properties {...testProps} />
       </TestProviders>
     );
     wrapper.find('[data-test-subj="settings-gear"]').at(0).simulate('click');
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/index.tsx
index 8029d166a688a5..40462fa0d09da5 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/index.tsx
@@ -7,7 +7,7 @@
 import React, { useState, useCallback, useMemo } from 'react';
 
 import { useDispatch, useSelector } from 'react-redux';
-import { TimelineStatus, TimelineTypeLiteral } from '../../../../../common/types/timeline';
+import { TimelineStatusLiteral, TimelineTypeLiteral } from '../../../../../common/types/timeline';
 import { useThrottledResizeObserver } from '../../../../common/components/utils';
 import { Note } from '../../../../common/lib/note';
 import { InputsModelId } from '../../../../common/store/inputs/constants';
@@ -52,7 +52,8 @@ interface Props {
   isFavorite: boolean;
   noteIds: string[];
   timelineId: string;
-  status: TimelineStatus;
+  timelineType: TimelineTypeLiteral;
+  status: TimelineStatusLiteral;
   title: string;
   toggleLock: ToggleLock;
   updateDescription: UpdateDescription;
@@ -87,6 +88,7 @@ export const Properties = React.memo<Props>(
     noteIds,
     status,
     timelineId,
+    timelineType,
     title,
     toggleLock,
     updateDescription,
@@ -164,10 +166,12 @@ export const Properties = React.memo<Props>(
           isFavorite={isFavorite}
           noteIds={noteIds}
           onToggleShowNotes={onToggleShowNotes}
+          status={status}
           showDescription={width >= showDescriptionThreshold}
           showNotes={showNotes}
           showNotesFromWidth={width >= showNotesThreshold}
           timelineId={timelineId}
+          timelineType={timelineType}
           title={title}
           toggleLock={onToggleLock}
           updateDescription={updateDescription}
@@ -196,6 +200,7 @@ export const Properties = React.memo<Props>(
           showUsersView={title.length > 0}
           status={status}
           timelineId={timelineId}
+          timelineType={timelineType}
           title={title}
           updateDescription={updateDescription}
           updateNote={updateNote}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/new_template_timeline.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/new_template_timeline.test.tsx
index cd6233334c5de0..b1424848728135 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/new_template_timeline.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/new_template_timeline.test.tsx
@@ -11,6 +11,7 @@ import {
   mockGlobalState,
   apolloClientObservable,
   SUB_PLUGINS_REDUCER,
+  kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../../../common/mock';
 import { createStore, State } from '../../../../common/store';
@@ -26,7 +27,13 @@ jest.mock('../../../../common/lib/kibana', () => {
 describe('NewTemplateTimeline', () => {
   const state: State = mockGlobalState;
   const { storage } = createSecuritySolutionStorageMock();
-  const store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  const store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
   const mockClosePopover = jest.fn();
   const mockTitle = 'NEW_TIMELINE';
   let wrapper: ReactWrapper;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_left.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_left.tsx
index 52766422e49c38..4673ba662b2e98 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_left.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_left.tsx
@@ -10,9 +10,12 @@ import React from 'react';
 import styled from 'styled-components';
 import { Description, Name, NotesButton, StarIcon } from './helpers';
 import { AssociateNote, UpdateNote } from '../../notes/helpers';
+
 import { Note } from '../../../../common/lib/note';
 import { SuperDatePicker } from '../../../../common/components/super_date_picker';
 
+import { TimelineTypeLiteral, TimelineStatusLiteral } from '../../../../../common/types/timeline';
+
 import * as i18n from './translations';
 
 type UpdateIsFavorite = ({ id, isFavorite }: { id: string; isFavorite: boolean }) => void;
@@ -22,6 +25,7 @@ type UpdateDescription = ({ id, description }: { id: string; description: string
 interface Props {
   isFavorite: boolean;
   timelineId: string;
+  timelineType: TimelineTypeLiteral;
   updateIsFavorite: UpdateIsFavorite;
   showDescription: boolean;
   description: string;
@@ -29,6 +33,7 @@ interface Props {
   updateTitle: UpdateTitle;
   updateDescription: UpdateDescription;
   showNotes: boolean;
+  status: TimelineStatusLiteral;
   associateNote: AssociateNote;
   showNotesFromWidth: boolean;
   getNotesByIds: (noteIds: string[]) => Note[];
@@ -77,8 +82,10 @@ export const PropertiesLeft = React.memo<Props>(
     showDescription,
     description,
     title,
+    timelineType,
     updateTitle,
     updateDescription,
+    status,
     showNotes,
     showNotesFromWidth,
     associateNote,
@@ -120,10 +127,12 @@ export const PropertiesLeft = React.memo<Props>(
             noteIds={noteIds}
             showNotes={showNotes}
             size="l"
+            status={status}
             text={i18n.NOTES}
             toggleShowNotes={onToggleShowNotes}
             toolTip={i18n.NOTES_TOOL_TIP}
             updateNote={updateNote}
+            timelineType={timelineType}
           />
         </EuiFlexItem>
       ) : null}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_right.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_right.test.tsx
index ae167515495f7e..a36e841f3f8714 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_right.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_right.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { PropertiesRight } from './properties_right';
 import { useKibana } from '../../../../common/lib/kibana';
-import { TimelineStatus } from '../../../../../common/types/timeline';
+import { TimelineStatus, TimelineType } from '../../../../../common/types/timeline';
 import { disableTemplate } from '../../../../../common/constants';
 
 jest.mock('../../../../common/lib/kibana', () => {
@@ -67,6 +67,7 @@ describe('Properties Right', () => {
     onOpenTimelineModal: jest.fn(),
     status: TimelineStatus.active,
     showTimelineModal: false,
+    timelineType: TimelineType.default,
     title: 'title',
     updateNote: jest.fn(),
   };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_right.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_right.tsx
index e20a3db80d8812..7a9fe85ae402b3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_right.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_right.tsx
@@ -17,7 +17,7 @@ import {
 import { NewTimeline, Description, NotesButton, NewCase, ExistingCase } from './helpers';
 
 import { disableTemplate } from '../../../../../common/constants';
-import { TimelineStatus } from '../../../../../common/types/timeline';
+import { TimelineStatusLiteral, TimelineTypeLiteral } from '../../../../../common/types/timeline';
 
 import { InspectButton, InspectButtonContainer } from '../../../../common/components/inspect';
 import { useKibana } from '../../../../common/lib/kibana';
@@ -83,9 +83,10 @@ interface PropertiesRightComponentProps {
   showNotesFromWidth: boolean;
   showTimelineModal: boolean;
   showUsersView: boolean;
-  status: TimelineStatus;
+  status: TimelineStatusLiteral;
   timelineId: string;
   title: string;
+  timelineType: TimelineTypeLiteral;
   updateDescription: UpdateDescription;
   updateNote: UpdateNote;
   usersViewing: string[];
@@ -111,6 +112,7 @@ const PropertiesRightComponent: React.FC<PropertiesRightComponentProps> = ({
   showTimelineModal,
   showUsersView,
   status,
+  timelineType,
   timelineId,
   title,
   updateDescription,
@@ -203,6 +205,8 @@ const PropertiesRightComponent: React.FC<PropertiesRightComponentProps> = ({
                     noteIds={noteIds}
                     showNotes={showNotes}
                     size="l"
+                    status={status}
+                    timelineType={timelineType}
                     text={i18n.NOTES}
                     toggleShowNotes={onToggleShowNotes}
                     toolTip={i18n.NOTES_TOOL_TIP}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/translations.ts
index 2568f41275401d..561f8e513aa090 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/translations.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/translations.ts
@@ -112,7 +112,7 @@ export const NEW_TIMELINE = i18n.translate(
 export const NEW_TEMPLATE_TIMELINE = i18n.translate(
   'xpack.securitySolution.timeline.properties.newTemplateTimelineButtonLabel',
   {
-    defaultMessage: 'Create template timeline',
+    defaultMessage: 'Create new timeline template',
   }
 );
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx
index 2b67cf75dcff9e..0ff4c0a70fff27 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx
@@ -30,11 +30,7 @@ describe('SelectableTimeline', () => {
     };
   });
 
-  const {
-    SelectableTimeline,
-
-    ORIGINAL_PAGE_SIZE,
-  } = jest.requireActual('./');
+  const { SelectableTimeline, ORIGINAL_PAGE_SIZE } = jest.requireActual('./');
 
   const props = {
     hideUntitled: false,
@@ -94,8 +90,10 @@ describe('SelectableTimeline', () => {
         sortField: SortFieldTimeline.updated,
         sortOrder: Direction.desc,
       },
+      status: null,
       onlyUserFavorite: false,
       timelineType: TimelineType.default,
+      templateTimelineType: null,
     };
     beforeAll(() => {
       mount(<SelectableTimeline {...props} />);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.tsx
index 56c7c3dcfeb76f..dacaf325130d70 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.tsx
@@ -33,6 +33,7 @@ import * as i18nTimeline from '../../open_timeline/translations';
 import { OpenTimelineResult } from '../../open_timeline/types';
 import { getEmptyTagValue } from '../../../../common/components/empty_value';
 import * as i18n from '../translations';
+import { useTimelineStatus } from '../../open_timeline/use_timeline_status';
 
 const MyEuiFlexItem = styled(EuiFlexItem)`
   display: inline-block;
@@ -118,6 +119,7 @@ const SelectableTimelineComponent: React.FC<SelectableTimelineProps> = ({
   const [onlyFavorites, setOnlyFavorites] = useState(false);
   const [searchRef, setSearchRef] = useState<HTMLElement | null>(null);
   const { fetchAllTimeline, timelines, loading, totalCount: timelineCount } = useGetAllTimeline();
+  const { timelineStatus, templateTimelineType } = useTimelineStatus({ timelineType });
 
   const onSearchTimeline = useCallback((val) => {
     setSearchTimelineValue(val);
@@ -249,24 +251,31 @@ const SelectableTimelineComponent: React.FC<SelectableTimelineProps> = ({
     },
   };
 
-  useEffect(
-    () =>
-      fetchAllTimeline({
-        pageInfo: {
-          pageIndex: 1,
-          pageSize,
-        },
-        search: searchTimelineValue,
-        sort: {
-          sortField: SortFieldTimeline.updated,
-          sortOrder: Direction.desc,
-        },
-        onlyUserFavorite: onlyFavorites,
-        timelineType,
-      }),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [onlyFavorites, pageSize, searchTimelineValue, timelineType]
-  );
+  useEffect(() => {
+    fetchAllTimeline({
+      pageInfo: {
+        pageIndex: 1,
+        pageSize,
+      },
+      search: searchTimelineValue,
+      sort: {
+        sortField: SortFieldTimeline.updated,
+        sortOrder: Direction.desc,
+      },
+      onlyUserFavorite: onlyFavorites,
+      status: timelineStatus,
+      timelineType,
+      templateTimelineType,
+    });
+  }, [
+    fetchAllTimeline,
+    onlyFavorites,
+    pageSize,
+    searchTimelineValue,
+    timelineType,
+    timelineStatus,
+    templateTimelineType,
+  ]);
 
   return (
     <EuiSelectableContainer isLoading={loading}>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/styles.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/styles.tsx
index 55bcbbecda2690..b27f213c6a02c1 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/styles.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/styles.tsx
@@ -29,7 +29,7 @@ export const TimelineBody = styled.div.attrs(({ className = '' }) => ({
   overflow: auto;
   scrollbar-width: thin;
   flex: 1;
-  visibility: ${({ visible }) => (visible ? 'visible' : 'hidden')};
+  display: ${({ visible }) => (visible ? 'block' : 'none')};
 
   &::-webkit-scrollbar {
     height: ${({ theme }) => theme.eui.euiScrollBar};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.test.tsx
index 79ec58711e06c4..b58505546c3417 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.test.tsx
@@ -24,6 +24,7 @@ import { TimelineComponent, Props as TimelineComponentProps } from './timeline';
 import { Sort } from './body/sort';
 import { mockDataProviders } from './data_providers/mock/mock_data_providers';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
+import { TimelineStatus } from '../../../../common/types/timeline';
 
 jest.mock('../../../common/lib/kibana');
 jest.mock('./properties/properties_right');
@@ -96,6 +97,7 @@ describe('Timeline', () => {
       showCallOutUnauthorizedMsg: false,
       start: startDate,
       sort,
+      status: TimelineStatus.active,
       toggleColumn: jest.fn(),
       usersViewing: ['elastic'],
     };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.tsx
index 85e3d5d9478b63..07d4b004d2eda7 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.tsx
@@ -40,6 +40,7 @@ import {
   IIndexPattern,
 } from '../../../../../../../src/plugins/data/public';
 import { useManageTimeline } from '../manage_timeline';
+import { TimelineStatusLiteral } from '../../../../common/types/timeline';
 
 const TimelineContainer = styled.div`
   height: 100%;
@@ -110,6 +111,7 @@ export interface Props {
   showCallOutUnauthorizedMsg: boolean;
   start: number;
   sort: Sort;
+  status: TimelineStatusLiteral;
   toggleColumn: (column: ColumnHeaderOptions) => void;
   usersViewing: string[];
 }
@@ -141,6 +143,7 @@ export const TimelineComponent: React.FC<Props> = ({
   show,
   showCallOutUnauthorizedMsg,
   start,
+  status,
   sort,
   toggleColumn,
   usersViewing,
@@ -214,6 +217,7 @@ export const TimelineComponent: React.FC<Props> = ({
             onToggleDataProviderExcluded={onToggleDataProviderExcluded}
             show={show}
             showCallOutUnauthorizedMsg={showCallOutUnauthorizedMsg}
+            status={status}
           />
         </TimelineHeaderContainer>
       </StyledEuiFlyoutHeader>
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/all/index.gql_query.ts b/x-pack/plugins/security_solution/public/timelines/containers/all/index.gql_query.ts
index 60d000fe78184a..5cbc922f09c9ad 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/all/index.gql_query.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/all/index.gql_query.ts
@@ -13,6 +13,8 @@ export const allTimelinesQuery = gql`
     $sort: SortTimeline
     $onlyUserFavorite: Boolean
     $timelineType: TimelineType
+    $templateTimelineType: TemplateTimelineType
+    $status: TimelineStatus
   ) {
     getAllTimeline(
       pageInfo: $pageInfo
@@ -20,8 +22,15 @@ export const allTimelinesQuery = gql`
       sort: $sort
       onlyUserFavorite: $onlyUserFavorite
       timelineType: $timelineType
+      templateTimelineType: $templateTimelineType
+      status: $status
     ) {
       totalCount
+      defaultTimelineCount
+      templateTimelineCount
+      elasticTemplateTimelineCount
+      customTemplateTimelineCount
+      favoriteCount
       timeline {
         savedObjectId
         description
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/all/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/all/index.tsx
index f025cf15181c3e..17cc0f64de0392 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/all/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/all/index.tsx
@@ -22,7 +22,11 @@ import { useApolloClient } from '../../../common/utils/apollo_context';
 
 import { allTimelinesQuery } from './index.gql_query';
 import * as i18n from '../../pages/translations';
-import { TimelineTypeLiteralWithNull } from '../../../../common/types/timeline';
+import {
+  TimelineTypeLiteralWithNull,
+  TimelineStatusLiteralWithNull,
+  TemplateTimelineTypeLiteralWithNull,
+} from '../../../../common/types/timeline';
 
 export interface AllTimelinesArgs {
   fetchAllTimeline: ({
@@ -30,11 +34,17 @@ export interface AllTimelinesArgs {
     pageInfo,
     search,
     sort,
+    status,
     timelineType,
   }: AllTimelinesVariables) => void;
   timelines: OpenTimelineResult[];
   loading: boolean;
   totalCount: number;
+  customTemplateTimelineCount: number;
+  defaultTimelineCount: number;
+  elasticTemplateTimelineCount: number;
+  templateTimelineCount: number;
+  favoriteCount: number;
 }
 
 export interface AllTimelinesVariables {
@@ -42,7 +52,9 @@ export interface AllTimelinesVariables {
   pageInfo: PageInfoTimeline;
   search: string;
   sort: SortTimeline;
+  status: TimelineStatusLiteralWithNull;
   timelineType: TimelineTypeLiteralWithNull;
+  templateTimelineType: TemplateTimelineTypeLiteralWithNull;
 }
 
 export const ALL_TIMELINE_QUERY_ID = 'FETCH_ALL_TIMELINES';
@@ -76,6 +88,7 @@ export const getAllTimeline = memoizeOne(
             )
           : null,
       savedObjectId: timeline.savedObjectId,
+      status: timeline.status,
       title: timeline.title,
       updated: timeline.updated,
       updatedBy: timeline.updatedBy,
@@ -90,27 +103,39 @@ export const useGetAllTimeline = (): AllTimelinesArgs => {
     loading: false,
     totalCount: 0,
     timelines: [],
+    customTemplateTimelineCount: 0,
+    defaultTimelineCount: 0,
+    elasticTemplateTimelineCount: 0,
+    templateTimelineCount: 0,
+    favoriteCount: 0,
   });
 
   const fetchAllTimeline = useCallback(
-    ({ onlyUserFavorite, pageInfo, search, sort, timelineType }: AllTimelinesVariables) => {
+    async ({
+      onlyUserFavorite,
+      pageInfo,
+      search,
+      sort,
+      status,
+      timelineType,
+      templateTimelineType,
+    }: AllTimelinesVariables) => {
       let didCancel = false;
       const abortCtrl = new AbortController();
 
       const fetchData = async () => {
         try {
           if (apolloClient != null) {
-            setAllTimelines({
-              ...allTimelines,
-              loading: true,
-            });
+            setAllTimelines((prevState) => ({ ...prevState, loading: true }));
 
             const variables: GetAllTimeline.Variables = {
               onlyUserFavorite,
               pageInfo,
               search,
               sort,
+              status,
               timelineType,
+              templateTimelineType,
             };
             const response = await apolloClient.query<
               GetAllTimeline.Query,
@@ -125,8 +150,16 @@ export const useGetAllTimeline = (): AllTimelinesArgs => {
                 },
               },
             });
-            const totalCount = response?.data?.getAllTimeline?.totalCount ?? 0;
-            const timelines = response?.data?.getAllTimeline?.timeline ?? [];
+            const getAllTimelineResponse = response?.data?.getAllTimeline;
+            const totalCount = getAllTimelineResponse?.totalCount ?? 0;
+            const timelines = getAllTimelineResponse?.timeline ?? [];
+            const customTemplateTimelineCount =
+              getAllTimelineResponse?.customTemplateTimelineCount ?? 0;
+            const defaultTimelineCount = getAllTimelineResponse?.defaultTimelineCount ?? 0;
+            const elasticTemplateTimelineCount =
+              getAllTimelineResponse?.elasticTemplateTimelineCount ?? 0;
+            const templateTimelineCount = getAllTimelineResponse?.templateTimelineCount ?? 0;
+            const favoriteCount = getAllTimelineResponse?.favoriteCount ?? 0;
             if (!didCancel) {
               dispatch(
                 inputsActions.setQuery({
@@ -141,6 +174,11 @@ export const useGetAllTimeline = (): AllTimelinesArgs => {
                 loading: false,
                 totalCount,
                 timelines: getAllTimeline(JSON.stringify(variables), timelines as TimelineResult[]),
+                customTemplateTimelineCount,
+                defaultTimelineCount,
+                elasticTemplateTimelineCount,
+                templateTimelineCount,
+                favoriteCount,
               });
             }
           }
@@ -155,6 +193,11 @@ export const useGetAllTimeline = (): AllTimelinesArgs => {
               loading: false,
               totalCount: 0,
               timelines: [],
+              customTemplateTimelineCount: 0,
+              defaultTimelineCount: 0,
+              elasticTemplateTimelineCount: 0,
+              templateTimelineCount: 0,
+              favoriteCount: 0,
             });
           }
         }
@@ -165,7 +208,7 @@ export const useGetAllTimeline = (): AllTimelinesArgs => {
         abortCtrl.abort();
       };
     },
-    [apolloClient, allTimelines, dispatch, dispatchToaster]
+    [apolloClient, dispatch, dispatchToaster]
   );
 
   useEffect(() => {
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/api.test.ts b/x-pack/plugins/security_solution/public/timelines/containers/api.test.ts
index 26373fa1a825d5..8a2f91d7171f74 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/api.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/api.test.ts
@@ -165,6 +165,7 @@ describe('persistTimeline', () => {
         },
       },
     };
+
     const version = null;
     const fetchMock = jest.fn();
     const postMock = jest.fn();
@@ -180,7 +181,11 @@ describe('persistTimeline', () => {
           patch: patchMock.mockReturnValue(mockPatchTimelineResponse),
         },
       });
-      api.persistTimeline({ timelineId, timeline: initialDraftTimeline, version });
+      api.persistTimeline({
+        timelineId,
+        timeline: initialDraftTimeline,
+        version,
+      });
     });
 
     afterAll(() => {
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/api.ts b/x-pack/plugins/security_solution/public/timelines/containers/api.ts
index a2277897e99bff..fbd89268880dbe 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/api.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/api.ts
@@ -12,6 +12,8 @@ import {
   TimelineResponse,
   TimelineResponseType,
   TimelineStatus,
+  TimelineErrorResponseType,
+  TimelineErrorResponse,
 } from '../../../common/types/timeline';
 import { TimelineInput, TimelineType } from '../../graphql/types';
 import {
@@ -48,6 +50,12 @@ const decodeTimelineResponse = (respTimeline?: TimelineResponse) =>
     fold(throwErrors(createToasterPlainError), identity)
   );
 
+const decodeTimelineErrorResponse = (respTimeline?: TimelineErrorResponse) =>
+  pipe(
+    TimelineErrorResponseType.decode(respTimeline),
+    fold(throwErrors(createToasterPlainError), identity)
+  );
+
 const postTimeline = async ({ timeline }: RequestPostTimeline): Promise<TimelineResponse> => {
   const response = await KibanaServices.get().http.post<TimelineResponse>(TIMELINE_URL, {
     method: 'POST',
@@ -61,12 +69,19 @@ const patchTimeline = async ({
   timelineId,
   timeline,
   version,
-}: RequestPatchTimeline): Promise<TimelineResponse> => {
-  const response = await KibanaServices.get().http.patch<TimelineResponse>(TIMELINE_URL, {
-    method: 'PATCH',
-    body: JSON.stringify({ timeline, timelineId, version }),
-  });
-
+}: RequestPatchTimeline): Promise<TimelineResponse | TimelineErrorResponse> => {
+  let response = null;
+  try {
+    response = await KibanaServices.get().http.patch<TimelineResponse>(TIMELINE_URL, {
+      method: 'PATCH',
+      body: JSON.stringify({ timeline, timelineId, version }),
+    });
+  } catch (err) {
+    // For Future developer
+    // We are not rejecting our promise here because we had issue with our RXJS epic
+    // the issue we were not able to pass the right object to it so we did manage the error in the success
+    return Promise.resolve(decodeTimelineErrorResponse(err.body));
+  }
   return decodeTimelineResponse(response);
 };
 
@@ -74,17 +89,31 @@ export const persistTimeline = async ({
   timelineId,
   timeline,
   version,
-}: RequestPersistTimeline): Promise<TimelineResponse> => {
-  if (timelineId == null && timeline.status === TimelineStatus.draft) {
-    const draftTimeline = await cleanDraftTimeline({ timelineType: timeline.timelineType! });
+}: RequestPersistTimeline): Promise<TimelineResponse | TimelineErrorResponse> => {
+  if (timelineId == null && timeline.status === TimelineStatus.draft && timeline) {
+    const draftTimeline = await cleanDraftTimeline({
+      timelineType: timeline.timelineType!,
+      templateTimelineId: timeline.templateTimelineId ?? undefined,
+      templateTimelineVersion: timeline.templateTimelineVersion ?? undefined,
+    });
+
+    const templateTimelineInfo =
+      timeline.timelineType! === TimelineType.template
+        ? {
+            templateTimelineId:
+              draftTimeline.data.persistTimeline.timeline.templateTimelineId ??
+              timeline.templateTimelineId,
+            templateTimelineVersion:
+              draftTimeline.data.persistTimeline.timeline.templateTimelineVersion ??
+              timeline.templateTimelineVersion,
+          }
+        : {};
 
     return patchTimeline({
       timelineId: draftTimeline.data.persistTimeline.timeline.savedObjectId,
       timeline: {
         ...timeline,
-        templateTimelineId: draftTimeline.data.persistTimeline.timeline.templateTimelineId,
-        templateTimelineVersion:
-          draftTimeline.data.persistTimeline.timeline.templateTimelineVersion,
+        ...templateTimelineInfo,
       },
       version: draftTimeline.data.persistTimeline.timeline.version ?? '',
     });
@@ -147,12 +176,24 @@ export const getDraftTimeline = async ({
 
 export const cleanDraftTimeline = async ({
   timelineType,
+  templateTimelineId,
+  templateTimelineVersion,
 }: {
   timelineType: TimelineType;
+  templateTimelineId?: string;
+  templateTimelineVersion?: number;
 }): Promise<TimelineResponse> => {
+  const templateTimelineInfo =
+    timelineType === TimelineType.template
+      ? {
+          templateTimelineId,
+          templateTimelineVersion,
+        }
+      : {};
   const response = await KibanaServices.get().http.post<TimelineResponse>(TIMELINE_DRAFT_URL, {
     body: JSON.stringify({
       timelineType,
+      ...templateTimelineInfo,
     }),
   });
 
diff --git a/x-pack/plugins/security_solution/public/timelines/pages/translations.ts b/x-pack/plugins/security_solution/public/timelines/pages/translations.ts
index 3ec98d47c67ea6..5a9f80013a3ede 100644
--- a/x-pack/plugins/security_solution/public/timelines/pages/translations.ts
+++ b/x-pack/plugins/security_solution/public/timelines/pages/translations.ts
@@ -30,3 +30,17 @@ export const ERROR_FETCHING_TIMELINES_TITLE = i18n.translate(
     defaultMessage: 'Failed to query all timelines data',
   }
 );
+
+export const UPDATE_TIMELINE_ERROR_TITLE = i18n.translate(
+  'xpack.securitySolution.timelines.updateTimelineErrorTitle',
+  {
+    defaultMessage: 'Timeline error',
+  }
+);
+
+export const UPDATE_TIMELINE_ERROR_TEXT = i18n.translate(
+  'xpack.securitySolution.timelines.updateTimelineErrorText',
+  {
+    defaultMessage: 'Something went wrong',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts
index 55e6849fdb6c4a..8fd75547cc539b 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts
@@ -70,6 +70,8 @@ export const createTimeline = actionCreator<{
   showCheckboxes?: boolean;
   showRowRenderers?: boolean;
   timelineType?: TimelineTypeLiteral;
+  templateTimelineId?: string;
+  templateTimelineVersion?: number;
 }>('CREATE_TIMELINE');
 
 export const pinEvent = actionCreator<{ id: string; eventId: string }>('PIN_EVENT');
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/epic.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/epic.ts
index 2155dc804aa7ed..94acb9d92075b7 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/epic.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/epic.ts
@@ -33,7 +33,7 @@ import {
   Filter,
   MatchAllFilter,
 } from '../../../../../../.../../../src/plugins/data/public';
-import { TimelineStatus } from '../../../../common/types/timeline';
+import { TimelineStatus, TimelineErrorResponse } from '../../../../common/types/timeline';
 import { inputsModel } from '../../../common/store/inputs';
 import {
   TimelineType,
@@ -43,6 +43,10 @@ import {
 } from '../../../graphql/types';
 import { addError } from '../../../common/store/app/actions';
 
+import { persistTimeline } from '../../containers/api';
+import { ALL_TIMELINE_QUERY_ID } from '../../containers/all';
+import * as i18n from '../../pages/translations';
+
 import {
   applyKqlFilterQuery,
   addProvider,
@@ -79,8 +83,6 @@ import { isNotNull } from './helpers';
 import { dispatcherTimelinePersistQueue } from './epic_dispatcher_timeline_persistence_queue';
 import { myEpicTimelineId } from './my_epic_timeline_id';
 import { ActionTimeline, TimelineEpicDependencies } from './types';
-import { persistTimeline } from '../../containers/api';
-import { ALL_TIMELINE_QUERY_ID } from '../../containers/all';
 
 const timelineActionsType = [
   applyKqlFilterQuery.type,
@@ -121,6 +123,7 @@ export const createTimelineEpic = <State>(): Epic<
     timelineByIdSelector,
     timelineTimeRangeSelector,
     apolloClient$,
+    kibana$,
   }
 ) => {
   const timeline$ = state$.pipe(map(timelineByIdSelector), filter(isNotNull));
@@ -146,13 +149,24 @@ export const createTimelineEpic = <State>(): Epic<
         if (action.type === addError.type) {
           return true;
         }
-        if (action.type === createTimeline.type && isItAtimelineAction(timelineId)) {
+        if (
+          isItAtimelineAction(timelineId) &&
+          timelineObj != null &&
+          timelineObj.status != null &&
+          TimelineStatus.immutable === timelineObj.status
+        ) {
+          return false;
+        } else if (action.type === createTimeline.type && isItAtimelineAction(timelineId)) {
           myEpicTimelineId.setTimelineVersion(null);
           myEpicTimelineId.setTimelineId(null);
+          myEpicTimelineId.setTemplateTimelineId(null);
+          myEpicTimelineId.setTemplateTimelineVersion(null);
         } else if (action.type === addTimeline.type && isItAtimelineAction(timelineId)) {
           const addNewTimeline: TimelineModel = get('payload.timeline', action);
           myEpicTimelineId.setTimelineId(addNewTimeline.savedObjectId);
           myEpicTimelineId.setTimelineVersion(addNewTimeline.version);
+          myEpicTimelineId.setTemplateTimelineId(addNewTimeline.templateTimelineId);
+          myEpicTimelineId.setTemplateTimelineVersion(addNewTimeline.templateTimelineVersion);
           return true;
         } else if (
           timelineActionsType.includes(action.type) &&
@@ -176,6 +190,8 @@ export const createTimelineEpic = <State>(): Epic<
         const action: ActionTimeline = get('action', objAction);
         const timelineId = myEpicTimelineId.getTimelineId();
         const version = myEpicTimelineId.getTimelineVersion();
+        const templateTimelineId = myEpicTimelineId.getTemplateTimelineId();
+        const templateTimelineVersion = myEpicTimelineId.getTemplateTimelineVersion();
 
         if (timelineNoteActionsType.includes(action.type)) {
           return epicPersistNote(
@@ -211,13 +227,37 @@ export const createTimelineEpic = <State>(): Epic<
             persistTimeline({
               timelineId,
               version,
-              timeline: convertTimelineAsInput(timeline[action.payload.id], timelineTimeRange),
+              timeline: {
+                ...convertTimelineAsInput(timeline[action.payload.id], timelineTimeRange),
+                templateTimelineId,
+                templateTimelineVersion,
+              },
             })
           ).pipe(
-            withLatestFrom(timeline$, allTimelineQuery$),
-            mergeMap(([result, recentTimeline, allTimelineQuery]) => {
+            withLatestFrom(timeline$, allTimelineQuery$, kibana$),
+            mergeMap(([result, recentTimeline, allTimelineQuery, kibana]) => {
+              const error = result as TimelineErrorResponse;
+              if (error.status_code != null && error.status_code === 405) {
+                kibana.notifications!.toasts.addDanger({
+                  title: i18n.UPDATE_TIMELINE_ERROR_TITLE,
+                  text: error.message ?? i18n.UPDATE_TIMELINE_ERROR_TEXT,
+                });
+                return [
+                  endTimelineSaving({
+                    id: action.payload.id,
+                  }),
+                ];
+              }
+
               const savedTimeline = recentTimeline[action.payload.id];
               const response: ResponseTimeline = get('data.persistTimeline', result);
+              if (response == null) {
+                return [
+                  endTimelineSaving({
+                    id: action.payload.id,
+                  }),
+                ];
+              }
               const callOutMsg = response.code === 403 ? [showCallOutUnauthorizedMsg()] : [];
 
               if (allTimelineQuery.refetch != null) {
@@ -264,6 +304,12 @@ export const createTimelineEpic = <State>(): Epic<
                     myEpicTimelineId.setTimelineVersion(
                       updatedTimeline[get('payload.id', checkAction)].version
                     );
+                    myEpicTimelineId.setTemplateTimelineId(
+                      updatedTimeline[get('payload.id', checkAction)].templateTimelineId
+                    );
+                    myEpicTimelineId.setTemplateTimelineVersion(
+                      updatedTimeline[get('payload.id', checkAction)].templateTimelineVersion
+                    );
                     return true;
                   }
                   return false;
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/epic_local_storage.test.tsx b/x-pack/plugins/security_solution/public/timelines/store/timeline/epic_local_storage.test.tsx
index 34778aba7873cc..388869194085c8 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/epic_local_storage.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/epic_local_storage.test.tsx
@@ -15,6 +15,7 @@ import {
   defaultHeaders,
   createSecuritySolutionStorageMock,
   mockIndexPattern,
+  kibanaObservable,
 } from '../../../common/mock';
 
 import { createStore, State } from '../../../common/store';
@@ -38,6 +39,7 @@ import { Direction } from '../../../graphql/types';
 
 import { addTimelineInStorage } from '../../containers/local_storage';
 import { isPageTimeline } from './epic_local_storage';
+import { TimelineStatus } from '../../../../common/types/timeline';
 
 jest.mock('../../containers/local_storage');
 
@@ -50,7 +52,13 @@ const addTimelineInStorageMock = addTimelineInStorage as jest.Mock;
 describe('epicLocalStorage', () => {
   const state: State = mockGlobalState;
   const { storage } = createSecuritySolutionStorageMock();
-  let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+  let store = createStore(
+    state,
+    SUB_PLUGINS_REDUCER,
+    apolloClientObservable,
+    kibanaObservable,
+    storage
+  );
 
   let props = {} as TimelineComponentProps;
   const sort: Sort = {
@@ -63,7 +71,13 @@ describe('epicLocalStorage', () => {
   const indexPattern = mockIndexPattern;
 
   beforeEach(() => {
-    store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable, storage);
+    store = createStore(
+      state,
+      SUB_PLUGINS_REDUCER,
+      apolloClientObservable,
+      kibanaObservable,
+      storage
+    );
     props = {
       browserFields: mockBrowserFields,
       columns: defaultHeaders,
@@ -89,6 +103,7 @@ describe('epicLocalStorage', () => {
       show: true,
       showCallOutUnauthorizedMsg: false,
       start: startDate,
+      status: TimelineStatus.active,
       sort,
       toggleColumn: jest.fn(),
       usersViewing: ['elastic'],
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
index c0615d36f7a2e0..33770aacde6bba 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
@@ -6,6 +6,7 @@
 
 import { getOr, omit, uniq, isEmpty, isEqualWith, union } from 'lodash/fp';
 
+import uuid from 'uuid';
 import { Filter } from '../../../../../../../src/plugins/data/public';
 
 import { disableTemplate } from '../../../../common/constants';
@@ -19,7 +20,7 @@ import {
 } from '../../../timelines/components/timeline/data_providers/data_provider';
 import { KueryFilterQuery, SerializedFilterQuery } from '../../../common/store/model';
 import { TimelineNonEcsData } from '../../../graphql/types';
-import { TimelineTypeLiteral } from '../../../../common/types/timeline';
+import { TimelineTypeLiteral, TimelineType } from '../../../../common/types/timeline';
 
 import { timelineDefaults } from './defaults';
 import { ColumnHeaderOptions, KqlMode, TimelineModel, EventType } from './model';
@@ -158,28 +159,38 @@ export const addNewTimeline = ({
   showRowRenderers = true,
   timelineById,
   timelineType,
-}: AddNewTimelineParams): TimelineById => ({
-  ...timelineById,
-  [id]: {
-    id,
-    ...timelineDefaults,
-    columns,
-    dataProviders,
-    dateRange,
-    filters,
-    itemsPerPage,
-    kqlQuery,
-    sort,
-    show,
-    savedObjectId: null,
-    version: null,
-    isSaving: false,
-    isLoading: false,
-    showCheckboxes,
-    showRowRenderers,
-    timelineType: !disableTemplate ? timelineType : timelineDefaults.timelineType,
-  },
-});
+}: AddNewTimelineParams): TimelineById => {
+  const templateTimelineInfo =
+    !disableTemplate && timelineType === TimelineType.template
+      ? {
+          templateTimelineId: uuid.v4(),
+          templateTimelineVersion: 1,
+        }
+      : {};
+  return {
+    ...timelineById,
+    [id]: {
+      id,
+      ...timelineDefaults,
+      columns,
+      dataProviders,
+      dateRange,
+      filters,
+      itemsPerPage,
+      kqlQuery,
+      sort,
+      show,
+      savedObjectId: null,
+      version: null,
+      isSaving: false,
+      isLoading: false,
+      showCheckboxes,
+      showRowRenderers,
+      timelineType: !disableTemplate ? timelineType : timelineDefaults.timelineType,
+      ...templateTimelineInfo,
+    },
+  };
+};
 
 interface PinTimelineEventParams {
   id: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/manage_timeline_id.tsx b/x-pack/plugins/security_solution/public/timelines/store/timeline/manage_timeline_id.tsx
index d68c9bd42d974c..6f8666a349d78c 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/manage_timeline_id.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/manage_timeline_id.tsx
@@ -7,6 +7,8 @@
 export class ManageEpicTimelineId {
   private timelineId: string | null = null;
   private version: string | null = null;
+  private templateTimelineId: string | null = null;
+  private templateVersion: number | null = null;
 
   public getTimelineId(): string | null {
     return this.timelineId;
@@ -16,6 +18,14 @@ export class ManageEpicTimelineId {
     return this.version;
   }
 
+  public getTemplateTimelineId(): string | null {
+    return this.templateTimelineId;
+  }
+
+  public getTemplateTimelineVersion(): number | null {
+    return this.templateVersion;
+  }
+
   public setTimelineId(timelineId: string | null) {
     this.timelineId = timelineId;
   }
@@ -23,4 +33,12 @@ export class ManageEpicTimelineId {
   public setTimelineVersion(version: string | null) {
     this.version = version;
   }
+
+  public setTemplateTimelineId(templateTimelineId: string | null) {
+    this.templateTimelineId = templateTimelineId;
+  }
+
+  public setTemplateTimelineVersion(templateVersion: number | null) {
+    this.templateVersion = templateVersion;
+  }
 }
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts
index e8ea3c8d16e3a8..57895fea8f8ff8 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts
@@ -160,7 +160,6 @@ export type SubsetTimelineModel = Readonly<
     | 'isLoading'
     | 'savedObjectId'
     | 'version'
-    | 'timelineType'
     | 'status'
   >
 >;
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.ts
index 30b7f73c839d19..4072b4ac2f78b3 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.ts
@@ -137,24 +137,26 @@ export const timelineReducer = reducerWithInitialState(initialTimelineState)
         timelineType = TimelineType.default,
         filters,
       }
-    ) => ({
-      ...state,
-      timelineById: addNewTimeline({
-        columns,
-        dataProviders,
-        dateRange,
-        filters,
-        id,
-        itemsPerPage,
-        kqlQuery,
-        sort,
-        show,
-        showCheckboxes,
-        showRowRenderers,
-        timelineById: state.timelineById,
-        timelineType,
-      }),
-    })
+    ) => {
+      return {
+        ...state,
+        timelineById: addNewTimeline({
+          columns,
+          dataProviders,
+          dateRange,
+          filters,
+          id,
+          itemsPerPage,
+          kqlQuery,
+          sort,
+          show,
+          showCheckboxes,
+          showRowRenderers,
+          timelineById: state.timelineById,
+          timelineType,
+        }),
+      };
+    }
   )
   .case(upsertColumn, (state, { column, id, index }) => ({
     ...state,
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
index 65798648f92c63..c64ed608339b67 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
@@ -10,6 +10,8 @@ import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
 import { AppApolloClient } from '../../../common/lib/lib';
 import { inputsModel } from '../../../common/store/inputs';
 import { NotesById } from '../../../common/store/app/model';
+import { StartServices } from '../../../types';
+
 import { TimelineModel } from './model';
 
 export interface AutoSavedWarningMsg {
@@ -53,5 +55,6 @@ export interface TimelineEpicDependencies<State> {
   selectAllTimelineQuery: () => (state: State, id: string) => inputsModel.GlobalQuery;
   selectNotesByIdSelector: (state: State) => NotesById;
   apolloClient$: Observable<AppApolloClient>;
+  kibana$: Observable<StartServices>;
   storage: Storage;
 }
diff --git a/x-pack/plugins/security_solution/public/types.ts b/x-pack/plugins/security_solution/public/types.ts
index 6d59824702cfa9..e212289458ed1b 100644
--- a/x-pack/plugins/security_solution/public/types.ts
+++ b/x-pack/plugins/security_solution/public/types.ts
@@ -19,6 +19,7 @@ import {
   TriggersAndActionsUIPublicPluginStart as TriggersActionsStart,
 } from '../../triggers_actions_ui/public';
 import { SecurityPluginSetup } from '../../security/public';
+import { AppFrontendLibs } from './common/lib/lib';
 
 export interface SetupPlugins {
   home: HomePublicPluginSetup;
@@ -47,3 +48,7 @@ export type StartServices = CoreStart &
 export interface PluginSetup {}
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface PluginStart {}
+
+export interface AppObservableLibs extends AppFrontendLibs {
+  kibana: CoreStart;
+}
diff --git a/x-pack/plugins/security_solution/server/endpoint/alerts/handlers/alerts.test.ts b/x-pack/plugins/security_solution/server/endpoint/alerts/handlers/alerts.test.ts
index 6c0ff9fcdc66f7..24af9917186ba7 100644
--- a/x-pack/plugins/security_solution/server/endpoint/alerts/handlers/alerts.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/alerts/handlers/alerts.test.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { IClusterClient, IRouter, IScopedClusterClient } from 'kibana/server';
+import { ILegacyClusterClient, IRouter, ILegacyScopedClusterClient } from 'kibana/server';
 import {
   elasticsearchServiceMock,
   httpServiceMock,
@@ -17,8 +17,8 @@ import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__
 
 describe('test alerts route', () => {
   let routerMock: jest.Mocked<IRouter>;
-  let mockClusterClient: jest.Mocked<IClusterClient>;
-  let mockScopedClient: jest.Mocked<IScopedClusterClient>;
+  let mockClusterClient: jest.Mocked<ILegacyClusterClient>;
+  let mockScopedClient: jest.Mocked<ILegacyScopedClusterClient>;
   let endpointAppContextService: EndpointAppContextService;
 
   beforeEach(() => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/alerts/handlers/lib/index.ts b/x-pack/plugins/security_solution/server/endpoint/alerts/handlers/lib/index.ts
index e398e70f1d7b7b..e5bcc9bcfdc061 100644
--- a/x-pack/plugins/security_solution/server/endpoint/alerts/handlers/lib/index.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/alerts/handlers/lib/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { SearchResponse } from 'elasticsearch';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { AlertEvent } from '../../../../../common/endpoint/types';
 import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { esQuery } from '../../../../../../../../src/plugins/data/server';
@@ -145,7 +145,7 @@ const buildAlertSearchQuery = async (
  * Makes a request to Elasticsearch, given an `AlertSearchRequestWrapper`.
  **/
 export const searchESForAlerts = async (
-  dataClient: IScopedClusterClient,
+  dataClient: ILegacyScopedClusterClient,
   query: AlertSearchQuery,
   indexPattern: string
 ): Promise<SearchResponse<AlertEvent>> => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
index 5435eff4ef1507..84f3d1a5631bfc 100644
--- a/x-pack/plugins/security_solution/server/endpoint/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IScopedClusterClient, SavedObjectsClientContract } from 'kibana/server';
+import { ILegacyScopedClusterClient, SavedObjectsClientContract } from 'kibana/server';
 import { xpackMocks } from '../../../../mocks';
 import {
   AgentService,
@@ -35,6 +35,9 @@ export const createMockEndpointAppContextServiceStartContract = (): jest.Mocked<
 export const createMockAgentService = (): jest.Mocked<AgentService> => {
   return {
     getAgentStatusById: jest.fn(),
+    authenticateAgentWithAccessToken: jest.fn(),
+    getAgent: jest.fn(),
+    listAgents: jest.fn(),
   };
 };
 
@@ -59,7 +62,7 @@ export const createMockIngestManagerStartContract = (
 };
 
 export function createRouteHandlerContext(
-  dataClient: jest.Mocked<IScopedClusterClient>,
+  dataClient: jest.Mocked<ILegacyScopedClusterClient>,
   savedObjectsClient: jest.Mocked<SavedObjectsClientContract>
 ) {
   const context = xpackMocks.createRequestHandlerContext();
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts
index 1ca205f669fa37..f6ae2c584a3466 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import {
-  IClusterClient,
+  ILegacyClusterClient,
   IRouter,
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
   KibanaResponseFactory,
   RequestHandler,
   RouteConfig,
@@ -40,8 +40,8 @@ import { HostId } from './support/unenroll';
 describe('test endpoint route', () => {
   let routerMock: jest.Mocked<IRouter>;
   let mockResponse: jest.Mocked<KibanaResponseFactory>;
-  let mockClusterClient: jest.Mocked<IClusterClient>;
-  let mockScopedClient: jest.Mocked<IScopedClusterClient>;
+  let mockClusterClient: jest.Mocked<ILegacyClusterClient>;
+  let mockScopedClient: jest.Mocked<ILegacyScopedClusterClient>;
   let mockSavedObjectClient: jest.Mocked<SavedObjectsClientContract>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let routeHandler: RequestHandler<any, any, any>;
@@ -60,7 +60,7 @@ describe('test endpoint route', () => {
 
   beforeEach(() => {
     mockClusterClient = elasticsearchServiceMock.createClusterClient() as jest.Mocked<
-      IClusterClient
+      ILegacyClusterClient
     >;
     mockScopedClient = elasticsearchServiceMock.createScopedClusterClient();
     mockSavedObjectClient = savedObjectsClientMock.create();
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts
index 2e6bb2c976fef1..545095a6a0c16f 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import {
   findAllUnenrolledHostIds,
   fetchAllUnenrolledHostIdsWithScroll,
@@ -24,7 +24,7 @@ const noUnenrolledEndpoint = () =>
   } as unknown) as SearchResponse<HostId>);
 
 describe('test find all unenrolled HostId', () => {
-  let mockScopedClient: jest.Mocked<IScopedClusterClient>;
+  let mockScopedClient: jest.Mocked<ILegacyScopedClusterClient>;
 
   it('can find all hits with scroll', async () => {
     const firstHostId = '1fdca33f-799f-49f4-939c-ea4383c77671';
@@ -82,7 +82,7 @@ describe('test find all unenrolled HostId', () => {
 });
 
 describe('test find unenrolled endpoint host id by hostId', () => {
-  let mockScopedClient: jest.Mocked<IScopedClusterClient>;
+  let mockScopedClient: jest.Mocked<ILegacyScopedClusterClient>;
 
   it('can find unenrolled endpoint by the host id when unenrolled', async () => {
     const firstEndpointHostId = '1fdca33f-799f-49f4-939c-ea4383c77671';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts
index ef6898fad2807d..332f969ddf7e59 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller, IScopedClusterClient } from 'kibana/server';
+import { LegacyAPICaller, ILegacyScopedClusterClient } from 'kibana/server';
 import { SearchResponse } from 'elasticsearch';
 import { metadataMirrorIndexPattern } from '../../../../../common/endpoint/constants';
 import { EndpointStatus } from '../../../../../common/endpoint/types';
@@ -23,7 +23,7 @@ interface HitSource {
 }
 
 export async function findUnenrolledHostByHostId(
-  client: IScopedClusterClient,
+  client: ILegacyScopedClusterClient,
   hostId: string
 ): Promise<HostId | undefined> {
   const queryParams = {
@@ -63,7 +63,9 @@ export async function findUnenrolledHostByHostId(
   }
 }
 
-export async function findAllUnenrolledHostIds(client: IScopedClusterClient): Promise<HostId[]> {
+export async function findAllUnenrolledHostIds(
+  client: ILegacyScopedClusterClient
+): Promise<HostId[]> {
   const queryParams = {
     index: metadataMirrorIndexPattern,
     scroll: KEEPALIVE,
@@ -90,7 +92,7 @@ export async function findAllUnenrolledHostIds(client: IScopedClusterClient): Pr
 
 export async function fetchAllUnenrolledHostIdsWithScroll(
   response: SearchResponse<HostId>,
-  client: APICaller,
+  client: LegacyAPICaller,
   hits: HostId[] = []
 ): Promise<HostId[]> {
   let newHits = response.hits?.hits || [];
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.test.ts
index 16af3a95bc72da..0578f795f4a4e5 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.test.ts
@@ -10,7 +10,7 @@ import {
 } from '../../mocks';
 import { getHostPolicyResponseHandler } from './handlers';
 import {
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
   KibanaResponseFactory,
   SavedObjectsClientContract,
 } from 'kibana/server';
@@ -27,7 +27,7 @@ import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__
 
 describe('test policy response handler', () => {
   let endpointAppContextService: EndpointAppContextService;
-  let mockScopedClient: jest.Mocked<IScopedClusterClient>;
+  let mockScopedClient: jest.Mocked<ILegacyScopedClusterClient>;
   let mockSavedObjectClient: jest.Mocked<SavedObjectsClientContract>;
   let mockResponse: jest.Mocked<KibanaResponseFactory>;
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
index 5e3c3537ec591c..703c46b05f7660 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
@@ -5,7 +5,7 @@
  */
 
 import { SearchResponse } from 'elasticsearch';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { GetHostPolicyResponse, HostPolicyResponse } from '../../../../common/endpoint/types';
 
 export function getESQueryPolicyResponseByHostID(hostID: string, index: string) {
@@ -32,7 +32,7 @@ export function getESQueryPolicyResponseByHostID(hostID: string, index: string)
 export async function getPolicyResponseByHostId(
   index: string,
   hostId: string,
-  dataClient: IScopedClusterClient
+  dataClient: ILegacyScopedClusterClient
 ): Promise<GetHostPolicyResponse | undefined> {
   const query = getESQueryPolicyResponseByHostID(hostId, index);
   const response = (await dataClient.callAsCurrentUser('search', query)) as SearchResponse<
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts
index 9b45a1a6c5354d..5c92b23d594de7 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts
@@ -12,12 +12,14 @@ import {
   validateChildren,
   validateAncestry,
   validateAlerts,
+  validateEntities,
 } from '../../../common/endpoint/schema/resolver';
 import { handleEvents } from './resolver/events';
 import { handleChildren } from './resolver/children';
 import { handleAncestry } from './resolver/ancestry';
 import { handleTree } from './resolver/tree';
 import { handleAlerts } from './resolver/alerts';
+import { handleEntities } from './resolver/entity';
 
 export function registerResolverRoutes(router: IRouter, endpointAppContext: EndpointAppContext) {
   const log = endpointAppContext.logFactory.get('resolver');
@@ -66,4 +68,16 @@ export function registerResolverRoutes(router: IRouter, endpointAppContext: Endp
     },
     handleTree(log, endpointAppContext)
   );
+
+  /**
+   * Used to get details about an entity, aka process.
+   */
+  router.get(
+    {
+      path: '/api/endpoint/resolver/entity',
+      validate: validateEntities,
+      options: { authRequired: true },
+    },
+    handleEntities()
+  );
 }
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts
new file mode 100644
index 00000000000000..69b3780ec1683a
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { RequestHandler } from 'kibana/server';
+import { TypeOf } from '@kbn/config-schema';
+import { validateEntities } from '../../../../common/endpoint/schema/resolver';
+import { ResolverEntityIndex } from '../../../../common/endpoint/types';
+
+/**
+ * This is used to get an 'entity_id' which is an internal-to-Resolver concept, from an `_id`, which
+ * is the artificial ID generated by ES for each document.
+ */
+export function handleEntities(): RequestHandler<unknown, TypeOf<typeof validateEntities.query>> {
+  return async (context, request, response) => {
+    const {
+      query: { _id, indices },
+    } = request;
+
+    /**
+     * A safe type for the response based on the semantics of the query.
+     * We specify _source, asking for `process.entity_id` and we only
+     * accept documents that have it.
+     * Also, we only request 1 document.
+     */
+    interface ExpectedQueryResponse {
+      hits: {
+        hits:
+          | []
+          | [
+              {
+                _source: {
+                  process: {
+                    entity_id: string;
+                  };
+                };
+              }
+            ];
+      };
+    }
+
+    const queryResponse: ExpectedQueryResponse = await context.core.elasticsearch.legacy.client.callAsCurrentUser(
+      'search',
+      {
+        index: indices,
+        body: {
+          // only return process.entity_id
+          _source: 'process.entity_id',
+          // only return 1 match at most
+          size: 1,
+          query: {
+            bool: {
+              filter: [
+                {
+                  // only return documents with the matching _id
+                  ids: {
+                    values: _id,
+                  },
+                },
+                {
+                  exists: {
+                    // only return documents that have process.entity_id
+                    field: 'process.entity_id',
+                  },
+                },
+              ],
+            },
+          },
+        },
+      }
+    );
+
+    const responseBody: ResolverEntityIndex = [];
+    for (const {
+      _source: {
+        process: { entity_id },
+      },
+    } of queryResponse.hits.hits) {
+      responseBody.push({
+        entity_id,
+      });
+    }
+    return response.ok({ body: responseBody });
+  };
+}
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/base.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/base.ts
index 025d3a9420634c..35f8cad01e6720 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/base.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/base.ts
@@ -5,7 +5,7 @@
  */
 
 import { SearchResponse } from 'elasticsearch';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { ResolverEvent } from '../../../../../common/endpoint/types';
 import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { legacyEventIndexPattern } from './legacy_event_index_pattern';
@@ -73,7 +73,7 @@ export abstract class ResolverQuery<T> implements MSearchQuery {
    * @param client a client for searching ES
    * @param ids a single more multiple unique node ids (e.g. entity_id or unique_pid)
    */
-  async search(client: IScopedClusterClient, ids: string | string[]): Promise<T> {
+  async search(client: ILegacyScopedClusterClient, ids: string | string[]): Promise<T> {
     const res: SearchResponse<ResolverEvent> = await client.callAsCurrentUser(
       'search',
       this.buildSearch(ids)
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/multi_searcher.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/multi_searcher.ts
index 4c0e1a5126e7c6..f873ab3019f64c 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/multi_searcher.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/multi_searcher.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { MSearchResponse } from 'elasticsearch';
 import { ResolverEvent } from '../../../../../common/endpoint/types';
 import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/common';
@@ -44,7 +44,7 @@ export interface QueryInfo {
  * https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/msearch_examples.html
  */
 export class MultiSearcher {
-  constructor(private readonly client: IScopedClusterClient) {}
+  constructor(private readonly client: ILegacyScopedClusterClient) {}
 
   /**
    * Perform the multi search on the passed in queries
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/fetch.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/fetch.ts
index 0af2fca7106bef..1a532c54c7d5d1 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/fetch.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/fetch.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import {
   ResolverChildren,
   ResolverRelatedEvents,
@@ -33,7 +33,7 @@ import { AlertsQuery } from '../queries/alerts';
  */
 export class Fetcher {
   constructor(
-    private readonly client: IScopedClusterClient,
+    private readonly client: ILegacyScopedClusterClient,
     /**
      * The anchoring origin for the tree.
      */
diff --git a/x-pack/plugins/security_solution/server/graphql/timeline/resolvers.ts b/x-pack/plugins/security_solution/server/graphql/timeline/resolvers.ts
index a40ef5466c7808..ab729bae6474d2 100644
--- a/x-pack/plugins/security_solution/server/graphql/timeline/resolvers.ts
+++ b/x-pack/plugins/security_solution/server/graphql/timeline/resolvers.ts
@@ -53,7 +53,9 @@ export const createTimelineResolvers = (
         args.pageInfo || null,
         args.search || null,
         args.sort || null,
-        args.timelineType || null
+        args.status || null,
+        args.timelineType || null,
+        args.templateTimelineType || null
       );
     },
   },
diff --git a/x-pack/plugins/security_solution/server/graphql/timeline/schema.gql.ts b/x-pack/plugins/security_solution/server/graphql/timeline/schema.gql.ts
index b9aa8534ab0e9c..a9d07389797dba 100644
--- a/x-pack/plugins/security_solution/server/graphql/timeline/schema.gql.ts
+++ b/x-pack/plugins/security_solution/server/graphql/timeline/schema.gql.ts
@@ -133,6 +133,12 @@ export const timelineSchema = gql`
   enum TimelineStatus {
     active
     draft
+    immutable
+  }
+
+  enum TemplateTimelineType {
+    elastic
+    custom
   }
 
   input TimelineInput {
@@ -277,6 +283,11 @@ export const timelineSchema = gql`
   type ResponseTimelines {
     timeline: [TimelineResult]!
     totalCount: Float
+    defaultTimelineCount: Float
+    templateTimelineCount: Float
+    elasticTemplateTimelineCount: Float
+    customTemplateTimelineCount: Float
+    favoriteCount: Float
   }
 
   #########################
@@ -285,7 +296,7 @@ export const timelineSchema = gql`
 
   extend type Query {
     getOneTimeline(id: ID!): TimelineResult!
-    getAllTimeline(pageInfo: PageInfoTimeline, search: String, sort: SortTimeline, onlyUserFavorite: Boolean, timelineType: TimelineType): ResponseTimelines!
+    getAllTimeline(pageInfo: PageInfoTimeline, search: String, sort: SortTimeline, onlyUserFavorite: Boolean, timelineType: TimelineType, templateTimelineType: TemplateTimelineType, status: TimelineStatus): ResponseTimelines!
   }
 
   extend type Mutation {
diff --git a/x-pack/plugins/security_solution/server/graphql/types.ts b/x-pack/plugins/security_solution/server/graphql/types.ts
index 40666b61939280..2db3052bae66ff 100644
--- a/x-pack/plugins/security_solution/server/graphql/types.ts
+++ b/x-pack/plugins/security_solution/server/graphql/types.ts
@@ -347,6 +347,7 @@ export enum TlsFields {
 export enum TimelineStatus {
   active = 'active',
   draft = 'draft',
+  immutable = 'immutable',
 }
 
 export enum TimelineType {
@@ -361,6 +362,11 @@ export enum SortFieldTimeline {
   created = 'created',
 }
 
+export enum TemplateTimelineType {
+  elastic = 'elastic',
+  custom = 'custom',
+}
+
 export enum NetworkDirectionEcs {
   inbound = 'inbound',
   outbound = 'outbound',
@@ -2119,6 +2125,16 @@ export interface ResponseTimelines {
   timeline: (Maybe<TimelineResult>)[];
 
   totalCount?: Maybe<number>;
+
+  defaultTimelineCount?: Maybe<number>;
+
+  templateTimelineCount?: Maybe<number>;
+
+  elasticTemplateTimelineCount?: Maybe<number>;
+
+  customTemplateTimelineCount?: Maybe<number>;
+
+  favoriteCount?: Maybe<number>;
 }
 
 export interface Mutation {
@@ -2256,6 +2272,10 @@ export interface GetAllTimelineQueryArgs {
   onlyUserFavorite?: Maybe<boolean>;
 
   timelineType?: Maybe<TimelineType>;
+
+  templateTimelineType?: Maybe<TemplateTimelineType>;
+
+  status?: Maybe<TimelineStatus>;
 }
 export interface AuthenticationsSourceArgs {
   timerange: TimerangeInput;
@@ -2714,6 +2734,10 @@ export namespace QueryResolvers {
     onlyUserFavorite?: Maybe<boolean>;
 
     timelineType?: Maybe<TimelineType>;
+
+    templateTimelineType?: Maybe<TemplateTimelineType>;
+
+    status?: Maybe<TimelineStatus>;
   }
 }
 
@@ -8670,6 +8694,24 @@ export namespace ResponseTimelinesResolvers {
     timeline?: TimelineResolver<(Maybe<TimelineResult>)[], TypeParent, TContext>;
 
     totalCount?: TotalCountResolver<Maybe<number>, TypeParent, TContext>;
+
+    defaultTimelineCount?: DefaultTimelineCountResolver<Maybe<number>, TypeParent, TContext>;
+
+    templateTimelineCount?: TemplateTimelineCountResolver<Maybe<number>, TypeParent, TContext>;
+
+    elasticTemplateTimelineCount?: ElasticTemplateTimelineCountResolver<
+      Maybe<number>,
+      TypeParent,
+      TContext
+    >;
+
+    customTemplateTimelineCount?: CustomTemplateTimelineCountResolver<
+      Maybe<number>,
+      TypeParent,
+      TContext
+    >;
+
+    favoriteCount?: FavoriteCountResolver<Maybe<number>, TypeParent, TContext>;
   }
 
   export type TimelineResolver<
@@ -8682,6 +8724,31 @@ export namespace ResponseTimelinesResolvers {
     Parent = ResponseTimelines,
     TContext = SiemContext
   > = Resolver<R, Parent, TContext>;
+  export type DefaultTimelineCountResolver<
+    R = Maybe<number>,
+    Parent = ResponseTimelines,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type TemplateTimelineCountResolver<
+    R = Maybe<number>,
+    Parent = ResponseTimelines,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type ElasticTemplateTimelineCountResolver<
+    R = Maybe<number>,
+    Parent = ResponseTimelines,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type CustomTemplateTimelineCountResolver<
+    R = Maybe<number>,
+    Parent = ResponseTimelines,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type FavoriteCountResolver<
+    R = Maybe<number>,
+    Parent = ResponseTimelines,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
 }
 
 export namespace MutationResolvers {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/README.md b/x-pack/plugins/security_solution/server/lib/detection_engine/README.md
index 7a48df72d6bdec..fa0716ec082858 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/README.md
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/README.md
@@ -59,7 +59,7 @@ which will:
 - Delete any existing alerts you have
 - Delete any existing alert tasks you have
 - Delete any existing signal mapping, policies, and template, you might have previously had.
-- Add the latest signal index and its mappings using your settings from `kibana.dev.yml` environment variable of `xpack.security_solution.signalsIndex`.
+- Add the latest signal index and its mappings using your settings from `kibana.dev.yml` environment variable of `xpack.securitySolution.signalsIndex`.
 - Posts the sample rule from `./rules/queries/query_with_rule_id.json`
 - The sample rule checks for root or admin every 5 minutes and reports that as a signal if it is a positive hit
 
@@ -171,6 +171,6 @@ go about doing so.
 To test out the functionality of large lists with rules, the user will need to import a list and post a rule with a reference to that exception list. The following outlines an example using the sample json rule provided in the repo.
 
 * First, set the appropriate env var in order to enable exceptions features`export ELASTIC_XPACK_SECURITY_SOLUTION_LISTS_FEATURE=true` and `export ELASTIC_XPACK_SECURITY_SOLUTION_EXCEPTIONS_LISTS=true` and start kibana
-* Second, import a list of ips from a file called `ci-badguys.txt`. The command should look like this: 
+* Second, import a list of ips from a file called `ci-badguys.txt`. The command should look like this:
 `cd $HOME/kibana/x-pack/plugins/lists/server/scripts && ./import_list_items_by_filename.sh ip ~/ci-badguys.txt`
 * Then, from the detection engine scripts folder (`cd kibana/x-pack/plugins/security_solution/server/lib/detection_engine/scripts`) run `./post_rule.sh rules/queries/lists/query_with_list_plugin.json`
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts
index e95b713105fc67..258201f2a940bf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts
@@ -6,7 +6,7 @@
 
 import dateMath from '@elastic/datemath';
 
-import { APICaller, KibanaRequest } from '../../../../../../../src/core/server';
+import { LegacyAPICaller, KibanaRequest } from '../../../../../../../src/core/server';
 import { MlPluginSetup } from '../../../../../ml/server';
 import { getAnomalies } from '../../machine_learning';
 
@@ -20,7 +20,7 @@ export const findMlSignals = async ({
   to,
 }: {
   ml: MlPluginSetup;
-  callCluster: APICaller;
+  callCluster: LegacyAPICaller;
   request: KibanaRequest;
   jobId: string;
   anomalyThreshold: number;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts
index 90484a46dc6d3e..0fb743c9c3ed67 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts
@@ -29,7 +29,7 @@ import {
   MetaOrUndefined,
   RuleId,
 } from '../../../common/detection_engine/schemas/common/schemas';
-import { CallAPIOptions } from '../../../../../../src/core/server';
+import { LegacyCallAPIOptions } from '../../../../../../src/core/server';
 import { Filter } from '../../../../../../src/plugins/data/server';
 import { RuleType } from '../../../common/detection_engine/types';
 import { ListArrayOrUndefined } from '../../../common/detection_engine/schemas/types';
@@ -69,7 +69,7 @@ export interface RuleTypeParams {
 export type CallWithRequest<T extends Record<string, any>, V> = (
   endpoint: string,
   params: T,
-  options?: CallAPIOptions
+  options?: LegacyCallAPIOptions
 ) => Promise<V>;
 
 export type RefreshTypes = false | 'wait_for';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/pick_saved_timeline.ts b/x-pack/plugins/security_solution/server/lib/timeline/pick_saved_timeline.ts
index 281726d488abe8..68e7f8d5e6fe19 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/pick_saved_timeline.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/pick_saved_timeline.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import uuid from 'uuid';
 import { isEmpty } from 'lodash/fp';
 import { AuthenticatedUser } from '../../../../security/common/model';
 import { UNAUTHENTICATED_USER } from '../../../common/constants';
@@ -28,18 +27,13 @@ export const pickSavedTimeline = (
     savedTimeline.updatedBy = userInfo?.username ?? UNAUTHENTICATED_USER;
   }
 
-  if (savedTimeline.timelineType === TimelineType.template) {
-    if (savedTimeline.templateTimelineId == null) {
-      // create template timeline
-      savedTimeline.templateTimelineId = uuid.v4();
-      savedTimeline.templateTimelineVersion = 1;
-    } else {
-      // update template timeline
-      if (savedTimeline.templateTimelineVersion != null) {
-        savedTimeline.templateTimelineVersion = savedTimeline.templateTimelineVersion + 1;
-      }
-    }
-  } else {
+  if (savedTimeline.status === TimelineStatus.draft) {
+    savedTimeline.status = !isEmpty(savedTimeline.title)
+      ? TimelineStatus.active
+      : TimelineStatus.draft;
+  }
+
+  if (savedTimeline.timelineType === TimelineType.default) {
     savedTimeline.timelineType = savedTimeline.timelineType ?? TimelineType.default;
     savedTimeline.templateTimelineId = null;
     savedTimeline.templateTimelineVersion = null;
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/import_timelines.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/import_timelines.ts
index 7180f06d853bef..adfdf831f22cf4 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/import_timelines.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/import_timelines.ts
@@ -138,6 +138,7 @@ export const mockGetTimelineValue = {
   kqlMode: 'filter',
   kqlQuery: { filterQuery: [] },
   title: 'My duplicate timeline',
+  timelineType: TimelineType.default,
   dateRange: { start: 1584523907294, end: 1584610307294 },
   savedQueryId: null,
   sort: { columnId: '@timestamp', sortDirection: 'desc' },
@@ -145,17 +146,25 @@ export const mockGetTimelineValue = {
   createdBy: 'angela',
   updated: 1584868346013,
   updatedBy: 'angela',
-  noteIds: [],
+  noteIds: ['d2649d40-6bc5-xxxx-0000-5db0048c6086'],
   pinnedEventIds: ['k-gi8nABm-sIqJ_scOoS'],
 };
 
 export const mockGetTemplateTimelineValue = {
   ...mockGetTimelineValue,
   timelineType: TimelineType.template,
-  templateTimelineId: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
+  templateTimelineId: '79deb4c0-6bc1-0000-0000-f5341fb7a189',
   templateTimelineVersion: 1,
 };
 
+export const mockUniqueParsedTemplateTimelineObjects = [
+  { ...mockUniqueParsedObjects[0], ...mockGetTemplateTimelineValue, templateTimelineVersion: 2 },
+];
+
+export const mockParsedTemplateTimelineObjects = [
+  { ...mockParsedObjects[0], ...mockGetTemplateTimelineValue },
+];
+
 export const mockGetDraftTimelineValue = {
   savedObjectId: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
   version: 'WzEyMjUsMV0=',
@@ -195,8 +204,51 @@ export const mockParsedTimelineObject = omit(
   mockUniqueParsedObjects[0]
 );
 
+export const mockParsedTemplateTimelineObject = omit(
+  [
+    'globalNotes',
+    'eventNotes',
+    'pinnedEventIds',
+    'version',
+    'savedObjectId',
+    'created',
+    'createdBy',
+    'updated',
+    'updatedBy',
+  ],
+  mockUniqueParsedTemplateTimelineObjects[0]
+);
+
 export const mockGetCurrentUser = {
   user: {
     username: 'mockUser',
   },
 };
+
+export const mockCreatedTimeline = {
+  savedObjectId: '79deb4c0-1111-1111-1111-f5341fb7a189',
+  version: 'WzEyMjUsMV0=',
+  columns: [],
+  dataProviders: [],
+  description: 'description',
+  eventType: 'all',
+  filters: [],
+  kqlMode: 'filter',
+  kqlQuery: { filterQuery: [] },
+  title: 'My duplicate timeline',
+  dateRange: { start: 1584523907294, end: 1584610307294 },
+  savedQueryId: null,
+  sort: { columnId: '@timestamp', sortDirection: 'desc' },
+  created: 1584828930463,
+  createdBy: 'angela',
+  updated: 1584868346013,
+  updatedBy: 'angela',
+  eventNotes: [],
+  globalNotes: [],
+  pinnedEventIds: [],
+};
+
+export const mockCreatedTemplateTimeline = {
+  ...mockCreatedTimeline,
+  ...mockGetTemplateTimelineValue,
+};
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/request_responses.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/request_responses.ts
index 0b320459c76a8c..9afe5ad533324f 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/request_responses.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/request_responses.ts
@@ -4,15 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import * as rt from 'io-ts';
+import stream from 'stream';
+
 import {
   TIMELINE_DRAFT_URL,
   TIMELINE_EXPORT_URL,
   TIMELINE_IMPORT_URL,
   TIMELINE_URL,
 } from '../../../../../common/constants';
-import stream from 'stream';
-import { requestMock } from '../../../detection_engine/routes/__mocks__';
 import { SavedTimeline, TimelineType, TimelineStatus } from '../../../../../common/types/timeline';
+
+import { requestMock } from '../../../detection_engine/routes/__mocks__';
+
 import { updateTimelineSchema } from '../schemas/update_timelines_schema';
 import { createTimelineSchema } from '../schemas/create_timelines_schema';
 
@@ -59,7 +62,7 @@ export const inputTimeline: SavedTimeline = {
   title: 't',
   timelineType: TimelineType.default,
   templateTimelineId: null,
-  templateTimelineVersion: null,
+  templateTimelineVersion: 1,
   dateRange: { start: 1585227005527, end: 1585313405527 },
   savedQueryId: null,
   sort: { columnId: '@timestamp', sortDirection: 'desc' },
@@ -68,7 +71,7 @@ export const inputTimeline: SavedTimeline = {
 export const inputTemplateTimeline = {
   ...inputTimeline,
   timelineType: TimelineType.template,
-  templateTimelineId: null,
+  templateTimelineId: '79deb4c0-6bc1-11ea-inpt-templatea189',
   templateTimelineVersion: null,
 };
 
@@ -90,11 +93,11 @@ export const createDraftTimelineWithoutTimelineId = {
 };
 
 export const createTemplateTimelineWithoutTimelineId = {
-  templateTimelineId: null,
   timeline: inputTemplateTimeline,
   timelineId: null,
   version: null,
   timelineType: TimelineType.template,
+  status: TimelineStatus.active,
 };
 
 export const createTimelineWithTimelineId = {
@@ -110,7 +113,6 @@ export const createDraftTimelineWithTimelineId = {
 export const createTemplateTimelineWithTimelineId = {
   ...createTemplateTimelineWithoutTimelineId,
   timelineId: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
-  templateTimelineId: 'existing template timeline id',
 };
 
 export const updateTimelineWithTimelineId = {
@@ -122,7 +124,7 @@ export const updateTimelineWithTimelineId = {
 export const updateTemplateTimelineWithTimelineId = {
   timeline: {
     ...inputTemplateTimeline,
-    templateTimelineId: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
+    templateTimelineId: '79deb4c0-6bc1-0000-0000-f5341fb7a189',
     templateTimelineVersion: 1,
   },
   timelineId: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/clean_draft_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/clean_draft_timelines_route.ts
index 9ad50b8f2266cd..8cabd84a965b75 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/clean_draft_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/clean_draft_timelines_route.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import uuid from 'uuid';
 import { IRouter } from '../../../../../../../src/core/server';
 import { ConfigType } from '../../..';
 import { transformError, buildSiemResponse } from '../../detection_engine/routes/utils';
@@ -14,6 +15,7 @@ import { buildRouteValidation } from '../../../utils/build_validation/route_vali
 import { getDraftTimeline, resetTimeline, getTimeline, persistTimeline } from '../saved_object';
 import { draftTimelineDefaults } from '../default_timeline';
 import { cleanDraftTimelineSchema } from './schemas/clean_draft_timelines_schema';
+import { TimelineType } from '../../../../common/types/timeline';
 
 export const cleanDraftTimelinesRoute = (
   router: IRouter,
@@ -60,10 +62,18 @@ export const cleanDraftTimelinesRoute = (
             },
           });
         }
+        const templateTimelineData =
+          request.body.timelineType === TimelineType.template
+            ? {
+                timelineType: request.body.timelineType,
+                templateTimelineId: uuid.v4(),
+                templateTimelineVersion: 1,
+              }
+            : {};
 
         const newTimelineResponse = await persistTimeline(frameworkRequest, null, null, {
           ...draftTimelineDefaults,
-          timelineType: request.body.timelineType,
+          ...templateTimelineData,
         });
 
         if (newTimelineResponse.code === 200) {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.test.ts
index 70ee1532395a5d..f5345c3dce2223 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.test.ts
@@ -23,6 +23,7 @@ import {
   createTimelineWithTimelineId,
   createTemplateTimelineWithoutTimelineId,
   createTemplateTimelineWithTimelineId,
+  updateTemplateTimelineWithTimelineId,
 } from './__mocks__/request_responses';
 import {
   CREATE_TEMPLATE_TIMELINE_ERROR_MESSAGE,
@@ -34,6 +35,7 @@ describe('create timelines', () => {
   let securitySetup: SecurityPluginSetup;
   let { context } = requestContextMock.createTools();
   let mockGetTimeline: jest.Mock;
+  let mockGetTemplateTimeline: jest.Mock;
   let mockPersistTimeline: jest.Mock;
   let mockPersistPinnedEventOnTimeline: jest.Mock;
   let mockPersistNote: jest.Mock;
@@ -55,6 +57,7 @@ describe('create timelines', () => {
     } as unknown) as SecurityPluginSetup;
 
     mockGetTimeline = jest.fn();
+    mockGetTemplateTimeline = jest.fn();
     mockPersistTimeline = jest.fn();
     mockPersistPinnedEventOnTimeline = jest.fn();
     mockPersistNote = jest.fn();
@@ -231,11 +234,14 @@ describe('create timelines', () => {
       });
     });
 
-    describe('Import a template timeline already exist', () => {
+    describe('Create a template timeline already exist', () => {
       beforeEach(() => {
         jest.doMock('../saved_object', () => {
           return {
             getTimeline: mockGetTimeline.mockReturnValue(mockGetTemplateTimelineValue),
+            getTimelineByTemplateTimelineId: mockGetTemplateTimeline.mockReturnValue({
+              timeline: [mockGetTemplateTimelineValue],
+            }),
             persistTimeline: mockPersistTimeline,
           };
         });
@@ -259,7 +265,7 @@ describe('create timelines', () => {
 
       test('returns error message', async () => {
         const response = await server.inject(
-          getCreateTimelinesRequest(createTemplateTimelineWithTimelineId),
+          getCreateTimelinesRequest(updateTemplateTimelineWithTimelineId),
           context
         );
         expect(response.body).toEqual({
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.ts
index d92f2ce0764c5c..60ddaea367aedd 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.ts
@@ -6,7 +6,6 @@
 import { IRouter } from '../../../../../../../src/core/server';
 
 import { TIMELINE_URL } from '../../../../common/constants';
-import { TimelineType } from '../../../../common/types/timeline';
 
 import { ConfigType } from '../../..';
 import { SetupPlugins } from '../../../plugin';
@@ -15,14 +14,12 @@ import { buildRouteValidation } from '../../../utils/build_validation/route_vali
 import { transformError, buildSiemResponse } from '../../detection_engine/routes/utils';
 
 import { createTimelineSchema } from './schemas/create_timelines_schema';
-import { buildFrameworkRequest } from './utils/common';
 import {
-  createTimelines,
-  getTimeline,
-  getTemplateTimeline,
-  CREATE_TEMPLATE_TIMELINE_ERROR_MESSAGE,
-  CREATE_TIMELINE_ERROR_MESSAGE,
-} from './utils/create_timelines';
+  buildFrameworkRequest,
+  CompareTimelinesStatus,
+  TimelineStatusActions,
+} from './utils/common';
+import { createTimelines } from './utils/create_timelines';
 
 export const createTimelinesRoute = (
   router: IRouter,
@@ -36,7 +33,7 @@ export const createTimelinesRoute = (
         body: buildRouteValidation(createTimelineSchema),
       },
       options: {
-        tags: ['access:securitySolution'],
+        tags: ['access:siem'],
       },
     },
     async (context, request, response) => {
@@ -46,40 +43,54 @@ export const createTimelinesRoute = (
         const frameworkRequest = await buildFrameworkRequest(context, security, request);
 
         const { timelineId, timeline, version } = request.body;
-        const { templateTimelineId, timelineType } = timeline;
-        const isHandlingTemplateTimeline = timelineType === TimelineType.template;
-
-        const existTimeline =
-          timelineId != null ? await getTimeline(frameworkRequest, timelineId) : null;
-        const existTemplateTimeline =
-          templateTimelineId != null
-            ? await getTemplateTimeline(frameworkRequest, templateTimelineId)
-            : null;
+        const {
+          templateTimelineId,
+          templateTimelineVersion,
+          timelineType,
+          title,
+          status,
+        } = timeline;
+        const compareTimelinesStatus = new CompareTimelinesStatus({
+          status,
+          title,
+          timelineType,
+          timelineInput: {
+            id: timelineId,
+            version,
+          },
+          templateTimelineInput: {
+            id: templateTimelineId,
+            version: templateTimelineVersion,
+          },
+          frameworkRequest,
+        });
+        await compareTimelinesStatus.init();
 
-        if (
-          (!isHandlingTemplateTimeline && existTimeline != null) ||
-          (isHandlingTemplateTimeline && (existTemplateTimeline != null || existTimeline != null))
-        ) {
-          return siemResponse.error({
-            body: isHandlingTemplateTimeline
-              ? CREATE_TEMPLATE_TIMELINE_ERROR_MESSAGE
-              : CREATE_TIMELINE_ERROR_MESSAGE,
-            statusCode: 405,
+        // Create timeline
+        if (compareTimelinesStatus.isCreatable) {
+          const newTimeline = await createTimelines({
+            frameworkRequest,
+            timeline,
+            timelineVersion: version,
           });
-        }
 
-        // Create timeline
-        const newTimeline = await createTimelines(frameworkRequest, timeline, null, version);
-        return response.ok({
-          body: {
-            data: {
-              persistTimeline: newTimeline,
+          return response.ok({
+            body: {
+              data: {
+                persistTimeline: newTimeline,
+              },
             },
-          },
-        });
+          });
+        } else {
+          return siemResponse.error(
+            compareTimelinesStatus.checkIsFailureCases(TimelineStatusActions.create) || {
+              statusCode: 405,
+              body: 'update timeline error',
+            }
+          );
+        }
       } catch (err) {
         const error = transformError(err);
-
         return siemResponse.error({
           body: error.message,
           statusCode: error.statusCode,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts
index 48e22f6af2a7b8..15fb8f3411cfab 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts
@@ -12,7 +12,7 @@ import {
   createMockConfig,
 } from '../../detection_engine/routes/__mocks__';
 import { TIMELINE_EXPORT_URL } from '../../../../common/constants';
-import { TimelineStatus } from '../../../../common/types/timeline';
+import { TimelineStatus, TimelineType } from '../../../../common/types/timeline';
 import { SecurityPluginSetup } from '../../../../../../plugins/security/server';
 
 import {
@@ -22,7 +22,19 @@ import {
   mockGetCurrentUser,
   mockGetTimelineValue,
   mockParsedTimelineObject,
+  mockParsedTemplateTimelineObjects,
+  mockUniqueParsedTemplateTimelineObjects,
+  mockParsedTemplateTimelineObject,
+  mockCreatedTemplateTimeline,
+  mockGetTemplateTimelineValue,
+  mockCreatedTimeline,
 } from './__mocks__/import_timelines';
+import {
+  TEMPLATE_TIMELINE_VERSION_CONFLICT_MESSAGE,
+  EMPTY_TITLE_ERROR_MESSAGE,
+  NOT_ALLOW_UPDATE_STATUS_ERROR_MESSAGE,
+  NOT_ALLOW_UPDATE_TIMELINE_TYPE_ERROR_MESSAGE,
+} from './utils/failure_cases';
 
 describe('import timelines', () => {
   let server: ReturnType<typeof serverMock.create>;
@@ -35,8 +47,7 @@ describe('import timelines', () => {
   let mockPersistPinnedEventOnTimeline: jest.Mock;
   let mockPersistNote: jest.Mock;
   let mockGetTupleDuplicateErrorsAndUniqueTimeline: jest.Mock;
-  const newTimelineSavedObjectId = '79deb4c0-6bc1-11ea-9999-f5341fb7a189';
-  const newTimelineVersion = '9999';
+
   beforeEach(() => {
     jest.resetModules();
     jest.resetAllMocks();
@@ -90,7 +101,7 @@ describe('import timelines', () => {
           getTimeline: mockGetTimeline.mockReturnValue(null),
           getTimelineByTemplateTimelineId: mockGetTemplateTimeline.mockReturnValue(null),
           persistTimeline: mockPersistTimeline.mockReturnValue({
-            timeline: { savedObjectId: newTimelineSavedObjectId, version: newTimelineVersion },
+            timeline: mockCreatedTimeline,
           }),
         };
       });
@@ -139,19 +150,38 @@ describe('import timelines', () => {
     test('should Create a new timeline savedObject with given timeline', async () => {
       const mockRequest = getImportTimelinesRequest();
       await server.inject(mockRequest, context);
-      expect(mockPersistTimeline.mock.calls[0][3]).toEqual(mockParsedTimelineObject);
+      expect(mockPersistTimeline.mock.calls[0][3]).toEqual({
+        ...mockParsedTimelineObject,
+        status: TimelineStatus.active,
+        templateTimelineId: null,
+        templateTimelineVersion: null,
+      });
     });
 
-    test('should Create a new timeline savedObject with given draft timeline', async () => {
+    test('should throw error if given an untitle timeline', async () => {
       mockGetTupleDuplicateErrorsAndUniqueTimeline.mockReturnValue([
         mockDuplicateIdErrors,
-        [{ ...mockUniqueParsedObjects[0], status: TimelineStatus.draft }],
+        [
+          {
+            ...mockUniqueParsedObjects[0],
+            title: '',
+          },
+        ],
       ]);
       const mockRequest = getImportTimelinesRequest();
-      await server.inject(mockRequest, context);
-      expect(mockPersistTimeline.mock.calls[0][3]).toEqual({
-        ...mockParsedTimelineObject,
-        status: TimelineStatus.active,
+      const response = await server.inject(mockRequest, context);
+      expect(response.body).toEqual({
+        success: false,
+        success_count: 0,
+        errors: [
+          {
+            id: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
+            error: {
+              status_code: 409,
+              message: EMPTY_TITLE_ERROR_MESSAGE,
+            },
+          },
+        ],
       });
     });
 
@@ -178,7 +208,9 @@ describe('import timelines', () => {
     test('should Create a new pinned event with new timelineSavedObjectId', async () => {
       const mockRequest = getImportTimelinesRequest();
       await server.inject(mockRequest, context);
-      expect(mockPersistPinnedEventOnTimeline.mock.calls[0][3]).toEqual(newTimelineSavedObjectId);
+      expect(mockPersistPinnedEventOnTimeline.mock.calls[0][3]).toEqual(
+        mockCreatedTimeline.savedObjectId
+      );
     });
 
     test('should Create notes', async () => {
@@ -202,7 +234,7 @@ describe('import timelines', () => {
     test('should provide note content when Creating notes for a timeline', async () => {
       const mockRequest = getImportTimelinesRequest();
       await server.inject(mockRequest, context);
-      expect(mockPersistNote.mock.calls[0][2]).toEqual(newTimelineVersion);
+      expect(mockPersistNote.mock.calls[0][2]).toEqual(mockCreatedTimeline.version);
     });
 
     test('should provide new notes when Creating notes for a timeline', async () => {
@@ -211,17 +243,17 @@ describe('import timelines', () => {
       expect(mockPersistNote.mock.calls[0][3]).toEqual({
         eventId: undefined,
         note: mockUniqueParsedObjects[0].globalNotes[0].note,
-        timelineId: newTimelineSavedObjectId,
+        timelineId: mockCreatedTimeline.savedObjectId,
       });
       expect(mockPersistNote.mock.calls[1][3]).toEqual({
         eventId: mockUniqueParsedObjects[0].eventNotes[0].eventId,
         note: mockUniqueParsedObjects[0].eventNotes[0].note,
-        timelineId: newTimelineSavedObjectId,
+        timelineId: mockCreatedTimeline.savedObjectId,
       });
       expect(mockPersistNote.mock.calls[2][3]).toEqual({
         eventId: mockUniqueParsedObjects[0].eventNotes[1].eventId,
         note: mockUniqueParsedObjects[0].eventNotes[1].note,
-        timelineId: newTimelineSavedObjectId,
+        timelineId: mockCreatedTimeline.savedObjectId,
       });
     });
 
@@ -268,7 +300,458 @@ describe('import timelines', () => {
             id: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
             error: {
               status_code: 409,
-              message: `timeline_id: "79deb4c0-6bc1-11ea-a90b-f5341fb7a189" already exists`,
+              message: `savedObjectId: "79deb4c0-6bc1-11ea-a90b-f5341fb7a189" already exists`,
+            },
+          },
+        ],
+      });
+    });
+
+    test('should throw error if given an untitle timeline', async () => {
+      mockGetTupleDuplicateErrorsAndUniqueTimeline.mockReturnValue([
+        mockDuplicateIdErrors,
+        [
+          {
+            ...mockUniqueParsedObjects[0],
+            title: '',
+          },
+        ],
+      ]);
+      const mockRequest = getImportTimelinesRequest();
+      const response = await server.inject(mockRequest, context);
+      expect(response.body).toEqual({
+        success: false,
+        success_count: 0,
+        errors: [
+          {
+            id: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
+            error: {
+              status_code: 409,
+              message: EMPTY_TITLE_ERROR_MESSAGE,
+            },
+          },
+        ],
+      });
+    });
+
+    test('should throw error if timelineType updated', async () => {
+      mockGetTupleDuplicateErrorsAndUniqueTimeline.mockReturnValue([
+        mockDuplicateIdErrors,
+        [
+          {
+            ...mockGetTimelineValue,
+            timelineType: TimelineType.template,
+          },
+        ],
+      ]);
+      const mockRequest = getImportTimelinesRequest();
+      const response = await server.inject(mockRequest, context);
+      expect(response.body).toEqual({
+        success: false,
+        success_count: 0,
+        errors: [
+          {
+            id: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
+            error: {
+              status_code: 409,
+              message: NOT_ALLOW_UPDATE_TIMELINE_TYPE_ERROR_MESSAGE,
+            },
+          },
+        ],
+      });
+    });
+  });
+
+  describe('request validation', () => {
+    beforeEach(() => {
+      jest.doMock('../saved_object', () => {
+        return {
+          getTimeline: mockGetTimeline.mockReturnValue(null),
+          persistTimeline: mockPersistTimeline.mockReturnValue({
+            timeline: { savedObjectId: '79deb4c0-6bc1-11ea-9999-f5341fb7a189' },
+          }),
+        };
+      });
+
+      jest.doMock('../../pinned_event/saved_object', () => {
+        return {
+          persistPinnedEventOnTimeline: mockPersistPinnedEventOnTimeline.mockReturnValue(
+            new Error('Test error')
+          ),
+        };
+      });
+
+      jest.doMock('../../note/saved_object', () => {
+        return {
+          persistNote: mockPersistNote,
+        };
+      });
+    });
+    test('disallows invalid query', async () => {
+      request = requestMock.create({
+        method: 'post',
+        path: TIMELINE_EXPORT_URL,
+        body: { id: 'someId' },
+      });
+      const importTimelinesRoute = jest.requireActual('./import_timelines_route')
+        .importTimelinesRoute;
+
+      importTimelinesRoute(server.router, createMockConfig(), securitySetup);
+      const result = server.validate(request);
+
+      expect(result.badRequest).toHaveBeenCalledWith(
+        [
+          'Invalid value "undefined" supplied to "file"',
+          'Invalid value "undefined" supplied to "file"',
+        ].join(',')
+      );
+    });
+  });
+});
+
+describe('import template timelines', () => {
+  let server: ReturnType<typeof serverMock.create>;
+  let request: ReturnType<typeof requestMock.create>;
+  let securitySetup: SecurityPluginSetup;
+  let { context } = requestContextMock.createTools();
+  let mockGetTimeline: jest.Mock;
+  let mockGetTemplateTimeline: jest.Mock;
+  let mockPersistTimeline: jest.Mock;
+  let mockPersistPinnedEventOnTimeline: jest.Mock;
+  let mockPersistNote: jest.Mock;
+  let mockGetTupleDuplicateErrorsAndUniqueTimeline: jest.Mock;
+  const mockNewTemplateTimelineId = 'new templateTimelineId';
+  beforeEach(() => {
+    jest.resetModules();
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    jest.clearAllMocks();
+
+    server = serverMock.create();
+    context = requestContextMock.createTools().context;
+
+    securitySetup = ({
+      authc: {
+        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
+      },
+      authz: {},
+    } as unknown) as SecurityPluginSetup;
+
+    mockGetTimeline = jest.fn();
+    mockGetTemplateTimeline = jest.fn();
+    mockPersistTimeline = jest.fn();
+    mockPersistPinnedEventOnTimeline = jest.fn();
+    mockPersistNote = jest.fn();
+    mockGetTupleDuplicateErrorsAndUniqueTimeline = jest.fn();
+
+    jest.doMock('../create_timelines_stream_from_ndjson', () => {
+      return {
+        createTimelinesStreamFromNdJson: jest
+          .fn()
+          .mockReturnValue(mockParsedTemplateTimelineObjects),
+      };
+    });
+
+    jest.doMock('../../../../../../../src/legacy/utils', () => {
+      return {
+        createPromiseFromStreams: jest.fn().mockReturnValue(mockParsedTemplateTimelineObjects),
+      };
+    });
+
+    jest.doMock('./utils/import_timelines', () => {
+      const originalModule = jest.requireActual('./utils/import_timelines');
+      return {
+        ...originalModule,
+        getTupleDuplicateErrorsAndUniqueTimeline: mockGetTupleDuplicateErrorsAndUniqueTimeline.mockReturnValue(
+          [mockDuplicateIdErrors, mockUniqueParsedTemplateTimelineObjects]
+        ),
+      };
+    });
+
+    jest.doMock('uuid', () => ({
+      v4: jest.fn().mockReturnValue(mockNewTemplateTimelineId),
+    }));
+  });
+
+  describe('Import a new template timeline', () => {
+    beforeEach(() => {
+      jest.doMock('../saved_object', () => {
+        return {
+          getTimeline: mockGetTimeline.mockReturnValue(null),
+          getTimelineByTemplateTimelineId: mockGetTemplateTimeline.mockReturnValue(null),
+          persistTimeline: mockPersistTimeline.mockReturnValue({
+            timeline: mockCreatedTemplateTimeline,
+          }),
+        };
+      });
+
+      jest.doMock('../../pinned_event/saved_object', () => {
+        return {
+          persistPinnedEventOnTimeline: mockPersistPinnedEventOnTimeline,
+        };
+      });
+
+      jest.doMock('../../note/saved_object', () => {
+        return {
+          persistNote: mockPersistNote,
+        };
+      });
+
+      const importTimelinesRoute = jest.requireActual('./import_timelines_route')
+        .importTimelinesRoute;
+      importTimelinesRoute(server.router, createMockConfig(), securitySetup);
+    });
+
+    test('should use given timelineId to check if the timeline savedObject already exist', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockGetTimeline.mock.calls[0][1]).toEqual(
+        mockUniqueParsedTemplateTimelineObjects[0].savedObjectId
+      );
+    });
+
+    test('should use given templateTimelineId to check if the timeline savedObject already exist', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockGetTemplateTimeline.mock.calls[0][1]).toEqual(
+        mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId
+      );
+    });
+
+    test('should Create a new timeline savedObject', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline).toHaveBeenCalled();
+    });
+
+    test('should Create a new timeline savedObject without timelineId', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline.mock.calls[0][1]).toBeNull();
+    });
+
+    test('should Create a new timeline savedObject without timeline version', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline.mock.calls[0][2]).toBeNull();
+    });
+
+    test('should Create a new timeline savedObject witn given timeline and skip the omitted fields', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline.mock.calls[0][3]).toEqual({
+        ...mockParsedTemplateTimelineObject,
+        status: TimelineStatus.active,
+      });
+    });
+
+    test('should NOT Create new pinned events', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistPinnedEventOnTimeline).not.toHaveBeenCalled();
+    });
+
+    test('should provide no noteSavedObjectId when Creating notes for a timeline', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistNote.mock.calls[0][1]).toBeNull();
+    });
+
+    test('should provide new timeline version when Creating notes for a timeline', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistNote.mock.calls[0][2]).toEqual(mockCreatedTemplateTimeline.version);
+    });
+
+    test('should exclude event notes when creating notes', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistNote.mock.calls[0][3]).toEqual({
+        eventId: undefined,
+        note: mockUniqueParsedTemplateTimelineObjects[0].globalNotes[0].note,
+        timelineId: mockCreatedTemplateTimeline.savedObjectId,
+      });
+    });
+
+    test('returns 200 when import timeline successfully', async () => {
+      const response = await server.inject(getImportTimelinesRequest(), context);
+      expect(response.status).toEqual(200);
+    });
+
+    test('should assign a templateTimeline Id automatically if not given one', async () => {
+      mockGetTupleDuplicateErrorsAndUniqueTimeline.mockReturnValue([
+        mockDuplicateIdErrors,
+        [
+          {
+            ...mockUniqueParsedTemplateTimelineObjects[0],
+            templateTimelineId: null,
+          },
+        ],
+      ]);
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline.mock.calls[0][3].templateTimelineId).toEqual(
+        mockNewTemplateTimelineId
+      );
+    });
+  });
+
+  describe('Import a template timeline already exist', () => {
+    beforeEach(() => {
+      jest.doMock('../saved_object', () => {
+        return {
+          getTimeline: mockGetTimeline.mockReturnValue(mockGetTemplateTimelineValue),
+          getTimelineByTemplateTimelineId: mockGetTemplateTimeline.mockReturnValue({
+            timeline: [mockGetTemplateTimelineValue],
+          }),
+          persistTimeline: mockPersistTimeline.mockReturnValue({
+            timeline: mockCreatedTemplateTimeline,
+          }),
+        };
+      });
+
+      jest.doMock('../../pinned_event/saved_object', () => {
+        return {
+          persistPinnedEventOnTimeline: mockPersistPinnedEventOnTimeline,
+        };
+      });
+
+      jest.doMock('../../note/saved_object', () => {
+        return {
+          persistNote: mockPersistNote,
+        };
+      });
+
+      const importTimelinesRoute = jest.requireActual('./import_timelines_route')
+        .importTimelinesRoute;
+      importTimelinesRoute(server.router, createMockConfig(), securitySetup);
+    });
+
+    test('should use given timelineId to check if the timeline savedObject already exist', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockGetTimeline.mock.calls[0][1]).toEqual(
+        mockUniqueParsedTemplateTimelineObjects[0].savedObjectId
+      );
+    });
+
+    test('should use given templateTimelineId to check if the timeline savedObject already exist', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockGetTemplateTimeline.mock.calls[0][1]).toEqual(
+        mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId
+      );
+    });
+
+    test('should UPDATE timeline savedObject', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline).toHaveBeenCalled();
+    });
+
+    test('should UPDATE timeline savedObject with timelineId', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline.mock.calls[0][1]).toEqual(
+        mockUniqueParsedTemplateTimelineObjects[0].savedObjectId
+      );
+    });
+
+    test('should UPDATE timeline savedObject without timeline version', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline.mock.calls[0][2]).toEqual(
+        mockUniqueParsedTemplateTimelineObjects[0].version
+      );
+    });
+
+    test('should UPDATE a new timeline savedObject witn given timeline and skip the omitted fields', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistTimeline.mock.calls[0][3]).toEqual(mockParsedTemplateTimelineObject);
+    });
+
+    test('should NOT Create new pinned events', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistPinnedEventOnTimeline).not.toHaveBeenCalled();
+    });
+
+    test('should provide noteSavedObjectId when Creating notes for a timeline', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistNote.mock.calls[0][1]).toBeNull();
+    });
+
+    test('should provide new timeline version when Creating notes for a timeline', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistNote.mock.calls[0][2]).toEqual(mockCreatedTemplateTimeline.version);
+    });
+
+    test('should exclude event notes when creating notes', async () => {
+      const mockRequest = getImportTimelinesRequest();
+      await server.inject(mockRequest, context);
+      expect(mockPersistNote.mock.calls[0][3]).toEqual({
+        eventId: undefined,
+        note: mockUniqueParsedTemplateTimelineObjects[0].globalNotes[0].note,
+        timelineId: mockCreatedTemplateTimeline.savedObjectId,
+      });
+    });
+
+    test('returns 200 when import timeline successfully', async () => {
+      const response = await server.inject(getImportTimelinesRequest(), context);
+      expect(response.status).toEqual(200);
+    });
+
+    test('should throw error if with given template timeline version conflict', async () => {
+      mockGetTupleDuplicateErrorsAndUniqueTimeline.mockReturnValue([
+        mockDuplicateIdErrors,
+        [
+          {
+            ...mockUniqueParsedTemplateTimelineObjects[0],
+            templateTimelineVersion: 1,
+          },
+        ],
+      ]);
+      const mockRequest = getImportTimelinesRequest();
+      const response = await server.inject(mockRequest, context);
+      expect(response.body).toEqual({
+        success: false,
+        success_count: 0,
+        errors: [
+          {
+            id: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
+            error: {
+              status_code: 409,
+              message: TEMPLATE_TIMELINE_VERSION_CONFLICT_MESSAGE,
+            },
+          },
+        ],
+      });
+    });
+
+    test('should throw error if status updated', async () => {
+      mockGetTupleDuplicateErrorsAndUniqueTimeline.mockReturnValue([
+        mockDuplicateIdErrors,
+        [
+          {
+            ...mockUniqueParsedTemplateTimelineObjects[0],
+            status: TimelineStatus.immutable,
+          },
+        ],
+      ]);
+      const mockRequest = getImportTimelinesRequest();
+      const response = await server.inject(mockRequest, context);
+      expect(response.body).toEqual({
+        success: false,
+        success_count: 0,
+        errors: [
+          {
+            id: '79deb4c0-6bc1-11ea-a90b-f5341fb7a189',
+            error: {
+              status_code: 409,
+              message: NOT_ALLOW_UPDATE_STATUS_ERROR_MESSAGE,
             },
           },
         ],
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.ts
index 5080142f22b155..fb4991d7d1e7d1 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.ts
@@ -7,17 +7,17 @@
 import { extname } from 'path';
 import { chunk, omit } from 'lodash/fp';
 
-import { validate } from '../../../../common/validate';
-import { importRulesSchema } from '../../../../common/detection_engine/schemas/response/import_rules_schema';
+import uuid from 'uuid';
 import { createPromiseFromStreams } from '../../../../../../../src/legacy/utils';
 import { IRouter } from '../../../../../../../src/core/server';
 
 import { TIMELINE_IMPORT_URL } from '../../../../common/constants';
+import { validate } from '../../../../common/validate';
 
 import { SetupPlugins } from '../../../plugin';
 import { ConfigType } from '../../../config';
 import { buildRouteValidation } from '../../../utils/build_validation/route_validation';
-
+import { importRulesSchema } from '../../../../common/detection_engine/schemas/response/import_rules_schema';
 import {
   buildSiemResponse,
   createBulkErrorObject,
@@ -28,7 +28,11 @@ import {
 import { createTimelinesStreamFromNdJson } from '../create_timelines_stream_from_ndjson';
 
 import { ImportTimelinesPayloadSchemaRt } from './schemas/import_timelines_schema';
-import { buildFrameworkRequest } from './utils/common';
+import {
+  buildFrameworkRequest,
+  CompareTimelinesStatus,
+  TimelineStatusActions,
+} from './utils/common';
 import {
   getTupleDuplicateErrorsAndUniqueTimeline,
   isBulkError,
@@ -38,11 +42,11 @@ import {
   PromiseFromStreams,
   timelineSavedObjectOmittedFields,
 } from './utils/import_timelines';
-import { createTimelines, getTimeline, getTemplateTimeline } from './utils/create_timelines';
-import { TimelineType, TimelineStatus } from '../../../../common/types/timeline';
-import { checkIsFailureCases } from './utils/update_timelines';
+import { createTimelines } from './utils/create_timelines';
+import { TimelineStatus } from '../../../../common/types/timeline';
 
 const CHUNK_PARSED_OBJECT_SIZE = 10;
+const DEFAULT_IMPORT_ERROR = `Something went wrong, there's something we didn't handle properly, please help us improve by providing the file you try to import on https://discuss.elastic.co/c/security/siem`;
 
 export const importTimelinesRoute = (
   router: IRouter,
@@ -118,100 +122,112 @@ export const importTimelinesRoute = (
 
                       return null;
                     }
+
                     const {
-                      savedObjectId = null,
+                      savedObjectId,
                       pinnedEventIds,
                       globalNotes,
                       eventNotes,
+                      status,
                       templateTimelineId,
                       templateTimelineVersion,
+                      title,
                       timelineType,
-                      version = null,
+                      version,
                     } = parsedTimeline;
                     const parsedTimelineObject = omit(
                       timelineSavedObjectOmittedFields,
                       parsedTimeline
                     );
-
                     let newTimeline = null;
                     try {
-                      const templateTimeline =
-                        templateTimelineId != null
-                          ? await getTemplateTimeline(frameworkRequest, templateTimelineId)
-                          : null;
-
-                      const timeline =
-                        savedObjectId != null &&
-                        (await getTimeline(frameworkRequest, savedObjectId));
-                      const isHandlingTemplateTimeline = timelineType === TimelineType.template;
-
-                      if (
-                        (timeline == null && !isHandlingTemplateTimeline) ||
-                        (timeline == null && templateTimeline == null && isHandlingTemplateTimeline)
-                      ) {
+                      const compareTimelinesStatus = new CompareTimelinesStatus({
+                        status,
+                        timelineType,
+                        title,
+                        timelineInput: {
+                          id: savedObjectId,
+                          version,
+                        },
+                        templateTimelineInput: {
+                          id: templateTimelineId,
+                          version: templateTimelineVersion,
+                        },
+                        frameworkRequest,
+                      });
+                      await compareTimelinesStatus.init();
+                      const isTemplateTimeline = compareTimelinesStatus.isHandlingTemplateTimeline;
+                      if (compareTimelinesStatus.isCreatableViaImport) {
                         // create timeline / template timeline
-                        newTimeline = await createTimelines(
+                        newTimeline = await createTimelines({
                           frameworkRequest,
-                          {
+                          timeline: {
                             ...parsedTimelineObject,
                             status:
-                              parsedTimelineObject.status === TimelineStatus.draft
+                              status === TimelineStatus.draft
                                 ? TimelineStatus.active
-                                : parsedTimelineObject.status,
+                                : status ?? TimelineStatus.active,
+                            templateTimelineVersion: isTemplateTimeline
+                              ? templateTimelineVersion
+                              : null,
+                            templateTimelineId: isTemplateTimeline
+                              ? templateTimelineId ?? uuid.v4()
+                              : null,
                           },
-                          null, // timelineSavedObjectId
-                          null, // timelineVersion
-                          pinnedEventIds,
-                          isHandlingTemplateTimeline
-                            ? globalNotes
-                            : [...globalNotes, ...eventNotes],
-                          [] // existing note ids
-                        );
+                          pinnedEventIds: isTemplateTimeline ? null : pinnedEventIds,
+                          notes: isTemplateTimeline ? globalNotes : [...globalNotes, ...eventNotes],
+                        });
 
                         resolve({
                           timeline_id: newTimeline.timeline.savedObjectId,
                           status_code: 200,
                         });
-                      } else if (
-                        timeline &&
-                        timeline != null &&
-                        templateTimeline != null &&
-                        isHandlingTemplateTimeline
-                      ) {
-                        // update template timeline
-                        const errorObj = checkIsFailureCases(
-                          isHandlingTemplateTimeline,
-                          version,
-                          templateTimelineVersion ?? null,
-                          timeline,
-                          templateTimeline
-                        );
-                        if (errorObj != null) {
-                          return siemResponse.error(errorObj);
-                        }
+                      }
 
-                        newTimeline = await createTimelines(
-                          frameworkRequest,
-                          { ...parsedTimelineObject, templateTimelineId, templateTimelineVersion },
-                          timeline.savedObjectId, // timelineSavedObjectId
-                          timeline.version, // timelineVersion
-                          pinnedEventIds,
-                          globalNotes,
-                          [] // existing note ids
+                      if (!compareTimelinesStatus.isHandlingTemplateTimeline) {
+                        const errorMessage = compareTimelinesStatus.checkIsFailureCases(
+                          TimelineStatusActions.createViaImport
                         );
+                        const message = errorMessage?.body ?? DEFAULT_IMPORT_ERROR;
 
-                        resolve({
-                          timeline_id: newTimeline.timeline.savedObjectId,
-                          status_code: 200,
-                        });
-                      } else {
                         resolve(
                           createBulkErrorObject({
                             id: savedObjectId ?? 'unknown',
                             statusCode: 409,
-                            message: `timeline_id: "${savedObjectId}" already exists`,
+                            message,
                           })
                         );
+                      } else {
+                        if (compareTimelinesStatus.isUpdatableViaImport) {
+                          // update template timeline
+                          newTimeline = await createTimelines({
+                            frameworkRequest,
+                            timeline: parsedTimelineObject,
+                            timelineSavedObjectId: compareTimelinesStatus.timelineId,
+                            timelineVersion: compareTimelinesStatus.timelineVersion,
+                            notes: globalNotes,
+                            existingNoteIds: compareTimelinesStatus.timelineInput.data?.noteIds,
+                          });
+
+                          resolve({
+                            timeline_id: newTimeline.timeline.savedObjectId,
+                            status_code: 200,
+                          });
+                        } else {
+                          const errorMessage = compareTimelinesStatus.checkIsFailureCases(
+                            TimelineStatusActions.updateViaImport
+                          );
+
+                          const message = errorMessage?.body ?? DEFAULT_IMPORT_ERROR;
+
+                          resolve(
+                            createBulkErrorObject({
+                              id: savedObjectId ?? 'unknown',
+                              statusCode: 409,
+                              message,
+                            })
+                          );
+                        }
                       }
                     } catch (err) {
                       resolve(
@@ -236,9 +252,9 @@ export const importTimelinesRoute = (
           ];
         }
 
-        const errorsResp = importTimelineResponse.filter((resp) =>
-          isBulkError(resp)
-        ) as BulkError[];
+        const errorsResp = importTimelineResponse.filter((resp) => {
+          return isBulkError(resp);
+        }) as BulkError[];
         const successes = importTimelineResponse.filter((resp) => {
           if (isImportRegular(resp)) {
             return resp.status_code === 200;
@@ -261,7 +277,6 @@ export const importTimelinesRoute = (
       } catch (err) {
         const error = transformError(err);
         const siemResponse = buildSiemResponse(response);
-
         return siemResponse.error({
           body: error.message,
           statusCode: error.statusCode,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.test.ts
index 2a3feb7afd59c2..3cedb925649a27 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.test.ts
@@ -26,7 +26,7 @@ import {
 import {
   UPDATE_TIMELINE_ERROR_MESSAGE,
   UPDATE_TEMPLATE_TIMELINE_ERROR_MESSAGE,
-} from './utils/update_timelines';
+} from './utils/failure_cases';
 
 describe('update timelines', () => {
   let server: ReturnType<typeof serverMock.create>;
@@ -93,7 +93,7 @@ describe('update timelines', () => {
         await server.inject(mockRequest, context);
       });
 
-      test('should Check a if given timeline id exist', async () => {
+      test('should Check if given timeline id exist', async () => {
         expect(mockGetTimeline.mock.calls[0][1]).toEqual(updateTimelineWithTimelineId.timelineId);
       });
 
@@ -178,7 +178,7 @@ describe('update timelines', () => {
               timeline: [mockGetTemplateTimelineValue],
             }),
             persistTimeline: mockPersistTimeline.mockReturnValue({
-              timeline: updateTimelineWithTimelineId.timeline,
+              timeline: updateTemplateTimelineWithTimelineId.timeline,
             }),
           };
         });
@@ -211,7 +211,7 @@ describe('update timelines', () => {
 
       test('should Update existing template timeline with template timelineId', async () => {
         expect(mockGetTemplateTimeline.mock.calls[0][1]).toEqual(
-          updateTemplateTimelineWithTimelineId.timelineId
+          updateTemplateTimelineWithTimelineId.timeline.templateTimelineId
         );
       });
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.ts
index d5ecd408a6ef45..f59df151b69550 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.ts
@@ -7,19 +7,17 @@
 import { IRouter } from '../../../../../../../src/core/server';
 
 import { TIMELINE_URL } from '../../../../common/constants';
-import { TimelineType } from '../../../../common/types/timeline';
 
 import { SetupPlugins } from '../../../plugin';
 import { buildRouteValidation } from '../../../utils/build_validation/route_validation';
 import { ConfigType } from '../../..';
 
 import { transformError, buildSiemResponse } from '../../detection_engine/routes/utils';
-import { FrameworkRequest } from '../../framework';
 
 import { updateTimelineSchema } from './schemas/update_timelines_schema';
-import { buildFrameworkRequest } from './utils/common';
-import { createTimelines, getTimeline, getTemplateTimeline } from './utils/create_timelines';
-import { checkIsFailureCases } from './utils/update_timelines';
+import { buildFrameworkRequest, TimelineStatusActions } from './utils/common';
+import { createTimelines } from './utils/create_timelines';
+import { CompareTimelinesStatus } from './utils/compare_timelines_status';
 
 export const updateTimelinesRoute = (
   router: IRouter,
@@ -33,7 +31,7 @@ export const updateTimelinesRoute = (
         body: buildRouteValidation(updateTimelineSchema),
       },
       options: {
-        tags: ['access:securitySolution'],
+        tags: ['access:siem'],
       },
     },
     // eslint-disable-next-line complexity
@@ -43,39 +41,54 @@ export const updateTimelinesRoute = (
       try {
         const frameworkRequest = await buildFrameworkRequest(context, security, request);
         const { timelineId, timeline, version } = request.body;
-        const { templateTimelineId, templateTimelineVersion, timelineType } = timeline;
-        const isHandlingTemplateTimeline = timelineType === TimelineType.template;
-        const existTimeline =
-          timelineId != null ? await getTimeline(frameworkRequest, timelineId) : null;
+        const {
+          templateTimelineId,
+          templateTimelineVersion,
+          timelineType,
+          title,
+          status,
+        } = timeline;
 
-        const existTemplateTimeline =
-          templateTimelineId != null
-            ? await getTemplateTimeline(frameworkRequest, templateTimelineId)
-            : null;
-
-        const errorObj = checkIsFailureCases(
-          isHandlingTemplateTimeline,
-          version,
-          templateTimelineVersion ?? null,
-          existTimeline,
-          existTemplateTimeline
-        );
-        if (errorObj != null) {
-          return siemResponse.error(errorObj);
-        }
-        const updatedTimeline = await createTimelines(
-          (frameworkRequest as unknown) as FrameworkRequest,
-          timeline,
-          timelineId,
-          version
-        );
-        return response.ok({
-          body: {
-            data: {
-              persistTimeline: updatedTimeline,
-            },
+        const compareTimelinesStatus = new CompareTimelinesStatus({
+          status,
+          title,
+          timelineType,
+          timelineInput: {
+            id: timelineId,
+            version,
+          },
+          templateTimelineInput: {
+            id: templateTimelineId,
+            version: templateTimelineVersion,
           },
+          frameworkRequest,
         });
+
+        await compareTimelinesStatus.init();
+        if (compareTimelinesStatus.isUpdatable) {
+          const updatedTimeline = await createTimelines({
+            frameworkRequest,
+            timeline,
+            timelineSavedObjectId: timelineId,
+            timelineVersion: version,
+          });
+
+          return response.ok({
+            body: {
+              data: {
+                persistTimeline: updatedTimeline,
+              },
+            },
+          });
+        } else {
+          const error = compareTimelinesStatus.checkIsFailureCases(TimelineStatusActions.update);
+          return siemResponse.error(
+            error || {
+              statusCode: 405,
+              body: 'update timeline error',
+            }
+          );
+        }
       } catch (err) {
         const error = transformError(err);
         return siemResponse.error({
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/common.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/common.ts
index adbfdbf6d6051c..2c2d651fd483be 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/common.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/common.ts
@@ -5,9 +5,10 @@
  */
 import { set } from 'lodash/fp';
 
-import { RequestHandlerContext } from 'src/core/server';
+import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
+
 import { SetupPlugins } from '../../../../plugin';
-import { KibanaRequest } from '../../../../../../../../src/core/server';
+
 import { FrameworkRequest } from '../../../framework';
 
 export const buildFrameworkRequest = async (
@@ -28,3 +29,19 @@ export const buildFrameworkRequest = async (
     )
   );
 };
+
+export enum TimelineStatusActions {
+  create = 'create',
+  createViaImport = 'createViaImport',
+  update = 'update',
+  updateViaImport = 'updateViaImport',
+}
+
+export type TimelineStatusAction =
+  | TimelineStatusActions.create
+  | TimelineStatusActions.createViaImport
+  | TimelineStatusActions.update
+  | TimelineStatusActions.updateViaImport;
+
+export * from './compare_timelines_status';
+export * from './timeline_object';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/compare_timelines_status.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/compare_timelines_status.test.ts
new file mode 100644
index 00000000000000..a6d379e534bc28
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/compare_timelines_status.test.ts
@@ -0,0 +1,810 @@
+/*
+ * 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 { TimelineType, TimelineStatus } from '../../../../../common/types/timeline';
+import { FrameworkRequest } from '../../../framework';
+
+import {
+  mockUniqueParsedObjects,
+  mockUniqueParsedTemplateTimelineObjects,
+  mockGetTemplateTimelineValue,
+  mockGetTimelineValue,
+} from '../__mocks__/import_timelines';
+
+import { CompareTimelinesStatus as TimelinesStatusType } from './compare_timelines_status';
+import {
+  EMPTY_TITLE_ERROR_MESSAGE,
+  UPDATE_STATUS_ERROR_MESSAGE,
+  UPDATE_TEMPLATE_TIMELINE_ERROR_MESSAGE,
+  TEMPLATE_TIMELINE_VERSION_CONFLICT_MESSAGE,
+  CREATE_TEMPLATE_TIMELINE_ERROR_MESSAGE,
+  getImportExistingTimelineError,
+} from './failure_cases';
+import { TimelineStatusActions } from './common';
+
+describe('CompareTimelinesStatus', () => {
+  describe('timeline', () => {
+    describe('given timeline exists', () => {
+      const mockGetTimeline: jest.Mock = jest.fn();
+      const mockGetTemplateTimeline: jest.Mock = jest.fn();
+      let timelineObj: TimelinesStatusType;
+
+      afterEach(() => {
+        jest.clearAllMocks();
+      });
+
+      afterAll(() => {
+        jest.resetModules();
+      });
+
+      beforeAll(() => {
+        jest.resetModules();
+      });
+
+      beforeEach(async () => {
+        jest.doMock('../../saved_object', () => {
+          return {
+            getTimeline: mockGetTimeline.mockReturnValue(mockGetTimelineValue),
+            getTimelineByTemplateTimelineId: mockGetTemplateTimeline.mockReturnValue({
+              timeline: [],
+            }),
+          };
+        });
+
+        const CompareTimelinesStatus = jest.requireActual('./compare_timelines_status')
+          .CompareTimelinesStatus;
+
+        timelineObj = new CompareTimelinesStatus({
+          timelineInput: {
+            id: mockUniqueParsedObjects[0].savedObjectId,
+            version: mockUniqueParsedObjects[0].version,
+          },
+          timelineType: TimelineType.default,
+          title: mockUniqueParsedObjects[0].title,
+          templateTimelineInput: {
+            id: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId,
+            version: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineVersion,
+          },
+          frameworkRequest: {} as FrameworkRequest,
+        });
+
+        await timelineObj.init();
+      });
+
+      test('should get timeline', () => {
+        expect(mockGetTimeline).toHaveBeenCalled();
+      });
+
+      test('should get templateTimeline', () => {
+        expect(mockGetTemplateTimeline).toHaveBeenCalled();
+      });
+
+      test('should not creatable', () => {
+        expect(timelineObj.isCreatable).toEqual(false);
+      });
+
+      test('should not CreatableViaImport', () => {
+        expect(timelineObj.isCreatableViaImport).toEqual(false);
+      });
+
+      test('should be Updatable', () => {
+        expect(timelineObj.isUpdatable).toEqual(true);
+      });
+
+      test('should not be UpdatableViaImport', () => {
+        expect(timelineObj.isUpdatableViaImport).toEqual(false);
+      });
+
+      test('should indicate we are handling a timeline', () => {
+        expect(timelineObj.isHandlingTemplateTimeline).toEqual(false);
+      });
+    });
+
+    describe('given timeline does NOT exists', () => {
+      const mockGetTimeline: jest.Mock = jest.fn();
+      const mockGetTemplateTimeline: jest.Mock = jest.fn();
+      let timelineObj: TimelinesStatusType;
+
+      afterEach(() => {
+        jest.clearAllMocks();
+      });
+
+      afterAll(() => {
+        jest.resetModules();
+      });
+
+      beforeAll(() => {
+        jest.resetModules();
+      });
+
+      beforeEach(async () => {
+        jest.doMock('../../saved_object', () => {
+          return {
+            getTimeline: mockGetTimeline.mockReturnValue(null),
+            getTimelineByTemplateTimelineId: mockGetTemplateTimeline.mockReturnValue({
+              timeline: [],
+            }),
+          };
+        });
+
+        const CompareTimelinesStatus = jest.requireActual('./compare_timelines_status')
+          .CompareTimelinesStatus;
+
+        timelineObj = new CompareTimelinesStatus({
+          timelineInput: {
+            id: mockUniqueParsedObjects[0].savedObjectId,
+            version: mockUniqueParsedObjects[0].version,
+          },
+          timelineType: TimelineType.default,
+          title: mockUniqueParsedObjects[0].title,
+          templateTimelineInput: {
+            id: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId,
+            version: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineVersion,
+          },
+          frameworkRequest: {} as FrameworkRequest,
+        });
+
+        await timelineObj.init();
+      });
+
+      test('should get timeline', () => {
+        expect(mockGetTimeline).toHaveBeenCalled();
+      });
+
+      test('should get templateTimeline', () => {
+        expect(mockGetTemplateTimeline).toHaveBeenCalled();
+      });
+
+      test('should be creatable', () => {
+        expect(timelineObj.isCreatable).toEqual(true);
+      });
+
+      test('should be CreatableViaImport', () => {
+        expect(timelineObj.isCreatableViaImport).toEqual(true);
+      });
+
+      test('should be Updatable', () => {
+        expect(timelineObj.isUpdatable).toEqual(false);
+      });
+
+      test('should not be UpdatableViaImport', () => {
+        expect(timelineObj.isUpdatableViaImport).toEqual(false);
+      });
+
+      test('should indicate we are handling a timeline', () => {
+        expect(timelineObj.isHandlingTemplateTimeline).toEqual(false);
+      });
+    });
+  });
+
+  describe('template timeline', () => {
+    describe('given template timeline exists', () => {
+      const mockGetTimeline: jest.Mock = jest.fn();
+      const mockGetTemplateTimeline: jest.Mock = jest.fn();
+
+      let timelineObj: TimelinesStatusType;
+
+      beforeEach(async () => {
+        jest.doMock('../../saved_object', () => ({
+          getTimeline: mockGetTimeline.mockReturnValue(mockGetTemplateTimelineValue),
+          getTimelineByTemplateTimelineId: mockGetTemplateTimeline.mockReturnValue({
+            timeline: [mockGetTemplateTimelineValue],
+          }),
+        }));
+
+        const CompareTimelinesStatus = jest.requireActual('./compare_timelines_status')
+          .CompareTimelinesStatus;
+
+        timelineObj = new CompareTimelinesStatus({
+          timelineInput: {
+            id: mockUniqueParsedObjects[0].savedObjectId,
+            version: mockUniqueParsedObjects[0].version,
+          },
+          timelineType: TimelineType.template,
+          title: mockUniqueParsedObjects[0].title,
+          templateTimelineInput: {
+            id: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId,
+            version: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineVersion,
+          },
+          frameworkRequest: {} as FrameworkRequest,
+        });
+        await timelineObj.init();
+      });
+
+      afterEach(() => {
+        jest.clearAllMocks();
+      });
+
+      afterAll(() => {
+        jest.resetModules();
+      });
+
+      beforeAll(() => {
+        jest.resetModules();
+      });
+
+      test('should get timeline', () => {
+        expect(mockGetTimeline).toHaveBeenCalled();
+      });
+
+      test('should get templateTimeline', () => {
+        expect(mockGetTemplateTimeline).toHaveBeenCalled();
+      });
+
+      test('should not creatable', () => {
+        expect(timelineObj.isCreatable).toEqual(false);
+      });
+
+      test('should not CreatableViaImport', () => {
+        expect(timelineObj.isCreatableViaImport).toEqual(false);
+      });
+
+      test('should be Updatable', () => {
+        expect(timelineObj.isUpdatable).toEqual(true);
+      });
+
+      test('should be UpdatableViaImport', () => {
+        expect(timelineObj.isUpdatableViaImport).toEqual(true);
+      });
+
+      test('should indicate we are handling a template timeline', () => {
+        expect(timelineObj.isHandlingTemplateTimeline).toEqual(true);
+      });
+    });
+
+    describe('given template timeline does NOT exists', () => {
+      const mockGetTimeline: jest.Mock = jest.fn();
+      const mockGetTemplateTimeline: jest.Mock = jest.fn();
+
+      let timelineObj: TimelinesStatusType;
+
+      afterEach(() => {
+        jest.clearAllMocks();
+      });
+
+      afterAll(() => {
+        jest.resetModules();
+      });
+
+      beforeAll(() => {
+        jest.resetModules();
+      });
+
+      beforeEach(async () => {
+        jest.doMock('../../saved_object', () => ({
+          getTimeline: mockGetTimeline,
+          getTimelineByTemplateTimelineId: mockGetTemplateTimeline,
+        }));
+
+        const CompareTimelinesStatus = jest.requireActual('./compare_timelines_status')
+          .CompareTimelinesStatus;
+
+        timelineObj = new CompareTimelinesStatus({
+          timelineInput: {
+            id: mockUniqueParsedObjects[0].savedObjectId,
+            version: mockUniqueParsedObjects[0].version,
+          },
+          timelineType: TimelineType.template,
+          title: mockUniqueParsedObjects[0].title,
+          templateTimelineInput: {
+            id: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId,
+            version: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineVersion,
+          },
+          frameworkRequest: {} as FrameworkRequest,
+        });
+        await timelineObj.init();
+      });
+
+      test('should get timeline', () => {
+        expect(mockGetTimeline).toHaveBeenCalled();
+      });
+
+      test('should get templateTimeline', () => {
+        expect(mockGetTemplateTimeline).toHaveBeenCalled();
+      });
+
+      test('should be creatable', () => {
+        expect(timelineObj.isCreatable).toEqual(true);
+      });
+
+      test('should throw no error on creatable', () => {
+        expect(timelineObj.checkIsFailureCases(TimelineStatusActions.create)).toBeNull();
+      });
+
+      test('should be CreatableViaImport', () => {
+        expect(timelineObj.isCreatableViaImport).toEqual(true);
+      });
+
+      test('should throw no error on CreatableViaImport', () => {
+        expect(timelineObj.checkIsFailureCases(TimelineStatusActions.createViaImport)).toBeNull();
+      });
+
+      test('should not be Updatable', () => {
+        expect(timelineObj.isUpdatable).toEqual(false);
+      });
+
+      test('should throw error when updat', () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.update);
+        expect(error?.body).toEqual(UPDATE_TEMPLATE_TIMELINE_ERROR_MESSAGE);
+      });
+
+      test('should not be UpdatableViaImport', () => {
+        expect(timelineObj.isUpdatableViaImport).toEqual(false);
+      });
+
+      test('should throw error when UpdatableViaImport', () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.updateViaImport);
+        expect(error?.body).toEqual(UPDATE_TEMPLATE_TIMELINE_ERROR_MESSAGE);
+      });
+
+      test('should indicate we are handling a template timeline', () => {
+        expect(timelineObj.isHandlingTemplateTimeline).toEqual(true);
+      });
+    });
+  });
+
+  describe(`Throw error if given title does NOT exists`, () => {
+    describe('timeline', () => {
+      const mockGetTimeline: jest.Mock = jest.fn();
+      const mockGetTemplateTimeline: jest.Mock = jest.fn();
+      let timelineObj: TimelinesStatusType;
+
+      afterEach(() => {
+        jest.clearAllMocks();
+      });
+
+      afterAll(() => {
+        jest.resetModules();
+      });
+
+      beforeAll(() => {
+        jest.resetModules();
+      });
+
+      beforeEach(async () => {
+        jest.doMock('../../saved_object', () => {
+          return {
+            getTimeline: mockGetTimeline.mockReturnValue(null),
+            getTimelineByTemplateTimelineId: mockGetTemplateTimeline.mockReturnValue({
+              timeline: [],
+            }),
+          };
+        });
+
+        const CompareTimelinesStatus = jest.requireActual('./compare_timelines_status')
+          .CompareTimelinesStatus;
+
+        timelineObj = new CompareTimelinesStatus({
+          timelineInput: {
+            id: mockUniqueParsedObjects[0].savedObjectId,
+            type: TimelineType.default,
+            version: mockUniqueParsedObjects[0].version,
+          },
+          timelineType: TimelineType.default,
+          title: null,
+          templateTimelineInput: {
+            id: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId,
+            type: TimelineType.template,
+            version: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineVersion,
+          },
+          frameworkRequest: {} as FrameworkRequest,
+        });
+
+        await timelineObj.init();
+      });
+
+      test(`should not be creatable`, () => {
+        expect(timelineObj.isCreatable).toEqual(false);
+      });
+
+      test(`throw error on create`, () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.create);
+        expect(error?.body).toEqual(EMPTY_TITLE_ERROR_MESSAGE);
+      });
+
+      test(`should not be creatable via import`, () => {
+        expect(timelineObj.isCreatableViaImport).toEqual(false);
+      });
+
+      test(`throw error when create via import`, () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.createViaImport);
+        expect(error?.body).toEqual(EMPTY_TITLE_ERROR_MESSAGE);
+      });
+
+      test(`should not be updatable`, () => {
+        expect(timelineObj.isUpdatable).toEqual(false);
+      });
+
+      test(`throw error when update`, () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.update);
+        expect(error?.body).toEqual(EMPTY_TITLE_ERROR_MESSAGE);
+      });
+
+      test(`should not be updatable via import`, () => {
+        expect(timelineObj.isUpdatableViaImport).toEqual(false);
+      });
+    });
+
+    describe('template timeline', () => {
+      const mockGetTimeline: jest.Mock = jest.fn();
+      const mockGetTemplateTimeline: jest.Mock = jest.fn();
+      let timelineObj: TimelinesStatusType;
+
+      afterEach(() => {
+        jest.clearAllMocks();
+      });
+
+      afterAll(() => {
+        jest.resetModules();
+      });
+
+      beforeAll(() => {
+        jest.resetModules();
+      });
+
+      beforeEach(async () => {
+        jest.doMock('../../saved_object', () => {
+          return {
+            getTimeline: mockGetTimeline.mockReturnValue(null),
+            getTimelineByTemplateTimelineId: mockGetTemplateTimeline.mockReturnValue({
+              timeline: [],
+            }),
+          };
+        });
+
+        const CompareTimelinesStatus = jest.requireActual('./compare_timelines_status')
+          .CompareTimelinesStatus;
+
+        timelineObj = new CompareTimelinesStatus({
+          timelineInput: {
+            id: mockUniqueParsedObjects[0].savedObjectId,
+            type: TimelineType.default,
+            version: mockUniqueParsedObjects[0].version,
+          },
+          timelineType: TimelineType.default,
+          title: null,
+          templateTimelineInput: {
+            id: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId,
+            type: TimelineType.template,
+            version: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineVersion,
+          },
+          frameworkRequest: {} as FrameworkRequest,
+        });
+
+        await timelineObj.init();
+      });
+
+      test(`should not be creatable`, () => {
+        expect(timelineObj.isCreatable).toEqual(false);
+      });
+
+      test(`throw error on create`, () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.create);
+        expect(error?.body).toEqual(EMPTY_TITLE_ERROR_MESSAGE);
+      });
+
+      test(`should not be creatable via import`, () => {
+        expect(timelineObj.isCreatableViaImport).toEqual(false);
+      });
+
+      test(`throw error when create via import`, () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.createViaImport);
+        expect(error?.body).toEqual(EMPTY_TITLE_ERROR_MESSAGE);
+      });
+
+      test(`should not be updatable`, () => {
+        expect(timelineObj.isUpdatable).toEqual(false);
+      });
+
+      test(`throw error when update`, () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.update);
+        expect(error?.body).toEqual(EMPTY_TITLE_ERROR_MESSAGE);
+      });
+
+      test(`should not be updatable via import`, () => {
+        expect(timelineObj.isUpdatableViaImport).toEqual(false);
+      });
+
+      test(`throw error when update via import`, () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.updateViaImport);
+        expect(error?.body).toEqual(EMPTY_TITLE_ERROR_MESSAGE);
+      });
+    });
+  });
+
+  describe(`Throw error if timeline status is updated`, () => {
+    describe('immutable timeline', () => {
+      const mockGetTimeline: jest.Mock = jest.fn();
+      const mockGetTemplateTimeline: jest.Mock = jest.fn();
+      let timelineObj: TimelinesStatusType;
+
+      afterEach(() => {
+        jest.clearAllMocks();
+      });
+
+      afterAll(() => {
+        jest.resetModules();
+      });
+
+      beforeAll(() => {
+        jest.resetModules();
+      });
+
+      beforeEach(async () => {
+        jest.doMock('../../saved_object', () => {
+          return {
+            getTimeline: mockGetTimeline.mockReturnValue({
+              ...mockGetTimelineValue,
+              status: TimelineStatus.immutable,
+            }),
+            getTimelineByTemplateTimelineId: mockGetTemplateTimeline.mockReturnValue({
+              timeline: [],
+            }),
+          };
+        });
+
+        const CompareTimelinesStatus = jest.requireActual('./compare_timelines_status')
+          .CompareTimelinesStatus;
+
+        timelineObj = new CompareTimelinesStatus({
+          timelineInput: {
+            id: mockUniqueParsedObjects[0].savedObjectId,
+            type: TimelineType.default,
+            version: mockUniqueParsedObjects[0].version,
+          },
+          timelineType: TimelineType.default,
+          title: 'mock title',
+          status: TimelineStatus.immutable,
+          templateTimelineInput: {
+            id: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId,
+            type: TimelineType.template,
+            version: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineVersion,
+          },
+          frameworkRequest: {} as FrameworkRequest,
+        });
+
+        await timelineObj.init();
+      });
+
+      test(`should not be updatable if existing status is immutable`, () => {
+        expect(timelineObj.isUpdatable).toBe(false);
+      });
+
+      test(`should throw error when update`, () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.update);
+        expect(error?.body).toEqual(UPDATE_STATUS_ERROR_MESSAGE);
+      });
+
+      test(`should not be updatable via import if existing status is immutable`, () => {
+        expect(timelineObj.isUpdatableViaImport).toBe(false);
+      });
+
+      test(`should throw error when update via import`, () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.updateViaImport);
+        expect(error?.body).toEqual(
+          getImportExistingTimelineError(mockUniqueParsedObjects[0].savedObjectId)
+        );
+      });
+    });
+
+    describe('immutable template timeline', () => {
+      const mockGetTimeline: jest.Mock = jest.fn();
+      const mockGetTemplateTimeline: jest.Mock = jest.fn();
+      let timelineObj: TimelinesStatusType;
+
+      afterEach(() => {
+        jest.clearAllMocks();
+      });
+
+      afterAll(() => {
+        jest.resetModules();
+      });
+
+      beforeAll(() => {
+        jest.resetModules();
+      });
+
+      beforeEach(async () => {
+        jest.doMock('../../saved_object', () => {
+          return {
+            getTimeline: mockGetTimeline.mockReturnValue({
+              ...mockGetTemplateTimelineValue,
+              status: TimelineStatus.immutable,
+            }),
+            getTimelineByTemplateTimelineId: mockGetTemplateTimeline.mockReturnValue({
+              timeline: [{ ...mockGetTemplateTimelineValue, status: TimelineStatus.immutable }],
+            }),
+          };
+        });
+
+        const CompareTimelinesStatus = jest.requireActual('./compare_timelines_status')
+          .CompareTimelinesStatus;
+
+        timelineObj = new CompareTimelinesStatus({
+          timelineInput: {
+            id: mockUniqueParsedObjects[0].savedObjectId,
+            type: TimelineType.default,
+            version: mockUniqueParsedObjects[0].version,
+          },
+          status: TimelineStatus.immutable,
+          timelineType: TimelineType.template,
+          title: 'mock title',
+          templateTimelineInput: {
+            id: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId,
+            type: TimelineType.template,
+            version: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineVersion,
+          },
+          frameworkRequest: {} as FrameworkRequest,
+        });
+
+        await timelineObj.init();
+      });
+
+      test(`should not be able to update`, () => {
+        expect(timelineObj.isUpdatable).toEqual(false);
+      });
+
+      test(`should not throw error when update`, () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.update);
+        expect(error?.body).toEqual(UPDATE_STATUS_ERROR_MESSAGE);
+      });
+
+      test(`should not be able to update via import`, () => {
+        expect(timelineObj.isUpdatableViaImport).toEqual(true);
+      });
+
+      test(`should not throw error when update via import`, () => {
+        const error = timelineObj.checkIsFailureCases(TimelineStatusActions.updateViaImport);
+        expect(error?.body).toBeUndefined();
+      });
+    });
+  });
+
+  describe('If create template timeline without template timeline id', () => {
+    const mockGetTimeline: jest.Mock = jest.fn();
+    const mockGetTemplateTimeline: jest.Mock = jest.fn();
+
+    let timelineObj: TimelinesStatusType;
+
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    afterAll(() => {
+      jest.resetModules();
+    });
+
+    beforeAll(() => {
+      jest.resetModules();
+    });
+
+    beforeEach(async () => {
+      jest.doMock('../../saved_object', () => ({
+        getTimeline: mockGetTimeline,
+        getTimelineByTemplateTimelineId: mockGetTemplateTimeline,
+      }));
+
+      const CompareTimelinesStatus = jest.requireActual('./compare_timelines_status')
+        .CompareTimelinesStatus;
+
+      timelineObj = new CompareTimelinesStatus({
+        timelineInput: {
+          id: mockUniqueParsedObjects[0].savedObjectId,
+          version: mockUniqueParsedObjects[0].version,
+        },
+        timelineType: TimelineType.template,
+        title: mockUniqueParsedObjects[0].title,
+        templateTimelineInput: {
+          id: null,
+          version: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineVersion,
+        },
+        frameworkRequest: {} as FrameworkRequest,
+      });
+      await timelineObj.init();
+    });
+
+    test('should not be creatable', () => {
+      expect(timelineObj.isCreatable).toEqual(true);
+    });
+
+    test(`throw no error when create`, () => {
+      const error = timelineObj.checkIsFailureCases(TimelineStatusActions.create);
+      expect(error?.body).toBeUndefined();
+    });
+
+    test('should be Creatable via import', () => {
+      expect(timelineObj.isCreatableViaImport).toEqual(true);
+    });
+
+    test(`throw no error when CreatableViaImport`, () => {
+      const error = timelineObj.checkIsFailureCases(TimelineStatusActions.createViaImport);
+      expect(error?.body).toBeUndefined();
+    });
+  });
+
+  describe('Throw error if template timeline version is conflict when update via import', () => {
+    const mockGetTimeline: jest.Mock = jest.fn();
+    const mockGetTemplateTimeline: jest.Mock = jest.fn();
+
+    let timelineObj: TimelinesStatusType;
+
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    afterAll(() => {
+      jest.resetModules();
+    });
+
+    beforeAll(() => {
+      jest.resetModules();
+    });
+
+    beforeEach(async () => {
+      jest.doMock('../../saved_object', () => ({
+        getTimeline: mockGetTimeline.mockReturnValue(mockGetTemplateTimelineValue),
+        getTimelineByTemplateTimelineId: mockGetTemplateTimeline.mockReturnValue({
+          timeline: [mockGetTemplateTimelineValue],
+        }),
+      }));
+
+      const CompareTimelinesStatus = jest.requireActual('./compare_timelines_status')
+        .CompareTimelinesStatus;
+
+      timelineObj = new CompareTimelinesStatus({
+        timelineInput: {
+          id: mockUniqueParsedObjects[0].savedObjectId,
+          version: mockUniqueParsedObjects[0].version,
+        },
+        timelineType: TimelineType.template,
+        title: mockUniqueParsedObjects[0].title,
+        templateTimelineInput: {
+          id: mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId,
+          version: mockGetTemplateTimelineValue.templateTimelineVersion,
+        },
+        frameworkRequest: {} as FrameworkRequest,
+      });
+      await timelineObj.init();
+    });
+
+    test('should not be creatable', () => {
+      expect(timelineObj.isCreatable).toEqual(false);
+    });
+
+    test(`throw error when create`, () => {
+      const error = timelineObj.checkIsFailureCases(TimelineStatusActions.create);
+      expect(error?.body).toEqual(CREATE_TEMPLATE_TIMELINE_ERROR_MESSAGE);
+    });
+
+    test('should not be Creatable via import', () => {
+      expect(timelineObj.isCreatableViaImport).toEqual(false);
+    });
+
+    test(`throw error when CreatableViaImport`, () => {
+      const error = timelineObj.checkIsFailureCases(TimelineStatusActions.createViaImport);
+      expect(error?.body).toEqual(
+        getImportExistingTimelineError(mockUniqueParsedObjects[0].savedObjectId)
+      );
+    });
+
+    test('should be updatable', () => {
+      expect(timelineObj.isUpdatable).toEqual(true);
+    });
+
+    test(`throw no error when update`, () => {
+      const error = timelineObj.checkIsFailureCases(TimelineStatusActions.update);
+      expect(error).toBeNull();
+    });
+
+    test('should not be updatable via import', () => {
+      expect(timelineObj.isUpdatableViaImport).toEqual(false);
+    });
+
+    test(`throw error when UpdatableViaImport`, () => {
+      const error = timelineObj.checkIsFailureCases(TimelineStatusActions.updateViaImport);
+      expect(error?.body).toEqual(TEMPLATE_TIMELINE_VERSION_CONFLICT_MESSAGE);
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/compare_timelines_status.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/compare_timelines_status.ts
new file mode 100644
index 00000000000000..d61d217a4cf492
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/compare_timelines_status.ts
@@ -0,0 +1,247 @@
+/*
+ * 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 { isEmpty } from 'lodash/fp';
+import {
+  TimelineTypeLiteralWithNull,
+  TimelineType,
+  TimelineStatus,
+  TimelineTypeLiteral,
+} from '../../../../../common/types/timeline';
+import { FrameworkRequest } from '../../../framework';
+
+import { TimelineStatusActions, TimelineStatusAction } from './common';
+import { TimelineObject } from './timeline_object';
+import {
+  checkIsCreateFailureCases,
+  checkIsUpdateFailureCases,
+  checkIsCreateViaImportFailureCases,
+  checkIsUpdateViaImportFailureCases,
+  commonFailureChecker,
+} from './failure_cases';
+
+interface GivenTimelineInput {
+  id: string | null | undefined;
+  type?: TimelineTypeLiteralWithNull;
+  version: string | number | null | undefined;
+}
+
+interface TimelinesStatusProps {
+  status: TimelineStatus | null | undefined;
+  title: string | null | undefined;
+  timelineType: TimelineTypeLiteralWithNull | undefined;
+  timelineInput: GivenTimelineInput;
+  templateTimelineInput: GivenTimelineInput;
+  frameworkRequest: FrameworkRequest;
+}
+
+export class CompareTimelinesStatus {
+  public readonly timelineObject: TimelineObject;
+  public readonly templateTimelineObject: TimelineObject;
+  private readonly timelineType: TimelineTypeLiteral;
+  private readonly title: string | null;
+  private readonly status: TimelineStatus;
+  constructor({
+    status = TimelineStatus.active,
+    title,
+    timelineType = TimelineType.default,
+    timelineInput,
+    templateTimelineInput,
+    frameworkRequest,
+  }: TimelinesStatusProps) {
+    this.timelineObject = new TimelineObject({
+      id: timelineInput.id,
+      type: timelineInput.type ?? TimelineType.default,
+      version: timelineInput.version,
+      frameworkRequest,
+    });
+
+    this.templateTimelineObject = new TimelineObject({
+      id: templateTimelineInput.id,
+      type: templateTimelineInput.type ?? TimelineType.template,
+      version: templateTimelineInput.version,
+      frameworkRequest,
+    });
+
+    this.timelineType = timelineType ?? TimelineType.default;
+    this.title = title ?? null;
+    this.status = status ?? TimelineStatus.active;
+  }
+
+  public get isCreatable() {
+    return (
+      this.isTitleValid &&
+      !this.isSavedObjectVersionConflict &&
+      ((this.timelineObject.isCreatable && !this.isHandlingTemplateTimeline) ||
+        (this.templateTimelineObject.isCreatable &&
+          this.timelineObject.isCreatable &&
+          this.isHandlingTemplateTimeline))
+    );
+  }
+
+  public get isCreatableViaImport() {
+    return (
+      this.isCreatedStatusValid &&
+      ((this.isCreatable && !this.isHandlingTemplateTimeline) ||
+        (this.isCreatable && this.isHandlingTemplateTimeline && this.isTemplateVersionValid))
+    );
+  }
+
+  private get isCreatedStatusValid() {
+    const obj = this.isHandlingTemplateTimeline ? this.templateTimelineObject : this.timelineObject;
+
+    return obj.isExists
+      ? this.status === obj.getData?.status && this.status !== TimelineStatus.draft
+      : this.status !== TimelineStatus.draft;
+  }
+
+  public get isUpdatable() {
+    return (
+      this.isTitleValid &&
+      !this.isSavedObjectVersionConflict &&
+      ((this.timelineObject.isUpdatable && !this.isHandlingTemplateTimeline) ||
+        (this.templateTimelineObject.isUpdatable && this.isHandlingTemplateTimeline))
+    );
+  }
+
+  private get isTimelineTypeValid() {
+    const obj = this.isHandlingTemplateTimeline ? this.templateTimelineObject : this.timelineObject;
+    const existintTimelineType = obj.getData?.timelineType ?? TimelineType.default;
+    return obj.isExists ? this.timelineType === existintTimelineType : true;
+  }
+
+  public get isUpdatableViaImport() {
+    return (
+      this.isTimelineTypeValid &&
+      this.isTitleValid &&
+      this.isUpdatedTimelineStatusValid &&
+      (this.timelineObject.isUpdatableViaImport ||
+        (this.templateTimelineObject.isUpdatableViaImport &&
+          this.isTemplateVersionValid &&
+          this.isHandlingTemplateTimeline))
+    );
+  }
+
+  public get isTitleValid() {
+    return (
+      (this.status !== TimelineStatus.draft && !isEmpty(this.title)) ||
+      this.status === TimelineStatus.draft
+    );
+  }
+
+  public getFailureChecker(action?: TimelineStatusAction) {
+    if (action === TimelineStatusActions.create) {
+      return checkIsCreateFailureCases;
+    } else if (action === TimelineStatusActions.createViaImport) {
+      return checkIsCreateViaImportFailureCases;
+    } else if (action === TimelineStatusActions.update) {
+      return checkIsUpdateFailureCases;
+    } else {
+      return checkIsUpdateViaImportFailureCases;
+    }
+  }
+
+  public checkIsFailureCases(action?: TimelineStatusAction) {
+    const failureChecker = this.getFailureChecker(action);
+    const version = this.templateTimelineObject.getVersion;
+    const commonError = commonFailureChecker(this.status, this.title);
+    if (commonError != null) {
+      return commonError;
+    }
+
+    const msg = failureChecker(
+      this.isHandlingTemplateTimeline,
+      this.status,
+      this.timelineType,
+      this.timelineObject.getVersion?.toString() ?? null,
+      version != null && typeof version === 'string' ? parseInt(version, 10) : version,
+      this.templateTimelineObject.getId,
+      this.timelineObject.getData,
+      this.templateTimelineObject.getData
+    );
+    return msg;
+  }
+
+  public get templateTimelineInput() {
+    return this.templateTimelineObject;
+  }
+
+  public get timelineInput() {
+    return this.timelineObject;
+  }
+
+  private getTimelines() {
+    return Promise.all([
+      this.timelineObject.getTimeline(),
+      this.templateTimelineObject.getTimeline(),
+    ]);
+  }
+
+  public get isHandlingTemplateTimeline() {
+    return this.timelineType === TimelineType.template;
+  }
+
+  private get isSavedObjectVersionConflict() {
+    const version = this.timelineObject?.getVersion;
+    const existingVersion = this.timelineObject?.data?.version;
+    if (version != null && this.timelineObject.isExists) {
+      return version !== existingVersion;
+    } else if (this.timelineObject.isExists && version == null) {
+      return true;
+    }
+    return false;
+  }
+
+  private get isTemplateVersionConflict() {
+    const version = this.templateTimelineObject?.getVersion;
+    const existingTemplateTimelineVersion = this.templateTimelineObject?.data
+      ?.templateTimelineVersion;
+    if (
+      version != null &&
+      this.templateTimelineObject.isExists &&
+      existingTemplateTimelineVersion != null
+    ) {
+      return version <= existingTemplateTimelineVersion;
+    } else if (this.templateTimelineObject.isExists && version == null) {
+      return true;
+    }
+    return false;
+  }
+
+  private get isTemplateVersionValid() {
+    const version = this.templateTimelineObject?.getVersion;
+    return typeof version === 'number' && !this.isTemplateVersionConflict;
+  }
+
+  private get isUpdatedTimelineStatusValid() {
+    const status = this.status;
+    const existingStatus = this.isHandlingTemplateTimeline
+      ? this.templateTimelineInput.data?.status
+      : this.timelineInput.data?.status;
+    return (
+      ((existingStatus == null || existingStatus === TimelineStatus.active) &&
+        (status == null || status === TimelineStatus.active)) ||
+      (existingStatus != null && status === existingStatus)
+    );
+  }
+
+  public get timelineId() {
+    if (this.isHandlingTemplateTimeline) {
+      return this.templateTimelineInput.data?.savedObjectId ?? this.templateTimelineInput.getId;
+    }
+    return this.timelineInput.data?.savedObjectId ?? this.timelineInput.getId;
+  }
+
+  public get timelineVersion() {
+    const version = this.isHandlingTemplateTimeline
+      ? this.templateTimelineInput.data?.version ?? this.timelineInput.getVersion
+      : this.timelineInput.data?.version ?? this.timelineInput.getVersion;
+    return version != null ? version.toString() : null;
+  }
+
+  public async init() {
+    await this.getTimelines();
+  }
+}
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/create_timelines.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/create_timelines.ts
index 5b2470821b6909..abe298566341c1 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/create_timelines.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/create_timelines.ts
@@ -12,6 +12,7 @@ import { FrameworkRequest } from '../../../framework';
 import { SavedTimeline, TimelineSavedObject } from '../../../../../common/types/timeline';
 import { SavedNote } from '../../../../../common/types/timeline/note';
 import { NoteResult, ResponseTimeline } from '../../../../graphql/types';
+
 export const CREATE_TIMELINE_ERROR_MESSAGE =
   'UPDATE timeline with POST is not allowed, please use PATCH instead';
 export const CREATE_TEMPLATE_TIMELINE_ERROR_MESSAGE =
@@ -20,16 +21,10 @@ export const CREATE_TEMPLATE_TIMELINE_ERROR_MESSAGE =
 export const saveTimelines = (
   frameworkRequest: FrameworkRequest,
   timeline: SavedTimeline,
-  timelineSavedObjectId?: string | null,
-  timelineVersion?: string | null
-): Promise<ResponseTimeline> => {
-  return timelineLib.persistTimeline(
-    frameworkRequest,
-    timelineSavedObjectId ?? null,
-    timelineVersion ?? null,
-    timeline
-  );
-};
+  timelineSavedObjectId: string | null = null,
+  timelineVersion: string | null = null
+): Promise<ResponseTimeline> =>
+  timelineLib.persistTimeline(frameworkRequest, timelineSavedObjectId, timelineVersion, timeline);
 
 export const savePinnedEvents = (
   frameworkRequest: FrameworkRequest,
@@ -72,15 +67,25 @@ export const saveNotes = (
   );
 };
 
-export const createTimelines = async (
-  frameworkRequest: FrameworkRequest,
-  timeline: SavedTimeline,
-  timelineSavedObjectId?: string | null,
-  timelineVersion?: string | null,
-  pinnedEventIds?: string[] | null,
-  notes?: NoteResult[],
-  existingNoteIds?: string[]
-): Promise<ResponseTimeline> => {
+interface CreateTimelineProps {
+  frameworkRequest: FrameworkRequest;
+  timeline: SavedTimeline;
+  timelineSavedObjectId?: string | null;
+  timelineVersion?: string | null;
+  pinnedEventIds?: string[] | null;
+  notes?: NoteResult[];
+  existingNoteIds?: string[];
+}
+
+export const createTimelines = async ({
+  frameworkRequest,
+  timeline,
+  timelineSavedObjectId = null,
+  timelineVersion = null,
+  pinnedEventIds = null,
+  notes = [],
+  existingNoteIds = [],
+}: CreateTimelineProps): Promise<ResponseTimeline> => {
   const responseTimeline = await saveTimelines(
     frameworkRequest,
     timeline,
@@ -89,7 +94,6 @@ export const createTimelines = async (
   );
   const newTimelineSavedObjectId = responseTimeline.timeline.savedObjectId;
   const newTimelineVersion = responseTimeline.timeline.version;
-
   let myPromises: unknown[] = [];
   if (pinnedEventIds != null && !isEmpty(pinnedEventIds)) {
     myPromises = [
@@ -143,8 +147,9 @@ export const getTemplateTimeline = async (
       frameworkRequest,
       templateTimelineId
     );
+    // eslint-disable-next-line no-empty
   } catch (e) {
     return null;
   }
-  return templateTimeline.timeline[0];
+  return templateTimeline?.timeline[0] ?? null;
 };
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/export_timelines.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/export_timelines.ts
index 1f02851c56b80e..23090bfc6f0bd9 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/export_timelines.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/export_timelines.ts
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { omit } from 'lodash/fp';
+
 import {
   SavedObjectsClient,
   SavedObjectsFindOptions,
@@ -16,7 +18,6 @@ import {
   ExportedNotes,
   TimelineSavedObject,
   ExportTimelineNotFoundError,
-  TimelineStatus,
 } from '../../../../../common/types/timeline';
 import { NoteSavedObject } from '../../../../../common/types/timeline/note';
 import { PinnedEventSavedObject } from '../../../../../common/types/timeline/pinned_event';
@@ -180,12 +181,11 @@ const getTimelinesFromObjects = async (
     if (myTimeline != null) {
       const timelineNotes = myNotes.filter((n) => n.timelineId === timelineId);
       const timelinePinnedEventIds = myPinnedEventIds.filter((p) => p.timelineId === timelineId);
+      const exportedTimeline = omit('status', myTimeline);
       return [
         ...acc,
         {
-          ...myTimeline,
-          status:
-            myTimeline.status === TimelineStatus.draft ? TimelineStatus.active : myTimeline.status,
+          ...exportedTimeline,
           ...getGlobalEventNotesByTimelineId(timelineNotes),
           pinnedEventIds: getPinnedEventsIdsByTimelineId(timelinePinnedEventIds),
         },
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/failure_cases.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/failure_cases.ts
new file mode 100644
index 00000000000000..60ba5389280c47
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/failure_cases.ts
@@ -0,0 +1,377 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { isEmpty } from 'lodash/fp';
+import {
+  TimelineSavedObject,
+  TimelineStatus,
+  TimelineTypeLiteral,
+} from '../../../../../common/types/timeline';
+
+export const UPDATE_TIMELINE_ERROR_MESSAGE =
+  'CREATE timeline with PATCH is not allowed, please use POST instead';
+export const UPDATE_TEMPLATE_TIMELINE_ERROR_MESSAGE =
+  "CREATE template timeline with PATCH is not allowed, please use POST instead (Given template timeline doesn't exist)";
+export const NO_MATCH_VERSION_ERROR_MESSAGE =
+  'TimelineVersion conflict: The given version doesn not match with existing timeline';
+export const NO_MATCH_ID_ERROR_MESSAGE =
+  "Timeline id doesn't match with existing template timeline";
+export const TEMPLATE_TIMELINE_VERSION_CONFLICT_MESSAGE = 'Template timelineVersion conflict';
+export const CREATE_TIMELINE_ERROR_MESSAGE =
+  'UPDATE timeline with POST is not allowed, please use PATCH instead';
+export const CREATE_TEMPLATE_TIMELINE_ERROR_MESSAGE =
+  'UPDATE template timeline with POST is not allowed, please use PATCH instead';
+export const EMPTY_TITLE_ERROR_MESSAGE = 'Title cannot be empty';
+export const UPDATE_STATUS_ERROR_MESSAGE = 'Update an immutable timeline is is not allowed';
+export const CREATE_TEMPLATE_TIMELINE_WITHOUT_VERSION_ERROR_MESSAGE =
+  'Create template timeline without a valid templateTimelineVersion is not allowed. Please start from 1 to create a new template timeline';
+export const CREATE_WITH_INVALID_STATUS_ERROR_MESSAGE = 'Cannot create a draft timeline';
+export const NOT_ALLOW_UPDATE_STATUS_ERROR_MESSAGE = 'Update status is not allowed';
+export const NOT_ALLOW_UPDATE_TIMELINE_TYPE_ERROR_MESSAGE = 'Update timelineType is not allowed';
+export const UPDAT_TIMELINE_VIA_IMPORT_NOT_ALLOWED_ERROR_MESSAGE =
+  'Update timeline via import is not allowed';
+
+const isUpdatingStatus = (
+  isHandlingTemplateTimeline: boolean,
+  status: TimelineStatus | null | undefined,
+  existTimeline: TimelineSavedObject | null,
+  existTemplateTimeline: TimelineSavedObject | null
+) => {
+  const obj = isHandlingTemplateTimeline ? existTemplateTimeline : existTimeline;
+  return obj?.status === TimelineStatus.immutable ? UPDATE_STATUS_ERROR_MESSAGE : null;
+};
+
+const isGivenTitleValid = (status: TimelineStatus, title: string | null | undefined) => {
+  return (status !== TimelineStatus.draft && !isEmpty(title)) || status === TimelineStatus.draft
+    ? null
+    : EMPTY_TITLE_ERROR_MESSAGE;
+};
+
+export const getImportExistingTimelineError = (id: string) =>
+  `savedObjectId: "${id}" already exists`;
+
+export const commonFailureChecker = (status: TimelineStatus, title: string | null | undefined) => {
+  const error = [isGivenTitleValid(status, title)].filter((msg) => msg != null).join(',');
+  return !isEmpty(error)
+    ? {
+        body: error,
+        statusCode: 405,
+      }
+    : null;
+};
+
+const commonUpdateTemplateTimelineCheck = (
+  isHandlingTemplateTimeline: boolean,
+  status: TimelineStatus | null | undefined,
+  timelineType: TimelineTypeLiteral,
+  version: string | null,
+  templateTimelineVersion: number | null,
+  templateTimelineId: string | null | undefined,
+  existTimeline: TimelineSavedObject | null,
+  existTemplateTimeline: TimelineSavedObject | null
+) => {
+  if (isHandlingTemplateTimeline) {
+    if (existTimeline != null && timelineType !== existTimeline.timelineType) {
+      return {
+        body: NOT_ALLOW_UPDATE_TIMELINE_TYPE_ERROR_MESSAGE,
+        statusCode: 403,
+      };
+    }
+
+    if (existTemplateTimeline == null && templateTimelineVersion != null) {
+      // template timeline !exists
+      // Throw error to create template timeline in patch
+      return {
+        body: UPDATE_TEMPLATE_TIMELINE_ERROR_MESSAGE,
+        statusCode: 405,
+      };
+    }
+
+    if (
+      existTimeline != null &&
+      existTemplateTimeline != null &&
+      existTimeline.savedObjectId !== existTemplateTimeline.savedObjectId
+    ) {
+      // Throw error you can not have a no matching between your timeline and your template timeline during an update
+      return {
+        body: NO_MATCH_ID_ERROR_MESSAGE,
+        statusCode: 409,
+      };
+    }
+
+    if (
+      existTemplateTimeline != null &&
+      existTemplateTimeline.templateTimelineVersion == null &&
+      existTemplateTimeline.version !== version
+    ) {
+      // throw error 409 conflict timeline
+      return {
+        body: NO_MATCH_VERSION_ERROR_MESSAGE,
+        statusCode: 409,
+      };
+    }
+  }
+  return null;
+};
+
+const commonUpdateTimelineCheck = (
+  isHandlingTemplateTimeline: boolean,
+  status: TimelineStatus | null | undefined,
+  timelineType: TimelineTypeLiteral,
+  version: string | null,
+  templateTimelineVersion: number | null,
+  templateTimelineId: string | null | undefined,
+  existTimeline: TimelineSavedObject | null,
+  existTemplateTimeline: TimelineSavedObject | null
+) => {
+  if (existTimeline == null) {
+    // timeline !exists
+    return {
+      body: UPDATE_TIMELINE_ERROR_MESSAGE,
+      statusCode: 405,
+    };
+  }
+
+  if (existTimeline?.version !== version) {
+    // throw error 409 conflict timeline
+    return {
+      body: NO_MATCH_VERSION_ERROR_MESSAGE,
+      statusCode: 409,
+    };
+  }
+
+  return null;
+};
+
+const commonUpdateCases = (
+  isHandlingTemplateTimeline: boolean,
+  status: TimelineStatus | null | undefined,
+  timelineType: TimelineTypeLiteral,
+  version: string | null,
+  templateTimelineVersion: number | null,
+  templateTimelineId: string | null | undefined,
+  existTimeline: TimelineSavedObject | null,
+  existTemplateTimeline: TimelineSavedObject | null
+) => {
+  if (isHandlingTemplateTimeline) {
+    return commonUpdateTemplateTimelineCheck(
+      isHandlingTemplateTimeline,
+      status,
+      timelineType,
+      version,
+      templateTimelineVersion,
+      templateTimelineId,
+      existTimeline,
+      existTemplateTimeline
+    );
+  } else {
+    return commonUpdateTimelineCheck(
+      isHandlingTemplateTimeline,
+      status,
+      timelineType,
+      version,
+      templateTimelineVersion,
+      templateTimelineId,
+      existTimeline,
+      existTemplateTimeline
+    );
+  }
+};
+
+const createTemplateTimelineCheck = (
+  isHandlingTemplateTimeline: boolean,
+  status: TimelineStatus,
+  timelineType: TimelineTypeLiteral,
+  version: string | null,
+  templateTimelineVersion: number | null,
+  templateTimelineId: string | null | undefined,
+  existTimeline: TimelineSavedObject | null,
+  existTemplateTimeline: TimelineSavedObject | null
+) => {
+  if (isHandlingTemplateTimeline && existTemplateTimeline != null) {
+    // Throw error to create template timeline in patch
+    return {
+      body: CREATE_TEMPLATE_TIMELINE_ERROR_MESSAGE,
+      statusCode: 405,
+    };
+  } else if (isHandlingTemplateTimeline && templateTimelineVersion == null) {
+    return {
+      body: CREATE_TEMPLATE_TIMELINE_WITHOUT_VERSION_ERROR_MESSAGE,
+      statusCode: 403,
+    };
+  } else {
+    return null;
+  }
+};
+
+export const checkIsUpdateViaImportFailureCases = (
+  isHandlingTemplateTimeline: boolean,
+  status: TimelineStatus | null | undefined,
+  timelineType: TimelineTypeLiteral,
+  version: string | null,
+  templateTimelineVersion: number | null,
+  templateTimelineId: string | null | undefined,
+  existTimeline: TimelineSavedObject | null,
+  existTemplateTimeline: TimelineSavedObject | null
+) => {
+  if (!isHandlingTemplateTimeline) {
+    if (existTimeline == null) {
+      return { body: UPDAT_TIMELINE_VIA_IMPORT_NOT_ALLOWED_ERROR_MESSAGE, statusCode: 405 };
+    } else {
+      return {
+        body: getImportExistingTimelineError(existTimeline!.savedObjectId),
+        statusCode: 405,
+      };
+    }
+  } else {
+    if (existTemplateTimeline != null && timelineType !== existTemplateTimeline?.timelineType) {
+      return {
+        body: NOT_ALLOW_UPDATE_TIMELINE_TYPE_ERROR_MESSAGE,
+        statusCode: 403,
+      };
+    }
+    const isStatusValid =
+      ((existTemplateTimeline?.status == null ||
+        existTemplateTimeline?.status === TimelineStatus.active) &&
+        (status == null || status === TimelineStatus.active)) ||
+      (existTemplateTimeline?.status != null && status === existTemplateTimeline?.status);
+
+    if (!isStatusValid) {
+      return {
+        body: NOT_ALLOW_UPDATE_STATUS_ERROR_MESSAGE,
+        statusCode: 405,
+      };
+    }
+
+    const error = commonUpdateTemplateTimelineCheck(
+      isHandlingTemplateTimeline,
+      status,
+      timelineType,
+      version,
+      templateTimelineVersion,
+      templateTimelineId,
+      existTimeline,
+      existTemplateTimeline
+    );
+    if (error) {
+      return error;
+    }
+    if (
+      templateTimelineVersion != null &&
+      existTemplateTimeline != null &&
+      existTemplateTimeline.templateTimelineVersion != null &&
+      existTemplateTimeline.templateTimelineVersion >= templateTimelineVersion
+    ) {
+      // Throw error you can not update a template timeline version with an old version
+      return {
+        body: TEMPLATE_TIMELINE_VERSION_CONFLICT_MESSAGE,
+        statusCode: 409,
+      };
+    }
+  }
+  return null;
+};
+
+export const checkIsUpdateFailureCases = (
+  isHandlingTemplateTimeline: boolean,
+  status: TimelineStatus | null | undefined,
+  timelineType: TimelineTypeLiteral,
+  version: string | null,
+  templateTimelineVersion: number | null,
+  templateTimelineId: string | null | undefined,
+  existTimeline: TimelineSavedObject | null,
+  existTemplateTimeline: TimelineSavedObject | null
+) => {
+  const error = isUpdatingStatus(
+    isHandlingTemplateTimeline,
+    status,
+    existTimeline,
+    existTemplateTimeline
+  );
+  if (error) {
+    return {
+      body: error,
+      statusCode: 403,
+    };
+  }
+  return commonUpdateCases(
+    isHandlingTemplateTimeline,
+    status,
+    timelineType,
+    version,
+    templateTimelineVersion,
+    templateTimelineId,
+    existTimeline,
+    existTemplateTimeline
+  );
+};
+
+export const checkIsCreateFailureCases = (
+  isHandlingTemplateTimeline: boolean,
+  status: TimelineStatus,
+  timelineType: TimelineTypeLiteral,
+  version: string | null,
+  templateTimelineVersion: number | null,
+  templateTimelineId: string | null | undefined,
+  existTimeline: TimelineSavedObject | null,
+  existTemplateTimeline: TimelineSavedObject | null
+) => {
+  if (!isHandlingTemplateTimeline && existTimeline != null) {
+    return {
+      body: CREATE_TIMELINE_ERROR_MESSAGE,
+      statusCode: 405,
+    };
+  } else if (isHandlingTemplateTimeline) {
+    return createTemplateTimelineCheck(
+      isHandlingTemplateTimeline,
+      status,
+      timelineType,
+      version,
+      templateTimelineVersion,
+      templateTimelineId,
+      existTimeline,
+      existTemplateTimeline
+    );
+  } else {
+    return null;
+  }
+};
+
+export const checkIsCreateViaImportFailureCases = (
+  isHandlingTemplateTimeline: boolean,
+  status: TimelineStatus | null | undefined,
+  timelineType: TimelineTypeLiteral,
+  version: string | null,
+  templateTimelineVersion: number | null,
+  templateTimelineId: string | null | undefined,
+  existTimeline: TimelineSavedObject | null,
+  existTemplateTimeline: TimelineSavedObject | null
+) => {
+  if (status === TimelineStatus.draft) {
+    return {
+      body: CREATE_WITH_INVALID_STATUS_ERROR_MESSAGE,
+      statusCode: 405,
+    };
+  }
+
+  if (!isHandlingTemplateTimeline) {
+    if (existTimeline != null) {
+      return {
+        body: getImportExistingTimelineError(existTimeline.savedObjectId),
+        statusCode: 405,
+      };
+    }
+  } else {
+    if (existTemplateTimeline != null) {
+      // Throw error to create template timeline in patch
+      return {
+        body: getImportExistingTimelineError(existTemplateTimeline.savedObjectId),
+        statusCode: 405,
+      };
+    }
+  }
+
+  return null;
+};
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/timeline_object.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/timeline_object.ts
new file mode 100644
index 00000000000000..9fb96b509ec3e8
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/timeline_object.ts
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import {
+  TimelineType,
+  TimelineTypeLiteral,
+  TimelineSavedObject,
+  TimelineStatus,
+} from '../../../../../common/types/timeline';
+import { getTimeline, getTemplateTimeline } from './create_timelines';
+import { FrameworkRequest } from '../../../framework';
+
+interface TimelineObjectProps {
+  id: string | null | undefined;
+  type: TimelineTypeLiteral;
+  version: string | number | null | undefined;
+  frameworkRequest: FrameworkRequest;
+}
+
+export class TimelineObject {
+  public readonly id: string | null;
+  private type: TimelineTypeLiteral;
+  public readonly version: string | number | null;
+  private frameworkRequest: FrameworkRequest;
+
+  public data: TimelineSavedObject | null;
+
+  constructor({
+    id = null,
+    type = TimelineType.default,
+    version = null,
+    frameworkRequest,
+  }: TimelineObjectProps) {
+    this.id = id;
+    this.type = type;
+
+    this.version = version;
+    this.frameworkRequest = frameworkRequest;
+    this.data = null;
+  }
+
+  public async getTimeline() {
+    this.data =
+      this.id != null
+        ? this.type === TimelineType.template
+          ? await getTemplateTimeline(this.frameworkRequest, this.id)
+          : await getTimeline(this.frameworkRequest, this.id)
+        : null;
+
+    return this.data;
+  }
+
+  public get getData() {
+    return this.data;
+  }
+
+  private get isImmutable() {
+    return this.data?.status === TimelineStatus.immutable;
+  }
+
+  public get isExists() {
+    return this.data != null;
+  }
+
+  public get isUpdatable() {
+    return this.isExists && !this.isImmutable;
+  }
+
+  public get isCreatable() {
+    return !this.isExists;
+  }
+
+  public get isUpdatableViaImport() {
+    return this.type === TimelineType.template && this.isExists;
+  }
+
+  public get getVersion() {
+    return this.version;
+  }
+
+  public get getId() {
+    return this.id;
+  }
+}
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/update_timelines.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/update_timelines.ts
deleted file mode 100644
index a4efa676daddc5..00000000000000
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/update_timelines.ts
+++ /dev/null
@@ -1,80 +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 { TimelineSavedObject } from '../../../../../common/types/timeline';
-
-export const UPDATE_TIMELINE_ERROR_MESSAGE =
-  'CREATE timeline with PATCH is not allowed, please use POST instead';
-export const UPDATE_TEMPLATE_TIMELINE_ERROR_MESSAGE =
-  'CREATE template timeline with PATCH is not allowed, please use POST instead';
-export const NO_MATCH_VERSION_ERROR_MESSAGE =
-  'TimelineVersion conflict: The given version doesn not match with existing timeline';
-export const NO_MATCH_ID_ERROR_MESSAGE =
-  "Timeline id doesn't match with existing template timeline";
-export const TEMPLATE_TIMELINE_VERSION_CONFLICT_MESSAGE = 'Template timelineVersion conflict';
-
-export const checkIsFailureCases = (
-  isHandlingTemplateTimeline: boolean,
-  version: string | null,
-  templateTimelineVersion: number | null,
-  existTimeline: TimelineSavedObject | null,
-  existTemplateTimeline: TimelineSavedObject | null
-) => {
-  if (!isHandlingTemplateTimeline && existTimeline == null) {
-    return {
-      body: UPDATE_TIMELINE_ERROR_MESSAGE,
-      statusCode: 405,
-    };
-  } else if (isHandlingTemplateTimeline && existTemplateTimeline == null) {
-    // Throw error to create template timeline in patch
-    return {
-      body: UPDATE_TEMPLATE_TIMELINE_ERROR_MESSAGE,
-      statusCode: 405,
-    };
-  } else if (
-    isHandlingTemplateTimeline &&
-    existTimeline != null &&
-    existTemplateTimeline != null &&
-    existTimeline.savedObjectId !== existTemplateTimeline.savedObjectId
-  ) {
-    // Throw error you can not have a no matching between your timeline and your template timeline during an update
-    return {
-      body: NO_MATCH_ID_ERROR_MESSAGE,
-      statusCode: 409,
-    };
-  } else if (!isHandlingTemplateTimeline && existTimeline?.version !== version) {
-    // throw error 409 conflict timeline
-    return {
-      body: NO_MATCH_VERSION_ERROR_MESSAGE,
-      statusCode: 409,
-    };
-  } else if (
-    isHandlingTemplateTimeline &&
-    existTemplateTimeline != null &&
-    existTemplateTimeline.templateTimelineVersion == null &&
-    existTemplateTimeline.version !== version
-  ) {
-    // throw error 409 conflict timeline
-    return {
-      body: NO_MATCH_VERSION_ERROR_MESSAGE,
-      statusCode: 409,
-    };
-  } else if (
-    isHandlingTemplateTimeline &&
-    templateTimelineVersion != null &&
-    existTemplateTimeline != null &&
-    existTemplateTimeline.templateTimelineVersion != null &&
-    existTemplateTimeline.templateTimelineVersion !== templateTimelineVersion
-  ) {
-    // Throw error you can not update a template timeline version with an old version
-    return {
-      body: TEMPLATE_TIMELINE_VERSION_CONFLICT_MESSAGE,
-      statusCode: 409,
-    };
-  } else {
-    return null;
-  }
-};
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object.ts
index bbb11cd642c4ca..ec90fc6d8e0710 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object.ts
@@ -7,13 +7,20 @@
 import { getOr } from 'lodash/fp';
 
 import { SavedObjectsFindOptions } from '../../../../../../src/core/server';
-import { UNAUTHENTICATED_USER, disableTemplate } from '../../../common/constants';
+import {
+  UNAUTHENTICATED_USER,
+  disableTemplate,
+  enableElasticFilter,
+} from '../../../common/constants';
 import { NoteSavedObject } from '../../../common/types/timeline/note';
 import { PinnedEventSavedObject } from '../../../common/types/timeline/pinned_event';
 import {
   SavedTimeline,
   TimelineSavedObject,
   TimelineTypeLiteralWithNull,
+  TimelineStatusLiteralWithNull,
+  TemplateTimelineTypeLiteralWithNull,
+  TemplateTimelineType,
 } from '../../../common/types/timeline';
 import {
   ResponseTimeline,
@@ -38,6 +45,14 @@ interface ResponseTimelines {
   totalCount: number;
 }
 
+interface AllTimelinesResponse extends ResponseTimelines {
+  defaultTimelineCount: number;
+  templateTimelineCount: number;
+  elasticTemplateTimelineCount: number;
+  customTemplateTimelineCount: number;
+  favoriteCount: number;
+}
+
 export interface ResponseTemplateTimeline {
   code?: Maybe<number>;
 
@@ -55,8 +70,10 @@ export interface Timeline {
     pageInfo: PageInfoTimeline | null,
     search: string | null,
     sort: SortTimeline | null,
-    timelineType: TimelineTypeLiteralWithNull
-  ) => Promise<ResponseTimelines>;
+    status: TimelineStatusLiteralWithNull,
+    timelineType: TimelineTypeLiteralWithNull,
+    templateTimelineType: TemplateTimelineTypeLiteralWithNull
+  ) => Promise<AllTimelinesResponse>;
 
   persistFavorite: (
     request: FrameworkRequest,
@@ -97,7 +114,7 @@ export const getTimelineByTemplateTimelineId = async (
 }> => {
   const options: SavedObjectsFindOptions = {
     type: timelineSavedObjectType,
-    filter: `siem-ui-timeline.attributes.templateTimelineId: ${templateTimelineId}`,
+    filter: `siem-ui-timeline.attributes.templateTimelineId: "${templateTimelineId}"`,
   };
   return getAllSavedTimeline(request, options);
 };
@@ -106,10 +123,13 @@ export const getTimelineByTemplateTimelineId = async (
  * which has no timelineType exists in the savedObject */
 const getTimelineTypeFilter = (
   timelineType: TimelineTypeLiteralWithNull,
-  includeDraft: boolean
+  templateTimelineType: TemplateTimelineTypeLiteralWithNull,
+  status: TimelineStatusLiteralWithNull
 ) => {
   const typeFilter =
-    timelineType === TimelineType.template
+    timelineType == null
+      ? null
+      : timelineType === TimelineType.template
       ? `siem-ui-timeline.attributes.timelineType: ${TimelineType.template}` /** Show only whose timelineType exists and equals to "template" */
       : /** Show me every timeline whose timelineType is not "template".
          * which includes timelineType === 'default' and
@@ -119,10 +139,30 @@ const getTimelineTypeFilter = (
   /** Show me every timeline whose status is not "draft".
    * which includes status === 'active' and
    * those status doesn't exists */
-  const draftFilter = includeDraft
-    ? `siem-ui-timeline.attributes.status: ${TimelineStatus.draft}`
-    : `not siem-ui-timeline.attributes.status: ${TimelineStatus.draft}`;
-  return `${typeFilter} and ${draftFilter}`;
+  const draftFilter =
+    status === TimelineStatus.draft
+      ? `siem-ui-timeline.attributes.status: ${TimelineStatus.draft}`
+      : `not siem-ui-timeline.attributes.status: ${TimelineStatus.draft}`;
+
+  const immutableFilter =
+    status == null
+      ? null
+      : status === TimelineStatus.immutable
+      ? `siem-ui-timeline.attributes.status: ${TimelineStatus.immutable}`
+      : `not siem-ui-timeline.attributes.status: ${TimelineStatus.immutable}`;
+
+  const templateTimelineTypeFilter =
+    templateTimelineType == null
+      ? null
+      : templateTimelineType === TemplateTimelineType.elastic
+      ? `siem-ui-timeline.attributes.createdBy: "Elsatic"`
+      : `not siem-ui-timeline.attributes.createdBy: "Elastic"`;
+
+  const filters =
+    !disableTemplate && enableElasticFilter
+      ? [typeFilter, draftFilter, immutableFilter, templateTimelineTypeFilter]
+      : [typeFilter, draftFilter, immutableFilter];
+  return filters.filter((f) => f != null).join(' and ');
 };
 
 export const getAllTimeline = async (
@@ -131,8 +171,10 @@ export const getAllTimeline = async (
   pageInfo: PageInfoTimeline | null,
   search: string | null,
   sort: SortTimeline | null,
-  timelineType: TimelineTypeLiteralWithNull
-): Promise<ResponseTimelines> => {
+  status: TimelineStatusLiteralWithNull,
+  timelineType: TimelineTypeLiteralWithNull,
+  templateTimelineType: TemplateTimelineTypeLiteralWithNull
+): Promise<AllTimelinesResponse> => {
   const options: SavedObjectsFindOptions = {
     type: timelineSavedObjectType,
     perPage: pageInfo != null ? pageInfo.pageSize : undefined,
@@ -144,13 +186,78 @@ export const getAllTimeline = async (
     /**
      * CreateTemplateTimelineBtn
      * Remove the comment here to enable template timeline and apply the change below
-     * filter: getTimelineTypeFilter(timelineType, false)
+     * filter: getTimelineTypeFilter(timelineType, templateTimelineType, false)
      */
-    filter: getTimelineTypeFilter(disableTemplate ? TimelineType.default : timelineType, false),
+    filter: getTimelineTypeFilter(
+      disableTemplate ? TimelineType.default : timelineType,
+      disableTemplate ? null : templateTimelineType,
+      disableTemplate ? null : status
+    ),
     sortField: sort != null ? sort.sortField : undefined,
     sortOrder: sort != null ? sort.sortOrder : undefined,
   };
-  return getAllSavedTimeline(request, options);
+
+  const timelineOptions = {
+    type: timelineSavedObjectType,
+    perPage: 1,
+    page: 1,
+    filter: getTimelineTypeFilter(TimelineType.default, null, TimelineStatus.active),
+  };
+
+  const templateTimelineOptions = {
+    type: timelineSavedObjectType,
+    perPage: 1,
+    page: 1,
+    filter: getTimelineTypeFilter(TimelineType.template, null, null),
+  };
+
+  const elasticTemplateTimelineOptions = {
+    type: timelineSavedObjectType,
+    perPage: 1,
+    page: 1,
+    filter: getTimelineTypeFilter(
+      TimelineType.template,
+      TemplateTimelineType.elastic,
+      TimelineStatus.immutable
+    ),
+  };
+
+  const customTemplateTimelineOptions = {
+    type: timelineSavedObjectType,
+    perPage: 1,
+    page: 1,
+    filter: getTimelineTypeFilter(
+      TimelineType.template,
+      TemplateTimelineType.custom,
+      TimelineStatus.active
+    ),
+  };
+
+  const favoriteTimelineOptions = {
+    type: timelineSavedObjectType,
+    searchFields: ['title', 'description', 'favorite.keySearch'],
+    perPage: 1,
+    page: 1,
+    filter: getTimelineTypeFilter(timelineType, null, TimelineStatus.active),
+  };
+
+  const result = await Promise.all([
+    getAllSavedTimeline(request, options),
+    getAllSavedTimeline(request, timelineOptions),
+    getAllSavedTimeline(request, templateTimelineOptions),
+    getAllSavedTimeline(request, elasticTemplateTimelineOptions),
+    getAllSavedTimeline(request, customTemplateTimelineOptions),
+    getAllSavedTimeline(request, favoriteTimelineOptions),
+  ]);
+
+  return Promise.resolve({
+    ...result[0],
+    defaultTimelineCount: result[1].totalCount,
+    templateTimelineCount: result[2].totalCount,
+    elasticTemplateTimelineCount: result[3].totalCount,
+    customTemplateTimelineCount: result[4].totalCount,
+    favoriteCount: result[5].totalCount,
+  });
 };
 
 export const getDraftTimeline = async (
@@ -160,7 +267,11 @@ export const getDraftTimeline = async (
   const options: SavedObjectsFindOptions = {
     type: timelineSavedObjectType,
     perPage: 1,
-    filter: getTimelineTypeFilter(timelineType, true),
+    filter: getTimelineTypeFilter(
+      timelineType,
+      timelineType === TimelineType.template ? TemplateTimelineType.custom : null,
+      TimelineStatus.draft
+    ),
     sortField: 'created',
     sortOrder: 'desc',
   };
@@ -395,7 +506,6 @@ const getAllSavedTimeline = async (request: FrameworkRequest, options: SavedObje
   }
 
   const savedObjects = await savedObjectsClient.find(options);
-
   const timelinesWithNotesAndPinnedEvents = await Promise.all(
     savedObjects.saved_objects.map(async (savedObject) => {
       const timelineSaveObject = convertSavedObjectToSavedTimeline(savedObject);
diff --git a/x-pack/plugins/snapshot_restore/server/plugin.ts b/x-pack/plugins/snapshot_restore/server/plugin.ts
index 10d259e28ee43b..cf7504363b823c 100644
--- a/x-pack/plugins/snapshot_restore/server/plugin.ts
+++ b/x-pack/plugins/snapshot_restore/server/plugin.ts
@@ -13,11 +13,11 @@ import { first } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
 import {
   CoreSetup,
-  ICustomClusterClient,
+  ILegacyCustomClusterClient,
   Plugin,
   Logger,
   PluginInitializerContext,
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
 } from 'kibana/server';
 
 import { PLUGIN } from '../common';
@@ -30,7 +30,7 @@ import { Dependencies } from './types';
 import { SnapshotRestoreConfig } from './config';
 
 export interface SnapshotRestoreContext {
-  client: IScopedClusterClient;
+  client: ILegacyScopedClusterClient;
 }
 
 async function getCustomEsClient(getStartServices: CoreSetup['getStartServices']) {
@@ -43,7 +43,7 @@ export class SnapshotRestoreServerPlugin implements Plugin<void, void, any, any>
   private readonly logger: Logger;
   private readonly apiRoutes: ApiRoutes;
   private readonly license: License;
-  private snapshotRestoreESClient?: ICustomClusterClient;
+  private snapshotRestoreESClient?: ILegacyCustomClusterClient;
 
   constructor(private context: PluginInitializerContext) {
     const { logger } = this.context;
diff --git a/x-pack/plugins/snapshot_restore/server/types.ts b/x-pack/plugins/snapshot_restore/server/types.ts
index 9710f812abf234..7794156eb1b888 100644
--- a/x-pack/plugins/snapshot_restore/server/types.ts
+++ b/x-pack/plugins/snapshot_restore/server/types.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { ScopedClusterClient, IRouter } from 'src/core/server';
+import { LegacyScopedClusterClient, IRouter } from 'src/core/server';
 import { LicensingPluginSetup } from '../../licensing/server';
 import { SecurityPluginSetup } from '../../security/server';
 import { CloudSetup } from '../../cloud/server';
@@ -31,4 +31,4 @@ export interface RouteDependencies {
   };
 }
 
-export type CallAsCurrentUser = ScopedClusterClient['callAsCurrentUser'];
+export type CallAsCurrentUser = LegacyScopedClusterClient['callAsCurrentUser'];
diff --git a/x-pack/plugins/spaces/common/constants.ts b/x-pack/plugins/spaces/common/constants.ts
index 11882ca2f1b3a8..33f1aae70ea009 100644
--- a/x-pack/plugins/spaces/common/constants.ts
+++ b/x-pack/plugins/spaces/common/constants.ts
@@ -16,12 +16,6 @@ export const SPACE_SEARCH_COUNT_THRESHOLD = 8;
  */
 export const MAX_SPACE_INITIALS = 2;
 
-/**
- * The type name used within the Monitoring index to publish spaces stats.
- * @type {string}
- */
-export const KIBANA_SPACES_STATS_TYPE = 'spaces';
-
 /**
  * The path to enter a space.
  */
diff --git a/x-pack/plugins/spaces/public/management/management_service.test.ts b/x-pack/plugins/spaces/public/management/management_service.test.ts
index 7d5ac444f5b746..eb543d44ecb4b6 100644
--- a/x-pack/plugins/spaces/public/management/management_service.test.ts
+++ b/x-pack/plugins/spaces/public/management/management_service.test.ts
@@ -9,7 +9,6 @@ import { coreMock } from 'src/core/public/mocks';
 import { spacesManagerMock } from '../spaces_manager/mocks';
 import { managementPluginMock } from '../../../../../src/plugins/management/public/mocks';
 import { ManagementSection } from 'src/plugins/management/public';
-import { Capabilities } from 'kibana/public';
 import { PluginsStart } from '../plugin';
 import { CoreSetup } from 'src/core/public';
 
@@ -58,66 +57,6 @@ describe('ManagementService', () => {
     });
   });
 
-  describe('#start', () => {
-    it('disables the spaces management page if the user is not authorized', () => {
-      const mockSpacesManagementPage = { disable: jest.fn() };
-      const mockKibanaSection = ({
-        registerApp: jest.fn().mockReturnValue(mockSpacesManagementPage),
-      } as unknown) as ManagementSection;
-
-      const deps = {
-        management: managementPluginMock.createSetupContract(),
-        getStartServices: coreMock.createSetup().getStartServices as CoreSetup<
-          PluginsStart
-        >['getStartServices'],
-        spacesManager: spacesManagerMock.create(),
-      };
-
-      deps.management.sections.getSection.mockImplementation((id) => {
-        if (id === 'kibana') return mockKibanaSection;
-        throw new Error(`unexpected getSection call: ${id}`);
-      });
-
-      const service = new ManagementService();
-      service.setup(deps);
-
-      const capabilities = ({ spaces: { manage: false } } as unknown) as Capabilities;
-      service.start({ capabilities });
-
-      expect(mockKibanaSection.registerApp).toHaveBeenCalledTimes(1);
-      expect(mockSpacesManagementPage.disable).toHaveBeenCalledTimes(1);
-    });
-
-    it('does not disable the spaces management page if the user is authorized', () => {
-      const mockSpacesManagementPage = { disable: jest.fn() };
-      const mockKibanaSection = ({
-        registerApp: jest.fn().mockReturnValue(mockSpacesManagementPage),
-      } as unknown) as ManagementSection;
-
-      const deps = {
-        management: managementPluginMock.createSetupContract(),
-        getStartServices: coreMock.createSetup().getStartServices as CoreSetup<
-          PluginsStart
-        >['getStartServices'],
-        spacesManager: spacesManagerMock.create(),
-      };
-
-      deps.management.sections.getSection.mockImplementation((id) => {
-        if (id === 'kibana') return mockKibanaSection;
-        throw new Error(`unexpected getSection call: ${id}`);
-      });
-
-      const service = new ManagementService();
-      service.setup(deps);
-
-      const capabilities = ({ spaces: { manage: true } } as unknown) as Capabilities;
-      service.start({ capabilities });
-
-      expect(mockKibanaSection.registerApp).toHaveBeenCalledTimes(1);
-      expect(mockSpacesManagementPage.disable).toHaveBeenCalledTimes(0);
-    });
-  });
-
   describe('#stop', () => {
     it('disables the spaces management page', () => {
       const mockSpacesManagementPage = { disable: jest.fn() };
diff --git a/x-pack/plugins/spaces/public/management/management_service.tsx b/x-pack/plugins/spaces/public/management/management_service.tsx
index 297df076368495..4d5a1b32b31a37 100644
--- a/x-pack/plugins/spaces/public/management/management_service.tsx
+++ b/x-pack/plugins/spaces/public/management/management_service.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { StartServicesAccessor, Capabilities } from 'src/core/public';
+import { StartServicesAccessor } from 'src/core/public';
 import {
   ManagementSetup,
   ManagementApp,
@@ -22,9 +22,6 @@ interface SetupDeps {
   securityLicense?: SecurityLicense;
 }
 
-interface StartDeps {
-  capabilities: Capabilities;
-}
 export class ManagementService {
   private registeredSpacesManagementApp?: ManagementApp;
 
@@ -36,12 +33,6 @@ export class ManagementService {
       );
   }
 
-  public start({ capabilities }: StartDeps) {
-    if (!capabilities.spaces.manage) {
-      this.disableSpacesApp();
-    }
-  }
-
   public stop() {
     this.disableSpacesApp();
   }
diff --git a/x-pack/plugins/spaces/public/plugin.tsx b/x-pack/plugins/spaces/public/plugin.tsx
index 4097a2e3e05230..8589993a97e024 100644
--- a/x-pack/plugins/spaces/public/plugin.tsx
+++ b/x-pack/plugins/spaces/public/plugin.tsx
@@ -87,10 +87,6 @@ export class SpacesPlugin implements Plugin<SpacesPluginSetup, SpacesPluginStart
   public start(core: CoreStart, plugins: PluginsStart) {
     initSpacesNavControl(this.spacesManager, core);
 
-    if (this.managementService) {
-      this.managementService.start({ capabilities: core.application.capabilities });
-    }
-
     return {
       activeSpace$: this.spacesManager.onActiveSpaceChange$,
       getActiveSpace: () => this.spacesManager.getActiveSpace(),
diff --git a/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts b/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts
index fa1a81fe080f8e..4ab309cc6015cc 100644
--- a/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts
+++ b/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts
@@ -4,18 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CallAPIOptions } from 'src/core/server';
+import { LegacyCallAPIOptions } from 'src/core/server';
 import { take } from 'rxjs/operators';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { Observable } from 'rxjs';
 import { KIBANA_STATS_TYPE_MONITORING } from '../../../monitoring/common/constants';
-import { KIBANA_SPACES_STATS_TYPE } from '../../common/constants';
 import { PluginsSetup } from '../plugin';
 
 type CallCluster = <T = unknown>(
   endpoint: string,
   clientParams: Record<string, unknown>,
-  options?: CallAPIOptions
+  options?: LegacyCallAPIOptions
 ) => Promise<T>;
 
 interface SpacesAggregationResponse {
@@ -118,8 +117,25 @@ export interface UsageStats {
   enabled: boolean;
   count?: number;
   usesFeatureControls?: boolean;
-  disabledFeatures?: {
-    [featureId: string]: number;
+  disabledFeatures: {
+    indexPatterns?: number;
+    discover?: number;
+    canvas?: number;
+    maps?: number;
+    siem?: number;
+    monitoring?: number;
+    graph?: number;
+    uptime?: number;
+    savedObjectsManagement?: number;
+    timelion?: number;
+    dev_tools?: number;
+    advancedSettings?: number;
+    infrastructure?: number;
+    visualize?: number;
+    logs?: number;
+    dashboard?: number;
+    ml?: number;
+    apm?: number;
   };
 }
 
@@ -129,6 +145,11 @@ interface CollectorDeps {
   licensing: PluginsSetup['licensing'];
 }
 
+interface BulkUpload {
+  usage: {
+    spaces: UsageStats;
+  };
+}
 /*
  * @param {Object} server
  * @return {Object} kibana usage stats type collection object
@@ -137,9 +158,35 @@ export function getSpacesUsageCollector(
   usageCollection: UsageCollectionSetup,
   deps: CollectorDeps
 ) {
-  return usageCollection.makeUsageCollector({
-    type: KIBANA_SPACES_STATS_TYPE,
+  return usageCollection.makeUsageCollector<UsageStats, BulkUpload>({
+    type: 'spaces',
     isReady: () => true,
+    schema: {
+      usesFeatureControls: { type: 'boolean' },
+      disabledFeatures: {
+        indexPatterns: { type: 'long' },
+        discover: { type: 'long' },
+        canvas: { type: 'long' },
+        maps: { type: 'long' },
+        siem: { type: 'long' },
+        monitoring: { type: 'long' },
+        graph: { type: 'long' },
+        uptime: { type: 'long' },
+        savedObjectsManagement: { type: 'long' },
+        timelion: { type: 'long' },
+        dev_tools: { type: 'long' },
+        advancedSettings: { type: 'long' },
+        infrastructure: { type: 'long' },
+        visualize: { type: 'long' },
+        logs: { type: 'long' },
+        dashboard: { type: 'long' },
+        ml: { type: 'long' },
+        apm: { type: 'long' },
+      },
+      available: { type: 'boolean' },
+      enabled: { type: 'boolean' },
+      count: { type: 'long' },
+    },
     fetch: async (callCluster: CallCluster) => {
       const license = await deps.licensing.license$.pipe(take(1)).toPromise();
       const available = license.isAvailable; // some form of spaces is available for all valid licenses
diff --git a/x-pack/plugins/task_manager/server/task_manager.ts b/x-pack/plugins/task_manager/server/task_manager.ts
index cb0d1ff3554d58..23cb33cfac6c23 100644
--- a/x-pack/plugins/task_manager/server/task_manager.ts
+++ b/x-pack/plugins/task_manager/server/task_manager.ts
@@ -12,7 +12,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { Option, some, map as mapOptional } from 'fp-ts/lib/Option';
 import {
   SavedObjectsSerializer,
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
   ISavedObjectsRepository,
 } from '../../../../src/core/server';
 import { Result, asErr, either, map, mapErr, promiseResult } from './lib/result_type';
@@ -63,7 +63,7 @@ const VERSION_CONFLICT_STATUS = 409;
 export interface TaskManagerOpts {
   logger: Logger;
   config: TaskManagerConfig;
-  callAsInternalUser: IScopedClusterClient['callAsInternalUser'];
+  callAsInternalUser: ILegacyScopedClusterClient['callAsInternalUser'];
   savedObjectsRepository: ISavedObjectsRepository;
   serializer: SavedObjectsSerializer;
   taskManagerId: string;
diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
new file mode 100644
index 00000000000000..13d7c62316040b
--- /dev/null
+++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -0,0 +1,247 @@
+{
+  "properties": {
+    "cloud": {
+      "properties": {
+        "isCloudEnabled": {
+          "type": "boolean"
+        }
+      }
+    },
+    "fileUploadTelemetry": {
+      "properties": {
+        "filesUploadedTotalCount": {
+          "type": "long"
+        }
+      }
+    },
+    "mlTelemetry": {
+      "properties": {
+        "file_data_visualizer": {
+          "properties": {
+            "index_creation_count": {
+              "type": "long"
+            }
+          }
+        }
+      }
+    },
+    "rollups": {
+      "properties": {
+        "index_patterns": {
+          "properties": {
+            "total": {
+              "type": "long"
+            }
+          }
+        },
+        "saved_searches": {
+          "properties": {
+            "total": {
+              "type": "long"
+            }
+          }
+        },
+        "visualizations": {
+          "properties": {
+            "saved_searches": {
+              "properties": {
+                "total": {
+                  "type": "long"
+                }
+              }
+            },
+            "total": {
+              "type": "long"
+            }
+          }
+        }
+      }
+    },
+    "spaces": {
+      "properties": {
+        "usesFeatureControls": {
+          "type": "boolean"
+        },
+        "disabledFeatures": {
+          "properties": {
+            "indexPatterns": {
+              "type": "long"
+            },
+            "discover": {
+              "type": "long"
+            },
+            "canvas": {
+              "type": "long"
+            },
+            "maps": {
+              "type": "long"
+            },
+            "siem": {
+              "type": "long"
+            },
+            "monitoring": {
+              "type": "long"
+            },
+            "graph": {
+              "type": "long"
+            },
+            "uptime": {
+              "type": "long"
+            },
+            "savedObjectsManagement": {
+              "type": "long"
+            },
+            "timelion": {
+              "type": "long"
+            },
+            "dev_tools": {
+              "type": "long"
+            },
+            "advancedSettings": {
+              "type": "long"
+            },
+            "infrastructure": {
+              "type": "long"
+            },
+            "visualize": {
+              "type": "long"
+            },
+            "logs": {
+              "type": "long"
+            },
+            "dashboard": {
+              "type": "long"
+            },
+            "ml": {
+              "type": "long"
+            },
+            "apm": {
+              "type": "long"
+            }
+          }
+        },
+        "available": {
+          "type": "boolean"
+        },
+        "enabled": {
+          "type": "boolean"
+        },
+        "count": {
+          "type": "long"
+        }
+      }
+    },
+    "upgrade-assistant-telemetry": {
+      "properties": {
+        "features": {
+          "properties": {
+            "deprecation_logging": {
+              "properties": {
+                "enabled": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        },
+        "ui_open": {
+          "properties": {
+            "cluster": {
+              "type": "long"
+            },
+            "indices": {
+              "type": "long"
+            },
+            "overview": {
+              "type": "long"
+            }
+          }
+        },
+        "ui_reindex": {
+          "properties": {
+            "close": {
+              "type": "long"
+            },
+            "open": {
+              "type": "long"
+            },
+            "start": {
+              "type": "long"
+            },
+            "stop": {
+              "type": "long"
+            }
+          }
+        }
+      }
+    },
+    "uptime": {
+      "properties": {
+        "last_24_hours": {
+          "properties": {
+            "hits": {
+              "properties": {
+                "autoRefreshEnabled": {
+                  "type": "boolean"
+                },
+                "autorefreshInterval": {
+                  "type": "long"
+                },
+                "dateRangeEnd": {
+                  "type": "date"
+                },
+                "dateRangeStart": {
+                  "type": "date"
+                },
+                "monitor_frequency": {
+                  "type": "long"
+                },
+                "monitor_name_stats": {
+                  "properties": {
+                    "avg_length": {
+                      "type": "float"
+                    },
+                    "max_length": {
+                      "type": "long"
+                    },
+                    "min_length": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "monitor_page": {
+                  "type": "long"
+                },
+                "no_of_unique_monitors": {
+                  "type": "long"
+                },
+                "no_of_unique_observer_locations": {
+                  "type": "long"
+                },
+                "observer_location_name_stats": {
+                  "properties": {
+                    "avg_length": {
+                      "type": "float"
+                    },
+                    "max_length": {
+                      "type": "long"
+                    },
+                    "min_length": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "overview_page": {
+                  "type": "long"
+                },
+                "settings_page": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/x-pack/plugins/transform/server/plugin.ts b/x-pack/plugins/transform/server/plugin.ts
index c8057a3e2fae11..79e9be239c798f 100644
--- a/x-pack/plugins/transform/server/plugin.ts
+++ b/x-pack/plugins/transform/server/plugin.ts
@@ -6,9 +6,9 @@
 import { i18n } from '@kbn/i18n';
 import {
   CoreSetup,
-  ICustomClusterClient,
+  ILegacyCustomClusterClient,
   Plugin,
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
   Logger,
   PluginInitializerContext,
 } from 'src/core/server';
@@ -23,7 +23,7 @@ import { License } from './services';
 declare module 'kibana/server' {
   interface RequestHandlerContext {
     transform?: {
-      dataClient: IScopedClusterClient;
+      dataClient: ILegacyScopedClusterClient;
     };
   }
 }
@@ -50,7 +50,7 @@ export class TransformServerPlugin implements Plugin<{}, void, any, any> {
   private readonly apiRoutes: ApiRoutes;
   private readonly license: License;
   private readonly logger: Logger;
-  private transformESClient?: ICustomClusterClient;
+  private transformESClient?: ILegacyCustomClusterClient;
 
   constructor(initContext: PluginInitializerContext) {
     this.logger = initContext.logger.get();
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index e6e9111e6b43cc..8cf2cff9459489 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -712,7 +712,6 @@
     "data.search.aggs.aggGroups.bucketsText": "バケット",
     "data.search.aggs.aggGroups.metricsText": "メトリック",
     "data.search.aggs.aggGroups.noneText": "なし",
-    "data.search.aggs.aggTypes.rangesFormatMessage": "{gte} {from} と {lt} {to}",
     "data.search.aggs.aggTypesLabel": "{fieldName} の範囲",
     "data.search.aggs.buckets.dateHistogram.customLabel.help": "このアグリゲーションのカスタムラベルを表します",
     "data.search.aggs.buckets.dateHistogram.dropPartials.help": "このアグリゲーションでdrop_partialsを使用するかどうかを指定します",
@@ -2230,7 +2229,6 @@
     "kibana_legacy.paginate.controls.pageSizeLabel": "ページサイズ",
     "kibana_legacy.paginate.controls.scrollTopButtonLabel": "最上部に移動",
     "kibana_legacy.paginate.size.allDropDownOptionLabel": "すべて",
-    "kibana_utils.defaultFeedbackMessage": "フィードバックがありますか？{link} で問題を報告してください。",
     "kibana_utils.history.savedObjectIsMissingNotificationMessage": "保存されたオブジェクトがありません",
     "kibana_utils.stateManagement.stateHash.unableToRestoreUrlErrorMessage": "URL を完全に復元できません。共有機能を使用していることを確認してください。",
     "kibana_utils.stateManagement.stateHash.unableToStoreHistoryInSessionErrorMessage": "セッションがいっぱいで安全に削除できるアイテムが見つからないため、Kibana は履歴アイテムを保存できません。\n\nこれは大抵新規タブに移動することで解決されますが、より大きな問題が原因である可能性もあります。このメッセージが定期的に表示される場合は、{gitHubIssuesUrl} で問題を報告してください。",
@@ -3873,7 +3871,6 @@
     "visualize.badge.readOnly.tooltip": "ビジュアライゼーションを保存できません",
     "visualize.createVisualization.noIndexPatternOrSavedSearchIdErrorMessage": "indexPatternまたはsavedSearchIdが必要です",
     "visualize.editor.createBreadcrumb": "作成",
-    "visualize.experimentalVisInfoText": "このビジュアライゼーションは実験的なものです。",
     "visualize.helpMenu.appName": "可視化",
     "visualize.linkedToSearch.unlinkSuccessNotificationText": "保存された検索「{searchTitle}」からリンクが解除されました",
     "visualize.listing.betaTitle": "ベータ",
@@ -3884,7 +3881,6 @@
     "visualize.listing.createNew.title": "最初のビジュアライゼーションの作成",
     "visualize.listing.experimentalTitle": "実験的",
     "visualize.listing.experimentalTooltip": "このビジュアライゼーションは今後のリリースで変更または削除される可能性があり、SLAのサポート対象になりません。",
-    "visualize.listing.noItemsMessage": "ビジュアライゼーションがないようです。",
     "visualize.listing.table.descriptionColumnName": "説明",
     "visualize.listing.table.entityName": "ビジュアライゼーション",
     "visualize.listing.table.entityNamePlural": "ビジュアライゼーション",
@@ -3906,12 +3902,9 @@
     "visualize.topNavMenu.saveVisualizationDisabledButtonTooltip": "保存する前に変更を適用または破棄",
     "visualize.topNavMenu.shareVisualizationButtonAriaLabel": "ビジュアライゼーションを共有",
     "visualize.topNavMenu.shareVisualizationButtonLabel": "共有",
-    "visualize.visualizationTypeInvalidNotificationMessage": "無効なビジュアライゼーションタイプ",
     "visualize.visualizeDescription": "ビジュアライゼーションを作成してElasticsearchインデックスに保存されたデータをアグリゲーションします。",
     "visualize.visualizeListingBreadcrumbsTitle": "可視化",
     "visualize.visualizeListingDeleteErrorTitle": "ビジュアライゼーションの削除中にエラーが発生",
-    "visualize.wizard.step1Breadcrumb": "作成",
-    "visualize.wizard.step2Breadcrumb": "作成",
     "xpack.actions.actionTypeRegistry.get.missingActionTypeErrorMessage": "アクションタイプ \"{id}\" は登録されていません。",
     "xpack.actions.actionTypeRegistry.register.duplicateActionTypeErrorMessage": "アクションタイプ \"{id}\" は既に登録されています。",
     "xpack.actions.appName": "アクション",
@@ -7870,7 +7863,6 @@
     "xpack.infra.registerFeatures.logsDescription": "ログをリアルタイムでストリーするか、コンソール式の UI で履歴ビューをスクロールします。",
     "xpack.infra.registerFeatures.logsTitle": "ログ",
     "xpack.infra.sampleDataLinkLabel": "ログ",
-    "xpack.infra.savedView.defaultViewName": "デフォルト",
     "xpack.infra.savedView.errorOnCreate.duplicateViewName": "その名前のビューは既に存在します",
     "xpack.infra.savedView.errorOnCreate.title": "ビューの保存中にエラーが発生しました。",
     "xpack.infra.savedView.findError.title": "ビューの読み込み中にエラーが発生しました。",
@@ -8004,9 +7996,7 @@
     "xpack.infra.waffle.savedViews.cancelButton": "キャンセル",
     "xpack.infra.waffle.savedViews.includeTimeFilterLabel": "ビューに時刻を保存",
     "xpack.infra.waffle.savedViews.includeTimeHelpText": "ビューが読み込まれるごとに現在選択された時刻の時間フィルターが変更されます。",
-    "xpack.infra.waffle.savedViews.loadViewsLabel": "読み込み",
     "xpack.infra.waffle.savedViews.saveButton": "保存",
-    "xpack.infra.waffle.savedViews.saveViewLabel": "保存",
     "xpack.infra.waffle.savedViews.viewNamePlaceholder": "名前",
     "xpack.infra.waffle.selectTwoGroupingsTitle": "最大 2 つのグループ分けを選択してください",
     "xpack.infra.waffle.unableToSelectGroupErrorMessage": "{nodeType} のオプションでグループを選択できません",
@@ -9148,7 +9138,6 @@
     "xpack.maps.source.ems.disabledDescription": "Elastic Maps Service へのアクセスが無効になっています。システム管理者に問い合わせるか、kibana.yml で「map.includeElasticMapsService」を設定してください。",
     "xpack.maps.source.ems.noAccessDescription": "Kibana が Elastic Maps Service にアクセスできません。システム管理者にお問い合わせください",
     "xpack.maps.source.emsFile.layerLabel": "レイヤー",
-    "xpack.maps.source.emsFile.selectPlaceholder": "EMS ベクターシェイプを選択",
     "xpack.maps.source.emsFile.unableToFindIdErrorMessage": "ID {id} の EMS ベクターシェイプが見つかりません",
     "xpack.maps.source.emsFileDescription": "Elastic Maps Service の行政区画のベクターシェイプ",
     "xpack.maps.source.emsFileTitle": "ベクターシェイプ",
@@ -9164,8 +9153,6 @@
     "xpack.maps.source.esGeoGrid.geofieldLabel": "地理空間フィールド",
     "xpack.maps.source.esGeoGrid.geofieldPlaceholder": "ジオフィールドを選択",
     "xpack.maps.source.esGeoGrid.gridRectangleDropdownOption": "グリッド",
-    "xpack.maps.source.esGeoGrid.indexPatternLabel": "インデックスパターン",
-    "xpack.maps.source.esGeoGrid.indexPatternPlaceholder": "インデックスパターンを選択",
     "xpack.maps.source.esGeoGrid.pointsDropdownOption": "クラスター",
     "xpack.maps.source.esGeoGrid.showAsLabel": "表示形式",
     "xpack.maps.source.esGrid.coarseDropdownOption": "粗い",
@@ -9199,7 +9186,6 @@
     "xpack.maps.source.esSearch.limitScalingLabel": "結果を {maxResultWindow} に限定。",
     "xpack.maps.source.esSearch.loadErrorMessage": "インデックスパターン {id} が見つかりません",
     "xpack.maps.source.esSearch.loadTooltipPropertiesErrorMsg": "ドキュメントが見つかりません。_id: {docId}",
-    "xpack.maps.source.esSearch.selectIndexPatternPlaceholder": "インデックスパターンを選択",
     "xpack.maps.source.esSearch.selectLabel": "ジオフィールドを選択",
     "xpack.maps.source.esSearch.sortFieldLabel": "フィールド",
     "xpack.maps.source.esSearch.sortFieldSelectPlaceholder": "ソートフィールドを選択",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 7086b48290c7fe..fb5d1050e50c58 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -713,7 +713,6 @@
     "data.search.aggs.aggGroups.bucketsText": "存储桶",
     "data.search.aggs.aggGroups.metricsText": "指标",
     "data.search.aggs.aggGroups.noneText": "无",
-    "data.search.aggs.aggTypes.rangesFormatMessage": "{gte} {from} 和 {lt} {to}",
     "data.search.aggs.aggTypesLabel": "{fieldName} 范围",
     "data.search.aggs.buckets.dateHistogram.customLabel.help": "表示此聚合的定制标签",
     "data.search.aggs.buckets.dateHistogram.dropPartials.help": "指定是否将 drop_partials 用于此聚合",
@@ -2233,7 +2232,6 @@
     "kibana_legacy.paginate.controls.pageSizeLabel": "页面大小",
     "kibana_legacy.paginate.controls.scrollTopButtonLabel": "滚动至顶部",
     "kibana_legacy.paginate.size.allDropDownOptionLabel": "全部",
-    "kibana_utils.defaultFeedbackMessage": "想反馈？请在 {link} 中创建问题。",
     "kibana_utils.history.savedObjectIsMissingNotificationMessage": "已保存对象缺失",
     "kibana_utils.stateManagement.stateHash.unableToRestoreUrlErrorMessage": "无法完全还原 URL，请确保使用共享功能。",
     "kibana_utils.stateManagement.stateHash.unableToStoreHistoryInSessionErrorMessage": "Kibana 无法将历史记录项存储在您的会话中，因为其已满，另外，似乎没有任何可安全删除的项目。\n\n通常，这可以通过移到全新的选项卡来解决，但这种情况可能是由更大的问题造成。如果您定期看到这个消息，请在 {gitHubIssuesUrl} 报告问题。",
@@ -3887,7 +3885,6 @@
     "visualize.listing.createNew.title": "创建您的首个可视化",
     "visualize.listing.experimentalTitle": "实验性",
     "visualize.listing.experimentalTooltip": "未来版本可能会更改或删除此可视化，其不受支持 SLA 的约束。",
-    "visualize.listing.noItemsMessage": "看起来您还没有任何可视化。",
     "visualize.listing.table.descriptionColumnName": "描述",
     "visualize.listing.table.entityName": "可视化",
     "visualize.listing.table.entityNamePlural": "可视化",
@@ -3909,12 +3906,9 @@
     "visualize.topNavMenu.saveVisualizationDisabledButtonTooltip": "保存前应用或放弃所做更改",
     "visualize.topNavMenu.shareVisualizationButtonAriaLabel": "共享可视化",
     "visualize.topNavMenu.shareVisualizationButtonLabel": "共享",
-    "visualize.visualizationTypeInvalidNotificationMessage": "无效的可视化类型",
     "visualize.visualizeDescription": "创建可视化并聚合在 Elasticsearch 索引中的数据存储。",
     "visualize.visualizeListingBreadcrumbsTitle": "Visualize",
     "visualize.visualizeListingDeleteErrorTitle": "删除可视化时出错",
-    "visualize.wizard.step1Breadcrumb": "创建",
-    "visualize.wizard.step2Breadcrumb": "创建",
     "xpack.actions.actionTypeRegistry.get.missingActionTypeErrorMessage": "未注册操作类型“{id}”。",
     "xpack.actions.actionTypeRegistry.register.duplicateActionTypeErrorMessage": "操作类型“{id}”已注册。",
     "xpack.actions.appName": "操作",
@@ -7874,7 +7868,6 @@
     "xpack.infra.registerFeatures.logsDescription": "实时流式传输日志或在类似控制台的工具中滚动浏览历史视图。",
     "xpack.infra.registerFeatures.logsTitle": "鏃ュ織",
     "xpack.infra.sampleDataLinkLabel": "日志",
-    "xpack.infra.savedView.defaultViewName": "默认值",
     "xpack.infra.savedView.errorOnCreate.duplicateViewName": "具有该名称的视图已存在。",
     "xpack.infra.savedView.errorOnCreate.title": "保存视图时出错。",
     "xpack.infra.savedView.findError.title": "加载视图时出错。",
@@ -8008,9 +8001,7 @@
     "xpack.infra.waffle.savedViews.cancelButton": "取消",
     "xpack.infra.waffle.savedViews.includeTimeFilterLabel": "将时间与视图一起存储",
     "xpack.infra.waffle.savedViews.includeTimeHelpText": "每次加载此仪表板时，这都会将时间筛选更改为当前选定的时间",
-    "xpack.infra.waffle.savedViews.loadViewsLabel": "负载",
     "xpack.infra.waffle.savedViews.saveButton": "保存",
-    "xpack.infra.waffle.savedViews.saveViewLabel": "保存",
     "xpack.infra.waffle.savedViews.viewNamePlaceholder": "名称",
     "xpack.infra.waffle.selectTwoGroupingsTitle": "选择最多两个分组",
     "xpack.infra.waffle.unableToSelectGroupErrorMessage": "无法选择 {nodeType} 的分组依据选项",
@@ -9152,7 +9143,6 @@
     "xpack.maps.source.ems.disabledDescription": "已禁用对 Elastic 地图服务的访问。让您的系统管理员在 kibana.yml 中设置“map.includeElasticMapsService”。",
     "xpack.maps.source.ems.noAccessDescription": "Kibana 无法访问 Elastic 地图服务。请联系您的系统管理员",
     "xpack.maps.source.emsFile.layerLabel": "图层",
-    "xpack.maps.source.emsFile.selectPlaceholder": "选择 EMS 矢量形状",
     "xpack.maps.source.emsFile.unableToFindIdErrorMessage": "找不到 ID {id} 的 EMS 矢量形状",
     "xpack.maps.source.emsFileDescription": "来自 Elastic 地图服务的管理边界的矢量形状",
     "xpack.maps.source.emsFileTitle": "矢量形状",
@@ -9168,8 +9158,6 @@
     "xpack.maps.source.esGeoGrid.geofieldLabel": "地理空间字段",
     "xpack.maps.source.esGeoGrid.geofieldPlaceholder": "选择地理字段",
     "xpack.maps.source.esGeoGrid.gridRectangleDropdownOption": "网格",
-    "xpack.maps.source.esGeoGrid.indexPatternLabel": "索引模式",
-    "xpack.maps.source.esGeoGrid.indexPatternPlaceholder": "选择索引模式",
     "xpack.maps.source.esGeoGrid.pointsDropdownOption": "集群",
     "xpack.maps.source.esGeoGrid.showAsLabel": "显示为",
     "xpack.maps.source.esGrid.coarseDropdownOption": "粗糙",
@@ -9203,7 +9191,6 @@
     "xpack.maps.source.esSearch.limitScalingLabel": "将结果数限制到 {maxResultWindow}。",
     "xpack.maps.source.esSearch.loadErrorMessage": "找不到索引模式 {id}",
     "xpack.maps.source.esSearch.loadTooltipPropertiesErrorMsg": "找不到文档，_id：{docId}",
-    "xpack.maps.source.esSearch.selectIndexPatternPlaceholder": "选择索引模式",
     "xpack.maps.source.esSearch.selectLabel": "选择地理字段",
     "xpack.maps.source.esSearch.sortFieldLabel": "字段",
     "xpack.maps.source.esSearch.sortFieldSelectPlaceholder": "选择排序字段",
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts
index 8f25533c0afb1e..348eebb97e384b 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'src/core/server';
+import { ILegacyScopedClusterClient } from 'src/core/server';
 
 interface DeprecationLoggingStatus {
   isEnabled: boolean;
 }
 
 export async function getDeprecationLoggingStatus(
-  dataClient: IScopedClusterClient
+  dataClient: ILegacyScopedClusterClient
 ): Promise<DeprecationLoggingStatus> {
   const response = await dataClient.callAsCurrentUser('cluster.getSettings', {
     includeDefaults: true,
@@ -23,7 +23,7 @@ export async function getDeprecationLoggingStatus(
 }
 
 export async function setDeprecationLogging(
-  dataClient: IScopedClusterClient,
+  dataClient: ILegacyScopedClusterClient,
   isEnabled: boolean
 ): Promise<DeprecationLoggingStatus> {
   const response = await dataClient.callAsCurrentUser('cluster.putSettings', {
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts
index 7b84c00a1eb848..cec89bbe2745e7 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 import { getIndexStateFromClusterState } from '../../common/get_index_state_from_cluster_state';
 import { ClusterStateAPIResponse } from '../../common/types';
 
 type StatusCheckResult = Record<string, 'open' | 'close'>;
 
 export const esIndicesStateCheck = async (
-  callAsUser: APICaller,
+  callAsUser: LegacyAPICaller,
   indices: string[]
 ): Promise<StatusCheckResult> => {
   // According to https://www.elastic.co/guide/en/elasticsearch/reference/7.6/cluster-state.html
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts
index 75fbbfc48909c2..98175e2ae791eb 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
+import { ILegacyScopedClusterClient } from 'src/core/server';
 import { DeprecationAPIResponse } from 'src/legacy/core_plugins/elasticsearch';
 import { EnrichedDeprecationInfo, UpgradeAssistantStatus } from '../../common/types';
 
 import { esIndicesStateCheck } from './es_indices_state_check';
 
 export async function getUpgradeAssistantStatus(
-  dataClient: IScopedClusterClient,
+  dataClient: ILegacyScopedClusterClient,
   isCloudEnabled: boolean
 ): Promise<UpgradeAssistantStatus> {
   const deprecations = await dataClient.callAsCurrentUser('transport.request', {
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts
index 8cb296719c19e6..78f159ed988674 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { SemVer } from 'semver';
-import { IScopedClusterClient, kibanaResponseFactory } from 'src/core/server';
+import { ILegacyScopedClusterClient, kibanaResponseFactory } from 'src/core/server';
 import { xpackMocks } from '../../../../mocks';
 import { CURRENT_VERSION } from '../../common/version';
 import {
@@ -24,7 +24,7 @@ describe('getAllNodeVersions', () => {
           node3: { version: '6.0.0' },
         },
       }),
-    } as unknown) as IScopedClusterClient;
+    } as unknown) as ILegacyScopedClusterClient;
 
     await expect(getAllNodeVersions(adminClient)).resolves.toEqual([
       new SemVer('6.0.0'),
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
index e12f501ba02be5..2b49d4c286f610 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
@@ -7,7 +7,7 @@
 import { uniq } from 'lodash';
 import { SemVer } from 'semver';
 import {
-  IScopedClusterClient,
+  ILegacyScopedClusterClient,
   KibanaRequest,
   KibanaResponseFactory,
   RequestHandler,
@@ -18,7 +18,7 @@ import { CURRENT_VERSION } from '../../common/version';
 /**
  * Returns an array of all the unique Elasticsearch Node Versions in the Elasticsearch cluster.
  */
-export const getAllNodeVersions = async (adminClient: IScopedClusterClient) => {
+export const getAllNodeVersions = async (adminClient: ILegacyScopedClusterClient) => {
   // Get the version information for all nodes in the cluster.
   const { nodes } = (await adminClient.callAsInternalUser('nodes.info', {
     filterPath: 'nodes.*.version',
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
index 4f61f0b8e4635b..54f9fe9d298f27 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
@@ -6,7 +6,11 @@
 
 import moment from 'moment';
 
-import { SavedObjectsFindResponse, SavedObjectsClientContract, APICaller } from 'src/core/server';
+import {
+  SavedObjectsFindResponse,
+  SavedObjectsClientContract,
+  LegacyAPICaller,
+} from 'src/core/server';
 import {
   IndexGroup,
   REINDEX_OP_TYPE,
@@ -112,7 +116,7 @@ export interface ReindexActions {
 
 export const reindexActionsFactory = (
   client: SavedObjectsClientContract,
-  callAsUser: APICaller
+  callAsUser: LegacyAPICaller
 ): ReindexActions => {
   // ----- Internal functions
   const isLocked = (reindexOp: ReindexSavedObject) => {
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
index 3edc3cfc59ebcc..a23ddc0d60329e 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { APICaller, Logger } from 'src/core/server';
+import { LegacyAPICaller, Logger } from 'src/core/server';
 import { first } from 'rxjs/operators';
 
 import { LicensingPluginSetup } from '../../../../licensing/server';
@@ -127,7 +127,7 @@ export interface ReindexService {
 }
 
 export const reindexServiceFactory = (
-  callAsUser: APICaller,
+  callAsUser: LegacyAPICaller,
   actions: ReindexActions,
   log: Logger,
   licensing: LicensingPluginSetup
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
index a490d2a919f0fb..756ce17b601998 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
@@ -3,7 +3,12 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { IClusterClient, Logger, SavedObjectsClientContract, FakeRequest } from 'src/core/server';
+import {
+  ILegacyClusterClient,
+  Logger,
+  SavedObjectsClientContract,
+  FakeRequest,
+} from 'src/core/server';
 import moment from 'moment';
 import { ReindexSavedObject, ReindexStatus } from '../../../common/types';
 import { Credential, CredentialStore } from './credential_store';
@@ -48,7 +53,7 @@ export class ReindexWorker {
   constructor(
     private client: SavedObjectsClientContract,
     private credentialStore: CredentialStore,
-    private clusterClient: IClusterClient,
+    private clusterClient: ILegacyClusterClient,
     log: Logger,
     private licensing: LicensingPluginSetup
   ) {
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
index 24347b7799871f..7188241e10f9a2 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
@@ -5,7 +5,7 @@
  */
 import { elasticsearchServiceMock } from 'src/core/server/mocks';
 import { registerUpgradeAssistantUsageCollector } from './usage_collector';
-import { IClusterClient } from 'src/core/server';
+import { ILegacyClusterClient } from 'src/core/server';
 
 /**
  * Since these route callbacks are so thin, these serve simply as integration tests
@@ -18,7 +18,7 @@ describe('Upgrade Assistant Usage Collector', () => {
   let dependencies: any;
   let callClusterStub: any;
   let usageCollection: any;
-  let clusterClient: IClusterClient;
+  let clusterClient: ILegacyClusterClient;
 
   beforeEach(() => {
     clusterClient = elasticsearchServiceMock.createClusterClient();
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
index 0c2e3a1e43f4aa..048dce6e4a5747 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
@@ -6,7 +6,7 @@
 
 import { get } from 'lodash';
 import {
-  APICaller,
+  LegacyAPICaller,
   ElasticsearchServiceStart,
   ISavedObjectsRepository,
   SavedObjectsServiceStart,
@@ -38,7 +38,9 @@ async function getSavedObjectAttributesFromRepo(
   }
 }
 
-async function getDeprecationLoggingStatusValue(callAsCurrentUser: APICaller): Promise<boolean> {
+async function getDeprecationLoggingStatusValue(
+  callAsCurrentUser: LegacyAPICaller
+): Promise<boolean> {
   try {
     const loggerDeprecationCallResult = await callAsCurrentUser('cluster.getSettings', {
       includeDefaults: true,
@@ -120,9 +122,29 @@ export function registerUpgradeAssistantUsageCollector({
   usageCollection,
   savedObjects,
 }: Dependencies) {
-  const upgradeAssistantUsageCollector = usageCollection.makeUsageCollector({
-    type: UPGRADE_ASSISTANT_TYPE,
+  const upgradeAssistantUsageCollector = usageCollection.makeUsageCollector<
+    UpgradeAssistantTelemetry
+  >({
+    type: 'upgrade-assistant-telemetry',
     isReady: () => true,
+    schema: {
+      features: {
+        deprecation_logging: {
+          enabled: { type: 'boolean' },
+        },
+      },
+      ui_open: {
+        cluster: { type: 'long' },
+        indices: { type: 'long' },
+        overview: { type: 'long' },
+      },
+      ui_reindex: {
+        close: { type: 'long' },
+        open: { type: 'long' },
+        start: { type: 'long' },
+        stop: { type: 'long' },
+      },
+    },
     fetch: async () => fetchUpgradeAssistantMetrics(elasticsearch, savedObjects),
   });
 
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
index 74c349d8948392..fffde339c59e57 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { i18n } from '@kbn/i18n';
-import { IScopedClusterClient, Logger, SavedObjectsClientContract } from 'kibana/server';
+import { ILegacyScopedClusterClient, Logger, SavedObjectsClientContract } from 'kibana/server';
 
 import { LicensingPluginSetup } from '../../../../licensing/server';
 
@@ -17,7 +17,7 @@ import { error } from '../../lib/reindexing/error';
 
 interface ReindexHandlerArgs {
   savedObjects: SavedObjectsClientContract;
-  dataClient: IScopedClusterClient;
+  dataClient: ILegacyScopedClusterClient;
   indexName: string;
   log: Logger;
   licensing: LicensingPluginSetup;
diff --git a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_monitors.test.tsx.snap b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_monitors.test.tsx.snap
index a79fb0f0d3debe..bec7e111fbb28e 100644
--- a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_monitors.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_monitors.test.tsx.snap
@@ -109,26 +109,61 @@ exports[`CertMonitors shallow renders expected elements for valid props 1`] = `
     }
   }
 >
-  <CertMonitors
-    monitors={
-      Array [
-        Object {
-          "id": "bad-ssl-dashboard",
-          "name": "",
-          "url": "https://badssl.com/dashboard/",
-        },
-        Object {
-          "id": "elastic-co",
-          "name": "elastic",
-          "url": "https://www.elastic.co/",
-        },
-        Object {
-          "id": "extended-validation",
-          "name": "",
-          "url": "https://extended-validation.badssl.com/",
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
         },
-      ]
+        "push": [Function],
+        "replace": [Function],
+      }
     }
-  />
+  >
+    <CertMonitors
+      monitors={
+        Array [
+          Object {
+            "id": "bad-ssl-dashboard",
+            "name": "",
+            "url": "https://badssl.com/dashboard/",
+          },
+          Object {
+            "id": "elastic-co",
+            "name": "elastic",
+            "url": "https://www.elastic.co/",
+          },
+          Object {
+            "id": "extended-validation",
+            "name": "",
+            "url": "https://extended-validation.badssl.com/",
+          },
+        ]
+      }
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_search.test.tsx.snap b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_search.test.tsx.snap
index 8d576fc116dae3..97f476a56135aa 100644
--- a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_search.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_search.test.tsx.snap
@@ -90,8 +90,43 @@ exports[`CertificatesSearch shallow renders expected elements for valid props 1`
     }
   }
 >
-  <CertificateSearch
-    setSearch={[MockFunction]}
-  />
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <CertificateSearch
+      setSearch={[MockFunction]}
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap
index f6a4b4598fe63d..d64434c48837cb 100644
--- a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap
@@ -91,24 +91,59 @@ exports[`CertStatus shallow renders expected elements for valid props 1`] = `
     }
   }
 >
-  <CertStatus
-    cert={
+  <ContextProvider
+    value={
       Object {
-        "common_name": "github.com",
-        "issuer": "DigiCert SHA2 Extended Validation Server CA",
-        "monitors": Array [
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
           Object {
-            "id": "github",
-            "name": "",
-            "url": "https://github.com/",
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
           },
         ],
-        "not_after": "2020-05-08T00:00:00.000Z",
-        "not_before": "2018-05-08T00:00:00.000Z",
-        "sha1": "ca06f56b258b7a0d4f2b05470939478651151984",
-        "sha256": "3111500c4a66012cdae333ec3fca1c9dde45c954440e7ee413716bff3663c074",
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
       }
     }
-  />
+  >
+    <CertStatus
+      cert={
+        Object {
+          "common_name": "github.com",
+          "issuer": "DigiCert SHA2 Extended Validation Server CA",
+          "monitors": Array [
+            Object {
+              "id": "github",
+              "name": "",
+              "url": "https://github.com/",
+            },
+          ],
+          "not_after": "2020-05-08T00:00:00.000Z",
+          "not_before": "2018-05-08T00:00:00.000Z",
+          "sha1": "ca06f56b258b7a0d4f2b05470939478651151984",
+          "sha256": "3111500c4a66012cdae333ec3fca1c9dde45c954440e7ee413716bff3663c074",
+        }
+      }
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/certificates_list.test.tsx.snap b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/certificates_list.test.tsx.snap
index fd90db793b26e0..dc808ffcdd22bc 100644
--- a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/certificates_list.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/certificates_list.test.tsx.snap
@@ -51,20 +51,55 @@ exports[`CertificateList shallow renders expected elements for valid props 1`] =
     }
   }
 >
-  <CertificateList
-    onChange={[MockFunction]}
-    page={
+  <ContextProvider
+    value={
       Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
         "index": 0,
-        "size": 10,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
       }
     }
-    sort={
-      Object {
-        "direction": "asc",
-        "field": "not_after",
+  >
+    <CertificateList
+      onChange={[MockFunction]}
+      page={
+        Object {
+          "index": 0,
+          "size": 10,
+        }
       }
-    }
-  />
+      sort={
+        Object {
+          "direction": "asc",
+          "field": "not_after",
+        }
+      }
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap
index b4e5a344122123..9a393940132946 100644
--- a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap
@@ -150,24 +150,59 @@ exports[`FingerprintCol shallow renders expected elements for valid props 1`] =
     }
   }
 >
-  <FingerprintCol
-    cert={
+  <ContextProvider
+    value={
       Object {
-        "common_name": "github.com",
-        "issuer": "DigiCert SHA2 Extended Validation Server CA",
-        "monitors": Array [
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
           Object {
-            "id": "github",
-            "name": "",
-            "url": "https://github.com/",
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
           },
         ],
-        "not_after": "2020-05-08T00:00:00.000Z",
-        "not_before": "2018-05-08T00:00:00.000Z",
-        "sha1": "ca06f56b258b7a0d4f2b05470939478651151984",
-        "sha256": "3111500c4a66012cdae333ec3fca1c9dde45c954440e7ee413716bff3663c074",
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
       }
     }
-  />
+  >
+    <FingerprintCol
+      cert={
+        Object {
+          "common_name": "github.com",
+          "issuer": "DigiCert SHA2 Extended Validation Server CA",
+          "monitors": Array [
+            Object {
+              "id": "github",
+              "name": "",
+              "url": "https://github.com/",
+            },
+          ],
+          "not_after": "2020-05-08T00:00:00.000Z",
+          "not_before": "2018-05-08T00:00:00.000Z",
+          "sha1": "ca06f56b258b7a0d4f2b05470939478651151984",
+          "sha256": "3111500c4a66012cdae333ec3fca1c9dde45c954440e7ee413716bff3663c074",
+        }
+      }
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/common/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
index b1f6f5dfc4401d..4d23cebf7d5ca0 100644
--- a/x-pack/plugins/uptime/public/components/common/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/common/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
@@ -145,6 +145,41 @@ exports[`UptimeDatePicker component validates props with shallow render 1`] = `
     }
   }
 >
-  <UptimeDatePicker />
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <UptimeDatePicker />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/duration_charts.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/duration_charts.test.tsx.snap
index 96918ab68f7163..81cd399078e703 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/duration_charts.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/duration_charts.test.tsx.snap
@@ -51,62 +51,97 @@ exports[`MonitorCharts component renders the component without errors 1`] = `
     }
   }
 >
-  <DurationChartComponent
-    anomalies={null}
-    loading={false}
-    locationDurationLines={
-      Array [
-        Object {
-          "line": Array [
-            Object {
-              "x": 1548697620000,
-              "y": 743928.2027027027,
-            },
-            Object {
-              "x": 1548697920000,
-              "y": 766840.0133333333,
-            },
-            Object {
-              "x": 1548698220000,
-              "y": 786970.8266666667,
-            },
-            Object {
-              "x": 1548698520000,
-              "y": 781064.7808219178,
-            },
-            Object {
-              "x": 1548698820000,
-              "y": 741563.04,
-            },
-            Object {
-              "x": 1548699120000,
-              "y": 759354.6756756756,
-            },
-            Object {
-              "x": 1548699420000,
-              "y": 737533.3866666667,
-            },
-            Object {
-              "x": 1548699720000,
-              "y": 728669.0266666666,
-            },
-            Object {
-              "x": 1548700020000,
-              "y": 719951.64,
-            },
-            Object {
-              "x": 1548700320000,
-              "y": 769181.7866666666,
-            },
-            Object {
-              "x": 1548700620000,
-              "y": 740805.2666666667,
-            },
-          ],
-          "name": "somewhere",
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
         },
-      ]
+        "push": [Function],
+        "replace": [Function],
+      }
     }
-  />
+  >
+    <DurationChartComponent
+      anomalies={null}
+      loading={false}
+      locationDurationLines={
+        Array [
+          Object {
+            "line": Array [
+              Object {
+                "x": 1548697620000,
+                "y": 743928.2027027027,
+              },
+              Object {
+                "x": 1548697920000,
+                "y": 766840.0133333333,
+              },
+              Object {
+                "x": 1548698220000,
+                "y": 786970.8266666667,
+              },
+              Object {
+                "x": 1548698520000,
+                "y": 781064.7808219178,
+              },
+              Object {
+                "x": 1548698820000,
+                "y": 741563.04,
+              },
+              Object {
+                "x": 1548699120000,
+                "y": 759354.6756756756,
+              },
+              Object {
+                "x": 1548699420000,
+                "y": 737533.3866666667,
+              },
+              Object {
+                "x": 1548699720000,
+                "y": 728669.0266666666,
+              },
+              Object {
+                "x": 1548700020000,
+                "y": 719951.64,
+              },
+              Object {
+                "x": 1548700320000,
+                "y": 769181.7866666666,
+              },
+              Object {
+                "x": 1548700620000,
+                "y": 740805.2666666667,
+              },
+            ],
+            "name": "somewhere",
+          },
+        ]
+      }
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
index 1db4a87b1c37b0..7316cfa368c6ec 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
@@ -77,26 +77,61 @@ exports[`MonitorBarSeries component shallow renders a series when there are down
     }
   }
 >
-  <MonitorBarSeries
-    histogramSeries={
-      Array [
-        Object {
-          "down": 1,
-          "timestamp": 124,
-          "up": 0,
-        },
-        Object {
-          "down": 1,
-          "timestamp": 125,
-          "up": 0,
-        },
-        Object {
-          "down": 1,
-          "timestamp": 126,
-          "up": 0,
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
         },
-      ]
+        "push": [Function],
+        "replace": [Function],
+      }
     }
-  />
+  >
+    <MonitorBarSeries
+      histogramSeries={
+        Array [
+          Object {
+            "down": 1,
+            "timestamp": 124,
+            "up": 0,
+          },
+          Object {
+            "down": 1,
+            "timestamp": 125,
+            "up": 0,
+          },
+          Object {
+            "down": 1,
+            "timestamp": 126,
+            "up": 0,
+          },
+        ]
+      }
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/ping_histogram.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/ping_histogram.test.tsx.snap
index 668e4e0c064a8b..fe20071ced4cb0 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/ping_histogram.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/ping_histogram.test.tsx.snap
@@ -85,160 +85,195 @@ exports[`PingHistogram component shallow renders the component without errors 1`
     }
   }
 >
-  <PingHistogramComponent
-    absoluteEndDate={1548700920000}
-    absoluteStartDate={1548697920000}
-    data={
+  <ContextProvider
+    value={
       Object {
-        "histogram": Array [
-          Object {
-            "downCount": 6,
-            "upCount": 33,
-            "x": 1581068329000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 30,
-            "x": 1581068359000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 33,
-            "x": 1581068389000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 30,
-            "x": 1581068419000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 33,
-            "x": 1581068449000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 30,
-            "x": 1581068479000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 33,
-            "x": 1581068509000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 30,
-            "x": 1581068539000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 33,
-            "x": 1581068569000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 30,
-            "x": 1581068599000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 33,
-            "x": 1581068629000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 30,
-            "x": 1581068659000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 33,
-            "x": 1581068689000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 6,
-            "upCount": 30,
-            "x": 1581068719000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 5,
-            "upCount": 34,
-            "x": 1581068749000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 3,
-            "upCount": 33,
-            "x": 1581068779000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 3,
-            "upCount": 36,
-            "x": 1581068809000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 3,
-            "upCount": 33,
-            "x": 1581068839000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 3,
-            "upCount": 36,
-            "x": 1581068869000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 3,
-            "upCount": 33,
-            "x": 1581068899000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 3,
-            "upCount": 36,
-            "x": 1581068929000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 3,
-            "upCount": 33,
-            "x": 1581068959000,
-            "y": 1,
-          },
-          Object {
-            "downCount": 3,
-            "upCount": 36,
-            "x": 1581068989000,
-            "y": 1,
-          },
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
           Object {
-            "downCount": 1,
-            "upCount": 11,
-            "x": 1581069019000,
-            "y": 1,
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
           },
         ],
-        "interval": "1s",
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
       }
     }
-  />
+  >
+    <PingHistogramComponent
+      absoluteEndDate={1548700920000}
+      absoluteStartDate={1548697920000}
+      data={
+        Object {
+          "histogram": Array [
+            Object {
+              "downCount": 6,
+              "upCount": 33,
+              "x": 1581068329000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 30,
+              "x": 1581068359000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 33,
+              "x": 1581068389000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 30,
+              "x": 1581068419000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 33,
+              "x": 1581068449000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 30,
+              "x": 1581068479000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 33,
+              "x": 1581068509000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 30,
+              "x": 1581068539000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 33,
+              "x": 1581068569000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 30,
+              "x": 1581068599000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 33,
+              "x": 1581068629000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 30,
+              "x": 1581068659000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 33,
+              "x": 1581068689000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 6,
+              "upCount": 30,
+              "x": 1581068719000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 5,
+              "upCount": 34,
+              "x": 1581068749000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 3,
+              "upCount": 33,
+              "x": 1581068779000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 3,
+              "upCount": 36,
+              "x": 1581068809000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 3,
+              "upCount": 33,
+              "x": 1581068839000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 3,
+              "upCount": 36,
+              "x": 1581068869000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 3,
+              "upCount": 33,
+              "x": 1581068899000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 3,
+              "upCount": 36,
+              "x": 1581068929000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 3,
+              "upCount": 33,
+              "x": 1581068959000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 3,
+              "upCount": 36,
+              "x": 1581068989000,
+              "y": 1,
+            },
+            Object {
+              "downCount": 1,
+              "upCount": 11,
+              "x": 1581069019000,
+              "y": 1,
+            },
+          ],
+          "interval": "1s",
+        }
+      }
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/monitor/__tests__/__snapshots__/monitor_charts.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/__tests__/__snapshots__/monitor_charts.test.tsx.snap
index dff5def46cbe03..8ca48b7e95ebe4 100644
--- a/x-pack/plugins/uptime/public/components/monitor/__tests__/__snapshots__/monitor_charts.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/__tests__/__snapshots__/monitor_charts.test.tsx.snap
@@ -51,8 +51,43 @@ exports[`MonitorCharts component renders the component without errors 1`] = `
     }
   }
 >
-  <MonitorCharts
-    monitorId="something"
-  />
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <MonitorCharts
+      monitorId="something"
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap
index 2ba4eda82a391c..09c58b6336871c 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap
@@ -26,22 +26,24 @@ Array [
       <p>
         In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.
       </p>
-      <a
-        class="euiButton euiButton--primary"
-        href="/app/management/stack/license_management/home"
-        rel="noopener noreferrer"
-        target="_blank"
-      >
-        <span
-          class="euiButton__content"
+      <span>
+        <a
+          class="euiButton euiButton--primary"
+          href="/app/management/stack/license_management/home"
+          rel="noopener noreferrer"
+          target="_blank"
         >
           <span
-            class="euiButton__text"
+            class="euiButton__content"
           >
-            Start free 14-day trial
+            <span
+              class="euiButton__text"
+            >
+              Start free 14-day trial
+            </span>
           </span>
-        </span>
-      </a>
+        </a>
+      </span>
     </div>
   </div>,
   <div
@@ -62,13 +64,19 @@ exports[`ShowLicenseInfo shallow renders without errors 1`] = `
     <p>
       In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.
     </p>
-    <EuiButton
-      color="primary"
-      href="/app/management/stack/license_management/home"
-      target="_blank"
+    <span
+      onClick={[Function]}
+      onKeyDown={[Function]}
     >
-      Start free 14-day trial
-    </EuiButton>
+      <EuiButton
+        color="primary"
+        href="/app/management/stack/license_management/home"
+        isLoading={false}
+        target="_blank"
+      >
+        Start free 14-day trial
+      </EuiButton>
+    </span>
   </EuiCallOut>
   <EuiSpacer />
 </Fragment>
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
index 7a61eb7391a10f..5c7215edcbce74 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
@@ -17,7 +17,6 @@ exports[`ML Flyout component renders without errors 1`] = `
     />
   </EuiFlyoutHeader>
   <EuiFlyoutBody>
-    <ShowLicenseInfo />
     <EuiText>
       <p>
         Here you can create a machine learning job to calculate anomaly scores on
@@ -67,7 +66,7 @@ exports[`ML Flyout component renders without errors 1`] = `
       >
         <EuiButton
           data-test-subj="uptimeMLCreateJobBtn"
-          disabled={true}
+          disabled={false}
           fill={true}
           isLoading={false}
           onClick={[Function]}
@@ -158,22 +157,24 @@ exports[`ML Flyout component shows license info if no ml available 1`] = `
                 <p>
                   In order to access duration anomaly detection, you have to be subscribed to an Elastic Platinum license.
                 </p>
-                <a
-                  class="euiButton euiButton--primary"
-                  href="/app/management/stack/license_management/home"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  <span
-                    class="euiButton__content"
+                <span>
+                  <a
+                    class="euiButton euiButton--primary"
+                    href="/app/management/stack/license_management/home"
+                    rel="noopener noreferrer"
+                    target="_blank"
                   >
                     <span
-                      class="euiButton__text"
+                      class="euiButton__content"
                     >
-                      Start free 14-day trial
+                      <span
+                        class="euiButton__text"
+                      >
+                        Start free 14-day trial
+                      </span>
                     </span>
-                  </span>
-                </a>
+                  </a>
+                </span>
               </div>
             </div>
             <div
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
index 9ad61f50b05217..24c4e818a0592d 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
@@ -80,6 +80,41 @@ exports[`ML Integrations shallow renders without errors 1`] = `
     }
   }
 >
-  <MLIntegrationComponent />
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <MLIntegrationComponent />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_job_link.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_job_link.test.tsx.snap
index 9957f13fc13343..1fe7a4cdd3ee5c 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_job_link.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_job_link.test.tsx.snap
@@ -68,15 +68,50 @@ exports[`ML JobLink shallow renders without errors 1`] = `
     }
   }
 >
-  <MLJobLink
-    basePath=""
-    dateRange={
+  <ContextProvider
+    value={
       Object {
-        "from": "",
-        "to": "",
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
       }
     }
-    monitorId="testMonitor"
-  />
+  >
+    <MLJobLink
+      basePath=""
+      dateRange={
+        Object {
+          "from": "",
+          "to": "",
+        }
+      }
+      monitorId="testMonitor"
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
index e9623c7aa78a2c..5f773d7b1b620d 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
@@ -80,10 +80,45 @@ exports[`Manage ML Job shallow renders without errors 1`] = `
     }
   }
 >
-  <ManageMLJobComponent
-    hasMLJob={true}
-    onEnableJob={[MockFunction]}
-    onJobDelete={[MockFunction]}
-  />
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <ManageMLJobComponent
+      hasMLJob={true}
+      onEnableJob={[MockFunction]}
+      onJobDelete={[MockFunction]}
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/license_info.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/license_info.test.tsx
index f3ac27c0569a36..55ca4d453d0614 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/license_info.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/license_info.test.tsx
@@ -7,8 +7,16 @@
 import React from 'react';
 import { renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { ShowLicenseInfo } from '../license_info';
+import * as redux from 'react-redux';
 
 describe('ShowLicenseInfo', () => {
+  beforeEach(() => {
+    const spy = jest.spyOn(redux, 'useDispatch');
+    spy.mockReturnValue(jest.fn());
+
+    const spy1 = jest.spyOn(redux, 'useSelector');
+    spy1.mockReturnValue(true);
+  });
   it('shallow renders without errors', () => {
     const wrapper = shallowWithIntl(<ShowLicenseInfo />);
     expect(wrapper).toMatchSnapshot();
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_flyout.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_flyout.test.tsx
index 31cdcfac9feef3..4795042ed845fd 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_flyout.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_flyout.test.tsx
@@ -9,47 +9,21 @@ import { renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { MLFlyoutView } from '../ml_flyout';
 import { UptimeSettingsContext } from '../../../../contexts';
 import { CLIENT_DEFAULTS } from '../../../../../common/constants';
-import { License } from '../../../../../../../plugins/licensing/common/license';
-
-const expiredLicense = new License({
-  signature: 'test signature',
-  license: {
-    expiryDateInMillis: 0,
-    mode: 'platinum',
-    status: 'expired',
-    type: 'platinum',
-    uid: '1',
-  },
-  features: {
-    ml: {
-      isAvailable: false,
-      isEnabled: false,
-    },
-  },
-});
-
-const validLicense = new License({
-  signature: 'test signature',
-  license: {
-    expiryDateInMillis: 30000,
-    mode: 'platinum',
-    status: 'active',
-    type: 'platinum',
-    uid: '2',
-  },
-  features: {
-    ml: {
-      isAvailable: true,
-      isEnabled: true,
-    },
-  },
-});
+import * as redux from 'react-redux';
 
 describe('ML Flyout component', () => {
   const createJob = () => {};
   const onClose = () => {};
   const { DATE_RANGE_START, DATE_RANGE_END } = CLIENT_DEFAULTS;
 
+  beforeEach(() => {
+    const spy = jest.spyOn(redux, 'useDispatch');
+    spy.mockReturnValue(jest.fn());
+
+    const spy1 = jest.spyOn(redux, 'useSelector');
+    spy1.mockReturnValue(true);
+  });
+
   it('renders without errors', () => {
     const wrapper = shallowWithIntl(
       <MLFlyoutView
@@ -62,8 +36,12 @@ describe('ML Flyout component', () => {
     expect(wrapper).toMatchSnapshot();
   });
   it('shows license info if no ml available', () => {
+    const spy1 = jest.spyOn(redux, 'useSelector');
+
+    // return false value for no license
+    spy1.mockReturnValue(false);
+
     const value = {
-      license: expiredLicense,
       basePath: '',
       dateRangeStart: DATE_RANGE_START,
       dateRangeEnd: DATE_RANGE_END,
@@ -88,7 +66,6 @@ describe('ML Flyout component', () => {
 
   it('able to create job if valid license is available', () => {
     const value = {
-      license: validLicense,
       basePath: '',
       dateRangeStart: DATE_RANGE_START,
       dateRangeEnd: DATE_RANGE_END,
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/license_info.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/license_info.tsx
index e37ec4cc4715d4..2461875d502b77 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/license_info.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/license_info.tsx
@@ -3,13 +3,48 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import React, { useContext } from 'react';
+import React, { useContext, useState, useEffect } from 'react';
 import { EuiCallOut, EuiButton, EuiSpacer } from '@elastic/eui';
+import { useDispatch, useSelector } from 'react-redux';
 import { UptimeSettingsContext } from '../../../contexts';
 import * as labels from './translations';
+import { getMLCapabilitiesAction } from '../../../state/actions';
+import { hasMLFeatureSelector } from '../../../state/selectors';
 
 export const ShowLicenseInfo = () => {
   const { basePath } = useContext(UptimeSettingsContext);
+  const [loading, setLoading] = useState<boolean>(false);
+  const hasMlFeature = useSelector(hasMLFeatureSelector);
+
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(getMLCapabilitiesAction.get());
+  }, [dispatch]);
+
+  useEffect(() => {
+    let retryInterval: any;
+    if (loading) {
+      retryInterval = setInterval(() => {
+        dispatch(getMLCapabilitiesAction.get());
+      }, 5000);
+    } else {
+      clearInterval(retryInterval);
+    }
+
+    return () => {
+      clearInterval(retryInterval);
+    };
+  }, [dispatch, loading]);
+
+  useEffect(() => {
+    setLoading(false);
+  }, [hasMlFeature]);
+
+  const startLicenseTrial = () => {
+    setLoading(true);
+  };
+
   return (
     <>
       <EuiCallOut
@@ -20,13 +55,16 @@ export const ShowLicenseInfo = () => {
         iconType="help"
       >
         <p>{labels.START_TRAIL_DESC}</p>
-        <EuiButton
-          color="primary"
-          href={basePath + `/app/management/stack/license_management/home`}
-          target="_blank"
-        >
-          {labels.START_TRAIL}
-        </EuiButton>
+        <span onClick={startLicenseTrial} onKeyDown={() => {}}>
+          <EuiButton
+            color="primary"
+            isLoading={loading}
+            target="_blank"
+            href={basePath + `/app/management/stack/license_management/home`}
+          >
+            {labels.START_TRAIL}
+          </EuiButton>
+        </span>
       </EuiCallOut>
       <EuiSpacer />
     </>
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout.tsx
index 8c3f814e841f7a..3e60f09452587a 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout.tsx
@@ -20,9 +20,11 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { useSelector } from 'react-redux';
 import * as labels from './translations';
 import { UptimeSettingsContext } from '../../../contexts';
 import { ShowLicenseInfo } from './license_info';
+import { hasMLFeatureSelector } from '../../../state/selectors';
 
 interface Props {
   isCreatingJob: boolean;
@@ -32,11 +34,11 @@ interface Props {
 }
 
 export function MLFlyoutView({ isCreatingJob, onClickCreate, onClose, canCreateMLJob }: Props) {
-  const { basePath, license } = useContext(UptimeSettingsContext);
+  const { basePath } = useContext(UptimeSettingsContext);
 
-  const isLoadingMLJob = false;
+  const hasMlFeature = useSelector(hasMLFeatureSelector);
 
-  const hasPlatinumLicense = license?.getFeature('ml')?.isAvailable;
+  const isLoadingMLJob = false;
 
   return (
     <EuiFlyout onClose={onClose} size="s" data-test-subj="uptimeMLFlyout">
@@ -47,7 +49,7 @@ export function MLFlyoutView({ isCreatingJob, onClickCreate, onClose, canCreateM
         <EuiSpacer size="s" />
       </EuiFlyoutHeader>
       <EuiFlyoutBody>
-        {!hasPlatinumLicense && <ShowLicenseInfo />}
+        {!hasMlFeature && <ShowLicenseInfo />}
         <EuiText>
           <p>{labels.CREAT_ML_JOB_DESC}</p>
           <p>
@@ -80,7 +82,7 @@ export function MLFlyoutView({ isCreatingJob, onClickCreate, onClose, canCreateM
               onClick={() => onClickCreate()}
               fill
               isLoading={isCreatingJob}
-              disabled={isCreatingJob || isLoadingMLJob || !hasPlatinumLicense || !canCreateMLJob}
+              disabled={isCreatingJob || isLoadingMLJob || !hasMlFeature || !canCreateMLJob}
             >
               {labels.CREATE_NEW_JOB}
             </EuiButton>
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
index e66808f76d24a2..1de19dda3b88f4 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
@@ -8,7 +8,7 @@ import React, { useContext, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { MachineLearningFlyout } from './ml_flyout_container';
 import {
-  hasMLFeatureAvailable,
+  hasMLFeatureSelector,
   hasMLJobSelector,
   isMLJobDeletedSelector,
   isMLJobDeletingSelector,
@@ -35,7 +35,7 @@ export const MLIntegrationComponent = () => {
 
   const dispatch = useDispatch();
 
-  const isMLAvailable = useSelector(hasMLFeatureAvailable);
+  const isMLAvailable = useSelector(hasMLFeatureSelector);
 
   const deleteMLJob = () => dispatch(deleteMLJobAction.get({ monitorId: monitorId as string }));
   const isMLJobDeleting = useSelector(isMLJobDeletingSelector);
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
index b586c1241290bc..df8ceed76b7968 100644
--- a/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
@@ -14,7 +14,7 @@ import {
 } from '../../../state/actions';
 import {
   anomaliesSelector,
-  hasMLFeatureAvailable,
+  hasMLFeatureSelector,
   hasMLJobSelector,
   selectDurationLines,
 } from '../../../state/selectors';
@@ -34,7 +34,7 @@ export const MonitorDuration: React.FC<MonitorIdParam> = ({ monitorId }) => {
 
   const { durationLines, loading } = useSelector(selectDurationLines);
 
-  const isMLAvailable = useSelector(hasMLFeatureAvailable);
+  const isMLAvailable = useSelector(hasMLFeatureSelector);
 
   const { data: mlJobs, loading: jobsLoading } = useSelector(hasMLJobSelector);
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/__test__/__snapshots__/ssl_certificate.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/status_details/__test__/__snapshots__/ssl_certificate.test.tsx.snap
index 5b63a09d4f7c4b..591b3f222d033f 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/__test__/__snapshots__/ssl_certificate.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/__test__/__snapshots__/ssl_certificate.test.tsx.snap
@@ -139,12 +139,47 @@ exports[`SSL Certificate component shallow renders 1`] = `
     }
   }
 >
-  <MonitorSSLCertificate
-    tls={
+  <ContextProvider
+    value={
       Object {
-        "not_after": "2020-04-24T11:41:38.200Z",
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
       }
     }
-  />
+  >
+    <MonitorSSLCertificate
+      tls={
+        Object {
+          "not_after": "2020-04-24T11:41:38.200Z",
+        }
+      }
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
index cdefa7db5688b9..6667da401d6a90 100644
--- a/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
@@ -1372,25 +1372,60 @@ exports[`EmptyState component renders child components when count is truthy 1`]
     }
   }
 >
-  <EmptyStateComponent
-    loading={false}
-    statesIndexStatus={
+  <ContextProvider
+    value={
       Object {
-        "docCount": 1,
-        "indexExists": true,
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
       }
     }
   >
-    <div>
-      Foo
-    </div>
-    <div>
-      Bar
-    </div>
-    <div>
-      Baz
-    </div>
-  </EmptyStateComponent>
+    <EmptyStateComponent
+      loading={false}
+      statesIndexStatus={
+        Object {
+          "docCount": 1,
+          "indexExists": true,
+        }
+      }
+    >
+      <div>
+        Foo
+      </div>
+      <div>
+        Bar
+      </div>
+      <div>
+        Baz
+      </div>
+    </EmptyStateComponent>
+  </ContextProvider>
 </ContextProvider>
 `;
 
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/filter_status_button.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/filter_status_button.test.tsx.snap
index b5d1b1d8ff60ed..0c7dfd8f924538 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/filter_status_button.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/filter_status_button.test.tsx.snap
@@ -75,12 +75,47 @@ exports[`FilterStatusButton shallow renders without errors for valid props 1`] =
     }
   }
 >
-  <FilterStatusButton
-    content="Up"
-    dataTestSubj="foo"
-    isActive={true}
-    value="up"
-    withNext={true}
-  />
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <FilterStatusButton
+      content="Up"
+      dataTestSubj="foo"
+      isActive={true}
+      value="up"
+      withNext={true}
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
index d593dcc21b5901..7fc6405aaa3031 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
@@ -51,21 +51,56 @@ exports[`MonitorList component MonitorListPagination component renders a no item
     }
   }
 >
-  <MonitorListComponent
-    monitorList={
+  <ContextProvider
+    value={
       Object {
-        "list": Object {
-          "nextPagePagination": null,
-          "prevPagePagination": null,
-          "summaries": Array [],
-          "totalSummaryCount": 0,
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
         },
-        "loading": false,
+        "push": [Function],
+        "replace": [Function],
       }
     }
-    pageSize={10}
-    setPageSize={[MockFunction]}
-  />
+  >
+    <MonitorListComponent
+      monitorList={
+        Object {
+          "list": Object {
+            "nextPagePagination": null,
+            "prevPagePagination": null,
+            "summaries": Array [],
+            "totalSummaryCount": 0,
+          },
+          "loading": false,
+        }
+      }
+      pageSize={10}
+      setPageSize={[MockFunction]}
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
 
@@ -120,83 +155,118 @@ exports[`MonitorList component MonitorListPagination component renders the pagin
     }
   }
 >
-  <MonitorListComponent
-    monitorList={
+  <ContextProvider
+    value={
       Object {
-        "list": Object {
-          "nextPagePagination": "{\\"cursorKey\\":{\\"monitor_id\\":456},\\"cursorDirection\\":\\"AFTER\\",\\"sortOrder\\":\\"ASC\\"}",
-          "prevPagePagination": "{\\"cursorKey\\":{\\"monitor_id\\":123},\\"cursorDirection\\":\\"BEFORE\\",\\"sortOrder\\":\\"ASC\\"}",
-          "summaries": Array [
-            Object {
-              "monitor_id": "foo",
-              "state": Object {
-                "checks": Array [
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.1",
-                      "status": "up",
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <MonitorListComponent
+      monitorList={
+        Object {
+          "list": Object {
+            "nextPagePagination": "{\\"cursorKey\\":{\\"monitor_id\\":456},\\"cursorDirection\\":\\"AFTER\\",\\"sortOrder\\":\\"ASC\\"}",
+            "prevPagePagination": "{\\"cursorKey\\":{\\"monitor_id\\":123},\\"cursorDirection\\":\\"BEFORE\\",\\"sortOrder\\":\\"ASC\\"}",
+            "summaries": Array [
+              Object {
+                "monitor_id": "foo",
+                "state": Object {
+                  "checks": Array [
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.1",
+                        "status": "up",
+                      },
+                      "timestamp": 124,
                     },
-                    "timestamp": 124,
-                  },
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.2",
-                      "status": "down",
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.2",
+                        "status": "down",
+                      },
+                      "timestamp": 125,
                     },
-                    "timestamp": 125,
-                  },
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.3",
-                      "status": "down",
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.3",
+                        "status": "down",
+                      },
+                      "timestamp": 126,
                     },
-                    "timestamp": 126,
+                  ],
+                  "summary": Object {
+                    "down": 2,
+                    "up": 1,
                   },
-                ],
-                "summary": Object {
-                  "down": 2,
-                  "up": 1,
+                  "timestamp": "123",
+                  "url": Object {},
                 },
-                "timestamp": "123",
-                "url": Object {},
               },
-            },
-            Object {
-              "monitor_id": "bar",
-              "state": Object {
-                "checks": Array [
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.1",
-                      "status": "up",
+              Object {
+                "monitor_id": "bar",
+                "state": Object {
+                  "checks": Array [
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.1",
+                        "status": "up",
+                      },
+                      "timestamp": 125,
                     },
-                    "timestamp": 125,
-                  },
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.2",
-                      "status": "up",
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.2",
+                        "status": "up",
+                      },
+                      "timestamp": 126,
                     },
-                    "timestamp": 126,
+                  ],
+                  "summary": Object {
+                    "down": 0,
+                    "up": 2,
                   },
-                ],
-                "summary": Object {
-                  "down": 0,
-                  "up": 2,
+                  "timestamp": "125",
+                  "url": Object {},
                 },
-                "timestamp": "125",
-                "url": Object {},
               },
-            },
-          ],
-          "totalSummaryCount": 2,
-        },
-        "loading": false,
+            ],
+            "totalSummaryCount": 2,
+          },
+          "loading": false,
+        }
       }
-    }
-    pageSize={10}
-    setPageSize={[MockFunction]}
-  />
+      pageSize={10}
+      setPageSize={[MockFunction]}
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
 
@@ -251,21 +321,56 @@ exports[`MonitorList component renders a no items message when no data is provid
     }
   }
 >
-  <MonitorListComponent
-    monitorList={
+  <ContextProvider
+    value={
       Object {
-        "list": Object {
-          "nextPagePagination": null,
-          "prevPagePagination": null,
-          "summaries": Array [],
-          "totalSummaryCount": 0,
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
         },
-        "loading": true,
+        "push": [Function],
+        "replace": [Function],
       }
     }
-    pageSize={10}
-    setPageSize={[MockFunction]}
-  />
+  >
+    <MonitorListComponent
+      monitorList={
+        Object {
+          "list": Object {
+            "nextPagePagination": null,
+            "prevPagePagination": null,
+            "summaries": Array [],
+            "totalSummaryCount": 0,
+          },
+          "loading": true,
+        }
+      }
+      pageSize={10}
+      setPageSize={[MockFunction]}
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
 
@@ -320,84 +425,119 @@ exports[`MonitorList component renders error list 1`] = `
     }
   }
 >
-  <MonitorListComponent
-    monitorList={
+  <ContextProvider
+    value={
       Object {
-        "error": [Error: foo message],
-        "list": Object {
-          "nextPagePagination": null,
-          "prevPagePagination": null,
-          "summaries": Array [
-            Object {
-              "monitor_id": "foo",
-              "state": Object {
-                "checks": Array [
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.1",
-                      "status": "up",
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <MonitorListComponent
+      monitorList={
+        Object {
+          "error": [Error: foo message],
+          "list": Object {
+            "nextPagePagination": null,
+            "prevPagePagination": null,
+            "summaries": Array [
+              Object {
+                "monitor_id": "foo",
+                "state": Object {
+                  "checks": Array [
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.1",
+                        "status": "up",
+                      },
+                      "timestamp": 124,
                     },
-                    "timestamp": 124,
-                  },
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.2",
-                      "status": "down",
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.2",
+                        "status": "down",
+                      },
+                      "timestamp": 125,
                     },
-                    "timestamp": 125,
-                  },
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.3",
-                      "status": "down",
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.3",
+                        "status": "down",
+                      },
+                      "timestamp": 126,
                     },
-                    "timestamp": 126,
+                  ],
+                  "summary": Object {
+                    "down": 2,
+                    "up": 1,
                   },
-                ],
-                "summary": Object {
-                  "down": 2,
-                  "up": 1,
+                  "timestamp": "123",
+                  "url": Object {},
                 },
-                "timestamp": "123",
-                "url": Object {},
               },
-            },
-            Object {
-              "monitor_id": "bar",
-              "state": Object {
-                "checks": Array [
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.1",
-                      "status": "up",
+              Object {
+                "monitor_id": "bar",
+                "state": Object {
+                  "checks": Array [
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.1",
+                        "status": "up",
+                      },
+                      "timestamp": 125,
                     },
-                    "timestamp": 125,
-                  },
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.2",
-                      "status": "up",
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.2",
+                        "status": "up",
+                      },
+                      "timestamp": 126,
                     },
-                    "timestamp": 126,
+                  ],
+                  "summary": Object {
+                    "down": 0,
+                    "up": 2,
                   },
-                ],
-                "summary": Object {
-                  "down": 0,
-                  "up": 2,
+                  "timestamp": "125",
+                  "url": Object {},
                 },
-                "timestamp": "125",
-                "url": Object {},
               },
-            },
-          ],
-          "totalSummaryCount": 2,
-        },
-        "loading": false,
+            ],
+            "totalSummaryCount": 2,
+          },
+          "loading": false,
+        }
       }
-    }
-    pageSize={10}
-    setPageSize={[MockFunction]}
-  />
+      pageSize={10}
+      setPageSize={[MockFunction]}
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
 
@@ -452,83 +592,118 @@ exports[`MonitorList component renders loading state 1`] = `
     }
   }
 >
-  <MonitorListComponent
-    monitorList={
+  <ContextProvider
+    value={
       Object {
-        "list": Object {
-          "nextPagePagination": null,
-          "prevPagePagination": null,
-          "summaries": Array [
-            Object {
-              "monitor_id": "foo",
-              "state": Object {
-                "checks": Array [
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.1",
-                      "status": "up",
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <MonitorListComponent
+      monitorList={
+        Object {
+          "list": Object {
+            "nextPagePagination": null,
+            "prevPagePagination": null,
+            "summaries": Array [
+              Object {
+                "monitor_id": "foo",
+                "state": Object {
+                  "checks": Array [
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.1",
+                        "status": "up",
+                      },
+                      "timestamp": 124,
                     },
-                    "timestamp": 124,
-                  },
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.2",
-                      "status": "down",
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.2",
+                        "status": "down",
+                      },
+                      "timestamp": 125,
                     },
-                    "timestamp": 125,
-                  },
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.3",
-                      "status": "down",
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.3",
+                        "status": "down",
+                      },
+                      "timestamp": 126,
                     },
-                    "timestamp": 126,
+                  ],
+                  "summary": Object {
+                    "down": 2,
+                    "up": 1,
                   },
-                ],
-                "summary": Object {
-                  "down": 2,
-                  "up": 1,
+                  "timestamp": "123",
+                  "url": Object {},
                 },
-                "timestamp": "123",
-                "url": Object {},
               },
-            },
-            Object {
-              "monitor_id": "bar",
-              "state": Object {
-                "checks": Array [
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.1",
-                      "status": "up",
+              Object {
+                "monitor_id": "bar",
+                "state": Object {
+                  "checks": Array [
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.1",
+                        "status": "up",
+                      },
+                      "timestamp": 125,
                     },
-                    "timestamp": 125,
-                  },
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.2",
-                      "status": "up",
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.2",
+                        "status": "up",
+                      },
+                      "timestamp": 126,
                     },
-                    "timestamp": 126,
+                  ],
+                  "summary": Object {
+                    "down": 0,
+                    "up": 2,
                   },
-                ],
-                "summary": Object {
-                  "down": 0,
-                  "up": 2,
+                  "timestamp": "125",
+                  "url": Object {},
                 },
-                "timestamp": "125",
-                "url": Object {},
               },
-            },
-          ],
-          "totalSummaryCount": 2,
-        },
-        "loading": true,
+            ],
+            "totalSummaryCount": 2,
+          },
+          "loading": true,
+        }
       }
-    }
-    pageSize={10}
-    setPageSize={[MockFunction]}
-  />
+      pageSize={10}
+      setPageSize={[MockFunction]}
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
 
@@ -1301,82 +1476,117 @@ exports[`MonitorList component shallow renders the monitor list 1`] = `
     }
   }
 >
-  <MonitorListComponent
-    monitorList={
+  <ContextProvider
+    value={
       Object {
-        "list": Object {
-          "nextPagePagination": null,
-          "prevPagePagination": null,
-          "summaries": Array [
-            Object {
-              "monitor_id": "foo",
-              "state": Object {
-                "checks": Array [
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.1",
-                      "status": "up",
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <MonitorListComponent
+      monitorList={
+        Object {
+          "list": Object {
+            "nextPagePagination": null,
+            "prevPagePagination": null,
+            "summaries": Array [
+              Object {
+                "monitor_id": "foo",
+                "state": Object {
+                  "checks": Array [
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.1",
+                        "status": "up",
+                      },
+                      "timestamp": 124,
                     },
-                    "timestamp": 124,
-                  },
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.2",
-                      "status": "down",
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.2",
+                        "status": "down",
+                      },
+                      "timestamp": 125,
                     },
-                    "timestamp": 125,
-                  },
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.3",
-                      "status": "down",
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.3",
+                        "status": "down",
+                      },
+                      "timestamp": 126,
                     },
-                    "timestamp": 126,
+                  ],
+                  "summary": Object {
+                    "down": 2,
+                    "up": 1,
                   },
-                ],
-                "summary": Object {
-                  "down": 2,
-                  "up": 1,
+                  "timestamp": "123",
+                  "url": Object {},
                 },
-                "timestamp": "123",
-                "url": Object {},
               },
-            },
-            Object {
-              "monitor_id": "bar",
-              "state": Object {
-                "checks": Array [
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.1",
-                      "status": "up",
+              Object {
+                "monitor_id": "bar",
+                "state": Object {
+                  "checks": Array [
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.1",
+                        "status": "up",
+                      },
+                      "timestamp": 125,
                     },
-                    "timestamp": 125,
-                  },
-                  Object {
-                    "monitor": Object {
-                      "ip": "127.0.0.2",
-                      "status": "up",
+                    Object {
+                      "monitor": Object {
+                        "ip": "127.0.0.2",
+                        "status": "up",
+                      },
+                      "timestamp": 126,
                     },
-                    "timestamp": 126,
+                  ],
+                  "summary": Object {
+                    "down": 0,
+                    "up": 2,
                   },
-                ],
-                "summary": Object {
-                  "down": 0,
-                  "up": 2,
+                  "timestamp": "125",
+                  "url": Object {},
                 },
-                "timestamp": "125",
-                "url": Object {},
               },
-            },
-          ],
-          "totalSummaryCount": 2,
-        },
-        "loading": false,
+            ],
+            "totalSummaryCount": 2,
+          },
+          "loading": false,
+        }
       }
-    }
-    pageSize={10}
-    setPageSize={[MockFunction]}
-  />
+      pageSize={10}
+      setPageSize={[MockFunction]}
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/status_filter.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/status_filter.test.tsx.snap
index e8b9326d360e8f..12f8cdf1dcdddc 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/status_filter.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/status_filter.test.tsx.snap
@@ -123,6 +123,41 @@ exports[`StatusFilterComponent shallow renders without errors for valid props 1`
     }
   }
 >
-  <StatusFilter />
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <StatusFilter />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
index 4520b760be3794..877ba889ec1ff2 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
@@ -51,56 +51,91 @@ exports[`MonitorListDrawer component renders a MonitorListDrawer when there are
     }
   }
 >
-  <MonitorListDrawerComponent
-    monitorDetails={
+  <ContextProvider
+    value={
       Object {
-        "error": Object {
-          "message": "Get https://expired.badssl.com: x509: certificate has expired or is not yet valid",
-          "type": "io",
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
         },
-        "monitorId": "bad-ssl",
+        "push": [Function],
+        "replace": [Function],
       }
     }
-    summary={
-      Object {
-        "monitor_id": "foo",
-        "state": Object {
-          "checks": Array [
-            Object {
-              "monitor": Object {
-                "ip": "127.0.0.1",
-                "status": "up",
+  >
+    <MonitorListDrawerComponent
+      monitorDetails={
+        Object {
+          "error": Object {
+            "message": "Get https://expired.badssl.com: x509: certificate has expired or is not yet valid",
+            "type": "io",
+          },
+          "monitorId": "bad-ssl",
+        }
+      }
+      summary={
+        Object {
+          "monitor_id": "foo",
+          "state": Object {
+            "checks": Array [
+              Object {
+                "monitor": Object {
+                  "ip": "127.0.0.1",
+                  "status": "up",
+                },
+                "timestamp": 121,
               },
-              "timestamp": 121,
-            },
-            Object {
-              "monitor": Object {
-                "ip": "127.0.0.2",
-                "status": "down",
+              Object {
+                "monitor": Object {
+                  "ip": "127.0.0.2",
+                  "status": "down",
+                },
+                "timestamp": 123,
               },
-              "timestamp": 123,
-            },
-            Object {
-              "monitor": Object {
-                "ip": "127.0.0.3",
-                "status": "up",
+              Object {
+                "monitor": Object {
+                  "ip": "127.0.0.3",
+                  "status": "up",
+                },
+                "timestamp": 125,
               },
-              "timestamp": 125,
+            ],
+            "summary": Object {
+              "down": 0,
+              "up": 1,
+            },
+            "timestamp": "123",
+            "url": Object {
+              "domain": "expired.badssl.com",
+              "full": "https://expired.badssl.com",
             },
-          ],
-          "summary": Object {
-            "down": 0,
-            "up": 1,
-          },
-          "timestamp": "123",
-          "url": Object {
-            "domain": "expired.badssl.com",
-            "full": "https://expired.badssl.com",
           },
-        },
+        }
       }
-    }
-  />
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
 
@@ -155,41 +190,76 @@ exports[`MonitorListDrawer component renders a MonitorListDrawer when there is o
     }
   }
 >
-  <MonitorListDrawerComponent
-    monitorDetails={
+  <ContextProvider
+    value={
       Object {
-        "error": Object {
-          "message": "Get https://expired.badssl.com: x509: certificate has expired or is not yet valid",
-          "type": "io",
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
         },
-        "monitorId": "bad-ssl",
+        "push": [Function],
+        "replace": [Function],
       }
     }
-    summary={
-      Object {
-        "monitor_id": "foo",
-        "state": Object {
-          "checks": Array [
-            Object {
-              "monitor": Object {
-                "ip": "127.0.0.1",
-                "status": "up",
+  >
+    <MonitorListDrawerComponent
+      monitorDetails={
+        Object {
+          "error": Object {
+            "message": "Get https://expired.badssl.com: x509: certificate has expired or is not yet valid",
+            "type": "io",
+          },
+          "monitorId": "bad-ssl",
+        }
+      }
+      summary={
+        Object {
+          "monitor_id": "foo",
+          "state": Object {
+            "checks": Array [
+              Object {
+                "monitor": Object {
+                  "ip": "127.0.0.1",
+                  "status": "up",
+                },
+                "timestamp": 121,
               },
-              "timestamp": 121,
+            ],
+            "summary": Object {
+              "down": 0,
+              "up": 1,
+            },
+            "timestamp": "123",
+            "url": Object {
+              "domain": "expired.badssl.com",
+              "full": "https://expired.badssl.com",
             },
-          ],
-          "summary": Object {
-            "down": 0,
-            "up": 1,
-          },
-          "timestamp": "123",
-          "url": Object {
-            "domain": "expired.badssl.com",
-            "full": "https://expired.badssl.com",
           },
-        },
+        }
       }
-    }
-  />
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap b/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap
index 36351da6f14c9d..55c66183de946d 100644
--- a/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap
@@ -51,18 +51,53 @@ exports[`CertificateForm shallow renders expected elements for valid props 1`] =
     }
   }
 >
-  <CertificateExpirationForm
-    fieldErrors={null}
-    formFields={
+  <ContextProvider
+    value={
       Object {
-        "certAgeThreshold": 36,
-        "certExpirationThreshold": 7,
-        "heartbeatIndices": "heartbeat-8*",
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
       }
     }
-    isDisabled={false}
-    loading={false}
-    onChange={[MockFunction]}
-  />
+  >
+    <CertificateExpirationForm
+      fieldErrors={null}
+      formFields={
+        Object {
+          "certAgeThreshold": 36,
+          "certExpirationThreshold": 7,
+          "heartbeatIndices": "heartbeat-8*",
+        }
+      }
+      isDisabled={false}
+      loading={false}
+      onChange={[MockFunction]}
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap b/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap
index c5d077007e6502..2eb434ffbaf40d 100644
--- a/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap
@@ -51,18 +51,53 @@ exports[`CertificateForm shallow renders expected elements for valid props 1`] =
     }
   }
 >
-  <IndicesForm
-    fieldErrors={null}
-    formFields={
+  <ContextProvider
+    value={
       Object {
-        "certAgeThreshold": 36,
-        "certExpirationThreshold": 7,
-        "heartbeatIndices": "heartbeat-8*",
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
       }
     }
-    isDisabled={false}
-    loading={false}
-    onChange={[MockFunction]}
-  />
+  >
+    <IndicesForm
+      fieldErrors={null}
+      formFields={
+        Object {
+          "certAgeThreshold": 36,
+          "certExpirationThreshold": 7,
+          "heartbeatIndices": "heartbeat-8*",
+        }
+      }
+      isDisabled={false}
+      loading={false}
+      onChange={[MockFunction]}
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/contexts/uptime_settings_context.tsx b/x-pack/plugins/uptime/public/contexts/uptime_settings_context.tsx
index 4fabf3f2ed4972..142c6e17c5fd90 100644
--- a/x-pack/plugins/uptime/public/contexts/uptime_settings_context.tsx
+++ b/x-pack/plugins/uptime/public/contexts/uptime_settings_context.tsx
@@ -9,11 +9,9 @@ import { UptimeAppProps } from '../uptime_app';
 import { CLIENT_DEFAULTS, CONTEXT_DEFAULTS } from '../../common/constants';
 import { CommonlyUsedRange } from '../components/common/uptime_date_picker';
 import { useGetUrlParams } from '../hooks';
-import { ILicense } from '../../../../plugins/licensing/common/types';
 
 export interface UptimeSettingsContextValues {
   basePath: string;
-  license?: ILicense | null;
   dateRangeStart: string;
   dateRangeEnd: string;
   isApmAvailable: boolean;
@@ -41,27 +39,12 @@ const defaultContext: UptimeSettingsContextValues = {
 export const UptimeSettingsContext = createContext(defaultContext);
 
 export const UptimeSettingsContextProvider: React.FC<UptimeAppProps> = ({ children, ...props }) => {
-  const {
-    basePath,
-    isApmAvailable,
-    isInfraAvailable,
-    isLogsAvailable,
-    commonlyUsedRanges,
-    plugins,
-  } = props;
+  const { basePath, isApmAvailable, isInfraAvailable, isLogsAvailable, commonlyUsedRanges } = props;
 
   const { dateRangeStart, dateRangeEnd } = useGetUrlParams();
 
-  let license: ILicense | null = null;
-
-  // @ts-ignore
-  plugins.licensing.license$.subscribe((licenseItem: ILicense) => {
-    license = licenseItem;
-  });
-
   const value = useMemo(() => {
     return {
-      license,
       basePath,
       isApmAvailable,
       isInfraAvailable,
@@ -71,7 +54,6 @@ export const UptimeSettingsContextProvider: React.FC<UptimeAppProps> = ({ childr
       dateRangeEnd: dateRangeEnd ?? DATE_RANGE_END,
     };
   }, [
-    license,
     basePath,
     isApmAvailable,
     isInfraAvailable,
diff --git a/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/certificates.test.tsx.snap b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/certificates.test.tsx.snap
index 53b2ea27864bc0..e1009236ef4b83 100644
--- a/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/certificates.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/certificates.test.tsx.snap
@@ -51,6 +51,41 @@ exports[`CertificatesPage shallow renders expected elements for valid props 1`]
     }
   }
 >
-  <CertificatesPage />
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <CertificatesPage />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/monitor.test.tsx.snap b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/monitor.test.tsx.snap
index 6064caa868bf82..cd92334cf72f5e 100644
--- a/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/monitor.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/monitor.test.tsx.snap
@@ -51,6 +51,41 @@ exports[`MonitorPage shallow renders expected elements for valid props 1`] = `
     }
   }
 >
-  <MonitorPage />
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <MonitorPage />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/not_found.test.tsx.snap b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/not_found.test.tsx.snap
index a4d13963aaf778..df67e320d7aac8 100644
--- a/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/not_found.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/not_found.test.tsx.snap
@@ -51,6 +51,41 @@ exports[`NotFoundPage render component for valid props 1`] = `
     }
   }
 >
-  <NotFoundPage />
+  <ContextProvider
+    value={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <NotFoundPage />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/overview.test.tsx.snap b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/overview.test.tsx.snap
index 0d732a943f167e..ab473140afe5d4 100644
--- a/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/overview.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/overview.test.tsx.snap
@@ -51,106 +51,141 @@ exports[`MonitorPage shallow renders expected elements for valid props 1`] = `
     }
   }
 >
-  <Memo()
-    indexPattern={
+  <ContextProvider
+    value={
       Object {
-        "fields": Array [
-          Object {
-            "aggregatable": true,
-            "esTypes": Array [
-              "date",
-            ],
-            "name": "@timestamp",
-            "readFromDocValues": true,
-            "searchable": true,
-            "type": "date",
-          },
-          Object {
-            "aggregatable": true,
-            "esTypes": Array [
-              "keyword",
-            ],
-            "name": "monitor.check_group",
-            "readFromDocValues": true,
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "esTypes": Array [
-              "long",
-            ],
-            "name": "monitor.duration.us",
-            "readFromDocValues": true,
-            "searchable": true,
-            "type": "number",
-          },
-          Object {
-            "aggregatable": true,
-            "esTypes": Array [
-              "keyword",
-            ],
-            "name": "monitor.id",
-            "readFromDocValues": true,
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "esTypes": Array [
-              "ip",
-            ],
-            "name": "monitor.ip",
-            "readFromDocValues": true,
-            "searchable": true,
-            "type": "ip",
-          },
-          Object {
-            "aggregatable": true,
-            "esTypes": Array [
-              "keyword",
-            ],
-            "name": "monitor.name",
-            "readFromDocValues": true,
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "esTypes": Array [
-              "keyword",
-            ],
-            "name": "monitor.status",
-            "readFromDocValues": true,
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "esTypes": Array [
-              "date_range",
-            ],
-            "name": "monitor.timespan",
-            "readFromDocValues": true,
-            "searchable": true,
-            "type": "unknown",
-          },
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
           Object {
-            "aggregatable": true,
-            "esTypes": Array [
-              "keyword",
-            ],
-            "name": "monitor.type",
-            "readFromDocValues": true,
-            "searchable": true,
-            "type": "string",
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
           },
         ],
-        "title": "heartbeat-8*",
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
       }
     }
-    loading={false}
-    setEsKueryFilters={[MockFunction]}
-  />
+  >
+    <Memo()
+      indexPattern={
+        Object {
+          "fields": Array [
+            Object {
+              "aggregatable": true,
+              "esTypes": Array [
+                "date",
+              ],
+              "name": "@timestamp",
+              "readFromDocValues": true,
+              "searchable": true,
+              "type": "date",
+            },
+            Object {
+              "aggregatable": true,
+              "esTypes": Array [
+                "keyword",
+              ],
+              "name": "monitor.check_group",
+              "readFromDocValues": true,
+              "searchable": true,
+              "type": "string",
+            },
+            Object {
+              "aggregatable": true,
+              "esTypes": Array [
+                "long",
+              ],
+              "name": "monitor.duration.us",
+              "readFromDocValues": true,
+              "searchable": true,
+              "type": "number",
+            },
+            Object {
+              "aggregatable": true,
+              "esTypes": Array [
+                "keyword",
+              ],
+              "name": "monitor.id",
+              "readFromDocValues": true,
+              "searchable": true,
+              "type": "string",
+            },
+            Object {
+              "aggregatable": true,
+              "esTypes": Array [
+                "ip",
+              ],
+              "name": "monitor.ip",
+              "readFromDocValues": true,
+              "searchable": true,
+              "type": "ip",
+            },
+            Object {
+              "aggregatable": true,
+              "esTypes": Array [
+                "keyword",
+              ],
+              "name": "monitor.name",
+              "readFromDocValues": true,
+              "searchable": true,
+              "type": "string",
+            },
+            Object {
+              "aggregatable": true,
+              "esTypes": Array [
+                "keyword",
+              ],
+              "name": "monitor.status",
+              "readFromDocValues": true,
+              "searchable": true,
+              "type": "string",
+            },
+            Object {
+              "aggregatable": true,
+              "esTypes": Array [
+                "date_range",
+              ],
+              "name": "monitor.timespan",
+              "readFromDocValues": true,
+              "searchable": true,
+              "type": "unknown",
+            },
+            Object {
+              "aggregatable": true,
+              "esTypes": Array [
+                "keyword",
+              ],
+              "name": "monitor.type",
+              "readFromDocValues": true,
+              "searchable": true,
+              "type": "string",
+            },
+          ],
+          "title": "heartbeat-8*",
+        }
+      }
+      loading={false}
+      setEsKueryFilters={[MockFunction]}
+    />
+  </ContextProvider>
 </ContextProvider>
 `;
diff --git a/x-pack/plugins/uptime/public/state/selectors/index.ts b/x-pack/plugins/uptime/public/state/selectors/index.ts
index d08db2ccf5f2d2..4c2b671203f0ad 100644
--- a/x-pack/plugins/uptime/public/state/selectors/index.ts
+++ b/x-pack/plugins/uptime/public/state/selectors/index.ts
@@ -36,7 +36,7 @@ export const snapshotDataSelector = ({ snapshot }: AppState) => snapshot;
 
 const mlCapabilitiesSelector = (state: AppState) => state.ml.mlCapabilities.data;
 
-export const hasMLFeatureAvailable = createSelector(
+export const hasMLFeatureSelector = createSelector(
   mlCapabilitiesSelector,
   (mlCapabilities) =>
     mlCapabilities?.isPlatinumOrTrialLicense && mlCapabilities?.mlFeatureEnabledInSpace
diff --git a/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
index 8d26838811262e..2e732f59e4f307 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
@@ -7,7 +7,7 @@
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import {
   IRouter,
-  CallAPIOptions,
+  LegacyCallAPIOptions,
   SavedObjectsClientContract,
   ISavedObjectsRepository,
 } from 'src/core/server';
@@ -18,7 +18,7 @@ import { DynamicSettings } from '../../../../common/runtime_types';
 export type APICaller = (
   endpoint: string,
   clientParams: Record<string, any>,
-  options?: CallAPIOptions
+  options?: LegacyCallAPIOptions
 ) => Promise<any>;
 
 export type UMElasticsearchQueryFn<P, R = any> = (
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts b/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
index 5d93a4d7f356d8..44b95515039d88 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
@@ -7,7 +7,7 @@
 import moment from 'moment';
 import { ISavedObjectsRepository, SavedObjectsClientContract } from 'kibana/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { PageViewParams, UptimeTelemetry } from './types';
+import { PageViewParams, UptimeTelemetry, Usage } from './types';
 import { APICaller } from '../framework';
 import { savedObjectsAdapter } from '../../saved_objects';
 
@@ -39,8 +39,36 @@ export class KibanaTelemetryAdapter {
     usageCollector: UsageCollectionSetup,
     getSavedObjectsClient: () => ISavedObjectsRepository | undefined
   ) {
-    return usageCollector.makeUsageCollector({
+    return usageCollector.makeUsageCollector<Usage>({
       type: 'uptime',
+      schema: {
+        last_24_hours: {
+          hits: {
+            autoRefreshEnabled: {
+              type: 'boolean',
+            },
+            autorefreshInterval: { type: 'long' },
+            dateRangeEnd: { type: 'date' },
+            dateRangeStart: { type: 'date' },
+            monitor_frequency: { type: 'long' },
+            monitor_name_stats: {
+              avg_length: { type: 'float' },
+              max_length: { type: 'long' },
+              min_length: { type: 'long' },
+            },
+            monitor_page: { type: 'long' },
+            no_of_unique_monitors: { type: 'long' },
+            no_of_unique_observer_locations: { type: 'long' },
+            observer_location_name_stats: {
+              avg_length: { type: 'float' },
+              max_length: { type: 'long' },
+              min_length: { type: 'long' },
+            },
+            overview_page: { type: 'long' },
+            settings_page: { type: 'long' },
+          },
+        },
+      },
       fetch: async (callCluster: APICaller) => {
         const savedObjectsClient = getSavedObjectsClient()!;
         if (savedObjectsClient) {
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/types.ts b/x-pack/plugins/uptime/server/lib/adapters/telemetry/types.ts
index ee3360ecc41b18..f2afeb2b7e50e0 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/telemetry/types.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/telemetry/types.ts
@@ -19,6 +19,12 @@ export interface Stats {
   avg_length: number;
 }
 
+export interface Usage {
+  last_24_hours: {
+    hits: UptimeTelemetry;
+  };
+}
+
 export interface UptimeTelemetry {
   overview_page: number;
   monitor_page: number;
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts
index b1f27a5332657d..17bbb051b1ab11 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts
@@ -6,7 +6,7 @@
 
 import { elasticsearchServiceMock } from '../../../../../../../src/core/server/mocks';
 import { getMonitorStatus } from '../get_monitor_status';
-import { ScopedClusterClient } from 'src/core/server';
+import { LegacyScopedClusterClient } from 'src/core/server';
 import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
 
 interface BucketItemCriteria {
@@ -50,7 +50,7 @@ type MockCallES = (method: any, params: any) => Promise<any>;
 
 const setupMock = (
   criteria: MultiPageCriteria[]
-): [MockCallES, jest.Mocked<Pick<ScopedClusterClient, 'callAsCurrentUser'>>] => {
+): [MockCallES, jest.Mocked<Pick<LegacyScopedClusterClient, 'callAsCurrentUser'>>] => {
   const esMock = elasticsearchServiceMock.createScopedClusterClient();
 
   criteria.forEach(({ after_key, bucketCriteria }) => {
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_index_pattern.ts b/x-pack/plugins/uptime/server/lib/requests/get_index_pattern.ts
index 7b08752f122497..345d02b990eb78 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_index_pattern.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_index_pattern.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller, CallAPIOptions } from 'src/core/server';
+import { LegacyAPICaller, LegacyCallAPIOptions } from 'src/core/server';
 import { UMElasticsearchQueryFn } from '../adapters';
 import { IndexPatternsFetcher, IIndexPattern } from '../../../../../../src/plugins/data/server';
 
@@ -12,10 +12,10 @@ export const getUptimeIndexPattern: UMElasticsearchQueryFn<{}, IIndexPattern | u
   callES,
   dynamicSettings,
 }) => {
-  const callAsCurrentUser: APICaller = async (
+  const callAsCurrentUser: LegacyAPICaller = async (
     endpoint: string,
     clientParams: Record<string, any> = {},
-    options?: CallAPIOptions
+    options?: LegacyCallAPIOptions
   ) => callES(endpoint, clientParams, options);
   const indexPatternsFetcher = new IndexPatternsFetcher(callAsCurrentUser);
 
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts b/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
index 6d62ae7ba2b29f..b2fb9ce68c1326 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
@@ -5,12 +5,12 @@
  */
 
 import moment from 'moment';
-import { APICaller } from 'src/core/server';
+import { LegacyAPICaller } from 'src/core/server';
 import { CursorPagination } from './types';
 import { parseRelativeDate } from '../../helper';
 
 export class QueryContext {
-  callES: APICaller;
+  callES: LegacyAPICaller;
   heartbeatIndices: string;
   dateRangeStart: string;
   dateRangeEnd: string;
diff --git a/x-pack/plugins/uptime/server/rest_api/types.ts b/x-pack/plugins/uptime/server/rest_api/types.ts
index 8720b9dc60b12a..589cb82d550f67 100644
--- a/x-pack/plugins/uptime/server/rest_api/types.ts
+++ b/x-pack/plugins/uptime/server/rest_api/types.ts
@@ -9,7 +9,7 @@ import {
   RequestHandler,
   RouteConfig,
   RouteMethod,
-  CallAPIOptions,
+  LegacyCallAPIOptions,
   SavedObjectsClientContract,
   RequestHandlerContext,
   KibanaRequest,
@@ -66,7 +66,7 @@ export interface UMRouteParams {
   callES: (
     endpoint: string,
     clientParams?: Record<string, any>,
-    options?: CallAPIOptions | undefined
+    options?: LegacyCallAPIOptions | undefined
   ) => Promise<any>;
   dynamicSettings: DynamicSettings;
   savedObjectsClient: SavedObjectsClientContract;
diff --git a/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts b/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts
index 8e8ca369dd02b4..2ee8b04b82eb8e 100644
--- a/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts
+++ b/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
 import { ES_SCROLL_SETTINGS } from '../../../common/constants';
 
 export function fetchAllFromScroll(
   searchResuls: any,
-  dataClient: IScopedClusterClient,
+  dataClient: ILegacyScopedClusterClient,
   hits: any[] = []
 ): Promise<any> {
   const newHits = get(searchResuls, 'hits.hits', []);
diff --git a/x-pack/plugins/watcher/server/plugin.ts b/x-pack/plugins/watcher/server/plugin.ts
index 67bf9a92abde69..70c4f980580e8b 100644
--- a/x-pack/plugins/watcher/server/plugin.ts
+++ b/x-pack/plugins/watcher/server/plugin.ts
@@ -12,8 +12,8 @@ declare module 'kibana/server' {
 
 import {
   CoreSetup,
-  ICustomClusterClient,
-  IScopedClusterClient,
+  ILegacyCustomClusterClient,
+  ILegacyScopedClusterClient,
   Logger,
   Plugin,
   PluginInitializerContext,
@@ -31,7 +31,7 @@ import { registerLoadHistoryRoute } from './routes/api/register_load_history_rou
 import { elasticsearchJsPlugin } from './lib/elasticsearch_js_plugin';
 
 export interface WatcherContext {
-  client: IScopedClusterClient;
+  client: ILegacyScopedClusterClient;
 }
 
 async function getCustomEsClient(getStartServices: CoreSetup['getStartServices']) {
@@ -42,7 +42,7 @@ async function getCustomEsClient(getStartServices: CoreSetup['getStartServices']
 
 export class WatcherServerPlugin implements Plugin<void, void, any, any> {
   private readonly log: Logger;
-  private watcherESClient?: ICustomClusterClient;
+  private watcherESClient?: ILegacyCustomClusterClient;
 
   private licenseStatus: LicenseStatus = {
     hasRequired: false,
diff --git a/x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts b/x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts
index 6d5b359b53d396..97018a55234895 100644
--- a/x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { reduce, size } from 'lodash';
 import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
@@ -27,7 +27,7 @@ function getIndexNamesFromAliasesResponse(json: Record<string, any>) {
   );
 }
 
-function getIndices(dataClient: IScopedClusterClient, pattern: string, limit = 10) {
+function getIndices(dataClient: ILegacyScopedClusterClient, pattern: string, limit = 10) {
   return dataClient
     .callAsCurrentUser('indices.getAlias', {
       index: pattern,
diff --git a/x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts b/x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts
index e3c82ef3965f45..f4e8c8e33b04cc 100644
--- a/x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { isEsError } from '../../shared_imports';
 // @ts-ignore
 import { Fields } from '../../models/fields/index';
@@ -16,7 +16,7 @@ const bodySchema = schema.object({
   indexes: schema.arrayOf(schema.string()),
 });
 
-function fetchFields(dataClient: IScopedClusterClient, indexes: string[]) {
+function fetchFields(dataClient: ILegacyScopedClusterClient, indexes: string[]) {
   const params = {
     index: indexes,
     fields: ['*'],
diff --git a/x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts b/x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts
index c61953db555d3e..c44a574df6f6e0 100644
--- a/x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts
@@ -6,7 +6,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { isEsError } from '../../shared_imports';
 import { INDEX_NAMES } from '../../../common/constants';
 import { RouteDependencies } from '../../types';
@@ -18,7 +18,7 @@ const paramsSchema = schema.object({
   id: schema.string(),
 });
 
-function fetchHistoryItem(dataClient: IScopedClusterClient, watchHistoryItemId: string) {
+function fetchHistoryItem(dataClient: ILegacyScopedClusterClient, watchHistoryItemId: string) {
   return dataClient.callAsCurrentUser('search', {
     index: INDEX_NAMES.WATCHER_HISTORY,
     body: {
diff --git a/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts b/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts
index 9f501b56d47030..ca01ddf64dcc74 100644
--- a/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { isEsError } from '../../../shared_imports';
 // @ts-ignore
 import { Settings } from '../../../models/settings/index';
 import { RouteDependencies } from '../../../types';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 
-function fetchClusterSettings(client: IScopedClusterClient) {
+function fetchClusterSettings(client: ILegacyScopedClusterClient) {
   return client.callAsInternalUser('cluster.getSettings', {
     includeDefaults: true,
     filterPath: '**.xpack.notification',
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts
index 923714739065ee..74bf8e99b6b182 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts
@@ -6,7 +6,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { isEsError } from '../../../../shared_imports';
 // @ts-ignore
 import { WatchStatus } from '../../../../models/watch_status/index';
@@ -18,7 +18,11 @@ const paramsSchema = schema.object({
   actionId: schema.string(),
 });
 
-function acknowledgeAction(dataClient: IScopedClusterClient, watchId: string, actionId: string) {
+function acknowledgeAction(
+  dataClient: ILegacyScopedClusterClient,
+  watchId: string,
+  actionId: string
+) {
   return dataClient.callAsCurrentUser('watcher.ackWatch', {
     id: watchId,
     action: actionId,
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts
index e7e3f5e3d9ba3a..468db5aa13fac6 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
 import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
@@ -13,7 +13,7 @@ import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_facto
 // @ts-ignore
 import { WatchStatus } from '../../../models/watch_status/index';
 
-function activateWatch(dataClient: IScopedClusterClient, watchId: string) {
+function activateWatch(dataClient: ILegacyScopedClusterClient, watchId: string) {
   return dataClient.callAsCurrentUser('watcher.activateWatch', {
     id: watchId,
   });
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts
index de4b1dbb4b44db..3fda7e1a270343 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
 import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
@@ -17,7 +17,7 @@ const paramsSchema = schema.object({
   watchId: schema.string(),
 });
 
-function deactivateWatch(dataClient: IScopedClusterClient, watchId: string) {
+function deactivateWatch(dataClient: ILegacyScopedClusterClient, watchId: string) {
   return dataClient.callAsCurrentUser('watcher.deactivateWatch', {
     id: watchId,
   });
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts
index 9f43d311a182fc..f70c24f6e12653 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
@@ -14,7 +14,7 @@ const paramsSchema = schema.object({
   watchId: schema.string(),
 });
 
-function deleteWatch(dataClient: IScopedClusterClient, watchId: string) {
+function deleteWatch(dataClient: ILegacyScopedClusterClient, watchId: string) {
   return dataClient.callAsCurrentUser('watcher.deleteWatch', {
     id: watchId,
   });
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts
index 9f27f3ca35bf6d..75e42023660951 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
 import { isEsError } from '../../../shared_imports';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
@@ -23,7 +23,7 @@ const bodySchema = schema.object({
   watch: schema.object({}, { unknowns: 'allow' }),
 });
 
-function executeWatch(dataClient: IScopedClusterClient, executeDetails: any, watchJson: any) {
+function executeWatch(dataClient: ILegacyScopedClusterClient, executeDetails: any, watchJson: any) {
   const body = executeDetails;
   body.watch = watchJson;
 
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts
index faa860b3ce6dd9..b311e81ff5ec12 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
 import { fetchAllFromScroll } from '../../../lib/fetch_all_from_scroll';
 import { INDEX_NAMES, ES_SCROLL_SETTINGS } from '../../../../common/constants';
@@ -23,7 +23,7 @@ const querySchema = schema.object({
   startTime: schema.string(),
 });
 
-function fetchHistoryItems(dataClient: IScopedClusterClient, watchId: any, startTime: any) {
+function fetchHistoryItems(dataClient: ILegacyScopedClusterClient, watchId: any, startTime: any) {
   const params: any = {
     index: INDEX_NAMES.WATCHER_HISTORY,
     scroll: ES_SCROLL_SETTINGS.KEEPALIVE,
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts
index d8905bcebeef33..2ecb94d2fe0d49 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
 import { isEsError } from '../../../shared_imports';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
@@ -17,7 +17,7 @@ const paramsSchema = schema.object({
   id: schema.string(),
 });
 
-function fetchWatch(dataClient: IScopedClusterClient, watchId: string) {
+function fetchWatch(dataClient: ILegacyScopedClusterClient, watchId: string) {
   return dataClient.callAsCurrentUser('watcher.getWatch', {
     id: watchId,
   });
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts
index 2eb6d270e808a3..5f81a25074a199 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
@@ -20,7 +20,7 @@ const bodySchema = schema.object({
   options: schema.object({}, { unknowns: 'allow' }),
 });
 
-function fetchVisualizeData(dataClient: IScopedClusterClient, index: any, body: any) {
+function fetchVisualizeData(dataClient: ILegacyScopedClusterClient, index: any, body: any) {
   const params = {
     index,
     body,
diff --git a/x-pack/plugins/watcher/server/routes/api/watches/register_delete_route.ts b/x-pack/plugins/watcher/server/routes/api/watches/register_delete_route.ts
index 41bf363978ab8b..c0494360feb43d 100644
--- a/x-pack/plugins/watcher/server/routes/api/watches/register_delete_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watches/register_delete_route.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { RouteDependencies } from '../../../types';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 
@@ -13,7 +13,7 @@ const bodySchema = schema.object({
   watchIds: schema.arrayOf(schema.string()),
 });
 
-function deleteWatches(dataClient: IScopedClusterClient, watchIds: string[]) {
+function deleteWatches(dataClient: ILegacyScopedClusterClient, watchIds: string[]) {
   const deletePromises = watchIds.map((watchId) => {
     return dataClient
       .callAsCurrentUser('watcher.deleteWatch', {
diff --git a/x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts b/x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts
index ca93221bf1de77..47eb76de31e6b6 100644
--- a/x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { ILegacyScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
 import { fetchAllFromScroll } from '../../../lib/fetch_all_from_scroll';
 import { INDEX_NAMES, ES_SCROLL_SETTINGS } from '../../../../common/constants';
@@ -14,7 +14,7 @@ import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_facto
 // @ts-ignore
 import { Watch } from '../../../models/watch/index';
 
-function fetchWatches(dataClient: IScopedClusterClient) {
+function fetchWatches(dataClient: ILegacyScopedClusterClient) {
   const params = {
     index: INDEX_NAMES.WATCHES,
     scroll: ES_SCROLL_SETTINGS.KEEPALIVE,
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index 6cafa3eeef08e3..29be6d826c1bc4 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -52,6 +52,7 @@ const onlyNotInCoverageTests = [
   require.resolve('../test/endpoint_api_integration_no_ingest/config.ts'),
   require.resolve('../test/reporting_api_integration/config.js'),
   require.resolve('../test/functional_embedded/config.ts'),
+  require.resolve('../test/ingest_manager_api_integration/config.ts'),
 ];
 
 require('@kbn/plugin-helpers').babelRegister();
diff --git a/x-pack/test/api_integration/apis/lens/telemetry.ts b/x-pack/test/api_integration/apis/lens/telemetry.ts
index 685e3eb13b0414..bd6144a2690b02 100644
--- a/x-pack/test/api_integration/apis/lens/telemetry.ts
+++ b/x-pack/test/api_integration/apis/lens/telemetry.ts
@@ -7,7 +7,7 @@
 import moment from 'moment';
 import expect from '@kbn/expect';
 import { Client, SearchParams } from 'elasticsearch';
-import { APICaller } from 'kibana/server';
+import { LegacyAPICaller } from 'kibana/server';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
@@ -22,9 +22,9 @@ const COMMON_HEADERS = {
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
   const es: Client = getService('legacyEs');
-  const callCluster: APICaller = (((path: 'search', searchParams: SearchParams) => {
+  const callCluster: LegacyAPICaller = (((path: 'search', searchParams: SearchParams) => {
     return es[path].call(es, searchParams);
-  }) as unknown) as APICaller;
+  }) as unknown) as LegacyAPICaller;
 
   async function assertExpectedSavedObjects(num: number) {
     // Make sure that new/deleted docs are available to search
diff --git a/x-pack/test/apm_api_integration/basic/tests/agent_configuration.ts b/x-pack/test/apm_api_integration/basic/tests/agent_configuration.ts
index f6750a8eca24e7..9f39da2037f8ea 100644
--- a/x-pack/test/apm_api_integration/basic/tests/agent_configuration.ts
+++ b/x-pack/test/apm_api_integration/basic/tests/agent_configuration.ts
@@ -10,11 +10,12 @@ import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function agentConfigurationTests({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
+  const supertestRead = getService('supertestAsApmReadUser');
+  const supertestWrite = getService('supertestAsApmWriteUser');
   const log = getService('log');
 
   function searchConfigurations(configuration: any) {
-    return supertest
+    return supertestRead
       .post(`/api/apm/settings/agent-configuration/search`)
       .send(configuration)
       .set('kbn-xsrf', 'foo');
@@ -22,7 +23,7 @@ export default function agentConfigurationTests({ getService }: FtrProviderConte
 
   async function createConfiguration(config: AgentConfigurationIntake) {
     log.debug('creating configuration', config.service);
-    const res = await supertest
+    const res = await supertestWrite
       .put(`/api/apm/settings/agent-configuration`)
       .send(config)
       .set('kbn-xsrf', 'foo');
@@ -34,7 +35,7 @@ export default function agentConfigurationTests({ getService }: FtrProviderConte
 
   async function updateConfiguration(config: AgentConfigurationIntake) {
     log.debug('updating configuration', config.service);
-    const res = await supertest
+    const res = await supertestWrite
       .put(`/api/apm/settings/agent-configuration?overwrite=true`)
       .send(config)
       .set('kbn-xsrf', 'foo');
@@ -46,7 +47,7 @@ export default function agentConfigurationTests({ getService }: FtrProviderConte
 
   async function deleteConfiguration({ service }: AgentConfigurationIntake) {
     log.debug('deleting configuration', service);
-    const res = await supertest
+    const res = await supertestWrite
       .delete(`/api/apm/settings/agent-configuration`)
       .send({ service })
       .set('kbn-xsrf', 'foo');
diff --git a/x-pack/test/apm_api_integration/basic/tests/annotations.ts b/x-pack/test/apm_api_integration/basic/tests/annotations.ts
index d4b4892eaf91cd..c522ebcfb5c65e 100644
--- a/x-pack/test/apm_api_integration/basic/tests/annotations.ts
+++ b/x-pack/test/apm_api_integration/basic/tests/annotations.ts
@@ -10,15 +10,15 @@ import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function annotationApiTests({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
+  const supertestWrite = getService('supertestAsApmAnnotationsWriteUser');
 
   function request({ method, url, data }: { method: string; url: string; data?: JsonObject }) {
     switch (method.toLowerCase()) {
       case 'post':
-        return supertest.post(url).send(data).set('kbn-xsrf', 'foo');
+        return supertestWrite.post(url).send(data).set('kbn-xsrf', 'foo');
 
       default:
-        throw new Error(`Unsupported methoed ${method}`);
+        throw new Error(`Unsupported method ${method}`);
     }
   }
 
diff --git a/x-pack/test/apm_api_integration/basic/tests/custom_link.ts b/x-pack/test/apm_api_integration/basic/tests/custom_link.ts
index 910c4797f39b76..77fdc83523ca64 100644
--- a/x-pack/test/apm_api_integration/basic/tests/custom_link.ts
+++ b/x-pack/test/apm_api_integration/basic/tests/custom_link.ts
@@ -10,7 +10,8 @@ import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function customLinksTests({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
+  const supertestRead = getService('supertestAsApmReadUser');
+  const supertestWrite = getService('supertestAsApmWriteUser');
   const log = getService('log');
 
   function searchCustomLinks(filters?: any) {
@@ -18,12 +19,12 @@ export default function customLinksTests({ getService }: FtrProviderContext) {
       pathname: `/api/apm/settings/custom_links`,
       query: filters,
     });
-    return supertest.get(path).set('kbn-xsrf', 'foo');
+    return supertestRead.get(path).set('kbn-xsrf', 'foo');
   }
 
   async function createCustomLink(customLink: CustomLink) {
     log.debug('creating configuration', customLink);
-    const res = await supertest
+    const res = await supertestWrite
       .post(`/api/apm/settings/custom_links`)
       .send(customLink)
       .set('kbn-xsrf', 'foo');
@@ -35,7 +36,7 @@ export default function customLinksTests({ getService }: FtrProviderContext) {
 
   async function updateCustomLink(id: string, customLink: CustomLink) {
     log.debug('updating configuration', id, customLink);
-    const res = await supertest
+    const res = await supertestWrite
       .put(`/api/apm/settings/custom_links/${id}`)
       .send(customLink)
       .set('kbn-xsrf', 'foo');
@@ -47,7 +48,7 @@ export default function customLinksTests({ getService }: FtrProviderContext) {
 
   async function deleteCustomLink(id: string) {
     log.debug('deleting configuration', id);
-    const res = await supertest
+    const res = await supertestWrite
       .delete(`/api/apm/settings/custom_links/${id}`)
       .set('kbn-xsrf', 'foo');
 
diff --git a/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts b/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts
index f3647c65106c92..42cbef69abbec9 100644
--- a/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts
+++ b/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function featureControlsTests({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
+  const supertest = getService('supertestAsApmWriteUser');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const security = getService('security');
   const spaces = getService('spaces');
diff --git a/x-pack/test/apm_api_integration/common/authentication.ts b/x-pack/test/apm_api_integration/common/authentication.ts
new file mode 100644
index 00000000000000..9c34b4791114a4
--- /dev/null
+++ b/x-pack/test/apm_api_integration/common/authentication.ts
@@ -0,0 +1,102 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PromiseReturnType } from '../../../plugins/apm/typings/common';
+import { SecurityServiceProvider } from '../../../../test/common/services/security';
+
+type SecurityService = PromiseReturnType<typeof SecurityServiceProvider>;
+
+export enum ApmUser {
+  apmReadUser = 'apm_read_user',
+  apmWriteUser = 'apm_write_user',
+  apmAnnotationsWriteUser = 'apm_annotations_write_user',
+}
+
+const roles = {
+  [ApmUser.apmReadUser]: {
+    elasticsearch: {
+      cluster: [],
+      indices: [
+        { names: ['observability-annotations'], privileges: ['read', 'view_index_metadata'] },
+      ],
+    },
+    kibana: [
+      {
+        base: [],
+        feature: {
+          apm: ['read'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+  [ApmUser.apmWriteUser]: {
+    elasticsearch: {
+      cluster: [],
+      indices: [
+        { names: ['observability-annotations'], privileges: ['read', 'view_index_metadata'] },
+      ],
+    },
+    kibana: [
+      {
+        base: [],
+        feature: {
+          apm: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+  [ApmUser.apmAnnotationsWriteUser]: {
+    elasticsearch: {
+      cluster: [],
+      indices: [
+        {
+          names: ['observability-annotations'],
+          privileges: [
+            'read',
+            'view_index_metadata',
+            'index',
+            'manage',
+            'create_index',
+            'create_doc',
+          ],
+        },
+      ],
+    },
+  },
+};
+
+const users = {
+  [ApmUser.apmReadUser]: {
+    roles: ['apm_user', ApmUser.apmReadUser],
+  },
+  [ApmUser.apmWriteUser]: {
+    roles: ['apm_user', ApmUser.apmWriteUser],
+  },
+  [ApmUser.apmAnnotationsWriteUser]: {
+    roles: ['apm_user', ApmUser.apmWriteUser, ApmUser.apmAnnotationsWriteUser],
+  },
+};
+
+export async function createApmUser(security: SecurityService, apmUser: ApmUser) {
+  const role = roles[apmUser];
+  const user = users[apmUser];
+
+  if (!role || !user) {
+    throw new Error(`No configuration found for ${apmUser}`);
+  }
+
+  await security.role.create(apmUser, role);
+
+  await security.user.create(apmUser, {
+    full_name: apmUser,
+    password: APM_TEST_PASSWORD,
+    roles: user.roles,
+  });
+}
+
+export const APM_TEST_PASSWORD = 'changeme';
diff --git a/x-pack/test/apm_api_integration/common/config.ts b/x-pack/test/apm_api_integration/common/config.ts
index 83dc597829a3cd..e4dc2a78ae0189 100644
--- a/x-pack/test/apm_api_integration/common/config.ts
+++ b/x-pack/test/apm_api_integration/common/config.ts
@@ -5,6 +5,11 @@
  */
 
 import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import supertestAsPromised from 'supertest-as-promised';
+import { format, UrlObject } from 'url';
+import { InheritedFtrProviderContext, InheritedServices } from './ftr_provider_context';
+import { PromiseReturnType } from '../../../plugins/apm/typings/common';
+import { createApmUser, APM_TEST_PASSWORD, ApmUser } from './authentication';
 
 interface Settings {
   license: 'basic' | 'trial';
@@ -12,6 +17,22 @@ interface Settings {
   name: string;
 }
 
+const supertestAsApmUser = (kibanaServer: UrlObject, apmUser: ApmUser) => async (
+  context: InheritedFtrProviderContext
+) => {
+  const security = context.getService('security');
+  await security.init();
+
+  await createApmUser(security, apmUser);
+
+  const url = format({
+    ...kibanaServer,
+    auth: `${apmUser}:${APM_TEST_PASSWORD}`,
+  });
+
+  return supertestAsPromised(url);
+};
+
 export function createTestConfig(settings: Settings) {
   const { testFiles, license, name } = settings;
 
@@ -20,14 +41,27 @@ export function createTestConfig(settings: Settings) {
       require.resolve('../../api_integration/config.ts')
     );
 
+    const services = xPackAPITestsConfig.get('services') as InheritedServices;
+    const servers = xPackAPITestsConfig.get('servers');
+
+    const supertestAsApmReadUser = supertestAsApmUser(servers.kibana, ApmUser.apmReadUser);
+
     return {
       testFiles,
-      servers: xPackAPITestsConfig.get('servers'),
-      services: xPackAPITestsConfig.get('services'),
+      servers,
+      services: {
+        ...services,
+        supertest: supertestAsApmReadUser,
+        supertestAsApmReadUser,
+        supertestAsApmWriteUser: supertestAsApmUser(servers.kibana, ApmUser.apmWriteUser),
+        supertestAsApmAnnotationsWriteUser: supertestAsApmUser(
+          servers.kibana,
+          ApmUser.apmAnnotationsWriteUser
+        ),
+      },
       junit: {
         reportName: name,
       },
-
       esTestCluster: {
         ...xPackAPITestsConfig.get('esTestCluster'),
         license,
@@ -36,3 +70,5 @@ export function createTestConfig(settings: Settings) {
     };
   };
 }
+
+export type ApmServices = PromiseReturnType<ReturnType<typeof createTestConfig>>['services'];
diff --git a/x-pack/test/apm_api_integration/common/ftr_provider_context.ts b/x-pack/test/apm_api_integration/common/ftr_provider_context.ts
index 90600816d17114..aee3d556605aa6 100644
--- a/x-pack/test/apm_api_integration/common/ftr_provider_context.ts
+++ b/x-pack/test/apm_api_integration/common/ftr_provider_context.ts
@@ -4,4 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { FtrProviderContext } from '../../api_integration/ftr_provider_context';
+import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { FtrProviderContext as InheritedFtrProviderContext } from '../../api_integration/ftr_provider_context';
+import { ApmServices } from './config';
+
+export type InheritedServices = InheritedFtrProviderContext extends GenericFtrProviderContext<
+  infer TServices,
+  {}
+>
+  ? TServices
+  : {};
+
+export { InheritedFtrProviderContext };
+export type FtrProviderContext = GenericFtrProviderContext<ApmServices, {}>;
diff --git a/x-pack/test/apm_api_integration/trial/tests/annotations.ts b/x-pack/test/apm_api_integration/trial/tests/annotations.ts
index 0913d0c4b90bb6..d5b6b8342e5ab2 100644
--- a/x-pack/test/apm_api_integration/trial/tests/annotations.ts
+++ b/x-pack/test/apm_api_integration/trial/tests/annotations.ts
@@ -13,7 +13,8 @@ const DEFAULT_INDEX_NAME = 'observability-annotations';
 
 // eslint-disable-next-line import/no-default-export
 export default function annotationApiTests({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
+  const supertestRead = getService('supertestAsApmReadUser');
+  const supertestWrite = getService('supertestAsApmAnnotationsWriteUser');
   const es = getService('es');
 
   function expectContainsObj(source: JsonObject, expected: JsonObject) {
@@ -30,13 +31,13 @@ export default function annotationApiTests({ getService }: FtrProviderContext) {
   function request({ method, url, data }: { method: string; url: string; data?: JsonObject }) {
     switch (method.toLowerCase()) {
       case 'get':
-        return supertest.get(url).set('kbn-xsrf', 'foo');
+        return supertestRead.get(url).set('kbn-xsrf', 'foo');
 
       case 'post':
-        return supertest.post(url).send(data).set('kbn-xsrf', 'foo');
+        return supertestWrite.post(url).send(data).set('kbn-xsrf', 'foo');
 
       default:
-        throw new Error(`Unsupported methoed ${method}`);
+        throw new Error(`Unsupported method ${method}`);
     }
   }
 
diff --git a/x-pack/test/epm_api_integration/apis/file.ts b/x-pack/test/epm_api_integration/apis/file.ts
deleted file mode 100644
index 7cf07e2cd99ae4..00000000000000
--- a/x-pack/test/epm_api_integration/apis/file.ts
+++ /dev/null
@@ -1,151 +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 ServerMock from 'mock-http-server';
-import { FtrProviderContext } from '../../api_integration/ftr_provider_context';
-
-export default function ({ getService }: FtrProviderContext) {
-  describe('package file', () => {
-    const server = new ServerMock({ host: 'localhost', port: 6666 });
-    beforeEach(() => {
-      server.start(() => {});
-    });
-    afterEach(() => {
-      server.stop(() => {});
-    });
-    it('fetches a .png screenshot image', async () => {
-      server.on({
-        method: 'GET',
-        path: '/package/auditd/2.0.4/img/screenshots/auditbeat-file-integrity-dashboard.png',
-        reply: {
-          headers: { 'content-type': 'image/png' },
-        },
-      });
-
-      const supertest = getService('supertest');
-      await supertest
-        .get(
-          '/api/ingest_manager/epm/packages/auditd/2.0.4/img/screenshots/auditbeat-file-integrity-dashboard.png'
-        )
-        .set('kbn-xsrf', 'xxx')
-        .expect('Content-Type', 'image/png')
-        .expect(200);
-    });
-
-    it('fetches an .svg icon image', async () => {
-      server.on({
-        method: 'GET',
-        path: '/package/auditd/2.0.4/img/icon.svg',
-        reply: {
-          headers: { 'content-type': 'image/svg' },
-        },
-      });
-
-      const supertest = getService('supertest');
-      await supertest
-        .get('/api/ingest_manager/epm/packages/auditd/2.0.4/img/icon.svg')
-        .set('kbn-xsrf', 'xxx')
-        .expect('Content-Type', 'image/svg');
-    });
-
-    it('fetches an auditbeat .conf rule file', async () => {
-      server.on({
-        method: 'GET',
-        path: '/package/auditd/2.0.4/auditbeat/rules/sample-rules-linux-32bit.conf',
-      });
-
-      const supertest = getService('supertest');
-      await supertest
-        .get(
-          '/api/ingest_manager/epm/packages/auditd/2.0.4/auditbeat/rules/sample-rules-linux-32bit.conf'
-        )
-        .set('kbn-xsrf', 'xxx')
-        .expect('Content-Type', 'application/json; charset=utf-8')
-        .expect(200);
-    });
-
-    it('fetches an auditbeat .yml config file', async () => {
-      server.on({
-        method: 'GET',
-        path: '/package/auditd/2.0.4/auditbeat/config/config.yml',
-        reply: {
-          headers: { 'content-type': 'text/yaml; charset=UTF-8' },
-        },
-      });
-
-      const supertest = getService('supertest');
-      await supertest
-        .get('/api/ingest_manager/epm/packages/auditd/2.0.4/auditbeat/config/config.yml')
-        .set('kbn-xsrf', 'xxx')
-        .expect('Content-Type', 'text/yaml; charset=UTF-8')
-        .expect(200);
-    });
-
-    it('fetches a .json kibana visualization file', async () => {
-      server.on({
-        method: 'GET',
-        path:
-          '/package/auditd/2.0.4/kibana/visualization/b21e0c70-c252-11e7-8692-232bd1143e8a-ecs.json',
-      });
-
-      const supertest = getService('supertest');
-      await supertest
-        .get(
-          '/api/ingest_manager/epm/packages/auditd/2.0.4/kibana/visualization/b21e0c70-c252-11e7-8692-232bd1143e8a-ecs.json'
-        )
-        .set('kbn-xsrf', 'xxx')
-        .expect('Content-Type', 'application/json; charset=utf-8')
-        .expect(200);
-    });
-
-    it('fetches a .json kibana dashboard file', async () => {
-      server.on({
-        method: 'GET',
-        path:
-          '/package/auditd/2.0.4/kibana/dashboard/7de391b0-c1ca-11e7-8995-936807a28b16-ecs.json',
-      });
-
-      const supertest = getService('supertest');
-      await supertest
-        .get(
-          '/api/ingest_manager/epm/packages/auditd/2.0.4/kibana/dashboard/7de391b0-c1ca-11e7-8995-936807a28b16-ecs.json'
-        )
-        .set('kbn-xsrf', 'xxx')
-        .expect('Content-Type', 'application/json; charset=utf-8')
-        .expect(200);
-    });
-
-    it('fetches an .json index pattern file', async () => {
-      server.on({
-        method: 'GET',
-        path: '/package/auditd/2.0.4/kibana/index-pattern/auditbeat-*.json',
-      });
-
-      const supertest = getService('supertest');
-      await supertest
-        .get('/api/ingest_manager/epm/packages/auditd/2.0.4/kibana/index-pattern/auditbeat-*.json')
-        .set('kbn-xsrf', 'xxx')
-        .expect('Content-Type', 'application/json; charset=utf-8')
-        .expect(200);
-    });
-
-    it('fetches a .json search file', async () => {
-      server.on({
-        method: 'GET',
-        path: '/package/auditd/2.0.4/kibana/search/0f10c430-c1c3-11e7-8995-936807a28b16-ecs.json',
-      });
-
-      const supertest = getService('supertest');
-      await supertest
-        .get(
-          '/api/ingest_manager/epm/packages/auditd/2.0.4/kibana/search/0f10c430-c1c3-11e7-8995-936807a28b16-ecs.json'
-        )
-        .set('kbn-xsrf', 'xxx')
-        .expect('Content-Type', 'application/json; charset=utf-8')
-        .expect(200);
-    });
-  });
-}
diff --git a/x-pack/test/epm_api_integration/apis/fixtures/packages/epr/yamlpipeline_1.0.0.tar.gz b/x-pack/test/epm_api_integration/apis/fixtures/packages/epr/yamlpipeline_1.0.0.tar.gz
deleted file mode 100644
index ca8695f111d023..00000000000000
Binary files a/x-pack/test/epm_api_integration/apis/fixtures/packages/epr/yamlpipeline_1.0.0.tar.gz and /dev/null differ
diff --git a/x-pack/test/epm_api_integration/apis/fixtures/packages/package/yamlpipeline_1.0.0 b/x-pack/test/epm_api_integration/apis/fixtures/packages/package/yamlpipeline_1.0.0
deleted file mode 100644
index bf167c583aab3c..00000000000000
--- a/x-pack/test/epm_api_integration/apis/fixtures/packages/package/yamlpipeline_1.0.0
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "name": "yamlpipeline",
-  "title": "Yaml Pipeline package",
-  "version": "1.0.0",
-  "description": "This package contains a yaml pipeline.\n",
-  "type": "integration",
-  "categories": [
-    "logs"
-  ],
-  "requirement": {
-    "kibana": {}
-  },
-  "assets": [
-    "/package/yamlpipeline-1.0.0/manifest.yml",
-    "/package/yamlpipeline-1.0.0/dataset/log/manifest.yml",
-    "/package/yamlpipeline-1.0.0/dataset/log/elasticsearch/ingest-pipeline/pipeline-entry.yml",
-    "/package/yamlpipeline-1.0.0/dataset/log/elasticsearch/ingest-pipeline/pipeline-json.yml",
-    "/package/yamlpipeline-1.0.0/dataset/log/elasticsearch/ingest-pipeline/pipeline-plaintext.yml"
-  ],
-  "format_version": "1.0.0",
-  "datasets": [
-    {
-      "title": "Log Yaml pipeline",
-      "name": "log",
-      "release": "",
-      "type": "logs",
-      "ingest_pipeline": ""
-    }
-  ],
-  "download": "/epr/yamlpipeline/yamlpipeline-1.0.0.tar.gz",
-  "path": "/package/yamlpipeline-1.0.0"
-}
\ No newline at end of file
diff --git a/x-pack/test/epm_api_integration/apis/list.ts b/x-pack/test/epm_api_integration/apis/list.ts
deleted file mode 100644
index cc486fe1c5a459..00000000000000
--- a/x-pack/test/epm_api_integration/apis/list.ts
+++ /dev/null
@@ -1,124 +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 expect from '@kbn/expect';
-import ServerMock from 'mock-http-server';
-import { FtrProviderContext } from '../../api_integration/ftr_provider_context';
-
-export default function ({ getService }: FtrProviderContext) {
-  describe('list', () => {
-    const server = new ServerMock({ host: 'localhost', port: 6666 });
-    beforeEach(() => {
-      server.start(() => {});
-    });
-    afterEach(() => {
-      server.stop(() => {});
-    });
-    it('lists all packages from the registry', async () => {
-      const searchResponse = [
-        {
-          description: 'First integration package',
-          download: '/package/first-1.0.1.tar.gz',
-          name: 'first',
-          title: 'First',
-          type: 'integration',
-          version: '1.0.1',
-        },
-        {
-          description: 'Second integration package',
-          download: '/package/second-2.0.4.tar.gz',
-          icons: [
-            {
-              src: '/package/second-2.0.4/img/icon.svg',
-              type: 'image/svg+xml',
-            },
-          ],
-          name: 'second',
-          title: 'Second',
-          type: 'integration',
-          version: '2.0.4',
-        },
-      ];
-      server.on({
-        method: 'GET',
-        path: '/search',
-        reply: {
-          status: 200,
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify(searchResponse),
-        },
-      });
-
-      const supertest = getService('supertest');
-      const fetchPackageList = async () => {
-        const response = await supertest
-          .get('/api/ingest_manager/epm/packages')
-          .set('kbn-xsrf', 'xxx')
-          .expect(200);
-        return response.body;
-      };
-
-      const listResponse = await fetchPackageList();
-      expect(listResponse.response.length).to.be(2);
-      expect(listResponse.response[0]).to.eql({ ...searchResponse[0], status: 'not_installed' });
-      expect(listResponse.response[1]).to.eql({ ...searchResponse[1], status: 'not_installed' });
-    });
-
-    it('sorts the packages even if the registry sends them unsorted', async () => {
-      const searchResponse = [
-        {
-          description: 'BBB integration package',
-          download: '/package/bbb-1.0.1.tar.gz',
-          name: 'bbb',
-          title: 'BBB',
-          type: 'integration',
-          version: '1.0.1',
-        },
-        {
-          description: 'CCC integration package',
-          download: '/package/ccc-2.0.4.tar.gz',
-          name: 'ccc',
-          title: 'CCC',
-          type: 'integration',
-          version: '2.0.4',
-        },
-        {
-          description: 'AAA integration package',
-          download: '/package/aaa-0.0.1.tar.gz',
-          name: 'aaa',
-          title: 'AAA',
-          type: 'integration',
-          version: '0.0.1',
-        },
-      ];
-      server.on({
-        method: 'GET',
-        path: '/search',
-        reply: {
-          status: 200,
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify(searchResponse),
-        },
-      });
-
-      const supertest = getService('supertest');
-      const fetchPackageList = async () => {
-        const response = await supertest
-          .get('/api/ingest_manager/epm/packages')
-          .set('kbn-xsrf', 'xxx')
-          .expect(200);
-        return response.body;
-      };
-
-      const listResponse = await fetchPackageList();
-
-      expect(listResponse.response.length).to.be(3);
-      expect(listResponse.response[0].name).to.eql('aaa');
-      expect(listResponse.response[1].name).to.eql('bbb');
-      expect(listResponse.response[2].name).to.eql('ccc');
-    });
-  });
-}
diff --git a/x-pack/test/epm_api_integration/config.ts b/x-pack/test/epm_api_integration/config.ts
deleted file mode 100644
index 6b08c7ec579559..00000000000000
--- a/x-pack/test/epm_api_integration/config.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
-
-export default async function ({ readConfigFile }: FtrConfigProviderContext) {
-  const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));
-
-  return {
-    testFiles: [require.resolve('./apis')],
-    servers: xPackAPITestsConfig.get('servers'),
-    services: {
-      supertest: xPackAPITestsConfig.get('services.supertest'),
-      es: xPackAPITestsConfig.get('services.es'),
-    },
-    junit: {
-      reportName: 'X-Pack EPM API Integration Tests',
-    },
-
-    esTestCluster: {
-      ...xPackAPITestsConfig.get('esTestCluster'),
-    },
-
-    kbnTestServer: {
-      ...xPackAPITestsConfig.get('kbnTestServer'),
-      serverArgs: [
-        ...xPackAPITestsConfig.get('kbnTestServer.serverArgs'),
-        '--xpack.ingestManager.epm.registryUrl=http://localhost:6666',
-      ],
-    },
-  };
-}
diff --git a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts
index d1acbf436bbe7f..b7890ccf3db16e 100644
--- a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts
+++ b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts
@@ -138,8 +138,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/57377
-    describe.skip('no advanced_settings privileges', function () {
+    describe('no advanced_settings privileges', function () {
       before(async () => {
         await security.role.create('no_advanced_settings_privileges_role', {
           elasticsearch: {
diff --git a/x-pack/test/functional/apps/cross_cluster_replication/home_page.ts b/x-pack/test/functional/apps/cross_cluster_replication/home_page.ts
index 883d3ed3388399..24ddac8ba22e7b 100644
--- a/x-pack/test/functional/apps/cross_cluster_replication/home_page.ts
+++ b/x-pack/test/functional/apps/cross_cluster_replication/home_page.ts
@@ -10,14 +10,20 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'crossClusterReplication']);
   const log = getService('log');
+  const security = getService('security');
 
   describe('Home page', function () {
     before(async () => {
+      await security.testUser.setRoles(['global_ccr_role']);
       await pageObjects.common.navigateToApp('crossClusterReplication');
     });
 
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
+
     it('Loads the app', async () => {
-      await log.debug(`Checking for app title to be Cross-Cluster Replication`);
+      log.debug(`Checking for app title to be Cross-Cluster Replication`);
       const appTitleText = await pageObjects.crossClusterReplication.appTitleText();
       expect(appTitleText).to.be('Cross-Cluster Replication');
 
diff --git a/x-pack/test/functional/apps/discover/async_scripted_fields.js b/x-pack/test/functional/apps/discover/async_scripted_fields.js
new file mode 100644
index 00000000000000..46848b1db0ef46
--- /dev/null
+++ b/x-pack/test/functional/apps/discover/async_scripted_fields.js
@@ -0,0 +1,124 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// Tests for scripted field in default distribution where async search is used
+import expect from '@kbn/expect';
+
+export default function ({ getService, getPageObjects }) {
+  const kibanaServer = getService('kibanaServer');
+  // const log = getService('log');
+  const retry = getService('retry');
+  const esArchiver = getService('esArchiver');
+  const log = getService('log');
+  const testSubjects = getService('testSubjects');
+
+  const PageObjects = getPageObjects(['common', 'settings', 'discover', 'timePicker']);
+  const queryBar = getService('queryBar');
+
+  describe('async search with scripted fields', function () {
+    this.tags(['skipFirefox']);
+
+    before(async function () {
+      await esArchiver.load('kibana_scripted_fields_on_logstash');
+      await esArchiver.loadIfNeeded('logstash_functional');
+      // changing the timepicker default here saves us from having to set it in Discover (~8s)
+      await kibanaServer.uiSettings.update({
+        'timepicker:timeDefaults':
+          '{  "from": "Sep 18, 2015 @ 19:37:13.000",  "to": "Sep 23, 2015 @ 02:30:09.000"}',
+      });
+    });
+
+    after(async function afterAll() {
+      await kibanaServer.uiSettings.replace({});
+      await kibanaServer.uiSettings.update({});
+      await esArchiver.unload('logstash_functional');
+      await esArchiver.load('empty_kibana');
+    });
+
+    it('query should show failed shards pop up', async function () {
+      if (false) {
+        /* If you had to modify the scripted fields, you could un-comment all this, run it, use es_archiver to update 'kibana_scripted_fields_on_logstash'
+         */
+        await PageObjects.settings.navigateTo();
+        await PageObjects.settings.clickKibanaIndexPatterns();
+        await PageObjects.settings.createIndexPattern('logsta');
+        await PageObjects.settings.clickScriptedFieldsTab();
+        await log.debug('add scripted field');
+        await PageObjects.settings.addScriptedField(
+          'sharedFail',
+          'painless',
+          'string',
+          null,
+          '1',
+          // Scripted field below with multiple string checking actually should cause share failure message
+          // bcause it's not checking if all the fields it uses exist in each doc (and they don't)
+          "if (doc['response.raw'].value == '200') { return 'good ' + doc['url.raw'].value } else { return 'bad ' + doc['machine.os.raw'].value } "
+        );
+      }
+
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.discover.selectIndexPattern('logsta*');
+
+      await retry.tryForTime(20000, async function () {
+        // wait for shards failed message
+        const shardMessage = await testSubjects.getVisibleText('euiToastHeader');
+        log.debug(shardMessage);
+        expect(shardMessage).to.be('1 of 3 shards failed');
+      });
+    });
+
+    it('query return results with valid scripted field', async function () {
+      if (false) {
+        /* the commented-out steps below were used to create the scripted fields in the logstash-* index pattern
+        which are now saved in the esArchive.
+         */
+
+        await PageObjects.settings.navigateTo();
+        await PageObjects.settings.clickKibanaIndexPatterns();
+        await PageObjects.settings.clickIndexPatternLogstash();
+        const startingCount = parseInt(await PageObjects.settings.getScriptedFieldsTabCount());
+        await PageObjects.settings.clickScriptedFieldsTab();
+        await log.debug('add scripted field');
+        await PageObjects.settings.addScriptedField(
+          'goodScript',
+          'painless',
+          'string',
+          null,
+          '1',
+          // Scripted field below with should work
+          "if (doc['response.raw'].value == '200') { if (doc['url.raw'].size() > 0) { return 'good ' + doc['url.raw'].value } else { return 'good' } } else { if (doc['machine.os.raw'].size() > 0) { return 'bad ' + doc['machine.os.raw'].value } else { return 'bad' } }"
+        );
+        await retry.try(async function () {
+          expect(parseInt(await PageObjects.settings.getScriptedFieldsTabCount())).to.be(
+            startingCount + 1
+          );
+        });
+
+        await PageObjects.settings.addScriptedField(
+          'goodScript2',
+          'painless',
+          'string',
+          null,
+          '1',
+          // Scripted field below which should work
+          "if (doc['url.raw'].size() > 0) { String tempString = \"\"; for ( int i = (doc['url.raw'].value.length() - 1); i >= 0 ; i--) { tempString = tempString + (doc['url.raw'].value).charAt(i); } return tempString; } else { return \"emptyUrl\"; }"
+        );
+        await retry.try(async function () {
+          expect(parseInt(await PageObjects.settings.getScriptedFieldsTabCount())).to.be(
+            startingCount + 2
+          );
+        });
+      }
+
+      await PageObjects.discover.selectIndexPattern('logstash-*');
+      await queryBar.setQuery('php* OR *jpg OR *css*');
+      await testSubjects.click('querySubmitButton');
+      await retry.tryForTime(30000, async function () {
+        expect(await PageObjects.discover.getHitCount()).to.be('13,301');
+      });
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/discover/index.ts b/x-pack/test/functional/apps/discover/index.ts
index b7937928a86320..323b728e164544 100644
--- a/x-pack/test/functional/apps/discover/index.ts
+++ b/x-pack/test/functional/apps/discover/index.ts
@@ -11,6 +11,7 @@ export default function ({ loadTestFile }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./feature_controls'));
     loadTestFile(require.resolve('./preserve_url'));
+    loadTestFile(require.resolve('./async_scripted_fields'));
     loadTestFile(require.resolve('./reporting'));
   });
 }
diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts
index a6d2c13cd2b314..fd8a46d2996898 100644
--- a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts
+++ b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts
@@ -182,8 +182,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it(`doesn't show Index Patterns in management side-nav`, async () => {
         await PageObjects.settings.navigateTo();
-        await testSubjects.existOrFail('kibana');
-        await testSubjects.missingOrFail('index_patterns');
+        await testSubjects.existOrFail('managementHome', {
+          timeout: config.get('timeouts.waitFor'),
+        });
+        await testSubjects.missingOrFail('indexPatterns');
       });
 
       it(`does not allow navigation to Index Patterns; redirects to management home`, async () => {
diff --git a/x-pack/test/functional/apps/maps/layer_errors.js b/x-pack/test/functional/apps/maps/layer_errors.js
index dee5c5b403e492..83b533a5599438 100644
--- a/x-pack/test/functional/apps/maps/layer_errors.js
+++ b/x-pack/test/functional/apps/maps/layer_errors.js
@@ -9,7 +9,8 @@ import expect from '@kbn/expect';
 export default function ({ getPageObjects }) {
   const PageObjects = getPageObjects(['maps', 'header']);
 
-  describe('layer errors', () => {
+  // Failing: See https://github.com/elastic/kibana/issues/69617
+  describe.skip('layer errors', () => {
     before(async () => {
       await PageObjects.maps.loadSavedMap('layer with errors');
     });
diff --git a/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts b/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts
index 819d03d8119468..28b8153ea4c2b2 100644
--- a/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts
+++ b/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts
@@ -310,19 +310,25 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
 
       describe('listing', () => {
-        it('redirects to Kibana home', async () => {
+        it(`doesn't display  management section`, async () => {
+          await PageObjects.settings.navigateTo();
+          await testSubjects.existOrFail('managementHome'); // this ensures we've gotten to the management page
+          await testSubjects.missingOrFail('objects');
+        });
+
+        it(`can't navigate to listing page`, async () => {
           await PageObjects.common.navigateToUrl('management', 'kibana/objects', {
             ensureCurrentUrl: false,
             shouldLoginIfPrompted: false,
             shouldUseHashForSubUrl: false,
           });
-          await PageObjects.header.waitUntilLoadingHasFinished();
-          await testSubjects.existOrFail('homeApp');
+
+          await testSubjects.existOrFail('managementHome');
         });
       });
 
       describe('edit visualization', () => {
-        it('redirects to Kibana home', async () => {
+        it('redirects to management home', async () => {
           await PageObjects.common.navigateToUrl(
             'management',
             'kibana/objects/savedVisualizations/75c3e060-1e7c-11e9-8488-65449e65d0ed',
@@ -333,7 +339,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
             }
           );
           await PageObjects.header.waitUntilLoadingHasFinished();
-          await testSubjects.existOrFail('homeApp');
+          await testSubjects.existOrFail('managementHome');
         });
       });
     });
diff --git a/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts b/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts
index f74643939477c1..862a4a80a465c8 100644
--- a/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts
+++ b/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts
@@ -82,7 +82,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it(`landing page shows "Create new Visualization" button`, async () => {
         await PageObjects.visualize.gotoVisualizationLandingPage();
-        await testSubjects.existOrFail('visualizeLandingPage', {
+        await testSubjects.existOrFail('visualizationLandingPage', {
           timeout: config.get('timeouts.waitFor'),
         });
         await testSubjects.existOrFail('newItemButton');
@@ -206,7 +206,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it(`landing page shows "Create new Visualization" button`, async () => {
         await PageObjects.visualize.gotoVisualizationLandingPage();
-        await testSubjects.existOrFail('visualizeLandingPage', {
+        await testSubjects.existOrFail('visualizationLandingPage', {
           timeout: config.get('timeouts.waitFor'),
         });
         await testSubjects.existOrFail('newItemButton');
@@ -321,7 +321,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it(`landing page shows "Create new Visualization" button`, async () => {
         await PageObjects.visualize.gotoVisualizationLandingPage();
-        await testSubjects.existOrFail('visualizeLandingPage', { timeout: 10000 });
+        await testSubjects.existOrFail('visualizationLandingPage', { timeout: 10000 });
         await testSubjects.existOrFail('newItemButton');
       });
 
diff --git a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts
index 6ddaa07e5cd109..5fb3f7aabcfcd1 100644
--- a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts
+++ b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts
@@ -79,7 +79,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       const toTime = 'Aug 22, 2019 @ 23:09:36.205';
 
       await PageObjects.common.navigateToApp('visualize');
-      await PageObjects.visualize.clickVisualizationByName('hybrid_histogram_line_chart');
+      await PageObjects.visualize.openSavedVisualization('hybrid_histogram_line_chart');
       await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
       await PageObjects.visChart.waitForVisualizationRenderingStabilized();
       await inspector.open();
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
index 14e05d21b87535..3eef95b42cb7de 100644
--- a/x-pack/test/functional/config.js
+++ b/x-pack/test/functional/config.js
@@ -242,6 +242,20 @@ export default async function ({ readConfigFile }) {
           ],
         },
 
+        global_ccr_role: {
+          elasticsearch: {
+            cluster: ['manage', 'manage_ccr'],
+          },
+          kibana: [
+            {
+              feature: {
+                discover: ['read'],
+              },
+              spaces: ['*'],
+            },
+          ],
+        },
+
         //Kibana feature privilege isn't specific to advancedSetting. It can be anything. https://github.com/elastic/kibana/issues/35965
         test_api_keys: {
           elasticsearch: {
diff --git a/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/data.json.gz b/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/data.json.gz
new file mode 100644
index 00000000000000..1e57c64f2d7df5
Binary files /dev/null and b/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/data.json.gz differ
diff --git a/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json b/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json
new file mode 100644
index 00000000000000..1816ebfc118915
--- /dev/null
+++ b/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json
@@ -0,0 +1,2763 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".kibana": {
+      }
+    },
+    "index": ".kibana_1",
+    "mappings": {
+      "_meta": {
+        "migrationMappingPropertyHashes": {
+          "action": "6e96ac5e648f57523879661ea72525b7",
+          "action_task_params": "a9d49f184ee89641044be0ca2950fa3a",
+          "alert": "7b44fba6773e37c806ce290ea9b7024e",
+          "apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd",
+          "apm-telemetry": "3525d7c22c42bc80f5e6e9cb3f2b26a2",
+          "application_usage_totals": "c897e4310c5f24b07caaff3db53ae2c1",
+          "application_usage_transactional": "965839e75f809fefe04f92dc4d99722a",
+          "canvas-element": "7390014e1091044523666d97247392fc",
+          "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
+          "cases": "08b8b110dbca273d37e8aef131ecab61",
+          "cases-comments": "c2061fb929f585df57425102fa928b4b",
+          "cases-configure": "42711cbb311976c0687853f4c1354572",
+          "cases-user-actions": "32277330ec6b721abe3b846cfd939a71",
+          "config": "ae24d22d5986d04124cc6568f771066f",
+          "dashboard": "d00f614b29a80360e1190193fd333bab",
+          "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e",
+          "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
+          "index-pattern": "66eccb05066c5a89924f48a9e9736499",
+          "infrastructure-ui-source": "ddc0ecb18383f6b26101a2fadb2dab0c",
+          "inventory-view": "5299b67717e96502c77babf1c16fd4d3",
+          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
+          "lens": "21c3ea0763beb1ecb0162529706b88c5",
+          "lens-ui-telemetry": "509bfa5978586998e05f9e303c07a327",
+          "map": "23d7aa4a720d4938ccde3983f87bd58d",
+          "maps-telemetry": "268da3a48066123fc5baf35abaa55014",
+          "metrics-explorer-view": "53c5365793677328df0ccb6138bf3cdd",
+          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
+          "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9",
+          "namespace": "2f4316de49999235636386fe51dc06c1",
+          "namespaces": "2f4316de49999235636386fe51dc06c1",
+          "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
+          "references": "7997cf5a56cc02bdc9c93361bde732b0",
+          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
+          "search": "181661168bbadd1eff5902361e2a0d5c",
+          "server": "ec97f1c5da1a19609a60874e5af1100c",
+          "siem-detection-engine-rule-actions": "6569b288c169539db10cb262bf79de18",
+          "siem-detection-engine-rule-status": "ae783f41c6937db6b7a2ef5c93a9e9b0",
+          "siem-ui-timeline": "f2d929253ecd06ffbac78b4047f45a86",
+          "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084",
+          "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
+          "space": "c5ca8acafa0beaa4d08d014a97b6bc6b",
+          "telemetry": "36a616f7026dfa617d6655df850fe16d",
+          "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
+          "tsvb-validation-telemetry": "3a37ef6c8700ae6fc97d5c7da00e9215",
+          "type": "2f4316de49999235636386fe51dc06c1",
+          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
+          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
+          "upgrade-assistant-reindex-operation": "296a89039fc4260292be36b1b005d8f2",
+          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
+          "uptime-dynamic-settings": "a6f3af21b612339cbe6eecc1e5a60871",
+          "url": "b675c3be8d76ecf029294d51dc7ec65d",
+          "visualization": "52d7a13ad68a150c4525b292d23e12cc"
+        }
+      },
+      "dynamic": "strict",
+      "properties": {
+        "action": {
+          "properties": {
+            "actionTypeId": {
+              "type": "keyword"
+            },
+            "config": {
+              "enabled": false,
+              "type": "object"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "secrets": {
+              "type": "binary"
+            }
+          }
+        },
+        "action_task_params": {
+          "properties": {
+            "actionId": {
+              "type": "keyword"
+            },
+            "apiKey": {
+              "type": "binary"
+            },
+            "params": {
+              "enabled": false,
+              "type": "object"
+            }
+          }
+        },
+        "alert": {
+          "properties": {
+            "actions": {
+              "properties": {
+                "actionRef": {
+                  "type": "keyword"
+                },
+                "actionTypeId": {
+                  "type": "keyword"
+                },
+                "group": {
+                  "type": "keyword"
+                },
+                "params": {
+                  "enabled": false,
+                  "type": "object"
+                }
+              },
+              "type": "nested"
+            },
+            "alertTypeId": {
+              "type": "keyword"
+            },
+            "apiKey": {
+              "type": "binary"
+            },
+            "apiKeyOwner": {
+              "type": "keyword"
+            },
+            "consumer": {
+              "type": "keyword"
+            },
+            "createdAt": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "keyword"
+            },
+            "enabled": {
+              "type": "boolean"
+            },
+            "muteAll": {
+              "type": "boolean"
+            },
+            "mutedInstanceIds": {
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "params": {
+              "enabled": false,
+              "type": "object"
+            },
+            "schedule": {
+              "properties": {
+                "interval": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "scheduledTaskId": {
+              "type": "keyword"
+            },
+            "tags": {
+              "type": "keyword"
+            },
+            "throttle": {
+              "type": "keyword"
+            },
+            "updatedBy": {
+              "type": "keyword"
+            }
+          }
+        },
+        "apm-indices": {
+          "properties": {
+            "apm_oss": {
+              "properties": {
+                "errorIndices": {
+                  "type": "keyword"
+                },
+                "metricsIndices": {
+                  "type": "keyword"
+                },
+                "onboardingIndices": {
+                  "type": "keyword"
+                },
+                "sourcemapIndices": {
+                  "type": "keyword"
+                },
+                "spanIndices": {
+                  "type": "keyword"
+                },
+                "transactionIndices": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "apm-telemetry": {
+          "properties": {
+            "agents": {
+              "properties": {
+                "dotnet": {
+                  "properties": {
+                    "agent": {
+                      "properties": {
+                        "version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "service": {
+                      "properties": {
+                        "framework": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "language": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "runtime": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "go": {
+                  "properties": {
+                    "agent": {
+                      "properties": {
+                        "version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "service": {
+                      "properties": {
+                        "framework": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "language": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "runtime": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "java": {
+                  "properties": {
+                    "agent": {
+                      "properties": {
+                        "version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "service": {
+                      "properties": {
+                        "framework": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "language": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "runtime": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "js-base": {
+                  "properties": {
+                    "agent": {
+                      "properties": {
+                        "version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "service": {
+                      "properties": {
+                        "framework": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "language": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "runtime": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "nodejs": {
+                  "properties": {
+                    "agent": {
+                      "properties": {
+                        "version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "service": {
+                      "properties": {
+                        "framework": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "language": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "runtime": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "python": {
+                  "properties": {
+                    "agent": {
+                      "properties": {
+                        "version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "service": {
+                      "properties": {
+                        "framework": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "language": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "runtime": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "ruby": {
+                  "properties": {
+                    "agent": {
+                      "properties": {
+                        "version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "service": {
+                      "properties": {
+                        "framework": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "language": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "runtime": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "rum-js": {
+                  "properties": {
+                    "agent": {
+                      "properties": {
+                        "version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "service": {
+                      "properties": {
+                        "framework": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "language": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "runtime": {
+                          "properties": {
+                            "composite": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "cardinality": {
+              "properties": {
+                "transaction": {
+                  "properties": {
+                    "name": {
+                      "properties": {
+                        "all_agents": {
+                          "properties": {
+                            "1d": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "rum": {
+                          "properties": {
+                            "1d": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "user_agent": {
+                  "properties": {
+                    "original": {
+                      "properties": {
+                        "all_agents": {
+                          "properties": {
+                            "1d": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "rum": {
+                          "properties": {
+                            "1d": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "counts": {
+              "properties": {
+                "agent_configuration": {
+                  "properties": {
+                    "all": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "error": {
+                  "properties": {
+                    "1d": {
+                      "type": "long"
+                    },
+                    "all": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "max_error_groups_per_service": {
+                  "properties": {
+                    "1d": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "max_transaction_groups_per_service": {
+                  "properties": {
+                    "1d": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "metric": {
+                  "properties": {
+                    "1d": {
+                      "type": "long"
+                    },
+                    "all": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "onboarding": {
+                  "properties": {
+                    "1d": {
+                      "type": "long"
+                    },
+                    "all": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "services": {
+                  "properties": {
+                    "1d": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "sourcemap": {
+                  "properties": {
+                    "1d": {
+                      "type": "long"
+                    },
+                    "all": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "span": {
+                  "properties": {
+                    "1d": {
+                      "type": "long"
+                    },
+                    "all": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "traces": {
+                  "properties": {
+                    "1d": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "transaction": {
+                  "properties": {
+                    "1d": {
+                      "type": "long"
+                    },
+                    "all": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "has_any_services": {
+              "type": "boolean"
+            },
+            "indices": {
+              "properties": {
+                "all": {
+                  "properties": {
+                    "total": {
+                      "properties": {
+                        "docs": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "store": {
+                          "properties": {
+                            "size_in_bytes": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards": {
+                  "properties": {
+                    "total": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "integrations": {
+              "properties": {
+                "ml": {
+                  "properties": {
+                    "all_jobs_count": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "retainment": {
+              "properties": {
+                "error": {
+                  "properties": {
+                    "ms": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "metric": {
+                  "properties": {
+                    "ms": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "onboarding": {
+                  "properties": {
+                    "ms": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "span": {
+                  "properties": {
+                    "ms": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "transaction": {
+                  "properties": {
+                    "ms": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "services_per_agent": {
+              "properties": {
+                "dotnet": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "go": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "java": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "js-base": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "nodejs": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "python": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "ruby": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "rum-js": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            },
+            "tasks": {
+              "properties": {
+                "agent_configuration": {
+                  "properties": {
+                    "took": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "agents": {
+                  "properties": {
+                    "took": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "cardinality": {
+                  "properties": {
+                    "took": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "groupings": {
+                  "properties": {
+                    "took": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "indices_stats": {
+                  "properties": {
+                    "took": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "integrations": {
+                  "properties": {
+                    "took": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "processor_events": {
+                  "properties": {
+                    "took": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "services": {
+                  "properties": {
+                    "took": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "versions": {
+                  "properties": {
+                    "took": {
+                      "properties": {
+                        "ms": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "version": {
+              "properties": {
+                "apm_server": {
+                  "properties": {
+                    "major": {
+                      "type": "long"
+                    },
+                    "minor": {
+                      "type": "long"
+                    },
+                    "patch": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "application_usage_totals": {
+          "properties": {
+            "appId": {
+              "type": "keyword"
+            },
+            "minutesOnScreen": {
+              "type": "float"
+            },
+            "numberOfClicks": {
+              "type": "long"
+            }
+          }
+        },
+        "application_usage_transactional": {
+          "properties": {
+            "appId": {
+              "type": "keyword"
+            },
+            "minutesOnScreen": {
+              "type": "float"
+            },
+            "numberOfClicks": {
+              "type": "long"
+            },
+            "timestamp": {
+              "type": "date"
+            }
+          }
+        },
+        "canvas-element": {
+          "dynamic": "false",
+          "properties": {
+            "@created": {
+              "type": "date"
+            },
+            "@timestamp": {
+              "type": "date"
+            },
+            "content": {
+              "type": "text"
+            },
+            "help": {
+              "type": "text"
+            },
+            "image": {
+              "type": "text"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "canvas-workpad": {
+          "dynamic": "false",
+          "properties": {
+            "@created": {
+              "type": "date"
+            },
+            "@timestamp": {
+              "type": "date"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "cases": {
+          "properties": {
+            "closed_at": {
+              "type": "date"
+            },
+            "closed_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "created_at": {
+              "type": "date"
+            },
+            "created_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "description": {
+              "type": "text"
+            },
+            "external_service": {
+              "properties": {
+                "connector_id": {
+                  "type": "keyword"
+                },
+                "connector_name": {
+                  "type": "keyword"
+                },
+                "external_id": {
+                  "type": "keyword"
+                },
+                "external_title": {
+                  "type": "text"
+                },
+                "external_url": {
+                  "type": "text"
+                },
+                "pushed_at": {
+                  "type": "date"
+                },
+                "pushed_by": {
+                  "properties": {
+                    "email": {
+                      "type": "keyword"
+                    },
+                    "full_name": {
+                      "type": "keyword"
+                    },
+                    "username": {
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "status": {
+              "type": "keyword"
+            },
+            "tags": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "keyword"
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cases-comments": {
+          "properties": {
+            "comment": {
+              "type": "text"
+            },
+            "created_at": {
+              "type": "date"
+            },
+            "created_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "pushed_at": {
+              "type": "date"
+            },
+            "pushed_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cases-configure": {
+          "properties": {
+            "closure_type": {
+              "type": "keyword"
+            },
+            "connector_id": {
+              "type": "keyword"
+            },
+            "connector_name": {
+              "type": "keyword"
+            },
+            "created_at": {
+              "type": "date"
+            },
+            "created_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cases-user-actions": {
+          "properties": {
+            "action": {
+              "type": "keyword"
+            },
+            "action_at": {
+              "type": "date"
+            },
+            "action_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "action_field": {
+              "type": "keyword"
+            },
+            "new_value": {
+              "type": "text"
+            },
+            "old_value": {
+              "type": "text"
+            }
+          }
+        },
+        "config": {
+          "dynamic": "true",
+          "properties": {
+            "accessibility:disableAnimations": {
+              "type": "boolean"
+            },
+            "buildNum": {
+              "type": "keyword"
+            },
+            "dateFormat:tz": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "defaultIndex": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "timepicker:quickRanges": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "dashboard": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "optionsJSON": {
+              "type": "text"
+            },
+            "panelsJSON": {
+              "type": "text"
+            },
+            "refreshInterval": {
+              "properties": {
+                "display": {
+                  "type": "keyword"
+                },
+                "pause": {
+                  "type": "boolean"
+                },
+                "section": {
+                  "type": "integer"
+                },
+                "value": {
+                  "type": "integer"
+                }
+              }
+            },
+            "timeFrom": {
+              "type": "keyword"
+            },
+            "timeRestore": {
+              "type": "boolean"
+            },
+            "timeTo": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "file-upload-telemetry": {
+          "properties": {
+            "filesUploadedTotalCount": {
+              "type": "long"
+            }
+          }
+        },
+        "graph-workspace": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "numLinks": {
+              "type": "integer"
+            },
+            "numVertices": {
+              "type": "integer"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "wsState": {
+              "type": "text"
+            }
+          }
+        },
+        "index-pattern": {
+          "properties": {
+            "fieldFormatMap": {
+              "type": "text"
+            },
+            "fields": {
+              "type": "text"
+            },
+            "intervalName": {
+              "type": "keyword"
+            },
+            "notExpandable": {
+              "type": "boolean"
+            },
+            "sourceFilters": {
+              "type": "text"
+            },
+            "timeFieldName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "type": {
+              "type": "keyword"
+            },
+            "typeMeta": {
+              "type": "keyword"
+            }
+          }
+        },
+        "infrastructure-ui-source": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "fields": {
+              "properties": {
+                "container": {
+                  "type": "keyword"
+                },
+                "host": {
+                  "type": "keyword"
+                },
+                "pod": {
+                  "type": "keyword"
+                },
+                "tiebreaker": {
+                  "type": "keyword"
+                },
+                "timestamp": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "logAlias": {
+              "type": "keyword"
+            },
+            "logColumns": {
+              "properties": {
+                "fieldColumn": {
+                  "properties": {
+                    "field": {
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "messageColumn": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "timestampColumn": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                }
+              },
+              "type": "nested"
+            },
+            "metricAlias": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "text"
+            }
+          }
+        },
+        "inventory-view": {
+          "properties": {
+            "accountId": {
+              "type": "keyword"
+            },
+            "autoBounds": {
+              "type": "boolean"
+            },
+            "autoReload": {
+              "type": "boolean"
+            },
+            "boundsOverride": {
+              "properties": {
+                "max": {
+                  "type": "integer"
+                },
+                "min": {
+                  "type": "integer"
+                }
+              }
+            },
+            "customMetrics": {
+              "properties": {
+                "aggregation": {
+                  "type": "keyword"
+                },
+                "field": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "label": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "customOptions": {
+              "properties": {
+                "field": {
+                  "type": "keyword"
+                },
+                "text": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "filterQuery": {
+              "properties": {
+                "expression": {
+                  "type": "keyword"
+                },
+                "kind": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "groupBy": {
+              "properties": {
+                "field": {
+                  "type": "keyword"
+                },
+                "label": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "metric": {
+              "properties": {
+                "aggregation": {
+                  "type": "keyword"
+                },
+                "field": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "label": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "nodeType": {
+              "type": "keyword"
+            },
+            "region": {
+              "type": "keyword"
+            },
+            "time": {
+              "type": "long"
+            },
+            "view": {
+              "type": "keyword"
+            }
+          }
+        },
+        "kql-telemetry": {
+          "properties": {
+            "optInCount": {
+              "type": "long"
+            },
+            "optOutCount": {
+              "type": "long"
+            }
+          }
+        },
+        "lens": {
+          "properties": {
+            "expression": {
+              "index": false,
+              "type": "keyword"
+            },
+            "state": {
+              "type": "flattened"
+            },
+            "title": {
+              "type": "text"
+            },
+            "visualizationType": {
+              "type": "keyword"
+            }
+          }
+        },
+        "lens-ui-telemetry": {
+          "properties": {
+            "count": {
+              "type": "integer"
+            },
+            "date": {
+              "type": "date"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          }
+        },
+        "map": {
+          "properties": {
+            "bounds": {
+              "type": "geo_shape"
+            },
+            "description": {
+              "type": "text"
+            },
+            "layerListJSON": {
+              "type": "text"
+            },
+            "mapStateJSON": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "maps-telemetry": {
+          "properties": {
+            "attributesPerMap": {
+              "properties": {
+                "dataSourcesCount": {
+                  "properties": {
+                    "avg": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "emsVectorLayersCount": {
+                  "dynamic": "true",
+                  "type": "object"
+                },
+                "layerTypesCount": {
+                  "dynamic": "true",
+                  "type": "object"
+                },
+                "layersCount": {
+                  "properties": {
+                    "avg": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indexPatternsWithGeoFieldCount": {
+              "type": "long"
+            },
+            "mapsTotalCount": {
+              "type": "long"
+            },
+            "settings": {
+              "properties": {
+                "showMapVisualizationTypes": {
+                  "type": "boolean"
+                }
+              }
+            },
+            "timeCaptured": {
+              "type": "date"
+            }
+          }
+        },
+        "metrics-explorer-view": {
+          "properties": {
+            "chartOptions": {
+              "properties": {
+                "stack": {
+                  "type": "boolean"
+                },
+                "type": {
+                  "type": "keyword"
+                },
+                "yAxisMode": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "currentTimerange": {
+              "properties": {
+                "from": {
+                  "type": "keyword"
+                },
+                "interval": {
+                  "type": "keyword"
+                },
+                "to": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "options": {
+              "properties": {
+                "aggregation": {
+                  "type": "keyword"
+                },
+                "filterQuery": {
+                  "type": "keyword"
+                },
+                "groupBy": {
+                  "type": "keyword"
+                },
+                "limit": {
+                  "type": "integer"
+                },
+                "metrics": {
+                  "properties": {
+                    "aggregation": {
+                      "type": "keyword"
+                    },
+                    "color": {
+                      "type": "keyword"
+                    },
+                    "field": {
+                      "type": "keyword"
+                    },
+                    "label": {
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "nested"
+                }
+              }
+            }
+          }
+        },
+        "migrationVersion": {
+          "dynamic": "true",
+          "properties": {
+            "index-pattern": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "space": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "ml-telemetry": {
+          "properties": {
+            "file_data_visualizer": {
+              "properties": {
+                "index_creation_count": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "namespace": {
+          "type": "keyword"
+        },
+        "namespaces": {
+          "type": "keyword"
+        },
+        "query": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "filters": {
+              "enabled": false,
+              "type": "object"
+            },
+            "query": {
+              "properties": {
+                "language": {
+                  "type": "keyword"
+                },
+                "query": {
+                  "index": false,
+                  "type": "keyword"
+                }
+              }
+            },
+            "timefilter": {
+              "enabled": false,
+              "type": "object"
+            },
+            "title": {
+              "type": "text"
+            }
+          }
+        },
+        "references": {
+          "properties": {
+            "id": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          },
+          "type": "nested"
+        },
+        "sample-data-telemetry": {
+          "properties": {
+            "installCount": {
+              "type": "long"
+            },
+            "unInstallCount": {
+              "type": "long"
+            }
+          }
+        },
+        "search": {
+          "properties": {
+            "columns": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "sort": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "uuid": {
+              "type": "keyword"
+            }
+          }
+        },
+        "siem-detection-engine-rule-actions": {
+          "properties": {
+            "actions": {
+              "properties": {
+                "action_type_id": {
+                  "type": "keyword"
+                },
+                "group": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "params": {
+                  "enabled": false,
+                  "type": "object"
+                }
+              }
+            },
+            "alertThrottle": {
+              "type": "keyword"
+            },
+            "ruleAlertId": {
+              "type": "keyword"
+            },
+            "ruleThrottle": {
+              "type": "keyword"
+            }
+          }
+        },
+        "siem-detection-engine-rule-status": {
+          "properties": {
+            "alertId": {
+              "type": "keyword"
+            },
+            "bulkCreateTimeDurations": {
+              "type": "float"
+            },
+            "gap": {
+              "type": "text"
+            },
+            "lastFailureAt": {
+              "type": "date"
+            },
+            "lastFailureMessage": {
+              "type": "text"
+            },
+            "lastLookBackDate": {
+              "type": "date"
+            },
+            "lastSuccessAt": {
+              "type": "date"
+            },
+            "lastSuccessMessage": {
+              "type": "text"
+            },
+            "searchAfterTimeDurations": {
+              "type": "float"
+            },
+            "status": {
+              "type": "keyword"
+            },
+            "statusDate": {
+              "type": "date"
+            }
+          }
+        },
+        "siem-ui-timeline": {
+          "properties": {
+            "columns": {
+              "properties": {
+                "aggregatable": {
+                  "type": "boolean"
+                },
+                "category": {
+                  "type": "keyword"
+                },
+                "columnHeaderType": {
+                  "type": "keyword"
+                },
+                "description": {
+                  "type": "text"
+                },
+                "example": {
+                  "type": "text"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "indexes": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "text"
+                },
+                "placeholder": {
+                  "type": "text"
+                },
+                "searchable": {
+                  "type": "boolean"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "dataProviders": {
+              "properties": {
+                "and": {
+                  "properties": {
+                    "enabled": {
+                      "type": "boolean"
+                    },
+                    "excluded": {
+                      "type": "boolean"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    },
+                    "kqlQuery": {
+                      "type": "text"
+                    },
+                    "name": {
+                      "type": "text"
+                    },
+                    "queryMatch": {
+                      "properties": {
+                        "displayField": {
+                          "type": "text"
+                        },
+                        "displayValue": {
+                          "type": "text"
+                        },
+                        "field": {
+                          "type": "text"
+                        },
+                        "operator": {
+                          "type": "text"
+                        },
+                        "value": {
+                          "type": "text"
+                        }
+                      }
+                    }
+                  }
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "excluded": {
+                  "type": "boolean"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "kqlQuery": {
+                  "type": "text"
+                },
+                "name": {
+                  "type": "text"
+                },
+                "queryMatch": {
+                  "properties": {
+                    "displayField": {
+                      "type": "text"
+                    },
+                    "displayValue": {
+                      "type": "text"
+                    },
+                    "field": {
+                      "type": "text"
+                    },
+                    "operator": {
+                      "type": "text"
+                    },
+                    "value": {
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            },
+            "dateRange": {
+              "properties": {
+                "end": {
+                  "type": "date"
+                },
+                "start": {
+                  "type": "date"
+                }
+              }
+            },
+            "description": {
+              "type": "text"
+            },
+            "eventType": {
+              "type": "keyword"
+            },
+            "favorite": {
+              "properties": {
+                "favoriteDate": {
+                  "type": "date"
+                },
+                "fullName": {
+                  "type": "text"
+                },
+                "keySearch": {
+                  "type": "text"
+                },
+                "userName": {
+                  "type": "text"
+                }
+              }
+            },
+            "filters": {
+              "properties": {
+                "exists": {
+                  "type": "text"
+                },
+                "match_all": {
+                  "type": "text"
+                },
+                "meta": {
+                  "properties": {
+                    "alias": {
+                      "type": "text"
+                    },
+                    "controlledBy": {
+                      "type": "text"
+                    },
+                    "disabled": {
+                      "type": "boolean"
+                    },
+                    "field": {
+                      "type": "text"
+                    },
+                    "formattedValue": {
+                      "type": "text"
+                    },
+                    "index": {
+                      "type": "keyword"
+                    },
+                    "key": {
+                      "type": "keyword"
+                    },
+                    "negate": {
+                      "type": "boolean"
+                    },
+                    "params": {
+                      "type": "text"
+                    },
+                    "type": {
+                      "type": "keyword"
+                    },
+                    "value": {
+                      "type": "text"
+                    }
+                  }
+                },
+                "missing": {
+                  "type": "text"
+                },
+                "query": {
+                  "type": "text"
+                },
+                "range": {
+                  "type": "text"
+                },
+                "script": {
+                  "type": "text"
+                }
+              }
+            },
+            "kqlMode": {
+              "type": "keyword"
+            },
+            "kqlQuery": {
+              "properties": {
+                "filterQuery": {
+                  "properties": {
+                    "kuery": {
+                      "properties": {
+                        "expression": {
+                          "type": "text"
+                        },
+                        "kind": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "serializedQuery": {
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            },
+            "savedQueryId": {
+              "type": "keyword"
+            },
+            "sort": {
+              "properties": {
+                "columnId": {
+                  "type": "keyword"
+                },
+                "sortDirection": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "templateTimelineId": {
+              "type": "text"
+            },
+            "templateTimelineVersion": {
+              "type": "integer"
+            },
+            "timelineType": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "siem-ui-timeline-note": {
+          "properties": {
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "eventId": {
+              "type": "keyword"
+            },
+            "note": {
+              "type": "text"
+            },
+            "timelineId": {
+              "type": "keyword"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "siem-ui-timeline-pinned-event": {
+          "properties": {
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "eventId": {
+              "type": "keyword"
+            },
+            "timelineId": {
+              "type": "keyword"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "space": {
+          "properties": {
+            "_reserved": {
+              "type": "boolean"
+            },
+            "color": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "disabledFeatures": {
+              "type": "keyword"
+            },
+            "imageUrl": {
+              "index": false,
+              "type": "text"
+            },
+            "initials": {
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "spaceId": {
+          "type": "keyword"
+        },
+        "telemetry": {
+          "properties": {
+            "allowChangingOptInStatus": {
+              "type": "boolean"
+            },
+            "enabled": {
+              "type": "boolean"
+            },
+            "lastReported": {
+              "type": "date"
+            },
+            "lastVersionChecked": {
+              "type": "keyword"
+            },
+            "reportFailureCount": {
+              "type": "integer"
+            },
+            "reportFailureVersion": {
+              "type": "keyword"
+            },
+            "sendUsageFrom": {
+              "type": "keyword"
+            },
+            "userHasSeenNotice": {
+              "type": "boolean"
+            }
+          }
+        },
+        "timelion-sheet": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "timelion_chart_height": {
+              "type": "integer"
+            },
+            "timelion_columns": {
+              "type": "integer"
+            },
+            "timelion_interval": {
+              "type": "keyword"
+            },
+            "timelion_other_interval": {
+              "type": "keyword"
+            },
+            "timelion_rows": {
+              "type": "integer"
+            },
+            "timelion_sheet": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "tsvb-validation-telemetry": {
+          "properties": {
+            "failedRequests": {
+              "type": "long"
+            }
+          }
+        },
+        "type": {
+          "type": "keyword"
+        },
+        "ui-metric": {
+          "properties": {
+            "count": {
+              "type": "integer"
+            }
+          }
+        },
+        "updated_at": {
+          "type": "date"
+        },
+        "upgrade-assistant-reindex-operation": {
+          "properties": {
+            "errorMessage": {
+              "type": "keyword"
+            },
+            "indexName": {
+              "type": "keyword"
+            },
+            "lastCompletedStep": {
+              "type": "integer"
+            },
+            "locked": {
+              "type": "date"
+            },
+            "newIndexName": {
+              "type": "keyword"
+            },
+            "reindexOptions": {
+              "properties": {
+                "openAndClose": {
+                  "type": "boolean"
+                },
+                "queueSettings": {
+                  "properties": {
+                    "queuedAt": {
+                      "type": "long"
+                    },
+                    "startedAt": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "reindexTaskId": {
+              "type": "keyword"
+            },
+            "reindexTaskPercComplete": {
+              "type": "float"
+            },
+            "runningReindexCount": {
+              "type": "integer"
+            },
+            "status": {
+              "type": "integer"
+            }
+          }
+        },
+        "upgrade-assistant-telemetry": {
+          "properties": {
+            "features": {
+              "properties": {
+                "deprecation_logging": {
+                  "properties": {
+                    "enabled": {
+                      "null_value": true,
+                      "type": "boolean"
+                    }
+                  }
+                }
+              }
+            },
+            "ui_open": {
+              "properties": {
+                "cluster": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "indices": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "overview": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            },
+            "ui_reindex": {
+              "properties": {
+                "close": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "open": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "start": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "stop": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "uptime-dynamic-settings": {
+          "properties": {
+            "certThresholds": {
+              "properties": {
+                "age": {
+                  "type": "long"
+                },
+                "expiration": {
+                  "type": "long"
+                }
+              }
+            },
+            "heartbeatIndices": {
+              "type": "keyword"
+            }
+          }
+        },
+        "url": {
+          "properties": {
+            "accessCount": {
+              "type": "long"
+            },
+            "accessDate": {
+              "type": "date"
+            },
+            "createDate": {
+              "type": "date"
+            },
+            "url": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "visualization": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "savedSearchRefName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "visState": {
+              "type": "text"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/test/functional/page_objects/security_page.ts b/x-pack/test/functional/page_objects/security_page.ts
index 395e41a91f53a4..e3efc8731e6b3d 100644
--- a/x-pack/test/functional/page_objects/security_page.ts
+++ b/x-pack/test/functional/page_objects/security_page.ts
@@ -315,6 +315,8 @@ export function SecurityPageProvider({ getService, getPageObjects }: FtrProvider
 
     async getElasticsearchUsers() {
       const users = [];
+      await testSubjects.click('tablePaginationPopoverButton');
+      await testSubjects.click('tablePagination-100-rows');
       for (const user of await testSubjects.findAll('userRow')) {
         const fullnameElement = await user.findByTestSubject('userRowFullName');
         const usernameElement = await user.findByTestSubject('userRowUserName');
@@ -339,6 +341,8 @@ export function SecurityPageProvider({ getService, getPageObjects }: FtrProvider
 
     async getElasticsearchRoles() {
       const roles = [];
+      await testSubjects.click('tablePaginationPopoverButton');
+      await testSubjects.click('tablePagination-100-rows');
       for (const role of await testSubjects.findAll('roleRow')) {
         const [rolename, reserved, deprecated] = await Promise.all([
           role.findByTestSubject('roleRowName').then((el) => el.getVisibleText()),
diff --git a/x-pack/test/ingest_manager_api_integration/apis/file.ts b/x-pack/test/ingest_manager_api_integration/apis/file.ts
new file mode 100644
index 00000000000000..33eeda1ee274d1
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/file.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../api_integration/ftr_provider_context';
+import { warnAndSkipTest } from '../helpers';
+
+export default function ({ getService }: FtrProviderContext) {
+  const log = getService('log');
+  const supertest = getService('supertest');
+  const dockerServers = getService('dockerServers');
+
+  const server = dockerServers.get('registry');
+  describe('package file', () => {
+    it('fetches a .png screenshot image', async function () {
+      if (server.enabled) {
+        await supertest
+          .get(
+            '/api/ingest_manager/epm/packages/filetest/0.1.0/img/screenshots/metricbeat_dashboard.png'
+          )
+          .set('kbn-xsrf', 'xxx')
+          .expect('Content-Type', 'image/png')
+          .expect(200);
+      } else {
+        warnAndSkipTest(this, log);
+      }
+    });
+
+    it('fetches an .svg icon image', async function () {
+      if (server.enabled) {
+        await supertest
+          .get('/api/ingest_manager/epm/packages/filetest/0.1.0/img/logo.svg')
+          .set('kbn-xsrf', 'xxx')
+          .expect('Content-Type', 'image/svg+xml')
+          .expect(200);
+      } else {
+        warnAndSkipTest(this, log);
+      }
+    });
+
+    it('fetches a .json kibana visualization file', async function () {
+      if (server.enabled) {
+        await supertest
+          .get(
+            '/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/visualization/sample_visualization.json'
+          )
+          .set('kbn-xsrf', 'xxx')
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      } else {
+        warnAndSkipTest(this, log);
+      }
+    });
+
+    it('fetches a .json kibana dashboard file', async function () {
+      if (server.enabled) {
+        await supertest
+          .get(
+            '/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/dashboard/sample_dashboard.json'
+          )
+          .set('kbn-xsrf', 'xxx')
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      } else {
+        warnAndSkipTest(this, log);
+      }
+    });
+
+    it('fetches a .json search file', async function () {
+      if (server.enabled) {
+        await supertest
+          .get('/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/search/sample_search.json')
+          .set('kbn-xsrf', 'xxx')
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      } else {
+        warnAndSkipTest(this, log);
+      }
+    });
+  });
+
+  // Disabled for now as we don't serve prebuilt index patterns in current packages.
+  // it('fetches an .json index pattern file', async function () {
+  //   if (server.enabled) {
+  //     await supertest
+  //       .get('/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/index-pattern/sample-*.json')
+  //       .set('kbn-xsrf', 'xxx')
+  //       .expect('Content-Type', 'application/json; charset=utf-8')
+  //       .expect(200);
+  //   } else {
+  //     warnAndSkipTest(this, log);
+  //   }
+  // });
+}
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/package_registry_config.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/package_registry_config.yml
new file mode 100644
index 00000000000000..0060e247827dae
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/package_registry_config.yml
@@ -0,0 +1,3 @@
+  package_paths:
+    - /registry/packages/package-storage
+    - /registry/packages/test-packages
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/docs/README.md b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/docs/README.md
new file mode 100644
index 00000000000000..0d19532bae2d72
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/docs/README.md
@@ -0,0 +1,5 @@
+# filetest
+
+This package contains randomly collected files from other packages to be used in API integration tests.
+
+It also serves as an example how to serve a package from the fixtures directory with the package registry docker container. For this, also see the `x-pack/test/ingest_manager_api_integration/config.ts` how the `test_packages` directory is mounted into the docker container, and `x-pack/test/ingest_manager_api_integration/apis/fixtures/package_registry_config.yml` how to pass the directory to the registry.
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/img/logo.svg b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/img/logo.svg
new file mode 100644
index 00000000000000..15b49bcf28aec2
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/img/logo.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F04E98" d="M29,32.0001 L15.935,9.4321 C13.48,5.1941 7,6.9351 7,11.8321 L7,52.1681 C7,57.0651 13.48,58.8061 15.935,54.5671 L29,32.0001 Z"/>
+    <path fill="#FA744E" d="M34.7773,32.0001 L33.3273,34.5051 L20.2613,57.0731 C19.8473,57.7871 19.3533,58.4271 18.8023,59.0001 L34.9273,59.0001 C38.7073,59.0001 42.2213,57.0601 44.2363,53.8611 L58.0003,32.0001 L34.7773,32.0001 Z"/>
+    <path fill="#343741" d="M44.2363,10.1392 C42.2213,6.9402 38.7073,5.0002 34.9273,5.0002 L18.8023,5.0002 C19.3533,5.5732 19.8473,6.2122 20.2613,6.9272 L33.3273,29.4942 L34.7773,32.0002 L58.0003,32.0002 L44.2363,10.1392 Z"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/img/screenshots/metricbeat_dashboard.png b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/img/screenshots/metricbeat_dashboard.png
new file mode 100644
index 00000000000000..76d414b86c4ab4
Binary files /dev/null and b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/img/screenshots/metricbeat_dashboard.png differ
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/kibana/dashboard/sample_dashboard.json b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/kibana/dashboard/sample_dashboard.json
new file mode 100644
index 00000000000000..0370f58706a65c
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/kibana/dashboard/sample_dashboard.json
@@ -0,0 +1,38 @@
+{
+  "attributes": {
+    "description": "Logs Kafka integration dashboard",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"highlightAll\":true,\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"version\":true}"
+    },
+    "optionsJSON": "{\"darkTheme\":false}",
+    "panelsJSON": "[{\"embeddableConfig\":{},\"gridData\":{\"h\":12,\"i\":\"1\",\"w\":24,\"x\":0,\"y\":0},\"panelIndex\":\"1\",\"panelRefName\":\"panel_0\",\"version\":\"7.3.0\"},{\"embeddableConfig\":{\"columns\":[\"kafka.log.class\",\"kafka.log.trace.class\",\"kafka.log.trace.full\"],\"sort\":[\"@timestamp\",\"desc\"]},\"gridData\":{\"h\":12,\"i\":\"2\",\"w\":24,\"x\":24,\"y\":0},\"panelIndex\":\"2\",\"panelRefName\":\"panel_1\",\"version\":\"7.3.0\"},{\"embeddableConfig\":{\"columns\":[\"log.level\",\"kafka.log.component\",\"message\"],\"sort\":[\"@timestamp\",\"desc\"]},\"gridData\":{\"h\":20,\"i\":\"3\",\"w\":48,\"x\":0,\"y\":20},\"panelIndex\":\"3\",\"panelRefName\":\"panel_2\",\"version\":\"7.3.0\"},{\"embeddableConfig\":{},\"gridData\":{\"h\":8,\"i\":\"4\",\"w\":48,\"x\":0,\"y\":12},\"panelIndex\":\"4\",\"panelRefName\":\"panel_3\",\"version\":\"7.3.0\"}]",
+    "timeRestore": false,
+    "title": "[Logs Kafka] Overview ECS",
+    "version": 1
+  },
+  "id": "sample_dashboard",
+  "references": [
+    {
+      "id": "number-of-kafka-stracktraces-by-class-ecs",
+      "name": "panel_0",
+      "type": "visualization"
+    },
+    {
+      "id": "Kafka stacktraces-ecs",
+      "name": "panel_1",
+      "type": "search"
+    },
+    {
+      "id": "sample_search",
+      "name": "panel_2",
+      "type": "search"
+    },
+    {
+      "id": "sample_visualization",
+      "name": "panel_3",
+      "type": "visualization"
+    }
+  ],
+  "type": "dashboard"
+}
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/kibana/search/sample_search.json b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/kibana/search/sample_search.json
new file mode 100644
index 00000000000000..1b34746cec89e1
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/kibana/search/sample_search.json
@@ -0,0 +1,36 @@
+{
+  "attributes": {
+    "columns": [
+      "log.level",
+      "kafka.log.component",
+      "message"
+    ],
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":null,\"disabled\":false,\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\",\"key\":\"dataset.name\",\"negate\":false,\"params\":{\"query\":\"kafka.log\",\"type\":\"phrase\"},\"type\":\"phrase\",\"value\":\"log\"},\"query\":{\"match\":{\"dataset.name\":{\"query\":\"kafka.log\",\"type\":\"phrase\"}}}}],\"highlightAll\":true,\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\",\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"version\":true}"
+    },
+    "sort": [
+      [
+        "@timestamp",
+        "desc"
+      ]
+    ],
+    "title": "All logs [Logs Kafka] ECS",
+    "version": 1
+  },
+  "id": "All Kafka logs-ecs",
+  "references": [
+    {
+      "id": "logs-*",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern"
+    },
+    {
+      "id": "logs-*",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+      "type": "index-pattern"
+    }
+  ],
+  "type": "search"
+}
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/kibana/visualization/sample_visualization.json b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/kibana/visualization/sample_visualization.json
new file mode 100644
index 00000000000000..5d5162436e6de7
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/kibana/visualization/sample_visualization.json
@@ -0,0 +1,22 @@
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[]}"
+    },
+    "savedSearchRefName": "search_0",
+    "title": "Log levels over time [Logs Kafka] ECS",
+    "uiStateJSON": "{}",
+    "version": 1,
+    "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"extended_bounds\":{},\"field\":\"@timestamp\",\"interval\":\"auto\",\"min_doc_count\":1},\"schema\":\"segment\",\"type\":\"date_histogram\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Log Level\",\"field\":\"log.level\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"@timestamp per day\"},\"type\":\"category\"}],\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"legendPosition\":\"right\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"times\":[],\"type\":\"histogram\",\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"title\":\"Log levels over time [Logs Kafka] ECS\",\"type\":\"histogram\"}"
+  },
+  "id": "sample_visualization",
+  "references": [
+    {
+      "id": "All Kafka logs-ecs",
+      "name": "search_0",
+      "type": "search"
+    }
+  ],
+  "type": "visualization"
+}
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/manifest.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/manifest.yml
new file mode 100644
index 00000000000000..ec3586689becf4
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/filetest/0.1.0/manifest.yml
@@ -0,0 +1,30 @@
+format_version: 1.0.0
+name: filetest
+title: For File Tests
+description: This is a package.
+version: 0.1.0
+categories: []
+# Options are experimental, beta, ga
+release: beta
+# The package type. The options for now are [integration, solution], more type might be added in the future.
+# The default type is integration and will be set if empty.
+type: integration
+license: basic
+# This package can be removed
+removable: true
+
+requirement:
+  elasticsearch:
+    versions: ">7.7.0"
+  kibana:
+    versions: ">7.7.0"
+
+screenshots:
+- src: "/img/screenshots/metricbeat_dashboard.png"
+  title: "metricbeat dashboard"
+  size: "1855x949"
+  type: "image/png"
+icons:
+  - src: "/img/logo.svg"
+    size: "16x16"
+    type: "image/svg+xml"
\ No newline at end of file
diff --git a/x-pack/test/epm_api_integration/apis/ilm.ts b/x-pack/test/ingest_manager_api_integration/apis/ilm.ts
similarity index 100%
rename from x-pack/test/epm_api_integration/apis/ilm.ts
rename to x-pack/test/ingest_manager_api_integration/apis/ilm.ts
diff --git a/x-pack/test/epm_api_integration/apis/index.js b/x-pack/test/ingest_manager_api_integration/apis/index.js
similarity index 90%
rename from x-pack/test/epm_api_integration/apis/index.js
rename to x-pack/test/ingest_manager_api_integration/apis/index.js
index 3dc4624d15cf42..ef8880f86078b3 100644
--- a/x-pack/test/epm_api_integration/apis/index.js
+++ b/x-pack/test/ingest_manager_api_integration/apis/index.js
@@ -9,7 +9,7 @@ export default function ({ loadTestFile }) {
     this.tags('ciGroup7');
     loadTestFile(require.resolve('./list'));
     loadTestFile(require.resolve('./file'));
-    loadTestFile(require.resolve('./template'));
+    //loadTestFile(require.resolve('./template'));
     loadTestFile(require.resolve('./ilm'));
   });
 }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/list.ts b/x-pack/test/ingest_manager_api_integration/apis/list.ts
new file mode 100644
index 00000000000000..200358cb6f8f03
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/list.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../api_integration/ftr_provider_context';
+import { warnAndSkipTest } from '../helpers';
+
+export default function ({ getService }: FtrProviderContext) {
+  const log = getService('log');
+  const supertest = getService('supertest');
+  const dockerServers = getService('dockerServers');
+
+  const server = dockerServers.get('registry');
+  // use function () {} and not () => {} here
+  // because `this` has to point to the Mocha context
+  // see https://mochajs.org/#arrow-functions
+
+  describe('list', async function () {
+    it('lists all packages from the registry', async function () {
+      if (server.enabled) {
+        const fetchPackageList = async () => {
+          const response = await supertest
+            .get('/api/ingest_manager/epm/packages')
+            .set('kbn-xsrf', 'xxx')
+            .expect(200);
+          return response.body;
+        };
+        const listResponse = await fetchPackageList();
+        expect(listResponse.response.length).to.be(11);
+      } else {
+        warnAndSkipTest(this, log);
+      }
+    });
+  });
+}
diff --git a/x-pack/test/epm_api_integration/apis/mock_http_server.d.ts b/x-pack/test/ingest_manager_api_integration/apis/mock_http_server.d.ts
similarity index 100%
rename from x-pack/test/epm_api_integration/apis/mock_http_server.d.ts
rename to x-pack/test/ingest_manager_api_integration/apis/mock_http_server.d.ts
diff --git a/x-pack/test/epm_api_integration/apis/template.ts b/x-pack/test/ingest_manager_api_integration/apis/template.ts
similarity index 100%
rename from x-pack/test/epm_api_integration/apis/template.ts
rename to x-pack/test/ingest_manager_api_integration/apis/template.ts
diff --git a/x-pack/test/ingest_manager_api_integration/config.ts b/x-pack/test/ingest_manager_api_integration/config.ts
new file mode 100644
index 00000000000000..bbef12463ed089
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/config.ts
@@ -0,0 +1,67 @@
+/*
+ * 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 path from 'path';
+
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { defineDockerServersConfig } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));
+
+  const registryPort: string | undefined = process.env.INGEST_MANAGEMENT_PACKAGE_REGISTRY_PORT;
+
+  // mount the config file for the package registry as well as
+  // the directory containing additional packages into the container
+  const dockerArgs: string[] = [
+    '-v',
+    `${path.join(
+      path.dirname(__filename),
+      './apis/fixtures/package_registry_config.yml'
+    )}:/registry/config.yml`,
+    '-v',
+    `${path.join(
+      path.dirname(__filename),
+      './apis/fixtures/test_packages'
+    )}:/registry/packages/test-packages`,
+  ];
+
+  return {
+    testFiles: [require.resolve('./apis')],
+    servers: xPackAPITestsConfig.get('servers'),
+    dockerServers: defineDockerServersConfig({
+      registry: {
+        enabled: !!registryPort,
+        image: 'docker.elastic.co/package-registry/package-registry:kibana-testing-1',
+        portInContainer: 8080,
+        port: registryPort,
+        args: dockerArgs,
+        waitForLogLine: 'package manifests loaded',
+      },
+    }),
+    services: {
+      supertest: xPackAPITestsConfig.get('services.supertest'),
+      es: xPackAPITestsConfig.get('services.es'),
+    },
+    junit: {
+      reportName: 'X-Pack EPM API Integration Tests',
+    },
+
+    esTestCluster: {
+      ...xPackAPITestsConfig.get('esTestCluster'),
+    },
+
+    kbnTestServer: {
+      ...xPackAPITestsConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...xPackAPITestsConfig.get('kbnTestServer.serverArgs'),
+        ...(registryPort
+          ? [`--xpack.ingestManager.epm.registryUrl=http://localhost:${registryPort}`]
+          : []),
+      ],
+    },
+  };
+}
diff --git a/x-pack/test/ingest_manager_api_integration/helpers.ts b/x-pack/test/ingest_manager_api_integration/helpers.ts
new file mode 100644
index 00000000000000..121630249621be
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/helpers.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Context } from 'mocha';
+import { ToolingLog } from '@kbn/dev-utils';
+
+export function warnAndSkipTest(mochaContext: Context, log: ToolingLog) {
+  log.warning(
+    'disabling tests because DockerServers service is not enabled, set INGEST_MANAGEMENT_PACKAGE_REGISTRY_PORT to run them'
+  );
+  mochaContext.skip();
+}
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index b0c161ca1d0c24..f0e47c68866010 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -110,9 +110,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
               id: policyInfo.datasource.id,
               dataset: { namespace: 'default' },
               name: 'Protect East Coast',
-              package: {
-                name: 'endpoint',
-                version: policyInfo.packageInfo.version,
+              meta: {
+                package: {
+                  name: 'endpoint',
+                  version: policyInfo.packageInfo.version,
+                },
               },
               policy: {
                 linux: {
diff --git a/x-pack/typings/js_levenshtein.d.ts b/x-pack/typings/js_levenshtein.d.ts
new file mode 100644
index 00000000000000..812bf24bf3dd78
--- /dev/null
+++ b/x-pack/typings/js_levenshtein.d.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+declare module 'js-levenshtein' {
+  const levenshtein: (a: string, b: string) => number;
+  export = levenshtein;
+}
diff --git a/yarn.lock b/yarn.lock
index 0a7899e4ac1023..d40a3abfa8939b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1929,7 +1929,7 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.9.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
   integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
@@ -5708,19 +5708,19 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-router-dom@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.3.tgz#b5d28e7850bd274d944c0fbbe5d57e6b30d71196"
-  integrity sha512-pCq7AkOvjE65jkGS5fQwQhvUp4+4PVD9g39gXLZViP2UqFiFzsEpB3PKf0O6mdbKsewSK8N14/eegisa/0CwnA==
+"@types/react-router-dom@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.5.tgz#7c334a2ea785dbad2b2dcdd83d2cf3d9973da090"
+  integrity sha512-ArBM4B1g3BWLGbaGvwBGO75GNFbLDUthrDojV2vHLih/Tq8M+tgvY1DSwkuNrPSwdp/GUL93WSEpTZs8nVyJLw==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
     "@types/react-router" "*"
 
-"@types/react-router@*", "@types/react-router@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.3.tgz#7c7ca717399af64d8733d8cb338dd43641b96f2d"
-  integrity sha512-0gGhmerBqN8CzlnDmSgGNun3tuZFXerUclWkqEhozdLaJtfcJRUTGkKaEKk+/MpHd1KDS1+o2zb/3PkBUiv2qQ==
+"@types/react-router@*", "@types/react-router@^5.1.7":
+  version "5.1.7"
+  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.7.tgz#e9d12ed7dcfc79187e4d36667745b69a5aa11556"
+  integrity sha512-2ouP76VQafKjtuc0ShpwUebhHwJo0G6rhahW9Pb8au3tQTjYXd2jta4wv6U2tGLR/I42yuG00+UXjNYY0dTzbg==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
@@ -19523,6 +19523,11 @@ js-levenshtein@^1.1.3:
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.3.tgz#3ef627df48ec8cf24bacf05c0f184ff30ef413c5"
   integrity sha512-/812MXr9RBtMObviZ8gQBhHO8MOrGj8HlEE+4ccMTElNA/6I3u39u+bhny55Lk921yn44nSZFy9naNLElL5wgQ==
 
+js-levenshtein@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
+  integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
+
 js-search@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/js-search/-/js-search-1.4.3.tgz#23a86d7e064ca53a473930edc48615b6b1c1954a"
@@ -21720,14 +21725,13 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.0.tgz#cfc45c37e9ec0d8f0a0ec3dd4ef7f7c3abe39256"
   integrity sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY=
 
-mini-create-react-context@^0.3.0:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz#79fc598f283dd623da8e088b05db8cddab250189"
-  integrity sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw==
+mini-create-react-context@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz#df60501c83151db69e28eac0ef08b4002efab040"
+  integrity sha512-b0TytUgFSbgFJGzJqXPKCFCBWigAjpjo+Fl7Vf7ZbKRDptszpppKxXH6DRXEABZ/gcEQczeb0iZ7JvL8e8jjCA==
   dependencies:
-    "@babel/runtime" "^7.4.0"
-    gud "^1.0.0"
-    tiny-warning "^1.0.2"
+    "@babel/runtime" "^7.5.5"
+    tiny-warning "^1.0.3"
 
 mini-css-extract-plugin@0.7.0, mini-css-extract-plugin@^0.7.0:
   version "0.7.0"
@@ -25678,30 +25682,10 @@ react-intl@^2.8.0:
     intl-relativeformat "^2.1.0"
     invariant "^2.1.1"
 
-react-is@^16.12.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
-  integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
-
-react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
-  integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
-
-react-is@^16.8.3:
-  version "16.9.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
-  integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==
-
-react-is@^16.8.4:
-  version "16.8.5"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.5.tgz#c54ac229dd66b5afe0de5acbe47647c3da692ff8"
-  integrity sha512-sudt2uq5P/2TznPV4Wtdi+Lnq3yaYW8LfvPKLM9BKD8jJNBkxMVyB0C9/GmVhLw7Jbdmndk/73n7XQGeN9A3QQ==
-
-react-is@^16.9.0:
-  version "16.11.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.11.0.tgz#b85dfecd48ad1ce469ff558a882ca8e8313928fa"
-  integrity sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw==
+react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.3, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
 react-is@~16.3.0:
   version "16.3.2"
@@ -25871,16 +25855,16 @@ react-reverse-portal@^1.0.4:
   resolved "https://registry.yarnpkg.com/react-reverse-portal/-/react-reverse-portal-1.0.4.tgz#d127d2c9147549b25c4959aba1802eca4b144cd4"
   integrity sha512-WESex/wSjxHwdG7M0uwPNkdQXaLauXNHi4INQiRybmFIXVzAqgf/Ak2OzJ4MLf4UuCD/IzEwJOkML2SxnnontA==
 
-react-router-dom@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz#06701b834352f44d37fbb6311f870f84c76b9c18"
-  integrity sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew==
+react-router-dom@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662"
+  integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==
   dependencies:
     "@babel/runtime" "^7.1.2"
     history "^4.9.0"
     loose-envify "^1.3.1"
     prop-types "^15.6.2"
-    react-router "5.1.2"
+    react-router "5.2.0"
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
 
@@ -25889,16 +25873,16 @@ react-router-redux@^4.0.8:
   resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-4.0.8.tgz#227403596b5151e182377dab835b5d45f0f8054e"
   integrity sha1-InQDWWtRUeGCN32rg1tdRfD4BU4=
 
-react-router@5.1.2, react-router@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz#6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418"
-  integrity sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==
+react-router@5.2.0, react-router@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293"
+  integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==
   dependencies:
     "@babel/runtime" "^7.1.2"
     history "^4.9.0"
     hoist-non-react-statics "^3.1.0"
     loose-envify "^1.3.1"
-    mini-create-react-context "^0.3.0"
+    mini-create-react-context "^0.4.0"
     path-to-regexp "^1.7.0"
     prop-types "^15.6.2"
     react-is "^16.6.0"
@@ -30133,7 +30117,7 @@ tiny-warning@^1.0.0:
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.2.tgz#1dfae771ee1a04396bdfde27a3adcebc6b648b28"
   integrity sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q==
 
-tiny-warning@^1.0.2:
+tiny-warning@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==